筛选条件增加是否完成状态、任务员工、任务大类、任务小类。是否完成状态、完成时常、超时时长字段顺序前置

src/views/monitor/job/index.vue

@@ -29,18 +29,27 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否完成" prop="whetherComplete">
+        <el-select v-model="queryParams.whetherComplete" placeholder="请选择任务是否完成" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_job_complete"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="任务员工" prop="empno">
         <el-input
           v-model="queryParams.empno"
           placeholder="请输入员工工号"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="任务大类" prop="jobType">
-        <el-select v-model="queryParams.status" placeholder="请选择任务大类" clearable>
+        <el-select v-model="queryParams.jobType" placeholder="请选择任务大类" clearable>
           <el-option
-            v-for="dict in dict.type.sys_job_type"
+            v-for="dict in dict.type.sys_oa"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -48,9 +57,9 @@
         </el-select>
       </el-form-item>
       <el-form-item label="任务小类" prop="jobTypeS">
-        <el-select v-model="queryParams.status" placeholder="请选择任务小类" clearable>
+        <el-select v-model="queryParams.jobTypeS" placeholder="请选择任务小类" clearable>
           <el-option
-            v-for="dict in dict.type.sys_job_types"
+            v-for="dict in dict.type.sys_oa_s"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -152,6 +161,7 @@
           ></el-switch>
         </template>
       </el-table-column>
+      <el-table-column label="是否完成" align="center" prop="whetherComplete" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -403,7 +413,7 @@ import Crontab from '@/components/Crontab'
 export default {
   components: { Crontab },
   name: "Job",
-  dicts: ['sys_job_group', 'sys_job_status', 'sys_oa','sys_oa_s','sys_yes_no'],
+  dicts: ['sys_job_complete', 'sys_job_group', 'sys_job_status', 'sys_oa','sys_oa_s', 'sys_yes_no'],
   data() {
     return {
       pickerOptions: {
@@ -468,7 +478,8 @@ export default {
         cont:undefined,
         timeout:undefined,
         status: undefined,
-        duration:undefined
+        duration:undefined,
+        whetherComplete:undefined
       },
       // 表单参数
       form: {},
@@ -531,12 +542,15 @@ export default {
     /** 查询定时任务列表 */
     getList() {
       this.loading = true;
+      // this.queryParams.jobTypeS = "数据备份"
       listJob(this.queryParams).then(response => {
+        console.log(response,'response')
         this.jobList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
       console.log(this.queryParams,'this.queryParams')
+      console.log(this.jobList,'this.jobList')
     },
     // 任务组名字典翻译
     jobGroupFormat(row, column) {
@@ -554,11 +568,14 @@ export default {
         jobName: undefined,
         empno:undefined,
         jobGroup: undefined,
+        jobType: undefined,
+        jobTypeS: undefined,
         invokeTarget: undefined,
         cronExpression: undefined,
         misfirePolicy: 1,
         concurrent: 1,
-        status: "0"
+        status: "0",
+        whetherComplete:undefined
       };
       this.resetForm("form");
     },

src/views/monitor/job/log.vue

@@ -131,6 +131,31 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" width="80" align="center" prop="jobLogId" />
+      <el-table-column label="任务执行状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_common_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column
+        label="完成时长"
+        width="180"
+        align="center"
+        prop="tqaaaa"
+      />
+      <el-table-column
+        label="超时时长"
+        width="180"
+        align="center"
+        prop="tqbbbb"
+      />
       <el-table-column
         label="任务名称"
         width="180"
@@ -180,28 +205,17 @@
         align="center"
         prop="executionTime"
       />
-      <el-table-column
-        label="完成时长"
-        width="180"
-        align="center"
-        prop="tqaaaa"
-      />
+
       <el-table-column
         label="预计时长"
         width="80"
         align="center"
         prop="durations"
       />
-      <el-table-column
-        label="超时时长"
-        width="180"
-        align="center"
-        prop="tqbbbb"
-      />
 
       <el-table-column
         label="oa执行状态"
-        width="80"
+        width="90"
         align="center"
         prop="completionStatus"
       >
@@ -233,19 +247,6 @@
         prop="jobMessage"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="任务执行状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_common_status"
-            :value="scope.row.status"
-          />
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="执行时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>-->
 
       <el-table-column
         label="操作"