Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/check/dialog.edit.vue

@@ -326,8 +326,9 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="onHide">取消</el-button>
+        
       </div>
     </DialogCom>
     <DialogSelect

src/views/check/index.vue

@@ -21,140 +21,145 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="70px"
+          label-width="90px"
         >
-          <el-form-item prop="checkType" label="任务类型">
-            <el-select
-              prop="checkType"
-              label="任务类型"
-              v-model="queryParams.checkType"
-              placeholder="请选择任务类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.check_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
-            <el-select
-              prop="execOrgType"
-              label="检查机构类型"
-              v-model="queryParams.execOrgType"
-              placeholder="请选择检查机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
-            <el-select
-              prop="checkOrgType"
-              label="受检机构类型"
-              v-model="queryParams.checkOrgType"
-              placeholder="请选择受检机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-form-item prop="checkType" label="任务类型">
+              <el-select
+                prop="checkType"
+                label="任务类型"
+                v-model="queryParams.checkType"
+                placeholder="请选择任务类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.check_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
+              <el-select
+                prop="execOrgType"
+                label="检查机构类型"
+                v-model="queryParams.execOrgType"
+                placeholder="请选择检查机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_org_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
+              <el-select
+                prop="checkOrgType"
+                label="受检机构类型"
+                v-model="queryParams.checkOrgType"
+                placeholder="请选择受检机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_org_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="checkRole" label="检查人员">
-            <el-select
-              @visible-change="getRolesByOrg"
-              prop="checkRole"
-              label="检查人员"
-              v-model="queryParams.checkRole"
-              placeholder="请选择用户角色"
-              clearable
-            >
-              <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
+            <el-form-item prop="checkRole" label="检查人员">
+              <el-select
+                @visible-change="getRolesByOrg"
+                prop="checkRole"
+                label="检查人员"
+                v-model="queryParams.checkRole"
+                placeholder="请选择用户角色"
+                clearable
+              >
+                <el-option
+                  v-for="dict in resumptionRoles"
+                  :key="dict.index"
+                  :label="dict.roleName"
+                  :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="planCycle" label="任务周期">
+              <el-select
+                prop="planCycle"
+                label="任务周期"
+                v-model="queryParams.planCycle"
+                placeholder="请选择任务周期"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.check_cycle"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item prop="planStatus" label="任务状态">
+              <el-select
+                prop="planStatus"
+                label="任务状态"
+                v-model="queryParams.planStatus"
+                placeholder="请选择任务状态"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.check_status"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="planName" label="任务名称">
+              <el-input
+                v-model="queryParams.planName"
+                :maxlength="50"
+                name="planName"
+                placeholder="请输入关键字"
+                clearable
               />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planCycle" label="任务周期">
-            <el-select
-              prop="planCycle"
-              label="任务周期"
-              v-model="queryParams.planCycle"
-              placeholder="请选择任务周期"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.check_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="getList"
+                >搜索</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planStatus" label="任务状态">
-            <el-select
-              prop="planStatus"
-              label="任务状态"
-              v-model="queryParams.planStatus"
-              placeholder="请选择任务状态"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.check_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
+              ><el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd()"
+                v-hasPermi="['core:checkplan:add']"
+                >新增任务</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planName" label="任务名称">
-            <el-input
-              v-model="queryParams.planName"
-              :maxlength="50"
-              name="planName"
-              placeholder="请输入关键字"
-              clearable
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            ><el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['core:checkplan:add']"
-              >新增任务</el-button
-            >
-          </el-form-item>
+            </el-form-item>
+          </el-row>
         </el-form>
 
-        <!--    按纽    -->
+        <!-- 按纽   
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5"> </el-col>
           <right-toolbar
@@ -162,7 +167,7 @@
             @queryTable="getList"
             :columns="columns"
           ></right-toolbar>
-        </el-row>
+        </el-row> -->
 
         <el-table
           border
@@ -175,6 +180,7 @@
           :tree-props="{ children: 'children' }"
         >
           <el-table-column
+            align="center"
             type="index"
             label="序号"
             width="80px"
@@ -243,6 +249,7 @@
           </el-table-column>
 
           <el-table-column
+            align="center"
             prop="count"
             label="任务次数"
             v-if="columns[6].visible"
@@ -317,7 +324,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-arrow-down"
+                icon="el-icon-top-left"
                 v-if="chehui(r.row)"
                 @click="chhuile(r.row)"
                 v-hasPermi="['core:checkplan:distribute']"

src/views/check/task/index.vue

@@ -139,32 +139,18 @@
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
                 >重置</el-button
               >
-              <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
                 >临时登记</el-button
               >
             </el-form-item>
           </el-row>
         </el-form>
         <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="exportExcel()"
-              v-hasPermi="['resumption:taskManager:export']"
-              >导出</el-button
-            >
-          </el-col> -->
-
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+       
         <el-table
           border
           height="600"
@@ -173,6 +159,7 @@
           :data="pageData"
         >
           <el-table-column
+            align="center"
             type="index"
             fixed
             min-width="50"
@@ -216,8 +203,8 @@
               <span>
                 <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
                 <!-- <label :style="statusColor(r.row.status, false)"> -->
-                  <label >
-                 {{
+                <label>
+                  {{
                     getLabel(dict.type.safety_check_status, r.row.status)
                   }}</label
                 >
@@ -263,36 +250,26 @@
             </template></el-table-column
           >
 
-  
-
           <el-table-column
             prop="submitBy"
             label="检查人"
             min-width="100"
             v-if="false"
           ></el-table-column>
-          <el-table-column 
-            label="检查时间"
-            min-width="120"
-            v-if="false"
-          >
+          <el-table-column label="检查时间" min-width="120" v-if="false">
             <template slot-scope="r">{{
               r.row.submitTime | dateTime
             }}</template>
           </el-table-column>
           <el-table-column
+            align="center"
             prop="exceptionCount"
             label="隐患问题数"
             min-width="80"
             v-if="columns[9].visible"
           >
           </el-table-column>
-          <el-table-column
-            prop="des"
-            label="备注"
-            min-width="80"
-            v-if="false"
-          >
+          <el-table-column prop="des" label="备注" min-width="80" v-if="false">
           </el-table-column>
           <el-table-column label="操作" fixed="right" min-width="200">
             <template slot-scope="r">
@@ -315,7 +292,7 @@
                 type="text"
                 @click="showscanRecord(r.row)"
                 v-hasPermi="['resumption:taskManager:query']"
-                >检查登记簿</el-button
+                >扫描记录</el-button
               >
               <el-button
                 type="text"
@@ -338,7 +315,10 @@
     <!-- 详情 -->
     <dialog-detail ref="detaildialog"></dialog-detail>
     <dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
-    <dialog-temporary-task  ref="dialogtemporarytask" @success="getList"></dialog-temporary-task>
+    <dialog-temporary-task
+      ref="dialogtemporarytask"
+      @success="getList"
+    ></dialog-temporary-task>
   </div>
 </template>
 
@@ -354,7 +334,7 @@ import { getLabel } from "@/views/commonOption.js";
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
-import DialogTemporaryTask from "@/views/safetycheck/taskManager/components/dialog.temporarytask.vue"
+import DialogTemporaryTask from "@/views/safetycheck/taskManager/components/dialog.temporarytask.vue";
 export default {
   name: "checkTaskList",
   dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
@@ -364,7 +344,7 @@ export default {
     DataRangePicker,
     OrgTreeSelect,
     OrgTree,
-    DialogTemporaryTask
+    DialogTemporaryTask,
   },
   data() {
     return {
@@ -388,7 +368,7 @@ export default {
         planStartTime: null,
         title: null,
         checkOrgIds: null,
-        range:[],
+        range: [],
       },
       selectedOrgName: null,
       pageData: [],
@@ -498,12 +478,12 @@ export default {
     },
     resetQuery() {
       this.queryParams.checkOrgIds = [];
-      this.queryParams.range=[];
+      this.queryParams.range = [];
       this.resetForm("queryParams");
       this.getList();
     },
-    handleAdd(){
-this.$refs["dialogtemporarytask"].show();
+    handleAdd() {
+      this.$refs["dialogtemporarytask"].show();
     },
     async getList() {
       console.log(this.queryParams, "this.queryParams");

src/views/core/drill/drillDictionary/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -119,7 +119,7 @@
     </el-row>
     <!-- 添加或修改预案演练库对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="演练项目" prop="drillType" style="width:100%;">
           <el-select v-model="form.drillType" placeholder="请选择演练项目" style="width:100%;">
             <el-option

src/views/core/drill/plan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -106,7 +106,7 @@
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <pagination :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
         </div>

src/views/core/drill/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>

src/views/core/edu/plan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -116,20 +116,20 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="任务周期" align="center" width="100" prop="planCycle">
+          <el-table-column label="任务周期" align="center" width="90" prop="planCycle">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column label="任务次数" align="center" width="100" prop="execTimes"/>
-          <el-table-column label="任务状态" align="center" width="100" prop="planStatus">
+          <el-table-column label="任务次数" align="center" width="90" prop="execTimes"/>
+          <el-table-column label="任务状态" align="center" width="90" prop="planStatus">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_status" :value="parseInt(scope.row.planStatus)"/>
             </template>
           </el-table-column>
 
 <!--          <el-table-column label="备注" align="center" prop="remark"/>-->
-          <el-table-column label="操作" width="180" align="left" header-align="center" fixed="right" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="200" align="left" header-align="center" fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-arrow-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:plan:edit']">下发

src/views/core/edu/task/dialog.newTask.vue

@@ -8,11 +8,11 @@
 
             <!-- 培训主题 -->
             <el-col :span="24">
-              <el-form-item prop="title" label="培训主题">
+              <el-form-item prop="title" label="任务名称">
                 <el-input
                   v-model="formData.title"
                   :maxlength="32"
-                  placeholder="请输入培训主题"
+                  placeholder="请输入任务名称"
                   clearable
                 />
               </el-form-item>
@@ -85,6 +85,13 @@
           </el-row>
 
           <el-row>
+           
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="培训图片">
+                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
+                           @input="imageListChanged"></imgUpload>
+              </el-form-item>
+            </el-col>
             <el-col :span="10">
               <el-form-item label="培训资料" prop="fileList">
                 <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" v-model="formData.fileList"/>
@@ -95,12 +102,7 @@
                 <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="培训图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
-                           @input="imageListChanged"></imgUpload>
-              </el-form-item>
-            </el-col>
+            
           </el-row>
         </el-form>
       </div>
@@ -140,14 +142,14 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        title: [{required: true, message: "请输入培训主题"}],
+        title: [{required: true, message: "请输入任务名称"}],
         content: [{required: true, message: "请输入培训内容"}],
         absenceList: [{required: true, type: "array", message: "请选择参会人员"}],
         startDate: [{required: true, message: "请输入培训开始时间"}],
         endDate: [{required: true, message: "请输入培训结束时间"}],
         note: [{required: true, message: "请输入培训总结"}],
         imageList: [{required: true, message: "请上传培训图片"}],
-        fileList: [{required: true, message: "请上传培训文件"}],
+        // fileList: [{required: true, message: "请上传培训文件"}],
       },
       startDatepickerOptions: {
         disabledDate(time) {

src/views/core/edu/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>
@@ -10,7 +10,7 @@
           <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-          <el-form-item label="培训主题" prop="title">
+          <el-form-item label="任务名称" prop="title">
             <el-input
               v-model="queryParams.title"
               placeholder="请输入关键字"
@@ -105,7 +105,7 @@
           height="650"
           size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" align="center" width="70" prop="no"/>
-          <el-table-column label="培训主题" width="315" align="left" header-align="center" prop="title"/>
+          <el-table-column label="任务名称" width="315" align="left" header-align="center" prop="title"/>
           <el-table-column label="受训机构" width="315" align="left" header-align="center" prop="orgName"/>
           <el-table-column label="任务进度" align="center" prop="status" width="150">
             <template slot-scope="scope">

src/views/core/materials/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -158,7 +158,7 @@
     </el-row>
     <!-- 添加或修改学习资料对话框 -->
     <DialogCom :title="title" :visible.sync="open" @close="cancel" width="700px" append-to-body>
-      <el-form :disabled="title=='知识库详情'" ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form :disabled="title=='知识库详情'" ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="资料名称" prop="title" class="endItem">
           <el-input v-model="form.title" placeholder="请输入资料名称" maxlength="50" show-word-limit/>
         </el-form-item>
@@ -174,7 +174,7 @@
                   <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
                 </el-form-item>-->
 
-        <el-form-item label="资料附件" prop="fileList">
+        <el-form-item label="上传文件" prop="fileList">
           <K-file-upload ref="upload" :isShowUploadBtn="title!='知识库详情'"
                          :defaultValue="formFileListDefualtValue"
                          v-model="form.fileList"/>

src/views/resumption/plan/dialog.edit.vue

@@ -267,8 +267,9 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
+       
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="onHide">取消</el-button>
       </div>
     </DialogCom>
     <DialogSelect

src/views/resumption/plan/index.vue

@@ -21,107 +21,113 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="70px"
+          label-width="90px"
         >
-          <el-form-item prop="planType" label="任务类型">
-            <el-select
-              prop="planType"
-              label="任务类型"
-              v-model="queryParams.planType"
-              placeholder="请选择任务类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.resumption_plan_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="resumptionRole" label="履职人员">
-            <el-select
-              @visible-change="getRolesByOrg"
-              prop="resumptionRole"
-              label="履职人员"
-              v-model="queryParams.resumptionRole"
-              placeholder="请选择用户角色"
-              clearable
-            >
-              <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
-              />
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-form-item prop="planType" label="任务类型">
+              <el-select
+                prop="planType"
+                label="任务类型"
+                v-model="queryParams.planType"
+                placeholder="请选择任务类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.resumption_plan_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="resumptionRole" label="履职人员">
+              <el-select
+                @visible-change="getRolesByOrg"
+                prop="resumptionRole"
+                label="履职人员"
+                v-model="queryParams.resumptionRole"
+                placeholder="请选择用户角色"
+                clearable
+              >
+                <el-option
+                  v-for="dict in resumptionRoles"
+                  :key="dict.index"
+                  :label="dict.roleName"
+                  :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="planCycle" label="任务周期">
-            <el-select
-              prop="planCycle"
-              label="任务周期"
-              v-model="queryParams.planCycle"
-              placeholder="请选择任务周期"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.resumption_plan_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+            <el-form-item prop="planCycle" label="任务周期">
+              <el-select
+                prop="planCycle"
+                label="任务周期"
+                v-model="queryParams.planCycle"
+                placeholder="请选择任务周期"
+                clearable
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planStatus" label="任务状态">
-            <el-select
-              prop="planStatus"
-              label="任务状态"
-              v-model="queryParams.planStatus"
-              placeholder="请选择任务状态"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.resumption_plan_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                <el-option
+                  v-for="item in dict.type.resumption_plan_cycle"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item prop="planStatus" label="任务状态">
+              <el-select
+                prop="planStatus"
+                label="任务状态"
+                v-model="queryParams.planStatus"
+                placeholder="请选择任务状态"
+                clearable
               >
-              </el-option>
-            </el-select>
-            <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
-          </el-form-item>
-          <el-form-item prop="planName" label="任务名称">
-            <el-input
-              v-model="queryParams.planName"
-              :maxlength="50"
-              name="planName"
-              placeholder="请输入任务名称"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['system:user:add']"
-              >新增任务</el-button
-            >
-          </el-form-item>
-          <el-row :gutter="10" class="mb8">
+                <el-option
+                  v-for="item in dict.type.resumption_plan_status"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+              <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
+            </el-form-item>
+            <el-form-item prop="planName" label="任务名称">
+              <el-input
+                v-model="queryParams.planName"
+                :maxlength="50"
+                name="planName"
+                placeholder="请输入任务名称"
+                clearable
+              />
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="getList"
+                >搜索</el-button
+              >
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd()"
+                v-hasPermi="['system:user:add']"
+                >新增任务</el-button
+              >
+            </el-form-item>
+          </el-row>
+          <!-- <el-row :gutter="10" class="mb8">
             <el-col :span="1.5"> </el-col>
 
             <right-toolbar
@@ -129,7 +135,7 @@
               @queryTable="getList"
               :columns="columns"
             ></right-toolbar>
-          </el-row>
+          </el-row> -->
         </el-form>
 
         <!--    按纽    -->
@@ -144,6 +150,7 @@
           row-key="id"
         >
           <el-table-column
+            align="center"
             fixed
             type="index"
             label="序号"
@@ -226,6 +233,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            align="center"
             prop="count"
             label="任务次数"
             v-if="columns[7].visible"
@@ -306,7 +314,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-arrow-down"
+                icon="el-icon-top-left"
                 v-if="chehui(r.row)"
                 @click="chhuile(r.row)"
                 v-hasPermi="['system:user:remove']"