From e5df2ae1310b307d34783164ece0c2e622491b79 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Wed, 4 Sep 2024 12:23:27 +0800 Subject: [PATCH 1/5] =?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/views/rule/rule/version.vue | 99 +++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 6 deletions(-) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index fd6ebc4..66e9893 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -45,8 +45,22 @@ >新增 - 开启引擎 - 关闭引擎 + 开启引擎 + + + + + + 关闭引擎 + + @@ -264,7 +278,7 @@ :visible.sync="drawer" :with-header="false" size="70%"> - 生成版本类 + @@ -299,6 +313,7 @@ +
确 定 @@ -307,7 +322,49 @@
- 11111 + + + +
+ 选择数据接入 +
+ + + + + + + + + + + +
+ 选择资产结构 +
+ + + + + + + + + + + + + + +
+ 选择资产集 +
+ + + + + + @@ -329,14 +386,21 @@ import { import {codemirror} from 'vue-codemirror' -import "codemirror/theme/ambiance.css"; // 这里引入的是主题样式，根据设置的theme的主题引入，一定要引入！！ +import "codemirror/theme/ambiance.css"; +import select from "view-design/src/components/select"; // 这里引入的是主题样式，根据设置的theme的主题引入，一定要引入！！ require("codemirror/mode/javascript/javascript"); // 这里引入的模式的js，根据设置的mode引入，一定要引入！ export default { name: "Rule", + computed: { + select() { + return select + } + }, data() { return { - + selects: false, + selectss: false, drawer: false, cmOptions: { lineNumbers: true, // 显示行号 @@ -421,6 +485,29 @@ export default { this.findById(); }, methods: { + + + //禁用 + handleStatus() { + if (row.status === "Y") { + enable(row.id).then((res) => { + this.$modal.msgSuccess("启用成功") + this.findList() + }) + } else { + disable(row.id).then((res) => { + this.$modal.msgSuccess("禁用成功") + this.findList() + }) + } + }, + //数据源 + chan() { + this.selects = true + }, + ch() { + this.selectss = true + }, //测试规则 drawers(id) { getFindByEditionId(id).then(res => { From 8cbce8dcbd600f5e8dbdf52ffbdee9ccf89bbb6a Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Wed, 4 Sep 2024 12:24:05 +0800 Subject: [PATCH 2/5] =?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/views/rule/rule/version.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 66e9893..8fbb53c 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -351,6 +351,7 @@ + From f61d5c844c16ac1091912a7046a86e347fa71f03 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Wed, 4 Sep 2024 20:52:30 +0800 Subject: [PATCH 3/5] =?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 | 25 ++++++--- src/views/rule/rule/version.vue | 89 ++++++++++++++++++++++----------- 2 files changed, 80 insertions(+), 34 deletions(-) diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js index f042566..d5798e0 100644 --- a/src/api/rule/ruleEdition.js +++ b/src/api/rule/ruleEdition.js @@ -65,13 +65,26 @@ export function enable(id) { url: `/rule/ruleEdition/enable/${id}`, }) } - -//通过id禁用客户 -export function disable(id) { +//数据接入 +export function selectById() { return request({ - url: `/rule/ruleEdition/disable/${id}`, + url: `/source/tableInfo/selectById`, + method: 'post', + }) +} +//表 +export function findTableIdByParentId(id) { + return request({ + url: `/source/tableInfo/findTableIdByParentId/${id}`, + method: 'post', }) } - - +//保存代码 +export function updateRuleEngine(data) { + return request({ + url: '/rule/ruleEdition/updateRuleEngine', + method: 'put', + data: data + }) +} diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 8fbb53c..38b7dea 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -259,13 +259,16 @@ + + 保存代码 - +
+ 确 定 取 消
@@ -310,7 +313,7 @@ - + @@ -325,33 +328,24 @@ -
- 选择数据接入 -
- - - - - +
+ 选择数据接入 +
+ + - - - + +
选择资产结构
- - - - - - - - - - + + + + + @@ -361,8 +355,23 @@ 选择资产集
+ + @@ -379,10 +388,10 @@ import { addGenerate, addRule, disable, - enable, + enable, findTableIdByParentId, getEditionList, - getFindByEditionId, - updateRule + getFindByEditionId, selectById, + updateRule, updateRuleEngine } from "@/api/rule/ruleEdition"; @@ -411,7 +420,6 @@ export default { lint: true, // 开启语法检查 }, - ruleAndEditionList: [], //版本 ruleAndEdition: {}, @@ -427,6 +435,7 @@ export default { showSearch: true, // 总条数 total: 0, + childId: {}, // 规则表格数据 ruleList: [], // 弹出层标题 @@ -465,7 +474,11 @@ export default { ruleId: '', ruleEngine: '', }, + //数据源 + dataOrigin: {}, + origins: [], + tableOrigin: [], showCode: false, // 表单校验 rules: { @@ -480,14 +493,33 @@ export default { this.ruleAndVersion.id = this.$route.query.id this.findById(); this.findList() + this.getDataOrigin() }, //生命周期 - 挂载完成（可以访问DOM元素）", mounted() { this.findById(); }, methods: { + //保存代码 + preserve() { + updateRuleEngine(this.form).then(res => { + this.$modal.msgSuccess("修改成功"); + }) + }, + //数据接入源 + getDataOrigin() { + selectById(this.dataOrigin).then(res => { + this.origins = res.data + console.log("origins", this.origins) + }) + }, - + chanChild() { + findTableIdByParentId(this.dataOrigin.sourceId).then(res => { + this.tableOrigin = res.data + console.log("tableOrigin", this.tableOrigin) + }) + }, //禁用 handleStatus() { if (row.status === "Y") { @@ -505,6 +537,7 @@ export default { //数据源 chan() { this.selects = true + this.chanChild() }, ch() { this.selectss = true From 0d25eb624efb460473bf18d494bce1e4e60f8f6c Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Wed, 4 Sep 2024 20:57:21 +0800 Subject: [PATCH 4/5] =?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/views/rule/rule/version.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 38b7dea..2c9482f 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -487,6 +487,7 @@ export default { ], } + }; }, created() { From 898d422c5dbda93355f37627ebc87ab35ec9c137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Wed, 4 Sep 2024 20:59:06 +0800 Subject: [PATCH 5/5] 1 --- src/views/rule/rule/version.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 8fbb53c..bbbaa64 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -486,8 +486,6 @@ export default { this.findById(); }, methods: { - - //禁用 handleStatus() { if (row.status === "Y") {