From 3e46a8e8fb9e02732560fb35c1734df21da5ad8f Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 09:22:01 +0800
Subject: [PATCH 1/7] =?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                   |  2 +-
 .../quest/node/components/node/dispFind.vue   |  1 +
 .../node/components/node/type/exporFind.vue   | 94 +++++++++---------
 src/views/rule/rule/version.vue               | 97 +++++++++++++++++--
 4 files changed, 141 insertions(+), 53 deletions(-)

diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js
index 6572780..ec85a94 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',
   })
 }
diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue
index c1c0e45..2b3f5e2 100644
--- a/src/views/quest/node/components/node/dispFind.vue
+++ b/src/views/quest/node/components/node/dispFind.vue
@@ -26,6 +26,7 @@ import ExporFind from "./type/exporFind.vue";
 import UniteFind from "./type/uniteFind.vue";
 
 
+
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'type-table',
diff --git a/src/views/quest/node/components/node/type/exporFind.vue b/src/views/quest/node/components/node/type/exporFind.vue
index 78bee58..a679c2b 100644
--- a/src/views/quest/node/components/node/type/exporFind.vue
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -1,31 +1,33 @@
 <template>
   <div>
-      <el-form label-position="right" label-width="60px">
-        <el-form-item label="输入表">
+    <el-form label-position="right" label-width="60px">
+      <el-form-item label="输入表">
           <span v-for="db in formDb">
-            <el-input v-model="db.dbTable" placeholder="无输入表" style="width: 60%;" disabled />
+            <el-input v-model="db.dbTable" placeholder="无输入表" style="width: 60%;" disabled/>
           </span>
-        </el-form-item>
-        <el-form-item label="输出表">
-          <el-input v-model="toDb.dbTable" placeholder="无输出表" style="width: 60%;" disabled />
-        </el-form-item>
-      </el-form>
+      </el-form-item>
+      <el-form-item label="输出表">
+        <el-input v-model="toDb.dbTable" placeholder="无输出表" style="width: 60%;" disabled/>
+      </el-form-item>
+    </el-form>
     <div>
       <el-button icon="el-icon-refresh-right" type="text" @click="init">刷新</el-button>
       <el-button icon="el-icon-setting" type="text" @click="checkFields">更改</el-button>
     </div>
     <div align="center">
-        <el-table ref="table" :data="formFields" height="450px">
-          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
-          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
-          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
-          <el-table-column :show-overflow-tooltip="true" label="字段所属表" prop="tableName" />
-          <el-table-column :show-overflow-tooltip="true" label="输出字段">
+      <el-table ref="table" :data="formFields" height="450px">
+        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName"/>
+        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment"/>
+        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType"/>
+        <el-table-column :show-overflow-tooltip="true" label="字段所属表" prop="tableName"/>
+        <el-table-column :show-overflow-tooltip="true" label="输出字段">
             <span slot-scope="scope" v-if="fieldsList && fieldsList.get(scope.row.fieldName)">
-              {{ fieldsList.get(scope.row.fieldName).fieldName+ '(' + fieldsList.get(scope.row.fieldName).fieldComment + ')' }}
+              {{
+                fieldsList.get(scope.row.fieldName).fieldName + '(' + fieldsList.get(scope.row.fieldName).fieldComment + ')'
+              }}
             </span>
-          </el-table-column>
-        </el-table>
+        </el-table-column>
+      </el-table>
     </div>
     <div align="center">
       <el-button @click="disp.findFlag = false">返回</el-button>
@@ -45,22 +47,22 @@
               v-model="queryParams.tableName"
               clearable
               @change="handleQuery"
-              placeholder="请输入表名称" />
+              placeholder="请输入表名称"/>
           </el-form-item>
           <el-form-item label="表描述" prop="tableComment">
             <el-input
               v-model="queryParams.tableComment"
               clearable
               @change="handleQuery"
-              placeholder="请输入表描述" />
+              placeholder="请输入表描述"/>
           </el-form-item>
           <el-form-item>
             <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">查找</el-button>
           </el-form-item>
         </el-form>
         <el-table ref="table" :data="tableOptions" height="300px">
-          <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
-          <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
+          <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName"/>
+          <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment"/>
           <el-table-column label="操作" width="50px">
             <template slot-scope="scope">
               <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
@@ -70,10 +72,10 @@
         <el-divider content-position="left">选择字段 v</el-divider>
         <el-table ref="table" :data="fieldsOptions" height="280px"
                   @row-click="clickRow" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
-          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
-          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
+          <el-table-column type="selection" width="55"/>
+          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName"/>
+          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment"/>
+          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType"/>
         </el-table>
         <br><br>
         <div align="center">
@@ -85,14 +87,15 @@
     <el-dialog title="选择字段" :visible.sync="checkFieldsMapFlag" width="60%" :modal="false">
       <div style="padding-left: 10px;padding-right: 10px;">
         <el-table ref="table" :data="formFields" height="500px">
-          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
-          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
-          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
-          <el-table-column :show-overflow-tooltip="true" label="字段所属表" prop="tableName" />
+          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName"/>
+          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment"/>
+          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType"/>
+          <el-table-column :show-overflow-tooltip="true" label="字段所属表" prop="tableName"/>
           <el-table-column :show-overflow-tooltip="true" label="目标字段">
             <template slot-scope="scope">
               <el-select v-model="scope.row.toFidlesName" placeholder="请选择字段">
-                <el-option v-for="field in toFields" :label="field.fieldName+'('+field.fieldComment+')'" :value="field.fieldName"/>
+                <el-option v-for="field in toFields" :label="field.fieldName+'('+field.fieldComment+')'"
+                           :value="field.fieldName"/>
               </el-select>
             </template>
           </el-table-column>
@@ -106,6 +109,7 @@
   </div>
 </template>
 
+
 <script>
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
@@ -166,7 +170,7 @@ export default {
       // 查询上级的所有节点
       /** 1.查询该节点的上一级节点*/
       this.data.lineList.forEach(line => {
-        if (line.to === this.node.id){
+        if (line.to === this.node.id) {
           listDisposition({nodeCode: line.from}).then(res => {
             const data = this.getVueDisp(res.data.rows)
             this.formDb = data.db
@@ -190,24 +194,24 @@ export default {
     },
     // 保存目标数据库
     save() {
-      console.log('formDb',this.formDb)
-      console.log('toDb',this.toDb)
-      console.log('formFields',this.formFields)
-      console.log('toFields',this.toFields)
-      console.log('fieldsList',this.fieldsList)
+      console.log('formDb', this.formDb)
+      console.log('toDb', this.toDb)
+      console.log('formFields', this.formFields)
+      console.log('toFields', this.toFields)
+      console.log('fieldsList', this.fieldsList)
       // 处理输入字段与输出字段
       const field = this.formFields
       let map = field.map(item => [item.fieldName, item.toFidlesName]);
       this.fieldsList = new Map()
       map.forEach(item => {
         this.toFields.forEach(toField => {
-          if (toField.fieldName === item[1]){
+          if (toField.fieldName === item[1]) {
             this.fieldsList.set(item[0], toField)
           }
         })
       })
       // 格式转换
-      let mysqlDisp = this.getMysqlDisp(this.toDb,this.fieldsList);
+      let mysqlDisp = this.getMysqlDisp(this.toDb, this.fieldsList);
       // 保存数据库
       batchAddUpd(mysqlDisp, this.disp.nodeCode).then(res => {
         this.$message.success(res.msg)
@@ -223,7 +227,7 @@ export default {
         const params = this.queryParams
         if ((table.dbName === params.dbName || !params.dbName) &&
           (table.tableName.includes(params.tableName) || !params.tableName) &&
-          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
+          (table.tableComment.includes(params.tableComment) || !params.tableComment)) {
           this.tableOptions.push(table)
         }
       })
@@ -235,7 +239,7 @@ export default {
         dbName: row.dbName,
         tableName: row.tableName,
         tableComment: row.tableComment,
-        dbTable: row.dbName+'.'+row.tableName+'('+ row.tableComment +')'
+        dbTable: row.dbName + '.' + row.tableName + '(' + row.tableComment + ')'
       }
       selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
         this.fieldsOptions = res.data
@@ -248,7 +252,7 @@ export default {
     handleSelectionChange(selection) {
       this.toFields = selection.map(item => {
         return {
-          dbTable: this.toDb.dbName+'.'+this.toDb.tableName,
+          dbTable: this.toDb.dbName + '.' + this.toDb.tableName,
           fieldName: item.columnName,
           fieldType: item.columnType,
           fieldComment: item.columnComment
@@ -280,7 +284,7 @@ export default {
             dbName: disp.dispDesc,
             tableName: disp.dispValue,
             tableComment: disp.dispLabel,
-            dbTable: disp.dispDesc+'.'+disp.dispValue+'('+disp.dispLabel+')'
+            dbTable: disp.dispDesc + '.' + disp.dispValue + '(' + disp.dispLabel + ')'
           })
         }
         if (disp.dispKey === 'fields') {
@@ -292,15 +296,15 @@ export default {
           })
         }
         // 输出调整
-        if (disp.dispKey === 'toDb'){
+        if (disp.dispKey === 'toDb') {
           toDb = {
             dbName: disp.dispDesc,
             tableName: disp.dispValue,
             tableComment: disp.dispLabel,
-            dbTable: disp.dispDesc+'.'+disp.dispValue+'('+disp.dispLabel+')'
+            dbTable: disp.dispDesc + '.' + disp.dispValue + '(' + disp.dispLabel + ')'
           }
         }
-        if (disp.dispKey === 'toFields'){
+        if (disp.dispKey === 'toFields') {
           fieldsMap.set(disp.dispDesc, {
             fieldName: disp.dispValue,
             fieldType: disp.dispType,
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 191205d..fd19a0d 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -408,16 +408,89 @@
         <span style="margin-left: 10px">{{ scope.row.center }}</span>
       </template>
     </el-table-column>
-
        <el-table-column label="操作">
-
       <template slot-scope="scope">
         <el-button
           size="mini"
-          @click="handleEditSelect()">选择
+          @click="handleEditSelect(scope.row)">选择
         </el-button>
       </template>
+      </el-table-column>
+  </el-table>
+</template>
+          </div>
+        <span>
+<!--tableDa-->
+ <el-button type="primary" @click="measurements()">测 试</el-button>
+        </span>
+                </el-card>
+              </el-col>
+        <span>
+                    <el-col v-show="selectss">
+                <el-card class="box-card">
+          <div slot="header" class="clearfix">
+        <span>选择资产集</span>
+            <template>
+  <el-table
+    :data="tableDa"
+    style="width: 100%">
+    <el-table-column
+      label="主键"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.id }}</span>
+      </template>
     </el-table-column>
+    <el-table-column
+      label="数据源ID"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.basicId }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="表名称"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.tableName }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="表备注"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.tableRemark }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="类型"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.type }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="数据量"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.dataNum }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="是否核心"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.center }}</span>
+      </template>
+    </el-table-column>
+       <el-table-column label="操作">
+      <template slot-scope="scope">
+        <el-button
+          size="mini"
+          @click="handleEditSelect(scope.row)">选择
+        </el-button>
+      </template>
+      </el-table-column>
   </el-table>
 </template>
           </div>
@@ -425,8 +498,9 @@
 
  <el-button type="primary" @click="measurements()">测 试</el-button>
         </span>
-                </el-card>
+              </el-card>
               </el-col>
+        </span>
       </span>
 
     </el-drawer>
@@ -530,7 +604,7 @@ export default {
       //数据源
       dataOrigin: {},
       origins: [],
-
+      tableDa: [],
       tableOrigin: [],
       showCode: false,
       // 表单校验
@@ -552,12 +626,20 @@ export default {
     this.findById();
   },
   methods: {
+    //数据
+    getDataTable(data) {
+      getDataTables(data.id).then(res => {
+        this.tableDa = res.data
+      })
+    },
     //表数据
-    handleEditSelect() {
-      findTableValueByTableName(this.tableOrigin.basicId, this.tableOrigin.tableName).then(res => {
+    handleEditSelect(data) {
+      alert(data.id)
+      findTableValueByTableName(data.basicId, data.tableName).then(res => {
         console.log(res.data)
         this.tableDatas = res.data
         console.log(this.tableDatas)
+        this.getDataTable(data);
       })
     },
     //规则测试
@@ -589,6 +671,7 @@ export default {
     chanChild() {
       findTableIdByParentId(this.dataOrigin.sourceId).then(res => {
         this.tableOrigin = res.data
+        console.log(this.tableOrigin)
         // console.log(this.tableOrigin)
       })
     },

From 26e77285be647f6ae79ff4a33d2b560afe805f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Tue, 10 Sep 2024 09:26:51 +0800
Subject: [PATCH 2/7] =?UTF-8?q?09100926:=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 4be85e2..7aa4b5c 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -423,10 +423,9 @@
               <el-table>
                  <el-table-column
                    v-for="tableData  in tableDatas"
-                   :key="key"
                    :label="tableData.label"
-                   :prop="tableData.value"
                    width="180">
+                   {{tableData.value}}
     </el-table-column>
                 <el-table-column label="操作">
 

From b9951ea35fec67eef42fef35b673e7bdd76445ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Tue, 10 Sep 2024 09:36:06 +0800
Subject: [PATCH 3/7] =?UTF-8?q?09100935:=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 | 63 ---------------------------------
 1 file changed, 63 deletions(-)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 7aa4b5c..9e62db6 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -356,69 +356,6 @@
           <div slot="header" class="clearfix">
         <span>选择资产集</span>
             <template>
-              <!--  <el-table-->
-<!--    :data="tableOrigin"-->
-<!--    style="width: 100%">-->
-<!--    <el-table-column-->
-<!--      label="主键"-->
-<!--      width="180">-->
-<!--      <template slot-scope="scope">-->
-<!--        <span style="margin-left: 10px">{{ scope.row.id }}</span>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="数据源ID"-->
-<!--      width="180">-->
-<!--      <template slot-scope="scope">-->
-<!--        <span style="margin-left: 10px">{{ scope.row.basicId }}</span>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="表名称"-->
-<!--      width="180">-->
-<!--      <template slot-scope="scope">-->
-<!--        <span style="margin-left: 10px">{{ scope.row.tableName }}</span>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="表备注"-->
-<!--      width="180">-->
-<!--      <template slot-scope="scope">-->
-<!--        <span style="margin-left: 10px">{{ scope.row.tableRemark }}</span>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="类型"-->
-<!--      width="180">-->
-<!--      <template slot-scope="scope">-->
-<!--        <span style="margin-left: 10px">{{ scope.row.type }}</span>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="数据量"-->
-<!--      width="180">-->
-<!--      <template slot-scope="scope">-->
-<!--        <span style="margin-left: 10px">{{ scope.row.dataNum }}</span>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="是否核心"-->
-<!--      width="180">-->
-<!--      <template slot-scope="scope">-->
-<!--        <span style="margin-left: 10px">{{ scope.row.center }}</span>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-
-<!--       <el-table-column label="操作">-->
-
-<!--      <template slot-scope="scope">-->
-<!--        <el-button-->
-<!--          size="mini"-->
-<!--          @click="handleEditSelect(scope.row)">选择-->
-<!--        </el-button>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--  </el-table>-->
               {{tableDatas}}
               <el-table>
                  <el-table-column

From 1ca1850d0ec2f6022333e73cb866b9b7cafa09a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Tue, 10 Sep 2024 09:40:13 +0800
Subject: [PATCH 4/7] =?UTF-8?q?09100940:=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 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 9e62db6..6efb8cc 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -505,7 +505,6 @@ export default {
     this.findById();
     this.findList()
     this.getDataOrigin()
-    this.findTableValueByTableName();
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {

From c373f38b2d5bea2960c6ed0b57c3ed46db875594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Tue, 10 Sep 2024 09:48:24 +0800
Subject: [PATCH 5/7] =?UTF-8?q?09100948:=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, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 6efb8cc..40c2801 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -359,7 +359,7 @@
               {{tableDatas}}
               <el-table>
                  <el-table-column
-                   v-for="tableData  in tableDatas"
+                   v-for="tableData in tableDatas"
                    :label="tableData.label"
                    width="180">
                    {{tableData.value}}
@@ -513,6 +513,8 @@ export default {
   methods: {
     //表数据
     handleEditSelect(data) {
+      console.log(data.basicId);
+      console.log(data.tableName);
       findTableValueByTableName(data.basicId, data.tableName).then(res => {
         console.log(res.data)
         this.tableDatas = res.data

From 8a41926bd4da359f768ee9c0d9b1889e88bc1c15 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 15:14:34 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                 | 40 ++++++++++++++++++++++++-----
 src/views/engine/ruleInfo/index.vue |  1 +
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 186e20b..fcd2a2c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,12 +19,12 @@ Vue.use(Router)
  * roles: ['admin', 'common']       // 访问路由的角色权限
  * permissions: ['a:a:a', 'b:b:b']  // 访问路由的菜单权限
  * meta : {
-    noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
-    title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
-    activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
-  }
+ noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
+ title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
+ icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
+ breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
+ activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
+ }
  */
 
 // 公共路由
@@ -146,6 +146,34 @@ export const dynamicRoutes = [
         meta: {title: '修改生成配置', activeMenu: '/tool/gen'}
       }
     ]
+  },
+  {
+    path: '/engine/rule-version',
+    component: Layout,
+    hidden: true,
+    permissions: ['engine:ruleInfo:query'],
+    children: [
+      {
+        path: 'index/:ruleId',
+        component: () => import('@/views/engine/ruleInfo/Version'),
+        name: 'Version',
+        meta: {title: `规则版本`, activeMenu: '/engine/ruleInfo'}
+      }
+    ]
+  },
+  {
+    path: '/engine/rule-test',
+    component: Layout,
+    hidden: true,
+    permissions: ['engine:ruleInfo:query'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/engine/ruleInfo/Test.vue'),
+        name: 'Test',
+        meta: {title: `测试拓扑图`, activeMenu: '/engine/ruleInfo'}
+      }
+    ]
   }
 ]
 
diff --git a/src/views/engine/ruleInfo/index.vue b/src/views/engine/ruleInfo/index.vue
index 03cb644..7d79e9e 100644
--- a/src/views/engine/ruleInfo/index.vue
+++ b/src/views/engine/ruleInfo/index.vue
@@ -253,6 +253,7 @@ export default {
         this.loading = false;
       });
     },
+
     // 取消按钮
     cancel() {
       this.open = false;

From 009f68fff91a8564124e7ea29d7e184fd2f4da55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Tue, 10 Sep 2024 15:25:32 +0800
Subject: [PATCH 7/7] =?UTF-8?q?09101525:=E8=B5=84=E4=BA=A7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=B7=AF=E5=BE=84=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/api/rule/ruleEdition.js | 2 +-
 src/api/source/source.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js
index cc3f1bd..510668c 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/findTableValueList?basicId=`+basicId+'&&tableName='+tableName,
     method: 'post',
   })
 }
diff --git a/src/api/source/source.js b/src/api/source/source.js
index 3101bd7..9320cb3 100644
--- a/src/api/source/source.js
+++ b/src/api/source/source.js
@@ -74,7 +74,7 @@ export function findByTableName() {
 //根据基础表ID和表名查询数据
 export function findTableValueList(basicId,tableName) {
   return request({
-    url: "/source/value/findTableValueByTableName?basicId="+basicId+"&tableName="+tableName,
+    url: "/source/value/findTableValueList?basicId="+basicId+"&tableName="+tableName,
     method: 'post',
   })
 }