From b04ffa354bfdd2905c2c8e933385cdd73853862a Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 10:26:46 +0800
Subject: [PATCH 1/8] Changes

---
 src/api/rule/ruleEdition.js     | 16 +++----
 src/views/rule/rule/version.vue | 76 ++++++++++++++++++++-------------
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js
index c4197eb..38334a0 100644
--- a/src/api/rule/ruleEdition.js
+++ b/src/api/rule/ruleEdition.js
@@ -17,14 +17,14 @@ export function getEditionList(id) {
   })
 }
 //
-// // 新增规则
-// export function addRule(data) {
-//   return request({
-//     url: '/rule/rule/insert',
-//     method: 'post',
-//     data: data
-//   })
-// }
+// 新增规则
+export function addRule(data) {
+  return request({
+    url: '/rule/ruleEdition/insert',
+    method: 'post',
+    data: data
+  })
+}
 //
 // // 修改规则
 // export function updateRule(data) {
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index b503e99..efabf14 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -32,17 +32,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['rule:rule:add']"-->
-<!--        >新增-->
-<!--        </el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['rule:rule:add']"-->
+      <!--        >新增-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--            type="success"-->
@@ -123,17 +123,11 @@
           更多操作
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item>
-
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
+                type="text"
                 @click="handleAdd"
-                v-hasPermi="['rule:rule:add']"
               >新增
               </el-button>
-
             </el-dropdown-item>
             <el-dropdown-item>开启引擎</el-dropdown-item>
             <el-dropdown-item>关闭引擎</el-dropdown-item>
@@ -314,18 +308,31 @@
     <!-- 添加或修改规则对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="规则名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入规则名称"/>
+        <el-form-item label="版本类" prop="ruleKind">
+          <el-input v-model="form.ruleKind" placeholder="请输入版本类"/>
         </el-form-item>
-        <el-form-item label="是否激活" prop="isActivate">
-          <el-input v-model="form.isActivate" placeholder="请输入是否激活"/>
+        <el-form-item label="版本名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入版本名称"/>
         </el-form-item>
-        <el-form-item label="规则描述" prop="ruleDesc">
-          <el-input v-model="form.ruleDesc" type="textarea" placeholder="请输入内容"/>
+        <el-form-item label="编码" prop="ruleCoding">
+          <el-input v-model="form.ruleCoding" type="textarea" placeholder="请输入编码"/>
         </el-form-item>
-        <el-form-item label="规则代码" prop="ruleCode">
-          <el-input v-model="form.ruleCode" placeholder="请输入规则代码"/>
+        <el-form-item label="是否激活" prop="ruleActivate">
+          <el-radio-group v-model="form.ruleActivate" placeholder="请输入是否激活">
+            <el-radio label="Y"></el-radio>
+            <el-radio label="N"></el-radio>
+          </el-radio-group>
         </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-input v-model="form.status" placeholder="请输入状态"/>
+        </el-form-item>
+        <el-form-item label="内容" prop="ruleContent">
+          <el-input v-model="form.ruleContent" placeholder="请输入内容"/>
+        </el-form-item>
+        <el-form-item label="内容" prop="ruleId">
+          <el-input v-model="form.ruleId" placeholder="请输入内容"/>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -336,8 +343,8 @@
 </template>
 
 <script>
-import {listRule, getRule, delRule, addRule, updateRule} from "/src/api/rule/rule";
-import {getEditionList} from "@/api/rule/ruleEdition";
+import {getRule, delRule, updateRule} from "/src/api/rule/rule";
+import {getEditionList, addRule} from "@/api/rule/ruleEdition";
 
 export default {
   name: "Rule",
@@ -384,7 +391,15 @@ export default {
       },
       rule: {},
       // 表单参数
-      form: {},
+      form: {
+        ruleKind: '',
+        name: '',
+        ruleCoding: '',
+        ruleActivate: '',
+        status: '',
+        ruleContent: '',
+        ruleId: '',
+      },
       // 表单校验
       rules: {
         isActivate: [
@@ -513,8 +528,11 @@ export default {
           } else {
             addRule(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
+              this.form.ruleId = this.rule.id
+              console.log(this.form.ruleId)
               this.open = false;
               // this.getList();
+              this.findList()
             });
           }
         }

From 367677a8effbb3dd0eef52ab720f480a8d949ff3 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 11:40:32 +0800
Subject: [PATCH 2/8] Changes

---
 src/views/rule/rule/version.vue | 128 +++-----------------------------
 1 file changed, 10 insertions(+), 118 deletions(-)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index efabf14..9c9a8a7 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -31,91 +31,6 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          plain-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          @click="handleAdd"-->
-      <!--          v-hasPermi="['rule:rule:add']"-->
-      <!--        >新增-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--            type="success"-->
-      <!--            plain-->
-      <!--            icon="el-icon-edit"-->
-      <!--            size="mini"-->
-      <!--            :disabled="single"-->
-      <!--            @click="handleUpdate"-->
-      <!--            v-hasPermi="['rule:rule:edit']"-->
-      <!--        >修改-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--            type="danger"-->
-      <!--            plain-->
-      <!--            icon="el-icon-delete"-->
-      <!--            size="mini"-->
-      <!--            :disabled="multiple"-->
-      <!--            @click="handleDelete"-->
-      <!--            v-hasPermi="['rule:rule:remove']"-->
-      <!--        >删除-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--            type="warning"-->
-      <!--            plain-->
-      <!--            icon="el-icon-download"-->
-      <!--            size="mini"-->
-      <!--            @click="handleExport"-->
-      <!--            v-hasPermi="['rule:rule:export']"-->
-      <!--        >导出-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-    </el-row>
-
-    <!--    <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">-->
-    <!--      <el-table-column type="selection" width="55" align="center" />-->
-    <!--      <el-table-column label="主键" align="center" prop="id" />-->
-    <!--      <el-table-column label="规则名称" align="center" prop="name" />-->
-    <!--      <el-table-column label="规则类型" align="center" prop="ruleType" />-->
-    <!--      <el-table-column label="是否激活" align="center" prop="isActivate" />-->
-    <!--      <el-table-column label="规则描述" align="center" prop="ruleDesc" />-->
-    <!--      <el-table-column label="规则代码" align="center" prop="ruleCode" />-->
-    <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-    <!--        <template slot-scope="scope">-->
-    <!--          <el-button-->
-    <!--            size="mini"-->
-    <!--            type="text"-->
-    <!--            icon="el-icon-edit"-->
-    <!--            @click="handleMaintain(scope.row)"-->
-    <!--            v-hasPermi="['rule:rule:remove']"-->
-    <!--          >规则维护</el-button>-->
-    <!--          <el-button-->
-    <!--            size="mini"-->
-    <!--            type="text"-->
-    <!--            icon="el-icon-edit"-->
-    <!--            @click="handleUpdate(scope.row)"-->
-    <!--            v-hasPermi="['rule:rule:edit']"-->
-    <!--          >修改</el-button>-->
-    <!--          <el-button-->
-    <!--            size="mini"-->
-    <!--            type="text"-->
-    <!--            icon="el-icon-delete"-->
-    <!--            @click="handleDelete(scope.row)"-->
-    <!--            v-hasPermi="['rule:rule:remove']"-->
-    <!--          >删除</el-button>-->
-    <!--        </template>-->
-    <!--      </el-table-column>-->
-    <!--    </el-table>-->
-
 
     <el-descriptions class="margin-top" title="规则版本" :column="3" border>
       <template slot="extra">
@@ -180,17 +95,9 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <!--    <pagination-->
-    <!--        v-show="total>0"-->
-    <!--        :total="total"-->
-    <!--        :page.sync="queryParams.pageNum"-->
-    <!--        :limit.sync="queryParams.pageSize"-->
-    <!--        @pagination="getList"-->
-    <!--    />-->
 
     <br><br>
     <el-row :gutter="10">
-      <!--            <el-empty description="暂无支付客户" v-if="customerList.length === 0"></el-empty>-->
       <el-col :span="12" v-for="customer in ruleAndEditionList">
 
         <el-card class="box-card">
@@ -242,13 +149,13 @@
                   </template>
                   {{ customer.ruleKind }}
                 </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    <i class="el-icon-user"></i>
-                    版本名称
-                  </template>
-                  {{ customer.name }}
-                </el-descriptions-item>
+                <!--                <el-descriptions-item>-->
+                <!--                  <template slot="label">-->
+                <!--                    <i class="el-icon-user"></i>-->
+                <!--                    版本名称-->
+                <!--                  </template>-->
+                <!--                  {{ customer.name }}-->
+                <!--                </el-descriptions-item>-->
                 <el-descriptions-item>
                   <template slot="label">
                     <i class="el-icon-user"></i>
@@ -285,21 +192,6 @@
 
               </el-descriptions>
             </div>
-
-            <!--                        <el-popconfirm-->
-            <!--                          confirm-button-text='好的'-->
-            <!--                          cancel-button-text='不用了'-->
-            <!--                          icon="el-icon-info"-->
-            <!--                          icon-color="red"-->
-            <!--                          title="这是一段内容确定删除吗？"-->
-            <!--                          @confirm="handleDelete(ruleAndVersion.id)"-->
-            <!--                        >-->
-            <!--                          <el-button style="float: right; padding: 5px ;margin: 0 5px" slot="reference" type="danger"-->
-            <!--                                     icon="el-icon-delete" circle></el-button>-->
-            <!--                        </el-popconfirm>-->
-
-            <!--                        <el-button style="float: right; padding: 5px ;margin: 0 5px" type="primary" icon="el-icon-edit"-->
-            <!--                                   @click="handleUpdate(ruleAndVersion.id)" circle></el-button>-->
           </div>
         </el-card>
       </el-col>
@@ -329,7 +221,7 @@
         <el-form-item label="内容" prop="ruleContent">
           <el-input v-model="form.ruleContent" placeholder="请输入内容"/>
         </el-form-item>
-        <el-form-item label="内容" prop="ruleId">
+        <el-form-item label="版本id" prop="ruleId">
           <el-input v-model="form.ruleId" placeholder="请输入内容"/>
         </el-form-item>
 
@@ -344,7 +236,7 @@
 
 <script>
 import {getRule, delRule, updateRule} from "/src/api/rule/rule";
-import {getEditionList, addRule} from "@/api/rule/ruleEdition";
+import {getEditionList, addRule, disable, enable} from "@/api/rule/ruleEdition";
 
 export default {
   name: "Rule",
@@ -398,7 +290,7 @@ export default {
         ruleActivate: '',
         status: '',
         ruleContent: '',
-        ruleId: '',
+        ruleId: 1,
       },
       // 表单校验
       rules: {

From 1758155041875eac8e826a355f359470060c8448 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 11:47:00 +0800
Subject: [PATCH 3/8] Changes

---
 src/views/quest/node/Home.vue                 |  45 +++---
 src/views/quest/node/components/node-item.vue |   3 -
 src/views/quest/task/index.vue                |  57 ++++----
 src/views/rule/rule/version.vue               | 128 ++++++++++++++++--
 4 files changed, 165 insertions(+), 68 deletions(-)

diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue
index 333c620..fdfe0be 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -91,34 +91,35 @@ export default {
         const rows = res.data.rows
         for (let i = 0; i < rows.length; i++) {
           const r = flowNode.methods.toJsPlumbNode(rows[i])
-          nodeTypeList.forEach(v => {
-            if (r.node.type === v.type) {
-              r.node.typeName = v.typeName
-              r.node.logImg = v.logImg
-              r.node.log_bg_color = v.log_bg_color
-            }
+          this.data.nodeList.push({
+            id: r.node.id,
+            type: r.node.type,
+            typeName: r.node.typeName,
+            nodeName: r.node.nodeName,
+            top: r.node.top,
+            left: r.node.left
           })
-          this.data.nodeList.push(r.node)
           if (r.line) {
             r.line.forEach(v => {
-              let flag = true
-              this.data.lineList.forEach(v2 =>{
-                if (v2.from === v.from && v2.to === v.to) {
-                  flag = false
-                }
-              })
-              if (flag){
-                this.data.lineList.push({
-                  from: v.from,
-                  to: v.to,
-                  label: "连线名称",
-                  id: GenNonDuplicateID(8),
-                  Remark: ""
-                });
-              }
+              this.data.lineList.push({
+                from: v.from,
+                to: v.to,
+                label: "连线名称",
+                id: GenNonDuplicateID(8),
+                Remark: ""
+              });
             })
           }
         }
+        this.data.nodeList.forEach(node => {
+          nodeTypeList.forEach(v => {
+            if (node.type === v.type) {
+              node.typeName = v.typeName
+              node.logImg = v.logImg
+              node.log_bg_color = v.log_bg_color
+            }
+          })
+        })
         // console.log(data)
         console.log(this.data)
       })
diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue
index 75de7e8..5efdb7e 100644
--- a/src/views/quest/node/components/node-item.vue
+++ b/src/views/quest/node/components/node-item.vue
@@ -138,8 +138,6 @@ export default {
     /** jsPlumb节点类型 --> 数据库节点类型 */
     toMysqlNode(node,preLine,nextLine){
       return {
-        id: node.authId,
-        nodeType: node.type,
         nodeCode: node.id,
         nodeName: node.nodeName,
         nodePositionTop: node.top,
@@ -152,7 +150,6 @@ export default {
     /** 数据库节点类型 --> jsPlumb节点类型 */
     toJsPlumbNode(nodeInfo){
       const node = {
-        authId: nodeInfo.id,
         id: nodeInfo.nodeCode,
         type: nodeInfo.nodeType,
         nodeName: nodeInfo.nodeName,
diff --git a/src/views/quest/task/index.vue b/src/views/quest/task/index.vue
index 777b1cb..681aa30 100644
--- a/src/views/quest/task/index.vue
+++ b/src/views/quest/task/index.vue
@@ -9,15 +9,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="任务触发器" prop="taskWebhook">
+        <el-input
+          v-model="queryParams.taskWebhook"
+          placeholder="请输入任务触发器"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="启用状态" prop="state">
-        <el-select v-model="queryParams.state" placeholder="请选择启用状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_enable_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        <el-input
+          v-model="queryParams.state"
+          placeholder="请输入启用状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -73,17 +79,13 @@
 
     <el-table v-loading="loading" :data="questList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="任务编码" align="center" prop="taskCode" />
       <el-table-column label="任务名称" align="center" prop="taskName" />
       <el-table-column label="任务触发器" align="center" prop="taskWebhook" />
       <el-table-column label="规则编码" align="center" prop="ruleCode" />
       <el-table-column label="任务类型" align="center" prop="taskType" />
-      <el-table-column label="任务内容" align="center" prop="taskData" />
-      <el-table-column label="启用状态" align="center" prop="state">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_enable_status" :value="scope.row.state"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="启用状态" align="center" prop="state" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -131,18 +133,11 @@
         <el-form-item label="规则编码" prop="ruleCode">
           <el-input v-model="form.ruleCode" placeholder="请输入规则编码" />
         </el-form-item>
-        <el-form-item label="任务内容">
-          <editor v-model="form.taskData" :min-height="192"/>
+        <el-form-item label="任务类型" prop="task_type">
+          <el-input v-model="form.taskType" placeholder="请输入任务类型" />
         </el-form-item>
         <el-form-item label="启用状态" prop="state">
-          <el-select v-model="form.state" placeholder="请选择启用状态">
-            <el-option
-              v-for="dict in dict.type.sys_enable_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+          <el-input v-model="form.state" placeholder="请输入启用状态" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -154,12 +149,10 @@
 </template>
 
 <script>
-import { listQuest, getQuest, delQuest, addQuest, updateQuest } from "/src/api/quest/quest";
-import dict from "../../../utils/dict";
+import {listQuest, getQuest, delQuest, addQuest, updateQuest} from "@/api/quest/quest";
 
 export default {
   name: "Quest",
-  dicts: ['sys_enable_status'],
   data() {
     return {
       // 遮罩层
@@ -203,11 +196,11 @@ export default {
     this.getList();
   },
   methods: {
-    dict,
     /** 查询任务列表 */
     getList() {
       this.loading = true;
       listQuest(this.queryParams).then(response => {
+        console.log(response)
         this.questList = response.data.rows;
         this.total = response.data.total;
         this.loading = false;
@@ -227,7 +220,6 @@ export default {
         taskWebhook: null,
         ruleCode: null,
         taskType: null,
-        taskData: null,
         state: null,
         createBy: null,
         createTime: null,
@@ -250,7 +242,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -292,13 +284,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function() {
         return delQuest(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 9c9a8a7..efabf14 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -31,6 +31,91 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['rule:rule:add']"-->
+      <!--        >新增-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--            type="success"-->
+      <!--            plain-->
+      <!--            icon="el-icon-edit"-->
+      <!--            size="mini"-->
+      <!--            :disabled="single"-->
+      <!--            @click="handleUpdate"-->
+      <!--            v-hasPermi="['rule:rule:edit']"-->
+      <!--        >修改-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--            type="danger"-->
+      <!--            plain-->
+      <!--            icon="el-icon-delete"-->
+      <!--            size="mini"-->
+      <!--            :disabled="multiple"-->
+      <!--            @click="handleDelete"-->
+      <!--            v-hasPermi="['rule:rule:remove']"-->
+      <!--        >删除-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--            type="warning"-->
+      <!--            plain-->
+      <!--            icon="el-icon-download"-->
+      <!--            size="mini"-->
+      <!--            @click="handleExport"-->
+      <!--            v-hasPermi="['rule:rule:export']"-->
+      <!--        >导出-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+    </el-row>
+
+    <!--    <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">-->
+    <!--      <el-table-column type="selection" width="55" align="center" />-->
+    <!--      <el-table-column label="主键" align="center" prop="id" />-->
+    <!--      <el-table-column label="规则名称" align="center" prop="name" />-->
+    <!--      <el-table-column label="规则类型" align="center" prop="ruleType" />-->
+    <!--      <el-table-column label="是否激活" align="center" prop="isActivate" />-->
+    <!--      <el-table-column label="规则描述" align="center" prop="ruleDesc" />-->
+    <!--      <el-table-column label="规则代码" align="center" prop="ruleCode" />-->
+    <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+    <!--        <template slot-scope="scope">-->
+    <!--          <el-button-->
+    <!--            size="mini"-->
+    <!--            type="text"-->
+    <!--            icon="el-icon-edit"-->
+    <!--            @click="handleMaintain(scope.row)"-->
+    <!--            v-hasPermi="['rule:rule:remove']"-->
+    <!--          >规则维护</el-button>-->
+    <!--          <el-button-->
+    <!--            size="mini"-->
+    <!--            type="text"-->
+    <!--            icon="el-icon-edit"-->
+    <!--            @click="handleUpdate(scope.row)"-->
+    <!--            v-hasPermi="['rule:rule:edit']"-->
+    <!--          >修改</el-button>-->
+    <!--          <el-button-->
+    <!--            size="mini"-->
+    <!--            type="text"-->
+    <!--            icon="el-icon-delete"-->
+    <!--            @click="handleDelete(scope.row)"-->
+    <!--            v-hasPermi="['rule:rule:remove']"-->
+    <!--          >删除</el-button>-->
+    <!--        </template>-->
+    <!--      </el-table-column>-->
+    <!--    </el-table>-->
+
 
     <el-descriptions class="margin-top" title="规则版本" :column="3" border>
       <template slot="extra">
@@ -95,9 +180,17 @@
       </el-descriptions-item>
     </el-descriptions>
 
+    <!--    <pagination-->
+    <!--        v-show="total>0"-->
+    <!--        :total="total"-->
+    <!--        :page.sync="queryParams.pageNum"-->
+    <!--        :limit.sync="queryParams.pageSize"-->
+    <!--        @pagination="getList"-->
+    <!--    />-->
 
     <br><br>
     <el-row :gutter="10">
+      <!--            <el-empty description="暂无支付客户" v-if="customerList.length === 0"></el-empty>-->
       <el-col :span="12" v-for="customer in ruleAndEditionList">
 
         <el-card class="box-card">
@@ -149,13 +242,13 @@
                   </template>
                   {{ customer.ruleKind }}
                 </el-descriptions-item>
-                <!--                <el-descriptions-item>-->
-                <!--                  <template slot="label">-->
-                <!--                    <i class="el-icon-user"></i>-->
-                <!--                    版本名称-->
-                <!--                  </template>-->
-                <!--                  {{ customer.name }}-->
-                <!--                </el-descriptions-item>-->
+                <el-descriptions-item>
+                  <template slot="label">
+                    <i class="el-icon-user"></i>
+                    版本名称
+                  </template>
+                  {{ customer.name }}
+                </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">
                     <i class="el-icon-user"></i>
@@ -192,6 +285,21 @@
 
               </el-descriptions>
             </div>
+
+            <!--                        <el-popconfirm-->
+            <!--                          confirm-button-text='好的'-->
+            <!--                          cancel-button-text='不用了'-->
+            <!--                          icon="el-icon-info"-->
+            <!--                          icon-color="red"-->
+            <!--                          title="这是一段内容确定删除吗？"-->
+            <!--                          @confirm="handleDelete(ruleAndVersion.id)"-->
+            <!--                        >-->
+            <!--                          <el-button style="float: right; padding: 5px ;margin: 0 5px" slot="reference" type="danger"-->
+            <!--                                     icon="el-icon-delete" circle></el-button>-->
+            <!--                        </el-popconfirm>-->
+
+            <!--                        <el-button style="float: right; padding: 5px ;margin: 0 5px" type="primary" icon="el-icon-edit"-->
+            <!--                                   @click="handleUpdate(ruleAndVersion.id)" circle></el-button>-->
           </div>
         </el-card>
       </el-col>
@@ -221,7 +329,7 @@
         <el-form-item label="内容" prop="ruleContent">
           <el-input v-model="form.ruleContent" placeholder="请输入内容"/>
         </el-form-item>
-        <el-form-item label="版本id" prop="ruleId">
+        <el-form-item label="内容" prop="ruleId">
           <el-input v-model="form.ruleId" placeholder="请输入内容"/>
         </el-form-item>
 
@@ -236,7 +344,7 @@
 
 <script>
 import {getRule, delRule, updateRule} from "/src/api/rule/rule";
-import {getEditionList, addRule, disable, enable} from "@/api/rule/ruleEdition";
+import {getEditionList, addRule} from "@/api/rule/ruleEdition";
 
 export default {
   name: "Rule",
@@ -290,7 +398,7 @@ export default {
         ruleActivate: '',
         status: '',
         ruleContent: '',
-        ruleId: 1,
+        ruleId: '',
       },
       // 表单校验
       rules: {

From 238dc3dc948214a8747fbd52cc4067f8168a6ce6 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 15:06:03 +0800
Subject: [PATCH 4/8] Changes

---
 src/views/rule/rule/index.vue   | 63 ++++++++++++++++++++-------------
 src/views/rule/rule/version.vue |  7 ++--
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue
index e3670f9..90da45e 100644
--- a/src/views/rule/rule/index.vue
+++ b/src/views/rule/rule/index.vue
@@ -40,7 +40,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['rule:rule:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +52,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['rule:rule:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['rule:rule:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,19 +75,20 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['rule:rule:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="规则名称" align="center" prop="name" />
-      <el-table-column label="规则类型" align="center" prop="ruleType" />
-      <el-table-column label="是否激活" align="center" prop="isActivate" />
-      <el-table-column label="规则描述" align="center" prop="ruleDesc" />
-      <el-table-column label="规则代码" align="center" prop="ruleCode" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键" align="center" prop="id"/>
+      <el-table-column label="规则名称" align="center" prop="name"/>
+      <el-table-column label="规则类型" align="center" prop="ruleType"/>
+      <el-table-column label="是否激活" align="center" prop="isActivate"/>
+      <el-table-column label="规则描述" align="center" prop="ruleDesc"/>
+      <el-table-column label="规则代码" align="center" prop="ruleCode"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -93,21 +97,24 @@
             icon="el-icon-edit"
             @click="handleMaintain(scope.row)"
             v-hasPermi="['rule:rule:remove']"
-          >规则维护</el-button>
+          >规则维护
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['rule:rule:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['rule:rule:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -124,21 +131,28 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="规则名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入规则名称" />
+          <el-input v-model="form.name" placeholder="请输入规则名称"/>
         </el-form-item>
 
+
         <el-form-item label="是否激活">
           <el-radio-group v-model="form.isActivate" placeholder="请输入是否激活">
             <el-radio label="Y"></el-radio>
             <el-radio label="N"></el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否激活">
+          <el-radio-group v-model="form.ruleType" placeholder="请输入规则">
+            <el-radio label="自定义规则"></el-radio>
+            <el-radio label="规则模板"></el-radio>
+          </el-radio-group>
+        </el-form-item>
 
         <el-form-item label="规则描述" prop="ruleDesc">
-          <el-input v-model="form.ruleDesc" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.ruleDesc" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
         <el-form-item label="规则代码" prop="ruleCode">
-          <el-input v-model="form.ruleCode" placeholder="请输入规则代码" />
+          <el-input v-model="form.ruleCode" placeholder="请输入规则代码"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -150,7 +164,7 @@
 </template>
 
 <script>
-import { listRule, getRule, delRule, addRule, updateRule } from "/src/api/rule/rule";
+import {listRule, getRule, delRule, addRule, updateRule} from "/src/api/rule/rule";
 
 export default {
   name: "Rule",
@@ -189,7 +203,7 @@ export default {
       // 表单校验
       rules: {
         isActivate: [
-          { required: true, message: "是否激活;是否激活不能为空", trigger: "blur" }
+          {required: true, message: "是否激活;是否激活不能为空", trigger: "blur"}
         ],
       }
     };
@@ -241,7 +255,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -253,8 +267,8 @@ export default {
     /** 规则维护按钮操作 */
     handleMaintain(row) {
       this.$router.push({
-        path:'version',
-        query:{id:row.id}
+        path: 'version',
+        query: {id: row.id}
       })
     },
     /** 修改按钮操作 */
@@ -290,12 +304,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除规则编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除规则编号为"' + ids + '"的数据项？').then(function () {
         return delRule(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index efabf14..4f5d36a 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -329,8 +329,8 @@
         <el-form-item label="内容" prop="ruleContent">
           <el-input v-model="form.ruleContent" placeholder="请输入内容"/>
         </el-form-item>
-        <el-form-item label="内容" prop="ruleId">
-          <el-input v-model="form.ruleId" placeholder="请输入内容"/>
+        <el-form-item label="版本" prop="ruleId">
+          <el-input v-model="form.ruleId" disabled placeholder="请输入版本"/>
         </el-form-item>
 
       </el-form>
@@ -344,7 +344,7 @@
 
 <script>
 import {getRule, delRule, updateRule} from "/src/api/rule/rule";
-import {getEditionList, addRule} from "@/api/rule/ruleEdition";
+import {getEditionList, addRule, enable, disable} from "@/api/rule/ruleEdition";
 
 export default {
   name: "Rule",
@@ -496,6 +496,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.form.ruleId = this.ruleAndVersion.id
       this.title = "添加规则";
     },
     // /** 规则维护按钮操作 */

From 79202eee50131cc67c6264abb8756d30fe9388b0 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 18:39:51 +0800
Subject: [PATCH 5/8] Changes

---
 src/api/rule/ruleEdition.js     | 18 ++++----
 src/views/rule/rule/version.vue | 78 ++++++++++++++++++++++++---------
 2 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js
index 38334a0..b8b8ba6 100644
--- a/src/api/rule/ruleEdition.js
+++ b/src/api/rule/ruleEdition.js
@@ -25,15 +25,15 @@ export function addRule(data) {
     data: data
   })
 }
-//
-// // 修改规则
-// export function updateRule(data) {
-//   return request({
-//     url: '/rule/rule/update',
-//     method: 'put',
-//     data: data
-//   })
-// }
+
+// 修改规则
+export function updateRule(data) {
+  return request({
+    url: '/rule/ruleEdition/update',
+    method: 'put',
+    data: data
+  })
+}
 //
 //
 // // 删除规则
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 4f5d36a..fe3a676 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -98,13 +98,7 @@
     <!--            @click="handleMaintain(scope.row)"-->
     <!--            v-hasPermi="['rule:rule:remove']"-->
     <!--          >规则维护</el-button>-->
-    <!--          <el-button-->
-    <!--            size="mini"-->
-    <!--            type="text"-->
-    <!--            icon="el-icon-edit"-->
-    <!--            @click="handleUpdate(scope.row)"-->
-    <!--            v-hasPermi="['rule:rule:edit']"-->
-    <!--          >修改</el-button>-->
+
     <!--          <el-button-->
     <!--            size="mini"-->
     <!--            type="text"-->
@@ -116,8 +110,8 @@
     <!--      </el-table-column>-->
     <!--    </el-table>-->
 
-
-    <el-descriptions class="margin-top" title="规则版本" :column="3" border>
+    {{ rule.name }}
+    <el-descriptions class="margin-top" :column="3" border>
       <template slot="extra">
         <el-dropdown split-button type="primary">
           更多操作
@@ -192,13 +186,10 @@
     <el-row :gutter="10">
       <!--            <el-empty description="暂无支付客户" v-if="customerList.length === 0"></el-empty>-->
       <el-col :span="12" v-for="customer in ruleAndEditionList">
-
         <el-card class="box-card">
-
           <div slot="header" class="clearfix">
             <div>
-
-              <el-descriptions class="margin-top" title="带边框列表" :column="3" :size="size" border>
+              <el-descriptions class="margin-top" title="规则引擎版本" :column="3" border>
                 <template slot="extra">
 
                   <el-dropdown>
@@ -207,11 +198,16 @@
                 </span>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item>
-
-                        规格详情
-
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-edit"
+                          @click="handleUpdate(customer.id)"
+                          v-hasPermi="['rule:rule:edit']"
+                        >规格详情
+                        </el-button>
                       </el-dropdown-item>
-                      <el-dropdown-item disabled>双皮奶</el-dropdown-item>
+
                       <el-dropdown-item>
                         <el-switch
                           style="float: right; margin: 4px 5px 0;"
@@ -339,12 +335,52 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+    <!-- 添加或修改规则对话框 -->
+<!--    <el-dialog :title="title" :visible.sync="opens" width="80%" append-to-body>-->
+<!--      <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
+<!--        <el-form-item label="版本主键" prop="id">-->
+<!--          <el-input v-model="form.id" placeholder="请输入版本类"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="版本类" prop="ruleKind">-->
+<!--          <el-input v-model="form.ruleKind" placeholder="请输入版本名称"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="版本名称" prop="name">-->
+<!--          <el-input v-model="form.name" type="textarea" placeholder="请输入编码"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="编码" prop="ruleCoding">-->
+<!--          <el-radio-group v-model="form.ruleCoding" placeholder="请输入是否激活">-->
+<!--            <el-radio label="Y"></el-radio>-->
+<!--            <el-radio label="N"></el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否激活" prop="ruleActivate">-->
+<!--          <el-input v-model="form.ruleActivate" placeholder="请输入状态"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="状态" prop="status">-->
+<!--          <el-input v-model="form.status" placeholder="请输入内容"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="内容" prop="ruleContent">-->
+<!--          <el-input v-model="form.ruleContent" disabled placeholder="请输入版本"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="规则ID" prop="ruleId">-->
+<!--          <el-input v-model="form.ruleId" disabled placeholder="请输入版本"/>-->
+<!--        </el-form-item>-->
+
+
+<!--      </el-form>-->
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--        <el-button @click="cancel">取 消</el-button>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
 <script>
-import {getRule, delRule, updateRule} from "/src/api/rule/rule";
-import {getEditionList, addRule, enable, disable} from "@/api/rule/ruleEdition";
+import {getRule, delRule} from "/src/api/rule/rule";
+import {getEditionList, addRule, enable, disable, updateRule} from "@/api/rule/ruleEdition";
 
 export default {
   name: "Rule",
@@ -371,6 +407,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // opens: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -431,6 +468,7 @@ export default {
         console.log(this.rule)
       })
     },
+
     /** 客户状态更改触发 */
     handleStatusChange(row) {
       console.log(row)
@@ -510,7 +548,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getRule(id).then(response => {
+      updateRule(id).then(response => {
         this.form = response.data[0];
         this.open = true;
         this.title = "修改规则";

From ec6f8650d6c6184e4c646bca4817dc54dddfc7fa Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 18:59:12 +0800
Subject: [PATCH 6/8] Changes

---
 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 fe3a676..fa8d0a7 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -545,9 +545,9 @@ export default {
     //   })
     // },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(id) {
       this.reset();
-      const id = row.id || this.ids
+      // const id = row.id || this.ids
       updateRule(id).then(response => {
         this.form = response.data[0];
         this.open = true;

From cc7a107b24bfbb41fb2310186399c69ba9536e1c Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 19:15:36 +0800
Subject: [PATCH 7/8] Changes

---
 src/views/rule/rule/index.vue   | 4 ++--
 src/views/rule/rule/version.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue
index 90da45e..8d2496c 100644
--- a/src/views/rule/rule/index.vue
+++ b/src/views/rule/rule/index.vue
@@ -272,9 +272,9 @@ export default {
       })
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(id) {
       this.reset();
-      const id = row.id || this.ids
+      // const id = row.id || this.ids
       getRule(id).then(response => {
         this.form = response.data[0];
         this.open = true;
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index fa8d0a7..fe3a676 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -545,9 +545,9 @@ export default {
     //   })
     // },
     /** 修改按钮操作 */
-    handleUpdate(id) {
+    handleUpdate(row) {
       this.reset();
-      // const id = row.id || this.ids
+      const id = row.id || this.ids
       updateRule(id).then(response => {
         this.form = response.data[0];
         this.open = true;

From 14b0ac412dbf18bd1cbdf57aa2bba7cb824117d9 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 19:16:15 +0800
Subject: [PATCH 8/8] Changes

---
 src/views/rule/rule/index.vue   | 4 ++--
 src/views/rule/rule/version.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue
index 8d2496c..90da45e 100644
--- a/src/views/rule/rule/index.vue
+++ b/src/views/rule/rule/index.vue
@@ -272,9 +272,9 @@ export default {
       })
     },
     /** 修改按钮操作 */
-    handleUpdate(id) {
+    handleUpdate(row) {
       this.reset();
-      // const id = row.id || this.ids
+      const id = row.id || this.ids
       getRule(id).then(response => {
         this.form = response.data[0];
         this.open = true;
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index fe3a676..fa8d0a7 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -545,9 +545,9 @@ export default {
     //   })
     // },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(id) {
       this.reset();
-      const id = row.id || this.ids
+      // const id = row.id || this.ids
       updateRule(id).then(response => {
         this.form = response.data[0];
         this.open = true;