diff --git a/src/api/task/task.js b/src/api/task/task.js index 08a316e..c03a26a 100644 --- a/src/api/task/task.js +++ b/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 + }) +} + + diff --git a/src/assets/img/5.png b/src/assets/img/5.png new file mode 100644 index 0000000..a6ce4c1 Binary files /dev/null and b/src/assets/img/5.png differ diff --git a/src/views/components/task/formData.vue b/src/views/components/task/formData.vue index 4e5b49c..e516d90 100644 --- a/src/views/components/task/formData.vue +++ b/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), diff --git a/src/views/components/task/formDataOut.vue b/src/views/components/task/formDataOut.vue index 959f65b..f0bdcbe 100644 --- a/src/views/components/task/formDataOut.vue +++ b/src/views/components/task/formDataOut.vue @@ -4,7 +4,7 @@
- + 字段名: {{ outPut }} 字段别名:{{dataOutPut.tableField.split(',')[index]}}
@@ -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)=>{ diff --git a/src/views/components/task/formJoin.vue b/src/views/components/task/formJoin.vue index cbe302d..dda84e1 100644 --- a/src/views/components/task/formJoin.vue +++ b/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) }) }, diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index b90488e..92d6783 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -146,10 +146,10 @@ - - - - + + + +