Merge remote-tracking branch 'origin/master'

src/api/task/task.js

@@ -35,4 +35,20 @@ export function deleteByTaskId(id) {
   })
 }
 
+//获得所有数据结构信息
+export function taskInputList() {
+  return request({
+    url: "/task/taskInput/list",
+    method: "GET",
+  })
+}
+
+//获得所有数据结构信息
+export function findByInputId(id) {
+  return request({
+    url: "/task/findByInputId/"+id,
+    method: "POST",
+  })
+}
+
 

src/views/task/task/index.vue

@@ -187,18 +187,18 @@
 <!--    添加任务详情设计-->
     <el-dialog title="添加表" :visible.sync="taskInputAdd">
 
-      <el-form  label-width="80px" :model="taskInputReq" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
+      <el-form  label-width="80px" :model="taskInfoList" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="任务id">
-          <el-input v-model="taskInputReq.taskId"></el-input>
+          <el-input v-model="taskInfoList.taskId"></el-input>
         </el-form-item>
 
         <el-form-item label="数据库id">
-          <el-input v-model="taskInputReq.databaseId"></el-input>
+          <el-input v-model="taskInfoList.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select v-model="taskReq.tableName" placeholder="请选择等级">
+          <el-select v-model="taskInfoList.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
-            <span v-for="table in tableList">
+            <span v-for="table in taskInfoList">
               <el-option :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
@@ -220,14 +220,12 @@
     <el-dialog title="添加表" :visible.sync="taskInputFieldAdd">
 
       <el-table
-        :data="taskList"
+        :data="structureList"
         style="width: 100%"
 
         @selection-change="handleSelectionChange">
 
 
-
-
         <el-table-column
           type="selection"
           width="55">
@@ -312,7 +310,15 @@ import {selectSourceExport} from "@/api/etl/switch";
 import {connectionTest} from "@/api/etl/switch";
 import {insertAdd} from "@/api/etl/switch";
 import {getInfo} from "@/api/etl/switch";
-import { addTask, deleteById, deleteByTaskId, selectTaskList, updateById } from '@/api/task/task'
+import {
+  addTask,
+  deleteById,
+  deleteByTaskId,
+  findByInputId,
+  selectTaskList,
+  taskInputList,
+  updateById
+} from '@/api/task/task'
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -333,7 +339,9 @@ export default {
       taskAddReq:{},
       taskInputReq:{},
       taskList:[],
+      taskInfoList:[],
       tableList:[],
+      structureList:[],
     };
   },
   //计算属性 类似于data概念",
@@ -342,6 +350,20 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    //查询字段
+    findByInputId(row){
+      findByInputId(row.id).then(res=>{
+        this.structureList = res.data;
+      })
+
+    },
+
+    //数据结构列表
+    taskInputList(){
+      taskInputList().then(res=>{
+        this.taskInfoList = res.data;
+      });
+    },
 
     executeTask(){
       this.taskInputAdd = true;
@@ -349,6 +371,7 @@ export default {
 
     addTaskInput(){
       this.taskInputAdd = false;
+      this.taskInputList();
       this.taskInputFieldAdd = true;
     },