Merge branch 'debug' of http://8.136.199.33:3000/eta_gn_front/eta_front into debug

src/views/system_manage/dataRefreshSetting.vue

@@ -22,10 +22,6 @@
                         <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-option v-for="item in SubSourceList" :key="item.Source" 
-                        :label="$i18nt.locale==='zh'?item.SubSourceName:item.SubSourceNameEn||item.SubSourceName" :value="item.SubSource"/>
-                    </el-select> -->
                     <el-button type="primary" @click="showDialog(true)"
                         v-permission="permissionBtn.sysDepartPermission.refresh_default"
                     >{{$t('SystemManage.DataRefresh.default_time')}}</el-button>
@@ -119,6 +115,9 @@
                             <span v-if="column.key==='IsStop'">
                                 {{row.IsStop? $t('SystemManage.DataRefresh.pause_op') : $t('SystemManage.DataRefresh.enable_op') }}
                             </span>
+                            <span v-else-if="column.key==='EndDate'">
+                                {{row.EndDate ? row.EndDate.substring(0,10) : ''}}
+                            </span>
                             <span v-else>
                                 {{row[column.key]}}
                             </span>
@@ -274,8 +273,6 @@ export default {
             settingTab:'time',
             Source:'',
             SourceList:[],
-            SubSource:'',
-            SubSourceList:[],
 
             terminalCodeList:[],
             edbClassifyList:[],
@@ -449,10 +446,6 @@ export default {
                     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
-                } */
                 //SMM不带频度
                 if(this.Source===11){
                     this.defaultFrequency=''
@@ -477,7 +470,6 @@ export default {
             dataRefreshInterface.getDefaultConfig({
                 Frequency:this.defaultFrequency,
                 Source:Number(this.Source),
-                SubSource:Number(this.SubSource)
             }).then(res=>{
                 this.defaultDialogLoading = false
                 if(res.Ret!==200) return 
@@ -505,7 +497,6 @@ export default {
             dataRefreshInterface.getSimgleEdbRefreshTime({
                 EdbInfoId,
                 Source:Number(this.Source),
-                SubSource:Number(this.SubSource)
             }).then(res=>{
                 this.defaultDialogLoading = false
                 if(res.Ret!==200) return 
@@ -535,23 +526,13 @@ export default {
         //一级数据源改变时，二级数据源和筛选项也重新赋值
         handleSourceChange(){
             const source = this.SourceList.find(i=>i.Source===this.Source)||{Child:[]}
-            this.SubSourceList = source.Child
-            this.SubSource=''
-            this.hasSelectOption = ![34,11].includes(this.Source)
+            this.hasSelectOption = true
             if(this.hasSelectOption){
                 this.resetSelect()
                 this.tableData = []
             }
-            //如果没有二级数据源，则请求表格筛选项数据；钢联化工，SMM没有筛选项数据
-            if(!this.SubSourceList.length&&this.hasSelectOption){
-                this.getSelectOption()
-                this.selectOptionChange()
-            }
-            //如果有二级数据源，默认选中第一个
-            if(this.SubSourceList.length){
-                this.SubSource = this.SubSourceList[0].SubSource
-                this.handleSubSourceChange()
-            }
+            this.getSelectOption()
+            this.selectOptionChange()
         },
         handleSubSourceChange(){
             this.getSelectOption()
@@ -620,7 +601,6 @@ export default {
             const classifyId = [...new Set(classifyArr.join(',').split(','))]
             const res = await dataRefreshInterface.getEdbTableList({
                 Source:Number(this.Source),
-                SubSource:Number(this.SubSource),
                 ClassifyId:classifyId.join(','),
                 TerminalCode:terminalCode,
                 SysUserId:Array.isArray(user)?user.join(','):user,
@@ -784,7 +764,6 @@ export default {
             const classifyId = [...new Set(classifyArr.join(',').split(','))]
             dataRefreshInterface.setRefreshTime({
                 Source:Number(this.Source),
-                SubSource:Number(this.SubSource),
                 ClassifyId:classifyId.join(','),
                 TerminalCode:terminalCode,
                 SysUserId:Array.isArray(user)?user.join(','):user,
@@ -805,7 +784,6 @@ export default {
         setDefaultTime(list){
             dataRefreshInterface.setDefaultTime({
                 Source:Number(this.Source),
-                SubSource:Number(this.SubSource),
                 Frequency:this.defaultFrequency,
                 List:list
             }).then(res=>{
@@ -821,7 +799,6 @@ export default {
             const classifyId = [...new Set(classifyArr.join(',').split(','))]
             dataRefreshInterface.setRefreshStatus({
                 Source:Number(this.Source),
-                SubSource:Number(this.SubSource),
                 ClassifyId:classifyId.join(','),
                 TerminalCode:terminalCode,
                 SysUserId:Array.isArray(user)?user.join(','):user,

src/views/system_manage/etaBaseConfig.vue

@@ -275,10 +275,10 @@
                         </div>
 
                         <!-- BI看板审批 -->
-                        <div v-if="isShowBIApprove" style="margin: 20px 0;">
+                        <!-- <div v-if="isShowBIApprove" style="margin: 20px 0;">
                             <span style="color:#606266;">{{$t('SystemManage.BaseConfig.bIDashboard_approval')}}</span> 
                             <el-switch v-model="BIApprove"></el-switch>
-                        </div>
+                        </div> -->
 
                         <!-- 研报logo -->
                         <div>
@@ -755,11 +755,11 @@ export default {
             )
         },
         //是否展示BI看板审批
-        isShowBIApprove(){
-            return this.permissionBtn.checkPermissionBtn(
-                this.permissionBtn.baseConfigPermission.etaBaseConfig_biApprove
-            )
-        },
+        // isShowBIApprove(){
+        //     return this.permissionBtn.checkPermissionBtn(
+        //         this.permissionBtn.baseConfigPermission.etaBaseConfig_biApprove
+        //     )
+        // },
         //是否显示中文PPT相关的表单项
         isShowPPT(){
             return this.permissionBtn.checkPermissionBtn(

src/views/system_manage/outlinkListConfig.vue

@@ -154,6 +154,7 @@ import mPage from '@/components/mPage.vue';
           outlinkConfigInterence.outlinkDelete({Id:item.Id}).then(res=>{
             if(res.Ret == 200){
               this.$message.success(this.$t('SystemManage.OutLinkConfig.del_success_msg'))
+              this.queryParams.CurrentIndex = 1;
               this.getOutlinkData()
             }
           })