From 429bb57dd402372e7e2253e429731c2be6cbd73d 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: Thu, 5 Sep 2024 22:34:48 +0800
Subject: [PATCH 1/2] =?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/task.js         |  9 +++++++++
 src/views/quest/node/Home.vue | 30 +++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/api/quest/task.js b/src/api/quest/task.js
index 0de8294..d63114b 100644
--- a/src/api/quest/task.js
+++ b/src/api/quest/task.js
@@ -50,3 +50,12 @@ export function execute(taskCode) {
     method: 'post'
   })
 }
+
+// 测试执行
+export function testExecute(data) {
+  return request({
+    url: '/quest/task/testExecute',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue
index d53a58a..6349875 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -3,10 +3,14 @@
     <div class="nodes-wrap" align="center">
       <el-button
         style="width: 75%;margin-top: 5px;margin-bottom: 5px;"
-        type="primary" @click="save">保存修改</el-button>
+        type="primary" @click="save">保存</el-button>
+      <el-button
+        style="width: 75%;margin-left: 0;margin-top: 5px;margin-bottom: 5px;"
+        type="info" @click="test">测试</el-button>
       <el-button
         style="width: 75%;margin-left: 0;margin-bottom: 5px;"
         @click="returnBack">返回</el-button>
+
       <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)">
@@ -60,6 +64,7 @@ import {batch, listNode} from "../../../api/quest/node";
 import {GenNonDuplicateID} from "../../../common/until";
 import panzoom from "panzoom";
 import methods from "./config/methods";
+import {execute, testExecute} from "../../../api/quest/task";
 
 export default {
   name: "FlowEdit",
@@ -181,13 +186,13 @@ export default {
       });
       return Array.from(map.values());
     },
-    // 保存修改按钮
-    save() {
+    /** 参数处理 */
+    handleSubmit() {
       // 1. 获取所有节点与连线信息
       const nodeList = this.data.nodeList
       const lineList = this.lineHandle(this.data.lineList)
-      this.checkData.nodeList = nodeList
-      this.checkData.lineList = lineList
+      this.checkData.nodeList = this.data.nodeList
+      this.checkData.lineList = this.data.lineList
 
       console.log(this.data)
       // 2. 处理所有信息,将jsPlumb类型 ==> 数据表类型
@@ -209,11 +214,22 @@ export default {
         })
         nodeData.push(flowNode.methods.toMysqlNode(node,preLine,nextLine,this.taskCode))
       })
-      // 3. 激活接口将参数传递到后端
+      return nodeData;
+    },
+    // 测试按钮
+    test() {
+      const nodeData = this.handleSubmit();
+      testExecute(nodeData).then(res => {
+        this.$message.success(res.data)
+      })
+    },
+    // 保存按钮
+    save() {
+      const nodeData = this.handleSubmit();
+      // 激活接口将参数保存到数据库
       batch(nodeData,this.$route.query.taskCode).then(res => {
         this.$message.success(res.msg)
       })
-      console.log(nodeData)
     },
     // 返回校验
     returnBack() {

From ddc2ff0e51085266713ee6c12718b139032907d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Fri, 6 Sep 2024 15:47:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?09061546:=E6=95=B0=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rule/rule/version.vue | 22 +++++++++++++---------
 src/views/source/index.vue      |  9 ++++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 2c9482f..ecac655 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -342,17 +342,18 @@
         <span>选择资产结构</span>
           </div>
       <span>
-          <el-select v-model="dataOrigin.tableId" placeholder="请选择数据接入" @blur="ch()">
+          <el-select v-model="dataOrigin.tableId" placeholder="请选择数据接入" @change="ch()">
               <el-option v-for="i in tableOrigin" :label="i.tableName" :value="i.id" :key="i.id"></el-option>
           </el-select>
       </span>
                 </el-card>
               </el-col>
             </el-row>
-                      <el-col v-show="selectss">
+        <el-col v-show="selectss">
                 <el-card class="box-card">
           <div slot="header" class="clearfix">
         <span>选择资产集</span>
+
           </div>
         <span>
 <template>
@@ -387,11 +388,14 @@ import {delRule, getRule} from "/src/api/rule/rule";
 import {
   addGenerate,
   addRule,
-  disable,
-  enable, findTableIdByParentId,
+  enable,
+  findTableIdByParentId,
   getEditionList,
-  getFindByEditionId, selectById,
-  updateRule, updateRuleEngine
+  getFindByEditionId,
+  selectById,
+  updateRule,
+  updateRuleEngine,
+  findTableValueByTableName
 } from "@/api/rule/ruleEdition";
 
 
@@ -493,8 +497,8 @@ export default {
   created() {
     this.ruleAndVersion.id = this.$route.query.id
     this.findById();
-    this.findList()
-    this.getDataOrigin()
+    this.findList();
+    this.getDataOrigin();
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {
@@ -514,7 +518,7 @@ export default {
         console.log("origins", this.origins)
       })
     },
-
+    //表结构
     chanChild() {
       findTableIdByParentId(this.dataOrigin.sourceId).then(res => {
         this.tableOrigin = res.data
diff --git a/src/views/source/index.vue b/src/views/source/index.vue
index 9e2cc7a..52907eb 100644
--- a/src/views/source/index.vue
+++ b/src/views/source/index.vue
@@ -178,14 +178,12 @@
         <el-form-item label="最大等待次数" prop="maxWaitSize">
           <el-input v-model="form.maxWaitSize" placeholder="请输入最大等待次数" />
         </el-form-item>
+        <el-form-item label="驱动" prop="driverName">
+          <el-input v-model="form.driverName" placeholder="请输入驱动名称" />
+        </el-form-item>
         <el-form-item label="是否初始化" prop="isInit">
-<!--          <el-input v-model="form.isInit" placeholder="请输入是否初始化" />-->
           <el-radio v-model="form.isInit" label="Y">是</el-radio>
           <el-radio v-model="form.isInit" label="N">否</el-radio>
-<!--          <el-radio-group v-model="form.isInit">-->
-<!--            <el-radio label="Y"></el-radio>-->
-<!--            <el-radio label="N"></el-radio>-->
-<!--          </el-radio-group>-->
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入是否初始化" />
@@ -285,6 +283,7 @@ export default {
         maxNum: null,
         maxWaitTime: null,
         maxWaitSize: null,
+        driverName: null,
         createBy: null,
         createTime: null,
         updateBy: null,