From f8328b4dd12c24119dbd32e422286c419c182304 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 08:51:52 +0800 Subject: [PATCH 1/4] Changes --- src/views/rule/rule/index.vue | 2 ++ src/views/rule/rule/version.vue | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue index 21251c7..92f0f22 100644 --- a/src/views/rule/rule/index.vue +++ b/src/views/rule/rule/index.vue @@ -129,6 +129,8 @@ + + diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 0cbba1c..53951b8 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -173,6 +173,46 @@ @pagination="getList" /> + + + + + + +
+ {{ customer.appName }} + + + + + + + + + + +
+ + + + From 8f800b09e5b2f6a8259aa056c76d9f0213a4d267 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 08:58:55 +0800 Subject: [PATCH 2/4] Changes --- src/views/rule/rule/index.vue | 9 ++++++--- src/views/rule/rule/version.vue | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue index 92f0f22..e3670f9 100644 --- a/src/views/rule/rule/index.vue +++ b/src/views/rule/rule/index.vue @@ -126,10 +126,13 @@ - - - + + + + + + diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 53951b8..a9b8f7e 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -175,22 +175,22 @@ - - + +
{{ customer.appName }} - - + + + + + + + + + + - + From 594a9c4d3219b53f3a211d8e40c943b669abb2b5 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 09:06:44 +0800 Subject: [PATCH 3/4] Changes --- src/views/rule/rule/version.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index a9b8f7e..e5128a6 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -180,7 +180,7 @@
- {{ customer.appName }} + {{ ruleAndVersion.appName }} @@ -198,14 +198,14 @@ icon="el-icon-info" icon-color="red" title="这是一段内容确定删除吗？" - @confirm="handleDelete(customer.id)" + @confirm="handleDelete(ruleAndVersion.id)" > + @click="handleUpdate(ruleAndVersion.id)" circle>
From 9cc3a87592a7e4b2d0a4fc6c86f6822b867e8439 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 14:25:36 +0800 Subject: [PATCH 4/4] Changes --- src/api/rule/ruleEdition.js | 47 +++++ src/views/rule/rule/version.vue | 320 ++++++++++++++++++++------------ 2 files changed, 249 insertions(+), 118 deletions(-) create mode 100644 src/api/rule/ruleEdition.js diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js new file mode 100644 index 0000000..60c74fe --- /dev/null +++ b/src/api/rule/ruleEdition.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +// // 查询规则列表 +// export function listRule(query) { +// return request({ +// url: '/rule/rule/list', +// method: 'post', +// params: query +// }) +// } + +// 查询规则详细 +export function getEditionList(id) { + return request({ + url: '/rule/ruleEdition/findById/' + id, + method: 'get' + }) +} +// +// // 新增规则 +// export function addRule(data) { +// return request({ +// url: '/rule/rule/insert', +// method: 'post', +// data: data +// }) +// } +// +// // 修改规则 +// export function updateRule(data) { +// return request({ +// url: '/rule/rule/update', +// method: 'put', +// data: data +// }) +// } +// +// +// // 删除规则 +// export function delRule(id) { +// return request({ +// url: '/rule/rule/delete/' + id, +// method: 'delete' +// }) +// } + + diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index e5128a6..a8e92b7 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -3,26 +3,26 @@ @@ -34,51 +34,51 @@ 新增 - - 修改 - - - - 删除 - - - - 导出 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,91 +126,160 @@ 主键 - {{ ruleAndVersion.id }} + {{ rule.id }} - {{ ruleAndVersion.name }} + {{ rule.name }} - {{ ruleAndVersion.ruleType }} + {{ rule.ruleType }} - {{ ruleAndVersion.isActivate }} + {{ rule.isActivate }} - {{ ruleAndVersion.ruleDesc }} + {{ rule.ruleDesc }} - {{ ruleAndVersion.ruleCode }} + {{ rule.ruleCode }} - - + + + + + + + +

- - + +
- {{ ruleAndVersion.appName }} - - - - - - - - - - - - - +
+ + + + + {{ customer.id }} + + + + {{ customer.ruleKind }} + + + + {{ customer.name }} + + + + {{ customer.ruleCoding }} + + + + {{ customer.ruleActivate }} + + + + {{ customer.status }} + + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
- + @@ -239,11 +308,15 @@