update

src/views/quality/checkjob/CheckJobEdit.vue

@@ -7,13 +7,13 @@
         <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
       </el-button-group>
     </div>
-    <div class="body-wrapper">
+    <div class="body-wrapper"  style="padding-left: 25%">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px"  style="width: 700px">
         <el-form-item label="任务名称" prop="jobName">
           <el-input v-model="form.jobName" placeholder="任务名称" />
         </el-form-item>
         <el-form-item label="任务类型" prop="jobType">
-          <el-select v-model="form.jobType" placeholder="请选择任务类型" @change="ruleItemSelectChanged">
+          <el-select v-model="form.jobType" placeholder="请选择任务类型" @change="ruleItemSelectChanged" style="width: 100%">
             <el-option
               v-for="item in ruleItemOptions"
               :key="item.typeId"
@@ -22,7 +22,16 @@
             />
           </el-select>
         </el-form-item>
-        <el-divider content-position="left">任务配置</el-divider>
+        <el-form-item label="检测用例" prop="checkCase">
+          <el-select v-model="form.checkCase" multiple placeholder="检测用例" style="width: 100%">
+            <el-option
+              v-for="item in checkCaseOptions"
+              :key="item.id"
+              :label="item.ruleName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="cron表达式" prop="cronExpression">
           <el-input v-model="form.cronExpression" placeholder="cron表达式" />
         </el-form-item>
@@ -37,7 +46,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="任务概述" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" :rows="8" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
     </div>
@@ -46,6 +55,7 @@
 
 <script>
 import { updateCheckJob, getScheduleJobById } from '@/api/quality/checkjob'
+import { pageCheckRule } from '@/api/quality/checkrule'
 
 export default {
   name: 'CheckJobEdit',
@@ -88,6 +98,7 @@ export default {
           { required: true, message: 'cron表达式不能为空', trigger: 'blur' }
         ]
       },
+      checkCaseOptions: [],
       // 状态数据字典
       statusOptions: [],
       // 规则级别数据字典
@@ -112,6 +123,7 @@ export default {
         this.statusOptions = response.data
       }
     })
+    this.getCheckRule()
   },
   mounted() {
     this.getCheckJob(this.data.id)
@@ -135,6 +147,29 @@ export default {
       })
       this.form.jobType = item.typeId
     },
+    getCheckRule() {
+      let ruleType = 'nr'
+      if(this.form.jobType == 'structure'){
+        ruleType = 'jg'
+      } else if(this.form.jobType == 'relevance'){
+        ruleType = 'gl'
+      }
+      let params = {
+        pageNum: 1,
+        pageSize: 20,
+        projectId: '1111',
+        ruleTypeId: '',
+        ruleName: '',
+        ruleType: ruleType
+      }
+      this.checkCaseOptions = []
+      pageCheckRule(params).then(response => {
+        if (response.success) {
+          const { data } = response
+          this.checkCaseOptions = data.data
+        }
+      })
+    },
     /** 提交按钮 */
     submitForm: function () {
       this.$refs['form'].validate(valid => {

src/views/quality/checkjob/CheckJobList.vue

@@ -106,7 +106,6 @@
             @click="handleDetail(scope.row)"
           >详情</el-button>
           <el-button
-            v-hasPerm="['quality:rule:edit']"
             size="mini"
             type="text"
             icon="el-icon-edit-outline"
@@ -174,9 +173,15 @@ export default {
         // { prop: 'methodParams', label: '方法参数', show: true },
         { prop: 'cronExpression', label: 'cron表达式', show: true },
         { prop: 'afterDate', label: '最近完成时间', show: true },
+        {
+          prop: 'schedule',
+          label: '任务进度',
+          show: true,
+          formatter: this.scheduleFormatter
+        },
         {
           prop: 'status',
-          label: '状态',
+          label: '定时状态',
           show: true,
           formatter: this.statusFormatter
         },
@@ -305,6 +310,9 @@ export default {
         return <el-tag type='warning'>{dictLabel}</el-tag>
       }
     },
+    scheduleFormatter(row, column, cellValue, index){
+      return '100%'
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1

src/views/quality/checkreport/CheckReportStructure.vue

@@ -124,6 +124,31 @@
               <el-table-column prop="checkTotalCount" label="核查数" align="center" />
               <el-table-column prop="checkErrorCount" label="不合规数" align="center" />
             </el-table>
+            <el-collapse accordion>
+              <el-collapse-item>
+                <template slot="title">
+                  不合规明细<i class="el-icon-arrow-right"></i>
+                </template>
+                <div>
+                  <el-table
+                    :data="table_key"
+                    border
+                    tooltip-effect="dark"
+                    :max-height="250"
+                    style="width: 100%; margin: 15px 0;"
+                  >
+                    <el-table-column prop="ruleName" label="用例名称" align="center" />
+                    <el-table-column prop="ruleSourceName" label="数据源" align="center" />
+                    <el-table-column prop="ruleTableName" label="数据表" align="center" />
+                    <el-table-column prop="checkTotalCount" label="实际表名" align="center" />
+                    <el-table-column prop="checkTotalCount" label="标准表名" align="center" />
+                    <el-table-column prop="checkTotalCount" label="实际字段" align="center" />
+                    <el-table-column prop="checkErrorCount" label="标准字段" align="center" />
+                    <el-table-column prop="checkErrorCount" label="不合规原因" align="center" />
+                  </el-table>
+                </div>
+              </el-collapse-item>
+            </el-collapse>
           </el-col>
         </el-row>
         <el-row>