update

2023-12-28 09:34:15 +08:00 · 2023-12-28 09:34:15 +08:00 · d3b3c8bc4e
commit d3b3c8bc4e
parent 300825d877
5 changed files with 107 additions and 132 deletions
--- a/src/api/quality/checkjob.js
+++ b/src/api/quality/checkjob.js
@ -59,3 +59,10 @@ export function runCheckJob(id) {
    method: 'post'
  })
 }
+
+export function getScheduleJobById(id) {
+  return request({
+    url: '/data/quality/scheduleJobs/' + id,
+    method: 'get'
+  })
+}
--- a/src/api/quality/checkrule.js
+++ b/src/api/quality/checkrule.js
@ -69,9 +69,9 @@ export function updateCheckRule(data) {
  })
 }

-export function listSourceIdBytable(id) {
+export function listSourceIdBytable(id, ruleId) {
  return request({
-    url: '/data/quality/checkRules/listSourceIdBytable/' + id,
+    url: '/data/quality/checkRules/listSourceIdBytable/' + id + '/ruleId/' + ruleId,
    method: 'get'
  })
 }
--- a/src/views/quality/checkjob/CheckJobEdit.vue
+++ b/src/views/quality/checkjob/CheckJobEdit.vue
@ -3,28 +3,28 @@
    <div slot="header" class="clearfix">
      <span>{{ title }}</span>
      <el-button-group style="float: right;">
-        <el-button v-if="active == 2" v-hasPerm="['metadata:datasource:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
        <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
      </el-button-group>
    </div>
    <div class="body-wrapper">
-      <el-steps :active="active" finish-status="success" align-center>
-        <el-step title="数据源信息" />
-        <el-step title="连接信息" />
-      </el-steps>
-      <el-form v-if="active == 1" ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="数据源类型" prop="dbType">
-          <el-select v-model="form.dbType">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <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-option
-              v-for="item in dbTypeOptions"
-              :key="item.id"
-              :label="item.itemValue"
-              :value="item.itemText"
+              v-for="item in ruleItemOptions"
+              :key="item.typeId"
+              :label="item.typeName"
+              :value="item.typeId"
            />
          </el-select>
        </el-form-item>
-        <el-form-item label="数据源名称" prop="sourceName">
-          <el-input v-model="form.sourceName" placeholder="请输入数据源名称" />
+        <el-divider content-position="left">任务配置</el-divider>
+        <el-form-item label="cron表达式" prop="cronExpression">
+          <el-input v-model="form.cronExpression" placeholder="cron表达式" />
        </el-form-item>
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
@ -32,58 +32,34 @@
              v-for="dict in statusOptions"
              :key="dict.id"
              :label="dict.itemText"
-            >{{ dict.itemValue }}</el-radio>
+            >{{ dict.itemValue }}
+            </el-radio>
          </el-radio-group>
        </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="任务概述" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
        </el-form-item>
      </el-form>
-      <el-form v-if="active == 2" ref="form2" :model="form2" :rules="rules2" label-width="80px">
-        <el-form-item label="主机" prop="host">
-          <el-input v-model="form2.host" placeholder="请输入主机" />
-        </el-form-item>
-        <el-form-item label="端口" prop="port">
-          <el-input v-model="form2.port" placeholder="请输入端口" />
-        </el-form-item>
-        <el-form-item v-if="form.dbType === '3' || form.dbType === '4'" label="服务名" prop="sid">
-          <el-input v-model="form2.sid" placeholder="请输入服务名" />
-        </el-form-item>
-        <el-form-item v-if="form.dbType !== '3' && form.dbType !== '4'" label="数据库" prop="dbName">
-          <el-input v-model="form2.dbName" placeholder="请输入数据库" />
-        </el-form-item>
-        <el-form-item label="用户名" prop="username">
-          <el-input v-model="form2.username" placeholder="请输入用户名" />
-        </el-form-item>
-        <el-form-item label="密码" prop="password">
-          <el-input v-model="form2.password" placeholder="请输入密码" />
-        </el-form-item>
-        <el-form-item>
-          <el-button v-hasPerm="['metadata:datasource:connect']" size="mini" type="primary" @click="handleCheckConnection">连通性检测</el-button>
-        </el-form-item>
-      </el-form>
-      <el-button v-if="active == 1" style="margin-top: 12px;" @click="handleNextStep">下一步</el-button>
-      <el-button v-if="active == 2" style="margin-top: 12px;" @click="handleLastStep">上一步</el-button>
    </div>
  </el-card>
 </template>

 <script>
-import { getDataSource, updateDataSource, checkConnection } from '@/api/metadata/datasource'
+import { updateCheckJob, getScheduleJobById } from '@/api/quality/checkjob'

 export default {
-  name: 'CheckJobEdit',
+  name: 'CheckJobAdd',
  props: {
    data: {
      type: Object,
-      default: function() {
+      default: function () {
        return {}
      }
    }
  },
  data() {
    return {
-      title: '数据源编辑',
+      title: '检测任务修改',
      // 展示切换
      showOptions: {
        data: {},
@ -98,108 +74,74 @@ export default {
        loadingText: '保存',
        isDisabled: false
      },
-      active: 1,
      // 表单参数
      form: {},
      // 表单校验
      rules: {
-        dbType: [
-          { required: true, message: '数据源类型不能为空', trigger: 'change' }
+        jobName: [
+          { required: true, message: '任务名称不能为空', trigger: 'blur' }
        ],
-        sourceName: [
-          { required: true, message: '数据源名称不能为空', trigger: 'blur' }
-        ]
-      },
-      form2: {},
-      rules2: {
-        host: [
-          { required: true, message: '主机不能为空', trigger: 'blur' }
+        jobType: [
+          { required: true, message: '任务类型不能为空', trigger: 'change' }
        ],
-        port: [
-          { required: true, message: '端口不能为空', trigger: 'blur' }
-        ],
-        sid: [
-          { required: true, message: '服务名不能为空', trigger: 'blur' }
-        ],
-        dbName: [
-          { required: true, message: '数据库不能为空', trigger: 'blur' }
-        ],
-        username: [
-          { required: true, message: '用户名不能为空', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: '密码不能为空', trigger: 'blur' }
+        cronExpression: [
+          { required: true, message: 'cron表达式不能为空', trigger: 'blur' }
        ]
      },
      // 状态数据字典
      statusOptions: [],
-      // 数据源类型数据字典
-      dbTypeOptions: []
+      // 规则级别数据字典
+      ruleLevelOptions: [],
+      // 核查类型数据字典
+      ruleItemOptions: [
+        { typeId: 'structure', typeName: '结构符合性' },
+        { typeId: 'content', typeName: '内容符合性' }
+      ],
+      sourceOptions: [],
+      tableOptions: [],
+      columnOptions: [],
+      dictTypeOptions: [],
+      relatedColumnOptions: []
    }
  },
  created() {
-    console.log('id:' + this.data.id)
+    this.form.jobType = this.data.jobType
    this.getDicts('sys_common_status').then(response => {
      if (response.success) {
        this.statusOptions = response.data
      }
    })
-    this.getDicts('data_db_type').then(response => {
-      if (response.success) {
-        this.dbTypeOptions = response.data
-      }
-    })
  },
  mounted() {
-    this.getDataSource(this.data.id)
+    this.getCheckJob(this.data.id)
  },
  methods: {
+    /** 获取详情 */
+    async getCheckJob(id) {
+      this.form = await getScheduleJobById(id).then(response => {
+        if (response.success) {
+          console.log('response==', response)
+          return response.data
+        }
+      })
+    },
    showCard() {
      this.$emit('showCard', this.showOptions)
    },
-    /** 获取详情 */
-    getDataSource: function(id) {
-      getDataSource(id).then(response => {
-        if (response.success) {
-          this.form = response.data
-          this.form2 = this.form.dbSchema
-        }
-      })
-    },
-    /** 步骤条下一步 */
-    handleNextStep() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.active++
-        }
-      })
-    },
-    /** 步骤条上一步 */
-    handleLastStep() {
-      this.active--
-    },
-    /** 检测数据库连通性 */
-    handleCheckConnection() {
-      this.$refs['form2'].validate(valid => {
-        if (valid) {
-          this.form.dbSchema = this.form2
-          checkConnection(this.form).then(response => {
-            if (response.success) {
-              this.$message.success('连接成功')
-            }
-          })
-        }
+    ruleItemSelectChanged(val) {
+      const item = this.ruleItemOptions.find(function (item) {
+        return item.typeId === val
      })
+      this.form.jobType = item.typeId
    },
    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form2'].validate(valid => {
+    submitForm: function () {
+      this.$refs['form'].validate(valid => {
        if (valid) {
-          this.form.dbSchema = this.form2
          this.loadingOptions.loading = true
          this.loadingOptions.loadingText = '保存中...'
          this.loadingOptions.isDisabled = true
-          updateDataSource(this.form).then(response => {
+          updateCheckJob(this.form).then(response => {
            if (response.success) {
              this.$message.success('保存成功')
              setTimeout(() => {
--- a/src/views/quality/checkjob/CheckJobList.vue
+++ b/src/views/quality/checkjob/CheckJobList.vue
@ -114,17 +114,18 @@
            @click="handleRun(scope.row)"
          >立即执行</el-button>
          <el-button
+            v-hasPerm="['quality:rule:edit']"
            size="mini"
            type="text"
-            icon="el-icon-view"
-            @click="handleRun(scope.row)"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleRun(scope.row)"
-          >查看</el-button>
+            icon="el-icon-edit-outline"
+            @click="handleEdit(scope.row)"
+          >修改</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-view"-->
+<!--            @click="handleRun(scope.row)"-->
+<!--          >查看</el-button>-->
        </template>
      </el-table-column>
    </el-table>
@ -152,7 +153,10 @@ export default {
      // 展示切换
      showOptions: {
        data: {},
-        showList: true
+        showList: true,
+        showAdd: false,
+        showEdit: false,
+        showDetail: false
      },
      // 遮罩层
      loading: true,
@ -162,8 +166,8 @@ export default {
        // { prop: 'beanName', label: 'bean名称', show: true },
        // { prop: 'methodName', label: '方法名称', show: true },
        // { prop: 'methodParams', label: '方法参数', show: true },
-        { prop: 'methodParams', label: '最近完成时间', show: true },
        { prop: 'cronExpression', label: 'cron表达式', show: true },
+        { prop: 'afterDate', label: '最近完成时间', show: true },
        {
          prop: 'status',
          label: '状态',
@ -218,6 +222,7 @@ export default {
        this.loading = false
        if (response.success) {
          const { data } = response
+          console.log('data.data==', data.data)
          this.tableDataList = data.data
          this.total = data.total
        }
@ -358,6 +363,6 @@ export default {
  float: right;
 }
 .el-card ::v-deep .el-card__body {
-  height: calc(100vh - 170px);
+  height: calc(100vh - 100px);
 }
 </style>
--- a/src/views/quality/checkrule/CheckRuleList.vue
+++ b/src/views/quality/checkrule/CheckRuleList.vue
@ -26,6 +26,26 @@
    <el-col :span="18">
      <el-card class="box-card" shadow="always">
        <el-form ref="queryForm" :model="queryParams" :inline="true">
+          <el-form-item label="数据源" prop="ruleName">
+            <el-input
+              v-model="queryParams.ruleSource"
+              placeholder="请输入数据源"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="数据表" prop="ruleName">
+            <el-input
+              v-model="queryParams.ruleTable"
+              placeholder="请输入数据表"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
          <el-form-item label="规则名称" prop="ruleName">
            <el-input
              v-model="queryParams.ruleName"
@ -180,10 +200,10 @@ export default {
      loading: true,
      // 表格头
      tableColumns: [
-        { prop: 'ruleName', label: '规则名称', show: true },
-        { prop: 'ruleType', label: '规则类型', show: true },
        { prop: 'ruleSource', label: '数据源', show: true },
        { prop: 'ruleTable', label: '数据表', show: true, formatter: this.ruleTableFormatter },
+        { prop: 'ruleName', label: '规则名称', show: true },
+        { prop: 'ruleType', label: '规则类型', show: true },
        // { prop: 'ruleColumn', label: '核查字段', show: true, formatter: this.ruleColumnFormatter },
        { prop: 'ruleLevel', label: '规则级别', width: 100, show: true },
        {
@ -297,7 +317,8 @@ export default {
        pageNum: 1,
        pageSize: 20,
        ruleTypeId: '',
-        ruleName: ''
+        ruleName: '',
+        ruleType: 'jj'
      }
      this.handleQuery()
    },