Merge remote-tracking branch 'origin/master'

src/views/etl/switch/index.vue

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