From 3a88d504c0cf97886a921455516bf692fbdf4c4f Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Sun, 8 Sep 2024 11:01:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/rule/ruleEdition.js | 15 ++++ src/views/rule/rule/version.vue | 122 +++++++++++++++++++++++++------- 2 files changed, 112 insertions(+), 25 deletions(-) diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js index d5798e0..1d90eca 100644 --- a/src/api/rule/ruleEdition.js +++ b/src/api/rule/ruleEdition.js @@ -79,6 +79,13 @@ export function findTableIdByParentId(id) { method: 'post', }) } +//表 +export function findTableValueByTableName(basicId,tableName) { + return request({ + url: `/source/value/findTableValueByTableName/?basicId=`+basicId+'&&tableName='+tableName, + method: 'post', + }) +} //保存代码 export function updateRuleEngine(data) { @@ -88,3 +95,11 @@ export function updateRuleEngine(data) { data: data }) } +//规则测试 +export function measurement(data) { + return request({ + url: '/rule/ruleEdition/measurement', + method: 'post', + data: data + }) +} diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 2c9482f..191205d 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -118,6 +118,7 @@ +

@@ -260,9 +261,8 @@ - 保存代码 - + @@ -312,13 +312,15 @@ - - + + @@ -342,7 +344,7 @@ 选择资产结构 - + @@ -353,31 +355,81 @@
选择资产集 -
- - @@ -390,8 +442,8 @@ import { disable, enable, findTableIdByParentId, getEditionList, - getFindByEditionId, selectById, - updateRule, updateRuleEngine + getFindByEditionId, selectById, measurement, + updateRule, updateRuleEngine, findTableValueByTableName } from "@/api/rule/ruleEdition"; @@ -419,7 +471,8 @@ export default { theme: "ambiance", lint: true, // 开启语法检查 }, - + tableData: [], + tableDatas: [], ruleAndEditionList: [], //版本 ruleAndEdition: {}, @@ -486,8 +539,6 @@ export default { {required: true, message: "是否激活;是否激活不能为空", trigger: "blur"} ], } - - }; }, created() { @@ -501,24 +552,44 @@ export default { this.findById(); }, methods: { - //保存代码 - preserve() { - updateRuleEngine(this.form).then(res => { - this.$modal.msgSuccess("修改成功"); + //表数据 + handleEditSelect() { + findTableValueByTableName(this.tableOrigin.basicId, this.tableOrigin.tableName).then(res => { + console.log(res.data) + this.tableDatas = res.data + console.log(this.tableDatas) }) }, + //规则测试 + measurements() { + measurement(this.form).then(res => { + this.$modal.msgSuccess("操作成功"); + }) + }, + //保存代码 + preserve() { + this.$refs["form"].validate(valid => { + updateRuleEngine(this.form).then(response => { + alert(this.form.ruleEngine) + // console.log(this.form) + this.$modal.msgSuccess("修改成功"); + }); + }); + }, + + //数据接入源 getDataOrigin() { selectById(this.dataOrigin).then(res => { this.origins = res.data - console.log("origins", this.origins) + // console.log("origins", this.origins) }) }, chanChild() { findTableIdByParentId(this.dataOrigin.sourceId).then(res => { this.tableOrigin = res.data - console.log("tableOrigin", this.tableOrigin) + // console.log(this.tableOrigin) }) }, //禁用 @@ -556,8 +627,9 @@ export default { addGenerate(this.form).then(res => { this.form.ruleKind = res.data.ruleKind this.form.ruleEngine = res.data.ruleEngine - alert(this.form.ruleKind) + alert(this.form.ruleEngine) this.showCode = true + this.findList() debugger }) },