From ddc2ff0e51085266713ee6c12718b139032907d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Fri, 6 Sep 2024 15:47:15 +0800
Subject: [PATCH 01/10] =?UTF-8?q?09061546:=E6=95=B0=E6=8D=AE=E6=8E=A5?=
=?UTF-8?q?=E5=85=A5=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/rule/rule/version.vue | 22 +++++++++++++---------
src/views/source/index.vue | 9 ++++-----
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 2c9482f..ecac655 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -342,17 +342,18 @@
选择资产结构
-
+
-
+
选择资产集
+
@@ -387,11 +388,14 @@ import {delRule, getRule} from "/src/api/rule/rule";
import {
addGenerate,
addRule,
- disable,
- enable, findTableIdByParentId,
+ enable,
+ findTableIdByParentId,
getEditionList,
- getFindByEditionId, selectById,
- updateRule, updateRuleEngine
+ getFindByEditionId,
+ selectById,
+ updateRule,
+ updateRuleEngine,
+ findTableValueByTableName
} from "@/api/rule/ruleEdition";
@@ -493,8 +497,8 @@ export default {
created() {
this.ruleAndVersion.id = this.$route.query.id
this.findById();
- this.findList()
- this.getDataOrigin()
+ this.findList();
+ this.getDataOrigin();
},
//生命周期 - 挂载完成（可以访问DOM元素）",
mounted() {
@@ -514,7 +518,7 @@ export default {
console.log("origins", this.origins)
})
},
-
+ //表结构
chanChild() {
findTableIdByParentId(this.dataOrigin.sourceId).then(res => {
this.tableOrigin = res.data
diff --git a/src/views/source/index.vue b/src/views/source/index.vue
index 9e2cc7a..52907eb 100644
--- a/src/views/source/index.vue
+++ b/src/views/source/index.vue
@@ -178,14 +178,12 @@
+
+
+
-
是
否
-
-
-
-
@@ -285,6 +283,7 @@ export default {
maxNum: null,
maxWaitTime: null,
maxWaitSize: null,
+ driverName: null,
createBy: null,
createTime: null,
updateBy: null,
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 02/10] =?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 @@
选择资产集
-
-
-
+
-
- {{ scope.row.date }}
+ {{ scope.row.id }}
+
+
+
+
+ {{ scope.row.basicId }}
+
+
+
+
+ {{ scope.row.tableName }}
+
+
+
+
+ {{ scope.row.tableRemark }}
+
+
+
+
+ {{ scope.row.type }}
+
+
+
+
+ {{ scope.row.dataNum }}
+
+
+
+
+ {{ scope.row.center }}
+
+
+ 选择
+
+
+
+
+
+ 测 试
-
+
@@ -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
})
},
From b7003dd31d20e0cda74b528cc680d1b0086ee1d1 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Sun, 8 Sep 2024 11:03:16 +0800
Subject: [PATCH 03/10] =?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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js
index 1d90eca..6572780 100644
--- a/src/api/rule/ruleEdition.js
+++ b/src/api/rule/ruleEdition.js
@@ -87,6 +87,7 @@ export function findTableValueByTableName(basicId,tableName) {
})
}
+
//保存代码
export function updateRuleEngine(data) {
return request({
From 1703942966e36a9c7253e0375e56174e9d8ca273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 21:06:34 +0800
Subject: [PATCH 04/10] =?UTF-8?q?09082106:=E8=A7=84=E5=88=99=E5=BC=95?=
=?UTF-8?q?=E6=93=8E=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E7=9A=84=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/rule/ruleEdition.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js
index 6572780..cc3f1bd 100644
--- a/src/api/rule/ruleEdition.js
+++ b/src/api/rule/ruleEdition.js
@@ -82,7 +82,7 @@ export function findTableIdByParentId(id) {
//表
export function findTableValueByTableName(basicId,tableName) {
return request({
- url: `/source/value/findTableValueByTableName/?basicId=`+basicId+'&&tableName='+tableName,
+ url: `/source/value/findTableValueByTableName?basicId=`+basicId+'&&tableName='+tableName,
method: 'post',
})
}
From 3b4bef141dc0956adbf997afc4057ddcd5e4ccd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 21:10:53 +0800
Subject: [PATCH 05/10] =?UTF-8?q?09082110:=E8=A7=84=E5=88=99=E5=BC=95?=
=?UTF-8?q?=E6=93=8E=E6=9F=A5=E8=AF=A2=E8=B5=84=E4=BA=A7=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/rule/rule/version.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 191205d..be3f9b3 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -414,7 +414,7 @@
选择
+ @click="handleEditSelect(scope.row)">选择
@@ -553,8 +553,9 @@ export default {
},
methods: {
//表数据
- handleEditSelect() {
- findTableValueByTableName(this.tableOrigin.basicId, this.tableOrigin.tableName).then(res => {
+ handleEditSelect(data) {
+ alert(data);
+ findTableValueByTableName(data.basicId, data.tableName).then(res => {
console.log(res.data)
this.tableDatas = res.data
console.log(this.tableDatas)
From 3e9e389862518c6fb258cf5534f837f3cfb92ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 21:13:59 +0800
Subject: [PATCH 06/10] =?UTF-8?q?09082114:=E8=A7=84=E5=88=99=E5=BC=95?=
=?UTF-8?q?=E6=93=8E=E6=9F=A5=E8=AF=A2=E8=B5=84=E4=BA=A7=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/rule/rule/version.vue | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index be3f9b3..83cf138 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -554,11 +554,10 @@ export default {
methods: {
//表数据
handleEditSelect(data) {
- alert(data);
findTableValueByTableName(data.basicId, data.tableName).then(res => {
console.log(res.data)
this.tableDatas = res.data
- console.log(this.tableDatas)
+ alert(res.data)
})
},
//规则测试
From 52c389868ec8c78b5029bdddd8daefef1f807b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 21:27:53 +0800
Subject: [PATCH 07/10] =?UTF-8?q?09082127:=E8=A7=84=E5=88=99=E5=BC=95?=
=?UTF-8?q?=E6=93=8E=E6=9F=A5=E8=AF=A2=E8=B5=84=E4=BA=A7=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/rule/rule/version.vue | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 83cf138..d5e5802 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -422,8 +422,12 @@
-
- 测 试
+
+ 测试
+
+
@@ -561,8 +565,9 @@ export default {
})
},
//规则测试
- measurements() {
- measurement(this.form).then(res => {
+ measurements(data) {
+ this.form=data
+ measurement(data).then(res => {
this.$modal.msgSuccess("操作成功");
})
},
From 667bceea9ff42e7216034402235578f2232bb78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 22:12:35 +0800
Subject: [PATCH 08/10] =?UTF-8?q?09082212:=E8=A7=84=E5=88=99=E5=BC=95?=
=?UTF-8?q?=E6=93=8E=E6=9F=A5=E8=AF=A2=E8=B5=84=E4=BA=A7=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/rule/rule/version.vue | 128 ++++++++++++++++++--------------
1 file changed, 73 insertions(+), 55 deletions(-)
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index d5e5802..f79582e 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -356,60 +356,77 @@
选择资产集
-
-
-
- {{ scope.row.id }}
-
-
-
-
- {{ scope.row.basicId }}
-
-
-
-
- {{ scope.row.tableName }}
-
-
-
-
- {{ scope.row.tableRemark }}
-
-
-
-
- {{ scope.row.type }}
-
-
-
-
- {{ scope.row.dataNum }}
-
-
-
-
- {{ scope.row.center }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value}}
+
+
-
+
+
@@ -566,7 +584,7 @@ export default {
},
//规则测试
measurements(data) {
- this.form=data
+ this.tableDatas=data
measurement(data).then(res => {
this.$modal.msgSuccess("操作成功");
})
From 796fce9f53da8f3ccfad3c10095386ff20b3185c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 22:18:28 +0800
Subject: [PATCH 09/10] =?UTF-8?q?09082218:=E8=A7=84=E5=88=99=E5=BC=95?=
=?UTF-8?q?=E6=93=8E=E6=9F=A5=E8=AF=A2=E8=B5=84=E4=BA=A7=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/rule/rule/version.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index f79582e..589fd8f 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -344,7 +344,7 @@
选择资产结构
-
+
@@ -435,7 +435,6 @@
-
@@ -568,6 +567,7 @@ export default {
this.findById();
this.findList()
this.getDataOrigin()
+ this.findTableValueByTableName();
},
//生命周期 - 挂载完成（可以访问DOM元素）",
mounted() {
From 2f256c7b1fda9e441fca8d4136723c50738ac35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 22:24:05 +0800
Subject: [PATCH 10/10] =?UTF-8?q?09082223:=E8=A7=84=E5=88=99=E5=BC=95?=
=?UTF-8?q?=E6=93=8E=E6=9F=A5=E8=AF=A2=E8=B5=84=E4=BA=A7=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/rule/rule/version.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 589fd8f..4be85e2 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -419,12 +419,14 @@
+ {{tableDatas}}
- {{value}}