From c1ea0180dd7f2aef4a0f82ed286858093ee3696b Mon Sep 17 00:00:00 2001 From: gaochang Date: Thu, 28 Dec 2023 18:45:27 +0800 Subject: [PATCH] update --- .../checkcontentrule/CheckContentRuleList.vue | 28 +- src/views/quality/checkjob/CheckJobAdd.vue | 3 +- src/views/quality/checkjob/CheckJobDetail.vue | 174 +++++++ src/views/quality/checkjob/CheckJobEdit.vue | 5 +- src/views/quality/checkjob/CheckJobList.vue | 28 +- src/views/quality/checkjob/index.vue | 6 +- .../CheckRelevanceRuleAdd.vue | 456 ++++++++++++++++++ .../CheckRelevanceRuleDetail.vue | 285 +++++++++++ .../CheckRelevanceRuleEdit.vue | 439 +++++++++++++++++ .../CheckRelevanceRuleList.vue | 429 ++++++++++++++++ .../quality/checkrelevancerule/index.vue | 48 ++ src/views/quality/checkrule/CheckRuleAdd.vue | 10 +- .../quality/checkrule/CheckRuleDetail.vue | 84 ---- src/views/quality/checkrule/CheckRuleEdit.vue | 90 +--- src/views/quality/checkrule/CheckRuleList.vue | 38 +- 15 files changed, 1916 insertions(+), 207 deletions(-) create mode 100644 src/views/quality/checkjob/CheckJobDetail.vue create mode 100644 src/views/quality/checkrelevancerule/CheckRelevanceRuleAdd.vue create mode 100644 src/views/quality/checkrelevancerule/CheckRelevanceRuleDetail.vue create mode 100644 src/views/quality/checkrelevancerule/CheckRelevanceRuleEdit.vue create mode 100644 src/views/quality/checkrelevancerule/CheckRelevanceRuleList.vue create mode 100644 src/views/quality/checkrelevancerule/index.vue diff --git a/src/views/quality/checkcontentrule/CheckContentRuleList.vue b/src/views/quality/checkcontentrule/CheckContentRuleList.vue index 8bd36a5..10c1cbb 100644 --- a/src/views/quality/checkcontentrule/CheckContentRuleList.vue +++ b/src/views/quality/checkcontentrule/CheckContentRuleList.vue @@ -26,6 +26,26 @@ + + + + + + + + { if (e.code === 'unique' || e.code === 'integrity' || e.code === 'accuracy' || - e.code === 'consistent' || e.code === 'relevance' || e.code === 'regular') { + e.code === 'consistent' || e.code === 'regular') { children.push(e) } }) @@ -386,7 +406,7 @@ export default { float: right; } .el-card ::v-deep .el-card__body { - height: calc(100vh - 170px); + height: calc(100vh - 100px); } .tree-wrapper { overflow-y: auto; diff --git a/src/views/quality/checkjob/CheckJobAdd.vue b/src/views/quality/checkjob/CheckJobAdd.vue index 70a919c..f7d2941 100644 --- a/src/views/quality/checkjob/CheckJobAdd.vue +++ b/src/views/quality/checkjob/CheckJobAdd.vue @@ -102,7 +102,8 @@ export default { // 核查类型数据字典 ruleItemOptions: [ { typeId: 'structure', typeName: '结构符合性' }, - { typeId: 'content', typeName: '内容符合性' } + { typeId: 'content', typeName: '内容符合性' }, + { typeId: 'relevance', typeName: '关联符合性' } ], sourceOptions: [], tableOptions: [], diff --git a/src/views/quality/checkjob/CheckJobDetail.vue b/src/views/quality/checkjob/CheckJobDetail.vue new file mode 100644 index 0000000..cae5fb3 --- /dev/null +++ b/src/views/quality/checkjob/CheckJobDetail.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/views/quality/checkjob/CheckJobEdit.vue b/src/views/quality/checkjob/CheckJobEdit.vue index f4dd6e5..b874855 100644 --- a/src/views/quality/checkjob/CheckJobEdit.vue +++ b/src/views/quality/checkjob/CheckJobEdit.vue @@ -48,7 +48,7 @@ import { updateCheckJob, getScheduleJobById } from '@/api/quality/checkjob' export default { - name: 'CheckJobAdd', + name: 'CheckJobEdit', props: { data: { type: Object, @@ -95,7 +95,8 @@ export default { // 核查类型数据字典 ruleItemOptions: [ { typeId: 'structure', typeName: '结构符合性' }, - { typeId: 'content', typeName: '内容符合性' } + { typeId: 'content', typeName: '内容符合性' }, + { typeId: 'relevance', typeName: '关联符合性' } ], sourceOptions: [], tableOptions: [], diff --git a/src/views/quality/checkjob/CheckJobList.vue b/src/views/quality/checkjob/CheckJobList.vue index a58b26a..6b14ec0 100644 --- a/src/views/quality/checkjob/CheckJobList.vue +++ b/src/views/quality/checkjob/CheckJobList.vue @@ -94,6 +94,19 @@ diff --git a/src/views/quality/checkjob/index.vue b/src/views/quality/checkjob/index.vue index e76598a..75e9971 100644 --- a/src/views/quality/checkjob/index.vue +++ b/src/views/quality/checkjob/index.vue @@ -9,6 +9,9 @@ + + + @@ -16,10 +19,11 @@ import CheckJobList from './CheckJobList' import CheckJobAdd from './CheckJobAdd' import CheckJobEdit from './CheckJobEdit' +import CheckJobDetail from './CheckJobDetail' export default { name: 'CheckJob', - components: { CheckJobList, CheckJobAdd, CheckJobEdit }, + components: { CheckJobList, CheckJobAdd, CheckJobEdit, CheckJobDetail }, data() { return { options: { diff --git a/src/views/quality/checkrelevancerule/CheckRelevanceRuleAdd.vue b/src/views/quality/checkrelevancerule/CheckRelevanceRuleAdd.vue new file mode 100644 index 0000000..bdb448a --- /dev/null +++ b/src/views/quality/checkrelevancerule/CheckRelevanceRuleAdd.vue @@ -0,0 +1,456 @@ + + + + + diff --git a/src/views/quality/checkrelevancerule/CheckRelevanceRuleDetail.vue b/src/views/quality/checkrelevancerule/CheckRelevanceRuleDetail.vue new file mode 100644 index 0000000..5c2e1d4 --- /dev/null +++ b/src/views/quality/checkrelevancerule/CheckRelevanceRuleDetail.vue @@ -0,0 +1,285 @@ + + + + + diff --git a/src/views/quality/checkrelevancerule/CheckRelevanceRuleEdit.vue b/src/views/quality/checkrelevancerule/CheckRelevanceRuleEdit.vue new file mode 100644 index 0000000..a6d1917 --- /dev/null +++ b/src/views/quality/checkrelevancerule/CheckRelevanceRuleEdit.vue @@ -0,0 +1,439 @@ + + + + + diff --git a/src/views/quality/checkrelevancerule/CheckRelevanceRuleList.vue b/src/views/quality/checkrelevancerule/CheckRelevanceRuleList.vue new file mode 100644 index 0000000..48d581d --- /dev/null +++ b/src/views/quality/checkrelevancerule/CheckRelevanceRuleList.vue @@ -0,0 +1,429 @@ + + + + + diff --git a/src/views/quality/checkrelevancerule/index.vue b/src/views/quality/checkrelevancerule/index.vue new file mode 100644 index 0000000..4852949 --- /dev/null +++ b/src/views/quality/checkrelevancerule/index.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/views/quality/checkrule/CheckRuleAdd.vue b/src/views/quality/checkrule/CheckRuleAdd.vue index 90d4384..a6d9387 100644 --- a/src/views/quality/checkrule/CheckRuleAdd.vue +++ b/src/views/quality/checkrule/CheckRuleAdd.vue @@ -75,7 +75,6 @@ import { listRuleLevel, listRuleItem, addCheckRule, listSourceIdBytable } from ' import { listDataSource } from '@/api/metadata/datasource' import { listDataTable } from '@/api/metadata/datatable' import { listDataColumn } from '@/api/metadata/datacolumn' -import { listDataDictType } from '@/api/standard/datadict' import { Transfer } from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' export default { @@ -201,11 +200,6 @@ export default { this.statusOptions = response.data } }) - listDataDictType().then(response => { - if (response.success) { - this.dictTypeOptions = response.data - } - }) this.getRuleLevelList() this.getRuleItemList() this.getDataSourceList() @@ -296,8 +290,8 @@ export default { this.form.ruleColumn = '' this.form.ruleColumnComment = '' - console.log('tableNameOldList=', tableNameOldList) - this.form.transferValue = tableNameOldList + // console.log('tableNameOldList=', tableNameOldList) + // this.form.transferValue = tableNameOldList } }, // 根据来源数据获取已有表 diff --git a/src/views/quality/checkrule/CheckRuleDetail.vue b/src/views/quality/checkrule/CheckRuleDetail.vue index 8a2545d..e154aae 100644 --- a/src/views/quality/checkrule/CheckRuleDetail.vue +++ b/src/views/quality/checkrule/CheckRuleDetail.vue @@ -65,77 +65,6 @@ - 核查配置 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ table.tableName + '(' + table.tableComment + ')' }} - - - - - - - - - {{ column.columnName + '(' + column.columnComment + ')' }} - - - - - - - - - - - - { - if (response.success) { - this.dictTypeOptions = response.data - } - }) this.getRuleLevelList() - this.getDataSourceList() }, mounted() { this.getCheckRule(this.data.id) @@ -259,13 +182,6 @@ export default { } }) }, - getDataSourceList() { - listDataSource().then(response => { - if (response.success) { - this.sourceOptions = response.data - } - }) - } } } diff --git a/src/views/quality/checkrule/CheckRuleEdit.vue b/src/views/quality/checkrule/CheckRuleEdit.vue index 4a06927..b0eaa6f 100644 --- a/src/views/quality/checkrule/CheckRuleEdit.vue +++ b/src/views/quality/checkrule/CheckRuleEdit.vue @@ -54,89 +54,6 @@ - - - - {{ column.columnName + '(' + column.columnComment + ')' }} - - - - 核查配置 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ table.tableName + '(' + table.tableComment + ')' }} - - - - - - - - - {{ column.columnName + '(' + column.columnComment + ')' }} - - - - - - - - - - - - { - if (response.success) { - this.dictTypeOptions = response.data - } - }) this.getRuleLevelList() this.getDataSourceList() }, @@ -263,6 +174,7 @@ export default { } }) this.tableOptions = await listDataTable({ sourceId: this.form.ruleSourceId }).then(response => { + console.log('response.data==', response.data) if (response.success) { return response.data } diff --git a/src/views/quality/checkrule/CheckRuleList.vue b/src/views/quality/checkrule/CheckRuleList.vue index 18d2252..60abe90 100644 --- a/src/views/quality/checkrule/CheckRuleList.vue +++ b/src/views/quality/checkrule/CheckRuleList.vue @@ -72,6 +72,14 @@ @click="handleAdd" >新增 + + 删除 +
@@ -120,8 +128,9 @@ :size="tableSize" :height="tableHeight" style="width: 100%;margin: 15px 0;" + @selection-change="handleSelectionChange" > - +