From 0207d7766cfc7aba5e16328e499d1cb7a48e171d Mon Sep 17 00:00:00 2001 From: chao <3072464591@QQ.com> Date: Wed, 8 May 2024 18:25:11 +0800 Subject: [PATCH] =?UTF-8?q?feat()=20=E8=A7=84=E5=88=99=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2,=E6=B5=8B=E8=AF=95=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/data/rule/engineConfig/index.vue | 8 +- src/views/data/rule/engineVersion/index.vue | 130 ++++++++++++-------- 2 files changed, 86 insertions(+), 52 deletions(-) diff --git a/src/views/data/rule/engineConfig/index.vue b/src/views/data/rule/engineConfig/index.vue index d94cd92..4c1dbb9 100644 --- a/src/views/data/rule/engineConfig/index.vue +++ b/src/views/data/rule/engineConfig/index.vue @@ -47,7 +47,7 @@ export default { }, scopeList: [ { type: "任务", value: "taskContext", "code": - "package com.etl.scope;\n" + + "package com.etl.data.rule.scope;\n" + "\n" + "/**\n" + " * @Author: Chao\n" + @@ -62,7 +62,7 @@ export default { "}\n" }, { type: "资产集", value: "recordContext", "code": - "package com.etl.scope;\n" + + "package com.etl.data.rule.scope;\n" + "\n" + "/**\n" + " * @Author: Chao\n" + @@ -78,7 +78,7 @@ export default { " }\n" + "}\n" }, { type: "资产记录", value: "dataSetContext", "code": - "package com.etl.scope;\n" + + "package com.etl.data.rule.scope;\n" + "\n" + "/**\n" + " * @Author: Chao\n" + @@ -94,7 +94,7 @@ export default { " }\n" + "}\n" }, { type: "资产模型", value: "dataModelContext", "code": - "package com.etl.scope;\n" + + "package com.etl.data.rule.scope;\n" + "\n" + "/**\n" + " * @Author: Chao\n" + diff --git a/src/views/data/rule/engineVersion/index.vue b/src/views/data/rule/engineVersion/index.vue index 3163ca2..92763f9 100644 --- a/src/views/data/rule/engineVersion/index.vue +++ b/src/views/data/rule/engineVersion/index.vue @@ -66,7 +66,10 @@ - {{ ruleEngineVersion.versionClass }} + {{ + ruleEngineVersion.versionClass + }} + {{ ruleEngineVersion.versionName }} {{ ruleEngineVersion.versionCode }} @@ -89,7 +92,8 @@
基本信息 - 生成引擎版本类 + 生成引擎版本类 +
@@ -176,19 +180,25 @@ - {{ ruleEngineVersionInfoAndTest.versionCode }} + {{ ruleEngineVersionInfoAndTest.versionClass }} + + {{ + ruleEngineVersionInfoAndTest.versionName + }} + + {{ + ruleEngineVersionInfoAndTest.versionCode + }} - {{ ruleEngineVersionInfoAndTest.name }} - {{ ruleEngineVersionInfoAndTest.code }} - + - + - + @@ -199,7 +209,7 @@ - @@ -208,11 +218,11 @@
选择数据接入
- + @@ -224,9 +234,9 @@ @@ -260,11 +270,12 @@ import Encoding from "@/components/Encoding/index.vue"; import {getEngineAndEngineVersion, updateEngineActivatedOrNot, updateEngineStatus} from "@/api/data/engine"; import {addEngineVersion, updateEngine} from "@/api/data/engineVersion"; +import {listAssetStructure, selectAssetSouructureTableList} from "@/api/data/structure"; export default { name: "EngineVersion", components: {Encoding}, - dicts: ['activated_or_not', 'status', 'scope', 'type', 'version_type'], + dicts: ['activated_or_not', 'status', 'scope', 'type', 'version_type', 'yes_no_test'], data() { return { ruleEngineId: this.$route.query.id, @@ -282,32 +293,7 @@ export default { // 弹框抽屉 ruleEngineVersionInfoAndTest: {}, // 数据接入集合 - assetStructureList: [ - { - name: "测试1", - systemName: "云计算系统", - databaseName: "yunjisuan", - type: "dataSource" - }, - { - name: "测试2", - systemName: "网站系统", - databaseName: "wangzhan", - type: "dataSource" - }, - { - name: "测试3", - systemName: "物联网系统", - databaseName: "wulianwang", - type: "dataSource" - }, - { - name: "测试4", - systemName: "传媒系统", - databaseName: "chuanmei", - type: "dataSource" - }, - ], + assetStructureList: [], // 数据接入集合选择 assetStructure: null, // 数据资产 @@ -414,14 +400,46 @@ export default { price: "653.69", create_time: "2024-5-7 16:37:16", }, - testResult: "" + testResult: "", + // 数据接入数量 + assetStructureDataCount: { + dataCount: null, + assetStructureTableCount: null, + assetStructureTableDataCount: null, + }, + // 数据接入数量 + structureTableDataCount: { + tableCount: null, + tableDataCount: null, + childrenList: [], + }, } }, created() { this.initRuleEngine(); }, methods: { + changeAssetStructure(row) { + this.assets = null; + this.assetsList = []; + selectAssetSouructureTableList(row).then((response) => { + // 打印 API 返回的响应数据 + // console.log(response); + // 将 API 返回的 data 属性赋值给 this.childrenList + this.assetsList = response.data.tableDetailsRespList; + + // 遍历 this.childrenList，为每个元素添加 type 属性，值为 "dataTable" + this.assetsList.forEach((item) => { + item.type = "dataTable"; + }); + this.structureTableDataCount.tableCount = response.data.tableCount + this.structureTableDataCount.tableDataCount = response.data.tableDataCount + this.structureTableDataCount.childrenList = this.childrenList + console.log("aaaaaaaaa") + console.log(this.assetsList) + }) + }, saveCoding() { updateEngine(this.ruleEngineVersionInfoAndTest).then(response => { this.$message.success('编码保存成功'); @@ -457,6 +475,7 @@ export default { case "test"://测试 this.ruleEngineVersionTestStatus = true; this.ruleEngineVersionInfoAndTest = command.ruleEngineVersion; + this.getAssetStructureList() break; case "status"://激活状态 command.ruleEngineVersion.isActivate = 'no-activate' === command.ruleEngineVersion.isActivate ? 'activated' : 'no-activate' @@ -468,6 +487,21 @@ export default { console.log(command.event); console.log(command.ruleEngineVersion); }, + + getAssetStructureList() { + listAssetStructure().then(response => { + this.assetStructureList = response.data.assetStructureList + this.assetStructureList.forEach( + item => { + item.type = "dataSource" + } + ) + // 数据接入数量 + this.assetStructureDataCount.dataCount = this.assetStructureList.length + this.assetStructureDataCount.assetStructureTableCount = response.data.assetStructureTableCount + this.assetStructureDataCount.assetStructureTableDataCount = response.data.assetStructureTableDataCount + }) + }, // 生成规则版本 genEngineVersion() { if (this.engineVersionForm.versionName == null || this.engineVersionForm.versionName === "") { @@ -484,7 +518,7 @@ export default { } this.engineVersionForm.versionClass = this.ruleEngineInfo.encoding + "_" + this.engineVersionForm.versionCode var codeIng = this.getCodeIng(); - this.$set( this.engineVersionForm, 'codeText', codeIng) + this.$set(this.engineVersionForm, 'codeText', codeIng) }, // 确定新增 addVersionSubmission() { @@ -496,10 +530,10 @@ export default { this.engineVersionForm.engineRuleId = this.ruleEngineInfo.id; this.ruleEngineInfo.engineRuleVersionList.forEach(item => { if (item.versionCode === this.engineVersionForm.versionCode) { - version ++; + version++; } }) - if (version != 0){ + if (version != 0) { this.$message.error('版本CODE已存在'); return; }