优化效果

src/views/quest/node/Home.vue

@@ -91,16 +91,23 @@ export default {
         const rows = res.data.rows
         for (let i = 0; i < rows.length; i++) {
           const r = flowNode.methods.toJsPlumbNode(rows[i])
-          this.data.nodeList.push({
+          nodeTypeList.forEach(v => {
-            id: r.node.id,
+            if (r.node.type === v.type) {
-            type: r.node.type,
+              r.node.typeName = v.typeName
-            typeName: r.node.typeName,
+              r.node.logImg = v.logImg
-            nodeName: r.node.nodeName,
+              r.node.log_bg_color = v.log_bg_color
-            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,
@@ -108,18 +115,10 @@ export default {
                   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)
       })

src/views/quest/node/components/node-item.vue

@@ -138,6 +138,8 @@ export default {
     /** jsPlumb节点类型 --> 数据库节点类型 */
     toMysqlNode(node,preLine,nextLine){
       return {
+        id: node.authId,
+        nodeType: node.type,
         nodeCode: node.id,
         nodeName: node.nodeName,
         nodePositionTop: node.top,
@@ -150,6 +152,7 @@ export default {
     /** 数据库节点类型 --> jsPlumb节点类型 */
     toJsPlumbNode(nodeInfo){
       const node = {
+        authId: nodeInfo.id,
         id: nodeInfo.nodeCode,
         type: nodeInfo.nodeType,
         nodeName: nodeInfo.nodeName,

src/views/quest/task/index.vue

@@ -9,21 +9,15 @@
           @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-input
+        <el-select v-model="queryParams.state" placeholder="请选择启用状态" clearable>
-          v-model="queryParams.state"
+          <el-option
-          placeholder="请输入启用状态"
+            v-for="dict in dict.type.sys_enable_status"
-          clearable
+            :key="dict.value"
-          @keyup.enter.native="handleQuery"
+            :label="dict.label"
+            :value="dict.value"
           />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -79,13 +73,17 @@
 
     <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="state" />
+      <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" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -133,11 +131,18 @@
         <el-form-item label="规则编码" prop="ruleCode">
           <el-input v-model="form.ruleCode" placeholder="请输入规则编码" />
         </el-form-item>
-        <el-form-item label="任务类型" prop="task_type">
+        <el-form-item label="任务内容">
-          <el-input v-model="form.taskType" placeholder="请输入任务类型" />
+          <editor v-model="form.taskData" :min-height="192"/>
         </el-form-item>
         <el-form-item label="启用状态" prop="state">
-          <el-input v-model="form.state" placeholder="请输入启用状态" />
+          <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-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -149,10 +154,12 @@
 </template>
 
 <script>
-import {listQuest, getQuest, delQuest, addQuest, updateQuest} from "@/api/quest/quest";
+import { listQuest, getQuest, delQuest, addQuest, updateQuest } from "/src/api/quest/quest";
+import dict from "../../../utils/dict";
 
 export default {
   name: "Quest",
+  dicts: ['sys_enable_status'],
   data() {
     return {
       // 遮罩层
@@ -196,11 +203,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;
@@ -220,6 +227,7 @@ export default {
         taskWebhook: null,
         ruleCode: null,
         taskType: null,
+        taskData: null,
         state: null,
         createBy: null,
         createTime: null,
@@ -289,7 +297,8 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {