Merge remote-tracking branch 'origin/master'

src/views/etl/switch/index.vue

@@ -212,7 +212,7 @@
         label="是否初始化"
         prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.yes_no" :value="scope.row.status"/>
         </template>
       </el-table-column>
 
@@ -274,13 +274,16 @@ import {getInfo} from "@/api/etl/switch";
 import {structure} from "@/api/etl/switch";
 
 export default {
+  dicts: ['sys_normal_disable','yes_no'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
   data() {
+
     //这里存放数据"
 
     return {
+      dicts: ['type','yes_no'],
       rules: {
         dataResourceName: [
           {required: true, message: "接入源名称不能为空", trigger: "blur"}

src/views/task/task/index.vue

@@ -196,10 +196,10 @@
           <el-input v-model="taskInfo.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
+          <el-select @change="changeTableName(taskInfo.tableName)" v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
             <span v-for="table in taskInfoList">
-              <el-option @select="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option  :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>
@@ -352,9 +352,12 @@ export default {
   //方法集合",
   methods: {
     //选择数据表改变数据
-    changeTableName(row){
-      console.log(row);
-      this.taskInfo = row;
+    changeTableName(table){
+      this.taskInfoList.forEach(res=>{
+        if(table.eq(res.tableName)){
+          this.taskInfo = res;
+        }
+      })
     },
 
     //查询字段