Merge branch 'ch/gn' of eta_gn_front/eta_front into debug

src/views/system_manage/dataRefreshSetting.vue

@@ -17,12 +17,12 @@
         <template v-if="settingTab=='time'">
             <div class="top-box">
                 <div class="select-box">
-                    <!-- <span>{{$t('SystemManage.DataRefresh.select_source')}}</span>
+                    <span>{{$t('SystemManage.DataRefresh.select_source')}}</span>
                     <el-select :placeholder="$t('SystemManage.DataRefresh.select_source_pld')" v-model="Source" @change="handleSourceChange">
                         <el-option v-for="item in SourceList" :key="item.Source" 
                         :label="item.SourceName" :value="item.Source"/>
                     </el-select>
-                    <el-select :placeholder="$t('SystemManage.DataRefresh.select_source_pld')" v-model="SubSource" v-if="SubSourceList.length" @change="handleSubSourceChange">
+                    <!-- <el-select :placeholder="$t('SystemManage.DataRefresh.select_source_pld')" v-model="SubSource" v-if="SubSourceList.length" @change="handleSubSourceChange">
                         <el-option v-for="item in SubSourceList" :key="item.Source" 
                         :label="$i18nt.locale==='zh'?item.SubSourceName:item.SubSourceNameEn||item.SubSourceName" :value="item.SubSource"/>
                     </el-select> -->
@@ -33,7 +33,7 @@
                 
                 <el-input :placeholder="$t('SystemManage.DataRefresh.indicator_name')" prefix-icon="el-icon-search" clearable
                     v-model="selectOption.keyWord" @input="selectOptionChange('keyWord')"
-                    ></el-input>
+                    v-if="![34,11].includes(Source)&&Source"></el-input>
                 
             </div>
             <div class="table-box" v-if="hasSelectOption">
@@ -272,7 +272,7 @@ export default {
     data() {
         return {
             settingTab:'time',
-            Source:0,
+            Source:'',
             SourceList:[],
             SubSource:'',
             SubSourceList:[],
@@ -291,7 +291,7 @@ export default {
                 sortType:'',//升序降序
                 sortParam:'',//排序字段
             },
-            hasSelectOption: true,
+            hasSelectOption:false,
             selectOptionLoading:false,
 
             
@@ -324,7 +324,7 @@ export default {
             statusSourceList:[],
             statusEdbClassifyList:[],
             searchParams:{
-                Source:0,
+                Source:'',
                 Status:'',
                 Frequency:'',
                 SysUserId:'',
@@ -444,11 +444,11 @@ export default {
             this.isSetTimeDialogShow = true
             if(isDefault){
                 //判断数据源是否选择
-                // if(!this.Source){
-                //     // this.$message.warning("请选择数据源")
-                //     this.$message.warning(this.$t('SystemManage.DataRefresh.select_source_pld'))
-                //     return
-                // }
+                if(!this.Source){
+                    // this.$message.warning("请选择数据源")
+                    this.$message.warning(this.$t('SystemManage.DataRefresh.select_source_pld'))
+                    return
+                }
                 /* if(this.SubSourceList.length&&!this.SubSource){
                     this.$message.warning("$t('SystemManage.DataRefresh.complete_data_source')")
                     return
@@ -537,7 +537,7 @@ export default {
             const source = this.SourceList.find(i=>i.Source===this.Source)||{Child:[]}
             this.SubSourceList = source.Child
             this.SubSource=''
-            this.hasSelectOption = true
+            this.hasSelectOption = ![34,11].includes(this.Source)
             if(this.hasSelectOption){
                 this.resetSelect()
                 this.tableData = []
@@ -568,7 +568,7 @@ export default {
         },
         //获取分类列表
         async getClassifyList(){
-            // if(!this.Source) return 
+            if(!this.Source) return 
             const res = await dataRefreshInterface.getClassifyList({
                 Source:Number(this.Source)
             })
@@ -589,7 +589,7 @@ export default {
             //获取终端编码列表
             await this.getClassifyList()
             //获取分类列表
-            // await this.getTerminalCodeList()
+            await this.getTerminalCodeList()
             this.selectOptionLoading = false
         },
         //切换数据源时重置表格选项
@@ -1094,10 +1094,8 @@ export default {
         },
     },
     mounted(){
-        // this.getSourceList()
+        this.getSourceList()
         this.getUserList()
-        this.getTableData('optionChange')
-        this.getSelectOption()
     }
 };
 </script>
@@ -1260,4 +1258,4 @@ export default {
         }
     }
 }
-</style>
+</style>