前台流程设计页面初版完毕

src/api/task/task.js

@@ -89,7 +89,7 @@ export function addTaskJoin(data) {
 //添加数据输出节点
 export function addTaskOutPut(data) {
   return request({
-    url: "/task/taskOutPut/addTaskOutPut",
+    url: "/task/taskOutPut/addTaskOutput",
     method: "POST",
     data:data
   })
@@ -104,6 +104,15 @@ export function executeTask(id) {
 }
 
 
+export function addNodeRule(data) {
+  return request({
+    url: "/task/nodeRule/addNodeRule/",
+    method: "POST",
+    data:data
+  })
+}
+
+
 
 
 

src/views/components/task/formData.vue

@@ -212,7 +212,7 @@ export default {
           "nodeId":this.nodeId,
           "nodeName":this.nodeName,
           "taskId":this.tableInfo.taskId,
-          "databaseId":this.tableInfo.parentId,
+          "databaseId":this.tableInfo.basicId,
           "tableName":this.tableInfo.tableName,
           "tableAsName":this.tableInfo.tableAsName,
           "tableField": this.tableInfo.tableField.substring(1),

src/views/components/task/formDataOut.vue

@@ -4,7 +4,7 @@
     <span v-if="taskDataOutPut">
       <el-button @click="nb"></el-button><br>
 
-      <span v-for="(outPut,index) in dataOutPut.tableField.split(',')">
+      <span v-for="(outPut,index) in dataOutPut.tableAsField.split(',')">
          <el-checkbox :label=outPut :value=outPut v-model="twoInputList">字段名： {{ outPut }} 字段别名：{{dataOutPut.tableField.split(',')[index]}}</el-checkbox><br>
       </span>
 
@@ -146,9 +146,15 @@ export default {
 
         console.log(this.oneNode)
       })
+      if(this.neighbors[0] !=null){
+
+      }
       findByNodeId(this.neighbors[1]).then(res=>{
+        if(res.data == null){
+          this.dataOutPut.tableField = this.oneNode.tableField
+          return;
+        }
         this.twoNode = res.data;
-        console.log(this.twoNode)
       })
 
       this.dataOutPut.tableField = this.oneNode.tableField + ',' + this.twoNode.tableField
@@ -164,6 +170,8 @@ export default {
 
     //选择要将数据存入的表中
     handleNodeClick(data) {
+      console.log('amanaman')
+      console.log(data)
       this.tableId = data.id
       this.basicId = data.basicId
       findStructureByTableId(data.id).then((res)=>{

src/views/components/task/formJoin.vue

@@ -99,12 +99,12 @@ export default {
     findAllTable(){
       findByNodeId(this.neighbors[0]).then(res=>{
         this.oneFieldList = res.data.tableAsField;
-        this.leftId = res.data.id;
+        this.leftId = res.data.nodeId;
         console.log(this.oneFieldList)
       })
       findByNodeId(this.neighbors[1]).then(res=>{
         this.twoFieldList = res.data.tableAsField;
-        this.rightId = res.data.id;
+        this.rightId = res.data.nodeId;
         console.log(this.twoFieldList)
       })
     },

src/views/task/task/index.vue

@@ -146,10 +146,10 @@
         <el-form-item label="优先级选择">
           <el-select v-model="taskReq.weigh" placeholder="请选择等级">
             <el-option label="请选择" value=""></el-option>
-            <el-option label="紧急" value="1"></el-option>
-            <el-option label="低" value="2"></el-option>
-            <el-option label="中" value="3"></el-option>
-            <el-option label="高" value="4"></el-option>
+            <el-option label="低" value="1"></el-option>
+            <el-option label="中" value="2"></el-option>
+            <el-option label="高" value="3"></el-option>
+            <el-option label="紧急" value="4"></el-option>
           </el-select>
         </el-form-item>