From db47bedd38cb5d0eddc65dd61ff3bf8d20237ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Tue, 3 Sep 2024 19:09:58 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=A1=A8=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=8A=82=E7=82=B9=E7=9A=84=E9=85=8D=E7=BD=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quest/node/components/node-item.vue |  10 -
 .../quest/node/components/node/dispFind.vue   |   2 +-
 .../quest/node/components/node/dispUpd.vue    |  59 -----
 .../node/components/node/type/tableFind.vue   | 216 +++++++++++++++++-
 .../node/components/node/type/tableUpd.vue    | 195 ----------------
 5 files changed, 206 insertions(+), 276 deletions(-)
 delete mode 100644 src/views/quest/node/components/node/dispUpd.vue
 delete mode 100644 src/views/quest/node/components/node/type/tableUpd.vue

diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue
index f7654b4..2a9d3ef 100644
--- a/src/views/quest/node/components/node-item.vue
+++ b/src/views/quest/node/components/node-item.vue
@@ -19,7 +19,6 @@
     <div class="node-anchor anchor-left" v-show="mouseEnter"></div>
     <div align="center">
       <DispFind :data="data" :node="node" :disp="disp" />
-      <DispUpd :data="data" :node="node" :disp="disp" />
     </div>
   </div>
 </template>
@@ -30,14 +29,12 @@ import Home from '../Home.vue'
 import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
 import {listDisposition} from "@/api/quest/disposition";
 import DispFind from "./node/dispFind.vue";
-import DispUpd from "./node/dispUpd.vue";
 
 
 export default {
   name: "nodeItem",
   components: {
     DispFind,
-    DispUpd,
   },
   props: {
     data: {},
@@ -92,13 +89,6 @@ export default {
             onClick: () => {
               this.toUpdName();
             }
-          },{
-            label: '设置配置',
-            disabled: false,
-            icon: "",
-            onClick: () => {
-              this.disp.type.findFlag = true;
-            }
           },{
             label: '删除节点',
             disabled: false,
diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue
index 6f8d583..16f175c 100644
--- a/src/views/quest/node/components/node/dispFind.vue
+++ b/src/views/quest/node/components/node/dispFind.vue
@@ -5,7 +5,7 @@
       <div style="padding-left: 20px;padding-right: 20px;">
 
         <span v-if="node.type === 'table'">
-          <TableFind :disp="disp" />
+          <TableFind :disp="disp" :node="node"  />
         </span>
         <span v-else-if="node.type === 'exportation'">
           <ExporFind :disp="disp" :data="data" :node="node" />
diff --git a/src/views/quest/node/components/node/dispUpd.vue b/src/views/quest/node/components/node/dispUpd.vue
deleted file mode 100644
index a5aaf3f..0000000
--- a/src/views/quest/node/components/node/dispUpd.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <!-- 修改节点配置-->
-  <div>
-    <!-- 自定义表单对话框 -->
-    <el-drawer :modal="false" :visible.sync="disp.updFlag" direction="rtl" title="节点配置" append-to-body size="60%">
-      <div>
-
-        <span v-if="node.type === 'table'">
-          <TableUpd :disp="disp" />
-        </span>
-        <span v-else-if="node.type === 'exportation'">
-          <ExporUpd :disp="disp" :data="data" :node="node" />
-        </span>
-
-
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
-// 例如：import 《组件名称》 from '《组件路径》,
-import TableUpd from './type/tableUpd.vue'
-
-export default {
-  // import引入的组件需要注入到对象中才能使用"
-  name: 'type-table',
-  components: {TableUpd},
-  props: {
-    data: {},
-    node: {},
-    disp: {
-      nodeCode: undefined,
-      nodeType: undefined,
-      findFlag: false,
-      updFlag: false,
-      formData: {
-        db: {},
-        fields: []
-      }
-    },
-
-  },
-  data() {
-    // 这里存放数据"
-    return {}
-  },
-  // 计算属性 类似于data概念",
-  computed: {},
-  // 方法集合",
-  methods: {
-
-  }
-}
-</script>
-<style scoped>
-
-</style>
diff --git a/src/views/quest/node/components/node/type/tableFind.vue b/src/views/quest/node/components/node/type/tableFind.vue
index fc2f196..3ee7d59 100644
--- a/src/views/quest/node/components/node/type/tableFind.vue
+++ b/src/views/quest/node/components/node/type/tableFind.vue
@@ -1,11 +1,16 @@
 <template>
   <div>
-    <span v-if="disp.formData.db.dbName && disp.formData.db.tableName">配置表信息:
-        {{ disp.formData.db.dbName }}.
-        {{ disp.formData.db.tableName }}
-        ({{ disp.formData.db.tableComment }})
-      </span>
-    <span v-else>无配置表</span>
+    <el-form label-position="right" label-width="120px" :model="disp.formData.db" :inline="true">
+      <el-form-item label="数据库" style="width: 30%;">
+        <el-input v-model="disp.formData.db.dbName" placeholder="未配置" disabled />
+      </el-form-item>
+      <el-form-item label="数据表" style="width: 30%;">
+        <el-input v-model="disp.formData.db.tableName" placeholder="未配置" disabled />
+      </el-form-item>
+      <el-form-item label="数据表备注" style="width: 30%;">
+        <el-input v-model="disp.formData.db.tableComment" placeholder="无备注" disabled />
+      </el-form-item>
+    </el-form>
     <span>
           <el-table ref="table" :data="disp.formData.fields" height="300px">
             <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
@@ -16,18 +21,54 @@
     <br><br>
     <div align="center">
       <el-button @click="disp.findFlag = false">确认</el-button>
-      <el-button type="primary" @click="disp.updFlag = true">修改配置</el-button>
+      <el-button type="primary" @click="toTableUpdFlag">修改配置</el-button>
     </div>
+    <el-dialog title="修改配置" :visible.sync="tableUpdFlag" width="80%">
+      <div>
+        <el-form v-model="checkTable">
+          <el-form-item label="数据源" prop="dbTable">
+            <el-cascader :options="treeList" :props="props" @change="checkDbTable">
+              <template slot-scope="{ node, data }">
+                <span v-if="data.tableRemark">{{ data.tableName + '[' + data.tableRemark + ']' }}</span>
+                <span v-else>{{ data.tableName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+              </template>
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="字段" prop="fields">
+            <el-table ref="table" :data="fieldsOptions" height="300px"
+                      @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>
+          </el-form-item>
+          <el-form-item>
+            <div align="center">
+              <el-button @click="tableUpdFlag = false">取消</el-button>
+              <el-button type="primary" @click="save">保存修改</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
+import {findTableInfoList} from "@/api/tableData/data";
+import {listSource} from "@/api/source/source";
+import {selectDbTableColumnsByName} from "@/api/tool/gen";
+import {batchAddUpd} from "@/api/quest/disposition";
+
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'tableFind',
   props: {
+    node: {},
     disp: {
       nodeCode: undefined,
       nodeType: undefined,
@@ -42,7 +83,34 @@ export default {
   data() {
     // 这里存放数据"
     return {
-
+      loading: false,
+      // 修改窗口显示状态
+      tableUpdFlag: false,
+      // 数据库+表 树形列表
+      treeList: [],
+      // 数据源列表
+      sourceList: [],
+      // 级联选择器配置
+      props: {
+        value: 'tableName',
+        label: 'tableName',
+        children: 'children'
+      },
+      // 数据库与表与字段
+      checkTable: {
+        source: {},
+        db: {
+          dbName: '',
+          dbComment: '',
+        },
+        table: {
+          tableName: '',
+          tableComment: ''
+        },
+        fields: []
+      },
+      // 全部字段列表
+      fieldsOptions: [],
     }
   },
   // 计算属性 类似于data概念",
@@ -53,9 +121,135 @@ export default {
   },
   // 方法集合",
   methods: {
-    toUpd() {
-      this.disp.updFlag = true
-    }
+    /** 点击修改配置按钮 */
+    toTableUpdFlag() {
+      this.selDataSourceTreeListAll()
+      this.tableUpdFlag = true
+    },
+    // 查询所有已同步的数据源的数据库+表 树形列表
+    selDataSourceTreeListAll(){
+      listSource({pageNum: 1, pageSize: 100,}).then(response => {
+        this.treeList = []
+        response.data.rows.forEach(item => {
+          this.treeList.push({
+            id: item.id,
+            basicId: item.id,
+            tableName: item.name,
+            tableRemark: item.systemName,
+            dataNum: item.initTotal,
+            isCenter: 'Y',
+            children: []
+          })
+        })
+        console.log(this.treeList)
+        findTableInfoList().then(res=>{
+          const trees = res.data
+          this.treeList.forEach(treeMaste => {
+            trees.forEach(tree => {
+              if (treeMaste.id === tree.basicId){
+                  treeMaste.children.push(tree)
+              }
+            })
+          })
+        })
+      });
+    },
+    // 选中数据库与表
+    checkDbTable(value) {
+      this.checkTable.source = this.treeList.filter(item => item.tableName === value[0])[0]
+      const db = this.checkTable.source.children.filter(item => item.tableName === value[1])[0]
+      this.checkTable.db = {
+        dbName: db.tableName,
+        dbComment: db.tableRemark,
+      }
+      const table = db.children.filter(item => item.tableName === value[2])[0]
+      this.checkTable.table = {
+        tableName: table.tableName,
+        tableComment: table.tableRemark
+      }
+      this.selectTable(this.checkTable.db.dbName, this.checkTable.table.tableName);
+    },
+    // 表字段查询
+    selectTable(dbName, tableName) {
+      selectDbTableColumnsByName(dbName, tableName).then(res => {
+        this.fieldsOptions = res.data
+      })
+    },
+    // 多选框选中数据
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.checkTable.fields = selection.map(item => {
+        return {
+          tableName: this.checkTable.tableName,
+          fieldName: item.columnName,
+          fieldType: item.columnType,
+          fieldComment: item.columnComment
+        };
+      });
+    },
+    /** 保存修改按钮 */
+    save() {
+      const dispList = this.getMysqlDisp(
+        this.checkTable.source,
+        this.checkTable.db,
+        this.checkTable.table,
+        this.checkTable.fields
+      )
+      this.disp.formData = {
+        db: {
+          dbName: this.checkTable.db.dbName,
+          tableName: this.checkTable.table.tableName,
+          tableComment: this.checkTable.table.tableComment
+        },
+        fields: this.checkTable.fields,
+      }
+      batchAddUpd(dispList, this.node.id).then(res => {
+        this.$message.success(res.msg)
+        this.tableUpdFlag = false
+      })
+      console.log(dispList)
+    },
+    /** 类型转换 vue -> mysql*/
+    getMysqlDisp(source, db, table, fields) {
+      const dispList = []
+      dispList.push({
+        nodeCode: this.node.id,
+        dispKey: 'source',
+        dispLabel: source.tableRemark,
+        dispValue: source.tableName,
+        dispType: 'string',
+        dispDesc: source.id
+      },{
+        nodeCode: this.node.id,
+        dispKey: 'db',
+        dispLabel: db.dbComment,
+        dispValue: db.dbName,
+        dispType: 'string',
+        dispDesc: source.tableName
+      },{
+        nodeCode: this.node.id,
+        dispKey: 'table',
+        dispLabel: table.tableComment,
+        dispValue: table.tableName,
+        dispType: 'string',
+        dispDesc: db.dbName
+      })
+      fields.forEach(field => {
+        dispList.push({
+          nodeCode: this.node.id,
+          dispKey: 'fields',
+          dispLabel: field.fieldComment,
+          dispValue: field.fieldName,
+          dispType: field.fieldType,
+          dispDesc: db.dbName+"."+table.tableName
+        })
+      })
+      return dispList;
+    },
+
   }
 }
 </script>
diff --git a/src/views/quest/node/components/node/type/tableUpd.vue b/src/views/quest/node/components/node/type/tableUpd.vue
deleted file mode 100644
index 4f12c72..0000000
--- a/src/views/quest/node/components/node/type/tableUpd.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <div>
-    <div style="padding-left: 10px;padding-right: 10px;">
-      <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
-        <el-form-item label="数据库名称" prop="dbName">
-          <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
-            <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="表名称" prop="tableName">
-          <el-input
-            v-model="queryParams.tableName"
-            clearable
-            @change="handleQuery"
-            placeholder="请输入表名称" />
-        </el-form-item>
-        <el-form-item label="表描述" prop="tableComment">
-          <el-input
-            v-model="queryParams.tableComment"
-            clearable
-            @change="handleQuery"
-            placeholder="请输入表描述" />
-        </el-form-item>
-        <el-form-item>
-          <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">查找</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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 label="操作" width="50px">
-          <template slot-scope="scope">
-            <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-divider content-position="left">选择字段 v</el-divider>
-      <el-table ref="table" :data="fieldsOptions" height="300px"
-                @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>
-      <br><br>
-      <div align="center">
-        <el-button type="primary" @click="saveDisposition">确 定</el-button>
-        <el-button @click="disp.updFlag = false">取 消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
-// 例如：import 《组件名称》 from '《组件路径》,
-import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
-import {batchAddUpd} from "@/api/quest/disposition";
-
-export default {
-  // import引入的组件需要注入到对象中才能使用"
-  name: 'tableUpd',
-  props: {
-    disp: {
-      nodeCode: undefined,
-      nodeType: undefined,
-      findFlag: false,
-      updFlag: false,
-      formData: {
-        db: {},
-        fields: []
-      }
-    }
-  },
-  data() {
-    // 这里存放数据"
-    return {
-      // 数据库列表
-      dbNameOptions: [],
-      // 展示数据表列表
-      tableOptions: [],
-      // 字段列表
-      fieldsOptions: [],
-      // 所有数据库列表
-      tableList: [],
-      queryParams: {}
-    }
-  },
-  // 计算属性 类似于data概念",
-  computed: {},
-  // 生命周期 - 创建完成（可以访问当前this实例）",
-  created() {
-    this.csh()
-  },
-  // 方法集合",
-  methods: {
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.tableOptions = []
-      this.tableList.forEach(table => {
-        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)){
-          this.tableOptions.push(table)
-        }
-      })
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 表字段查询*/
-    selectTable(row) {
-      this.disp.formData.fields = []
-      this.disp.formData.db = row
-      selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
-        this.fieldsOptions = res.data
-      })
-    },
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.disp.formData.fields = selection.map(item => {
-        return {
-          fieldName: item.columnName,
-          fieldType: item.columnType,
-          fieldComment: item.columnComment
-        };
-      });
-    },
-    // 查询所有数据库名称
-    selDbNameList() {
-      selDbNameAll().then(res => {
-        this.dbNameOptions = res.data
-      })
-    },
-    // 查询所有表名称信息
-    getListAll() {
-      listDbTableAll().then(res => {
-        this.tableList = res.data;
-        this.tableOptions = res.data;
-      });
-    },
-    csh() {
-      this.selDbNameList()
-      this.getListAll()
-    },
-    // 保存配置按钮
-    saveDisposition() {
-      const dispData = this.disp.formData
-      const dispList = this.getMysqlDisp(dispData.db,dispData.fields)
-      batchAddUpd(dispList, this.disp.nodeCode).then(res => {
-        this.$message.success(res.msg)
-        this.disp.updFlag = false
-      })
-    },
-    /** 类型转换 vue -> mysql*/
-    getMysqlDisp(db, fields) {
-      const dispList = []
-      dispList.push({
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'db',
-        dispLabel: '数据库',
-        dispValue: db.dbName,
-        dispType: 'string'
-      },{
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'table',
-        dispLabel: db.tableComment,
-        dispValue: db.tableName,
-        dispType: 'string'
-      })
-      fields.forEach(field => {
-        dispList.push({
-          nodeCode: this.disp.nodeCode,
-          dispKey: 'fields',
-          dispLabel: field.fieldComment,
-          dispValue: field.fieldName,
-          dispType: field.fieldType
-        })
-      })
-      return dispList;
-    },
-
-  }
-}
-</script>
-<style scoped>
-
-</style>

From 9ed909738fa9e50c5ea2fb03b3458d6bfa464dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Tue, 3 Sep 2024 20:13:58 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/show/index.vue | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/src/views/show/index.vue b/src/views/show/index.vue
index 34d3365..5acc366 100644
--- a/src/views/show/index.vue
+++ b/src/views/show/index.vue
@@ -47,41 +47,15 @@
               </el-descriptions-item>
               <el-descriptions-item label="Value">{{ DataValue.value }}</el-descriptions-item>
             </el-descriptions>
-
-
           </el-col>
         </el-row>
       </el-card>
-<!--      <el-table-->
-<!--        :data="DataValue"-->
-<!--        style="width: 100%">-->
-<!--        <el-table-column-->
-<!--          prop="key"-->
-<!--          label="key"-->
-<!--          width="180">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="label"-->
-<!--          label="label"-->
-<!--          width="180">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="type"-->
-<!--          label="type">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="value"-->
-<!--          label="value">-->
-<!--        </el-table-column>-->
-<!--      </el-table>-->
-
     </el-main>
   </el-container>
 </div>
 </template>
 <script setup>
 import {findByTableName, findTableValueList} from "@/api/source/source";
-import {findTableInfoList} from "@/api/tableData/data";
 
 export default {
   name: 'Show',
@@ -103,7 +77,6 @@ export default {
   },
   created() {
    this.findByTableName();
-   this.findTableInfoList();
   },
   methods: {
     findByTableName(){

From aed1fec1596faa93639141a399a3760314c03aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Tue, 3 Sep 2024 20:53:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quest/node/Home.vue                 | 33 ++++++++++++++---
 src/views/quest/node/components/node-item.vue |  5 +++
 .../quest/node/components/node/dispFind.vue   |  6 +--
 .../node/components/node/type/exporFind.vue   | 37 +++++++++----------
 .../node/components/node/type/tableFind.vue   | 10 ++---
 src/views/quest/node/config/init.js           | 29 +++------------
 6 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue
index e274391..23e0ccf 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -7,12 +7,35 @@
       <el-button
         style="width: 75%;margin-left: 0;margin-bottom: 5px;"
         @click="returnBack">返回</el-button>
-      <hr>
-      <div v-for="item in nodeTypeList" :key="item.type" class="node" draggable="true" @dragstart="drag($event, item)">
-        <div class="log">
-          <img :src="item.logImg" alt="">
+      <div>
+        <el-divider content-position="left">基础</el-divider>
+        <div v-for="item in nodeTypeList.filter(node => node.partition === 'basis')" :key="item.type" class="node" draggable="true" @dragstart="drag($event, item)">
+          <div class="log">
+            <img :src="item.logImg" alt="">
+          </div>
+          <div class="name">{{item.typeName}}</div>
+        </div>
+        <el-divider content-position="left">数据输入</el-divider>
+        <div v-for="item in nodeTypeList.filter(node => node.partition === 'req')" :key="item.type" class="node" draggable="true" @dragstart="drag($event, item)">
+          <div class="log">
+            <img :src="item.logImg" alt="">
+          </div>
+          <div class="name">{{item.typeName}}</div>
+        </div>
+        <el-divider content-position="left">数据处理</el-divider>
+        <div v-for="item in nodeTypeList.filter(node => node.partition === 'operation')" :key="item.type" class="node" draggable="true" @dragstart="drag($event, item)">
+          <div class="log">
+            <img :src="item.logImg" alt="">
+          </div>
+          <div class="name">{{item.typeName}}</div>
+        </div>
+        <el-divider content-position="left">数据输出</el-divider>
+        <div v-for="item in nodeTypeList.filter(node => node.partition === 'resp')" :key="item.type" class="node" draggable="true" @dragstart="drag($event, item)">
+          <div class="log">
+            <img :src="item.logImg" alt="">
+          </div>
+          <div class="name">{{item.typeName}}</div>
         </div>
-        <div class="name">{{item.typeName}}</div>
       </div>
     </div>
     <div id="flowWrap" ref="flowWrap" class="flow-wrap" @drop="drop($event)" @dragover="allowDrop($event)"
diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue
index 2a9d3ef..d7b9a52 100644
--- a/src/views/quest/node/components/node-item.vue
+++ b/src/views/quest/node/components/node-item.vue
@@ -165,6 +165,11 @@ export default {
     },
     // 双击触发-查看配置
     findDisposition() {
+      let type = this.node.type
+      if (type === 'start' || type === 'end'){
+        this.toUpdName()
+        return
+      }
       // 查询节点配置信息
       this.disp.nodeCode = this.node.id
       this.disp.findFlag = true
diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue
index 16f175c..c1c0e45 100644
--- a/src/views/quest/node/components/node/dispFind.vue
+++ b/src/views/quest/node/components/node/dispFind.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 节点配置-->
   <div align="center">
-    <el-drawer :visible.sync="disp.findFlag" direction="rtl" title="配置信息" append-to-body size="60%">
+    <el-dialog :visible.sync="disp.findFlag" direction="rtl" title="配置信息" append-to-body width="60%">
       <div style="padding-left: 20px;padding-right: 20px;">
 
         <span v-if="node.type === 'table'">
@@ -13,10 +13,8 @@
         <span v-else-if="node.type === 'unite'">
           <UniteFind :disp="disp" :data="data" :node="node" />
         </span>
-
-
       </div>
-    </el-drawer>
+    </el-dialog>
   </div>
 </template>
 
diff --git a/src/views/quest/node/components/node/type/exporFind.vue b/src/views/quest/node/components/node/type/exporFind.vue
index 90f96b0..78bee58 100644
--- a/src/views/quest/node/components/node/type/exporFind.vue
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -1,24 +1,18 @@
 <template>
   <div>
+      <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 />
+          </span>
+        </el-form-item>
+        <el-form-item label="输出表">
+          <el-input v-model="toDb.dbTable" placeholder="无输出表" style="width: 60%;" disabled />
+        </el-form-item>
+      </el-form>
     <div>
-      <span v-if="formDb">
-        输入表信息: <br><br>
-        <span v-for="db in formDb">
-          <el-tag type="primary" v-if="db.dbTable">{{ db.dbTable }}</el-tag><br><br>
-        </span>
-      </span>
-      <span v-else>无输入表</span>
-      <br><br>
-      <span v-if="toDb && toDb.dbTable">
-        输出表信息: <br><br>
-        <el-tag type="primary" v-if="toDb.dbTable">{{ toDb.dbTable }}</el-tag>
-        <el-button type="text" @click="checkFields">更改输出表</el-button>
-      </span>
-      <span v-else>
-        无输出表:
-        <el-button type="text" @click="checkFields">选择输出表</el-button>
-      </span>
-      <br><br>
+      <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">
@@ -38,7 +32,7 @@
       <el-button type="primary" @click="disp.findFlag = false">确认</el-button>
     </div>
 
-    <el-dialog title="选择输出表" :visible.sync="checkFieldsFlag" width="60%">
+    <el-dialog title="选择输出表" :visible.sync="checkFieldsFlag" width="60%" :modal="false">
       <div style="padding-left: 10px;padding-right: 10px;">
         <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
           <el-form-item label="数据库名称" prop="dbName">
@@ -88,7 +82,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="选择字段" :visible.sync="checkFieldsMapFlag" width="60%">
+    <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" />
@@ -166,6 +160,9 @@ export default {
   methods: {
     // 初始化
     init() {
+      this.formDb = []
+      this.toDb = {}
+      this.formFields = []
       // 查询上级的所有节点
       /** 1.查询该节点的上一级节点*/
       this.data.lineList.forEach(line => {
diff --git a/src/views/quest/node/components/node/type/tableFind.vue b/src/views/quest/node/components/node/type/tableFind.vue
index 3ee7d59..d5229fc 100644
--- a/src/views/quest/node/components/node/type/tableFind.vue
+++ b/src/views/quest/node/components/node/type/tableFind.vue
@@ -23,11 +23,11 @@
       <el-button @click="disp.findFlag = false">确认</el-button>
       <el-button type="primary" @click="toTableUpdFlag">修改配置</el-button>
     </div>
-    <el-dialog title="修改配置" :visible.sync="tableUpdFlag" width="80%">
+    <el-dialog title="修改配置" :visible.sync="tableUpdFlag" width="80%" :modal="false">
       <div>
         <el-form v-model="checkTable">
-          <el-form-item label="数据源" prop="dbTable">
-            <el-cascader :options="treeList" :props="props" @change="checkDbTable">
+          <el-form-item label="数据来源" prop="dbTable">
+            <el-cascader :options="treeList" :props="props" @change="checkDbTable" style="width: 60%;">
               <template slot-scope="{ node, data }">
                 <span v-if="data.tableRemark">{{ data.tableName + '[' + data.tableRemark + ']' }}</span>
                 <span v-else>{{ data.tableName }}</span>
@@ -35,7 +35,7 @@
               </template>
             </el-cascader>
           </el-form-item>
-          <el-form-item label="字段" prop="fields">
+          <el-form-item prop="fields">
             <el-table ref="table" :data="fieldsOptions" height="300px"
                       @row-click="clickRow" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="55" />
@@ -88,8 +88,6 @@ export default {
       tableUpdFlag: false,
       // 数据库+表 树形列表
       treeList: [],
-      // 数据源列表
-      sourceList: [],
       // 级联选择器配置
       props: {
         value: 'tableName',
diff --git a/src/views/quest/node/config/init.js b/src/views/quest/node/config/init.js
index 2ca9c27..c6fc494 100644
--- a/src/views/quest/node/config/init.js
+++ b/src/views/quest/node/config/init.js
@@ -3,43 +3,22 @@ const nodeTypeList = [
     type: 'start',
     typeName: '开始',
     nodeName: '开始',
+    partition: 'basis',
     logImg: require('@/assets/svg/1开始.svg'),
     log_bg_color: 'rgba(0, 128, 0, 0.2)'
   },{
     type: 'end',
     typeName: '结束',
     nodeName: '结束',
+    partition: 'basis',
     logImg: require('@/assets/svg/2结束.svg'),
     log_bg_color: 'rgba(255, 0, 0, 0.2)'
-  },{
-    type: 'dataSet',
-    typeName: '文件',
-    nodeName: '文件',
-    logImg: require('@/assets/svg/5文件数据.svg'),
-    log_bg_color: 'rgba(0, 128, 0, 0.2)'
-  },{
-    type: 'encode',
-    typeName: '加密',
-    nodeName: '加密',
-    logImg: require('@/assets/svg/6数据校验.svg'),
-    log_bg_color: 'rgba(163, 117, 233, 0.2)'
-  },{
-    type: 'personService',
-    typeName: '个人服务',
-    nodeName: '个人服务',
-    logImg: require('@/assets/svg/8个人服务.svg'),
-    log_bg_color: 'rgba(132, 166, 251, 0.2)'
-  },{
-    type: 'arrange',
-    typeName: '清洗',
-    nodeName: '清洗',
-    logImg: require('@/assets/svg/15清洗.svg'),
-    log_bg_color: 'rgba(250, 205, 81, 0.2)'
   },
   {
     type: 'table',
     typeName: '表结构',
     nodeName: '表结构',
+    partition: 'req',
     logImg: require('@/assets/svg/5文件数据.svg'),
     log_bg_color: 'rgba(0, 128, 0, 0.2)'
   },
@@ -47,6 +26,7 @@ const nodeTypeList = [
     type: 'unite',
     typeName: '联合查询',
     nodeName: '联合查询',
+    partition: 'operation',
     logImg: require('@/assets/svg/侧边栏测试任务.svg'),
     log_bg_color: 'rgba(0, 128, 0, 0.2)'
   },
@@ -54,6 +34,7 @@ const nodeTypeList = [
     type: 'exportation',
     typeName: '数据输出',
     nodeName: '数据输出',
+    partition: 'resp',
     logImg: require('@/assets/svg/19导出.svg'),
     log_bg_color: 'rgba(0, 128, 0, 0.2)'
   }

From bd7d5997abc52721563f83adbab39d93582bce0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Tue, 3 Sep 2024 23:37:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E6=9C=AA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quest/node/Home.vue | 63 ++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue
index 23e0ccf..123771a 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -128,15 +128,24 @@ export default {
             top: r.node.top,
             left: r.node.left
           })
+          this.checkData.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
+          })
           // 连线添加
           if (r.line) {
             r.line.forEach(v => {
               this.data.lineList.push({
                 from: v.from,
-                to: v.to,
-                label: "连线名称",
-                id: GenNonDuplicateID(8),
-                Remark: ""
+                to: v.to
+              });
+              this.checkData.lineList.push({
+                from: v.from,
+                to: v.to
               });
             })
           }
@@ -145,8 +154,8 @@ export default {
         this.nodeHandle()
         // 连线去重
         this.data.lineList = this.lineHandle(this.data.lineList)
+        this.checkData.lineList = this.lineHandle(this.data.lineList)
       })
-      this.flag = true
     },
     // 节点批量处理-初始化
     nodeHandle() {
@@ -200,18 +209,53 @@ export default {
       // 3. 激活接口将参数传递到后端
       batch(nodeData,this.$route.query.taskCode).then(res => {
         this.$message.success(res.msg)
-        this.flag = true
       })
       console.log(nodeData)
     },
+    // 返回校验
     returnBack() {
-      if (this.flag){
+      const newNodeList = this.data.nodeList
+      const oldNodeList = this.checkData.nodeList
+      const newLineList = this.data.lineList
+      const oldLineList = this.checkData.lineList
+      // this.$router.push({path: '/quest/task'})
+      if (this.checkNodeList(newNodeList,oldNodeList) && this.checkLineList(newLineList,oldLineList)){
         this.$router.push({path: '/quest/task'})
       }else{
         this.checkReturn()
       }
-
     },
+    // 节点校验
+    checkNodeList(newNodeList, oldNodeList) {
+      let newLen = newNodeList.length
+      let oldLen = oldNodeList.length
+      if (newLen !== oldLen) return false;
+      for (let i = 0; i < newLen; i++) {
+        if (newNodeList[i].id === oldNodeList[i].id &&
+          newNodeList[i].nodeName === oldNodeList[i].nodeName &&
+          newNodeList[i].type === oldNodeList[i].type &&
+          newNodeList[i].left === oldNodeList[i].left &&
+          newNodeList[i].top === oldNodeList[i].top){
+          continue;
+        }
+        return false;
+      }
+      return true;
+    },
+    checkLineList(newLineList,oldLineList) {
+      let newLen = newLineList.length
+      let oldLen = oldLineList.length
+      if (newLen !== oldLen) return false;
+      for (let i = 0; i < newLen; i++) {
+        if (newLineList[i].from === oldLineList[i].from &&
+          newLineList[i].to === oldLineList[i].to){
+          continue;
+        }
+        return false;
+      }
+      return true;
+    },
+    // 未保存 返回按钮
     checkReturn() {
       this.$confirm('更改未保存,是否保存?', '未保存提示', {
         confirmButtonText: '保存',
@@ -219,13 +263,14 @@ export default {
         type: 'warning'
       }).then(() => {
         this.save()
+        this.$router.push({path: '/quest/task'})
       }).catch(() => {
         this.$message({
           type: 'success',
           message: '返回成功'
         });
+        this.$router.push({path: '/quest/task'})
       });
-      this.$router.push({path: '/quest/task'})
     },
     // 修改状态更新
     checkFlag(){

From 740ad27ef043a25e3c9f301c91317e844b60c9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Wed, 4 Sep 2024 09:53:23 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quest/{quest.js => task.js} | 12 ++++++------
 src/views/quest/node/Home.vue       |  3 +++
 src/views/quest/task/index.vue      |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename src/api/quest/{quest.js => task.js} (77%)

diff --git a/src/api/quest/quest.js b/src/api/quest/task.js
similarity index 77%
rename from src/api/quest/quest.js
rename to src/api/quest/task.js
index 9146d3a..0de8294 100644
--- a/src/api/quest/quest.js
+++ b/src/api/quest/task.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询任务列表
 export function listQuest(query) {
   return request({
-    url: '/quest/quest/list',
+    url: '/quest/task/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listQuest(query) {
 // 查询任务详细
 export function getQuest(id) {
   return request({
-    url: '/quest/quest/selectTaskById/' + id,
+    url: '/quest/task/selectTaskById/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getQuest(id) {
 // 新增任务
 export function addQuest(data) {
   return request({
-    url: '/quest/quest',
+    url: '/quest/task',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addQuest(data) {
 // 修改任务
 export function updateQuest(data) {
   return request({
-    url: '/quest/quest',
+    url: '/quest/task',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateQuest(data) {
 // 删除任务
 export function delQuest(id) {
   return request({
-    url: '/quest/quest/' + id,
+    url: '/quest/task/' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delQuest(id) {
 // 执行任务
 export function execute(taskCode) {
   return request({
-    url: '/quest/quest/execute/'+taskCode,
+    url: '/quest/task/execute/'+taskCode,
     method: 'post'
   })
 }
diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue
index 123771a..d53a58a 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -186,6 +186,9 @@ export default {
       // 1. 获取所有节点与连线信息
       const nodeList = this.data.nodeList
       const lineList = this.lineHandle(this.data.lineList)
+      this.checkData.nodeList = nodeList
+      this.checkData.lineList = lineList
+
       console.log(this.data)
       // 2. 处理所有信息,将jsPlumb类型 ==> 数据表类型
       const nodeData = []
diff --git a/src/views/quest/task/index.vue b/src/views/quest/task/index.vue
index 1821856..1e3f271 100644
--- a/src/views/quest/task/index.vue
+++ b/src/views/quest/task/index.vue
@@ -154,11 +154,11 @@
 </template>
 
 <script>
-import {listQuest, getQuest, delQuest, addQuest, updateQuest, execute} from "/src/api/quest/quest";
+import {listQuest, getQuest, delQuest, addQuest, updateQuest, execute} from "/src/api/quest/task";
 import dict from "../../../utils/dict";
 
 export default {
-  name: "Quest",
+  name: "Task",
   dicts: ['sys_enable_status'],
   data() {
     return {