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

.gitignore

@@ -17,4 +17,6 @@
 
 /static/dll.vendor.js
 /.idea
-/static/base_config.js
+/static/base_config.js
+
+.vscode

src/views/BI_manage/components/ChartBox.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="chart-box" v-if="compData" ref="compRef" v-loading="loading" element-loading-text="拼命加载中">
     <div class="top-title-box">
-      <div class="title" @click="goDetail">{{ chartInfo.ChartName }}</div>
+      <div class="title" @click="goDetail">{{ chartInfo&&chartInfo.ChartName }}</div>
       <div class="opt-box">
         <img
           class="icon"
@@ -121,7 +121,7 @@ export default {
     async handleGetChartData() {
       const res = await dataBaseInterface.getChartByCode({ UniqueCode: this.compData.UniqueCode })
       this.loading = false
-      if (res.Ret !== 200) return;
+      if (res.Ret !== 200||!res.Data.ChartInfo) return;
       this.chartInfo = res.Data.ChartInfo;
 
       this.chartInfo.SeasonExtraConfig && (this.SeasonExtraConfig = JSON.parse(this.chartInfo.SeasonExtraConfig))

src/views/BI_manage/index.vue

@@ -400,7 +400,7 @@ export default {
       position: absolute;
       right: 20px;
       top: 14px;
-      border-left: 1px solid $border-color;
+      /*border-left: 1px solid $border-color;*/
       padding-left: 10px;
     }
   }

src/views/approve_manage/approveDetail.vue

@@ -4,8 +4,8 @@
         <div class="approve-detail">
             <div class="approve-info">
                 <span>{{ mainType == 'report'?$t('AprrovalDetailPage.report_name_info'):$t('AprrovalPage.kanban_name')}}:{{reportInfo.title||''}}</span>
-                <span v-if="mainType == 'report'">{{$t('AprrovalDetailPage.classification_info')}}:{{reportInfo.classify||''}}</span>
-                <span style="min-width: 100px;">{{$t('AprrovalPage.submitter_lable')}}:{{reportInfo.approver||''}}</span>
+                <span v-if="mainType == 'report'" style="margin-left: 60px;">{{$t('AprrovalDetailPage.classification_info')}}:{{reportInfo.classify||''}}</span>
+                <span style="min-width: 100px;margin-left: 60px;">{{$t('AprrovalPage.submitter_lable')}}:{{reportInfo.approver||''}}</span>
             </div>
             <div v-if="mainType == 'report'" class="approve-content" 
                 v-loading="isLoading"
@@ -451,7 +451,6 @@ export default {
         flex-direction: column;
         .approve-info{
             display: flex;
-            gap:60px;
             padding:15px 20px;
             border-bottom: 1px solid #C8CDD9;
         }

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -175,7 +175,7 @@
                 </div>
                 <el-radio-group v-model="chart_source" @change="() => {search_page=1;$refs.chartListRef.scrollTop = 0;getreportlist()}" style="margin: 10px 0;">
                   <el-radio :label="1" style="margin-bottom:5px">{{$t('Slides.eta_chart_gallery')}}</el-radio>
-                  <el-radio :label="2" style="margin-bottom:5px">{{$t('Slides.commodity_price_curve')}}</el-radio> 
+                  <!-- <el-radio :label="2" style="margin-bottom:5px">{{$t('Slides.commodity_price_curve')}}</el-radio>  -->
                   <el-radio :label="3" style="margin-bottom:5px">{{$t('Slides.correlation_charts')}}</el-radio>
                   <el-radio :label="6" style="margin-bottom:5px">{{$t('Slides.fitted_equation_curves')}}</el-radio>
                   <el-radio :label="7" style="margin-bottom:5px">{{$t('Slides.statistical_features')}}</el-radio>
@@ -443,10 +443,10 @@ export default {
     panelTabs(){
       return  [ 
         {val:'图表',label:this.$t('Slides.table_chart') },
-        {val:'MyETA批量',label:this.$t('Slides.my_eta_batch')},
+        // {val:'MyETA批量',label:this.$t('Slides.my_eta_batch')},
         {val:'沙盘', label:this.$t('Slides.sandbox_name')},
         {val:'表格', label:this.$t('Slides.table_name')},
-        {val:'语义分析插入', label:this.$t('Slides.table_analysis_semantic')},
+        // {val:'语义分析插入', label:this.$t('Slides.table_analysis_semantic')},
       ]
     },  
     

src/views/report_manage/reportV2/normalReport/components/ETAChart.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="eta-chart-wrap">
         <div class="top-box">
-            <div class="left-card">
+            <!-- <div class="left-card">
                 <span :class="['item',activeType==='ETA图库'?'active':'']" @click="activeTypeChange('ETA图库')">{{$t('ReportManage.ReportList.chart_inventory_radio')}}</span>
                 <span :class="['item',activeType==='MyETA'?'active':'']" @click="activeTypeChange('MyETA')">{{$t('MyEtaPage.tab_my')}}</span>
-            </div>
+            </div> -->
             <el-input
                 class="search-box"
                 :placeholder="$t('ReportManage.ReportList.chart_name')"

src/views/report_manage/reportV2/normalReport/mixins/reportMixin.js

@@ -71,21 +71,21 @@ export default {
                 type:'statisticAnalysis',
                 icon:require('@/assets/img/smartReport/icon06.png')
             },
-            {
-                name:this.$t('ReportManage.ReportList.price_curve_radio'),
-                type:'etaPriceChart',
-                icon:require('@/assets/img/smartReport/icon07.png')
-            },
+            // {
+            //     name:this.$t('ReportManage.ReportList.price_curve_radio'),
+            //     type:'etaPriceChart',
+            //     icon:require('@/assets/img/smartReport/icon07.png')
+            // },
             {
                 name:this.$t('ReportManage.ReportList.sandbox_top_type'),
                 type:'etaSandBox',
                 icon:require('@/assets/img/smartReport/icon08.png')
             },
-            {
-                name:this.$t('ReportManage.ReportList.semantic_top_type'),
-                type:'semanticAnalysis',
-                icon:require('@/assets/img/smartReport/icon09.png')
-            }
+            // {
+            //     name:this.$t('ReportManage.ReportList.semantic_top_type'),
+            //     type:'semanticAnalysis',
+            //     icon:require('@/assets/img/smartReport/icon09.png')
+            // }
           ]
       },
       

src/views/report_manage/reportV2/smartReport/components/ETAChart.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="eta-chart-wrap">
         <div class="top-box">
-            <div class="left-card">
+            <!-- <div class="left-card">
                 <span :class="['item',activeType==='ETA图库'?'active':'']" @click="activeTypeChange('ETA图库')">{{$t('ReportManage.ReportList.chart_inventory_radio')}}</span>
                 <span :class="['item',activeType==='MyETA'?'active':'']" @click="activeTypeChange('MyETA')">{{$t('MyEtaPage.tab_my')}}</span>
-            </div>
+            </div> -->
             <div class="right">
                 <el-input
                     class="search-box"

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -1411,24 +1411,24 @@ export default {
                     visable:true,
                     icon:require('@/assets/img/smartReport/icon06.png')
                 },
-                {
-                    name:this.$t('ReportManage.ReportList.price_curve_radio'),
-                    type:'etaPriceChart',
-                    visable:true,
-                    icon:require('@/assets/img/smartReport/icon07.png')
-                },
+                // {
+                //     name:this.$t('ReportManage.ReportList.price_curve_radio'),
+                //     type:'etaPriceChart',
+                //     visable:true,
+                //     icon:require('@/assets/img/smartReport/icon07.png')
+                // },
                 {
                     name:this.$t('ReportManage.ReportList.sandbox_top_type'),
                     type:'etaSandBox',
                     visable:true,
                     icon:require('@/assets/img/smartReport/icon08.png')
                 },
-                {
-                    name:this.$t('ReportManage.ReportList.semantic_top_type'),
-                    type:'semanticAnalysis',
-                    visable:true,
-                    icon:require('@/assets/img/smartReport/icon09.png')
-                }
+                // {
+                //     name:this.$t('ReportManage.ReportList.semantic_top_type'),
+                //     type:'semanticAnalysis',
+                //     visable:true,
+                //     icon:require('@/assets/img/smartReport/icon09.png')
+                // }
             ]
       },
 

src/views/supply_manage/stockPlant.vue

@@ -10,6 +10,7 @@
           v-model="searchTxt"
           style="width:350px;margin-left: 15px;"
           @keyup.enter.native="getTableList"
+          @clear="pageNo=1,getTableList()"
           clearable>
           <i slot="prefix" class="el-input__icon el-icon-search"/>
         </el-input>

src/views/system_manage/components/addUserDialog.vue

@@ -36,7 +36,7 @@
                     <el-option label="域用户" :value="1"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item :label="$t('SystemManage.DepartManage.user_depart')" prop="depart" v-if="userForm.title == $t('SystemManage.DepartManage.user_add_btn')">
+            <el-form-item :label="$t('SystemManage.DepartManage.user_depart')" prop="depart" v-if="isAddUserDialogShow&&!userForm.admin_id">
                 <el-cascader :options="departArr" v-model="userForm.depart" :props="form_departProp"
                     :placeholder="$t('SystemManage.DepartManage.user_add_placeholder05')" :disabled="userForm.disabledForm" clearable>
                 </el-cascader>

src/views/system_manage/dataOperaAuth.vue

@@ -302,7 +302,7 @@ export default {
     tabs(){
       const tabs = [
         { label: this.$t('SystemManage.OperateAuth.tab01'), key: 1 },
-        { label: this.$t('SystemManage.OperateAuth.tab02'), key: 2 },
+        // { label: this.$t('SystemManage.OperateAuth.tab02'), key: 2 },
         { label: this.$t('SystemManage.OperateAuth.tab03'), key: 3 },
         { label: this.$t('SystemManage.OperateAuth.tab04'), key: 4 },
         { label: this.$t('SystemManage.OperateAuth.tab05'), key: 5 },

src/views/system_manage/dataRefreshSetting.vue

@@ -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')"
-                    v-if="![34,11].includes(Source)&&Source"></el-input>
+                    ></el-input>
                 
             </div>
             <div class="table-box" v-if="hasSelectOption">
@@ -272,7 +272,7 @@ export default {
     data() {
         return {
             settingTab:'time',
-            Source:'',
+            Source:0,
             SourceList:[],
             SubSource:'',
             SubSourceList:[],
@@ -291,7 +291,7 @@ export default {
                 sortType:'',//升序降序
                 sortParam:'',//排序字段
             },
-            hasSelectOption:false,
+            hasSelectOption: true,
             selectOptionLoading:false,
 
             
@@ -324,7 +324,7 @@ export default {
             statusSourceList:[],
             statusEdbClassifyList:[],
             searchParams:{
-                Source:'',
+                Source:0,
                 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 = ![34,11].includes(this.Source)
+            this.hasSelectOption = true
             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,8 +1094,10 @@ export default {
         },
     },
     mounted(){
-        this.getSourceList()
+        // this.getSourceList()
         this.getUserList()
+        this.getTableData('optionChange')
+        this.getSelectOption()
     }
 };
 </script>

src/views/system_manage/etaBaseConfig.vue

@@ -274,6 +274,12 @@
                             </div>
                         </div>
 
+                        <!-- BI看板审批 -->
+                        <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>
+
                         <!-- 研报logo -->
                         <div>
                             <div style="width:100%;margin-bottom: 20px;">
@@ -307,12 +313,6 @@
                                 </span>
                             </div>
                         </div>
-
-                        <!-- BI看板审批 -->
-                        <div v-if="isShowBIApprove" style="margin-top: 20px;">
-                            <span>{{$t('SystemManage.BaseConfig.bIDashboard_approval')}}</span> 
-                            <el-switch v-model="BIApprove"></el-switch>
-                        </div>
                     </div>
                     <div class="side">
                     

src/views/system_manage/newAuthManage.vue

@@ -9,8 +9,8 @@
                     </el-option>
                 </el-select>
             </div>
-            <!-- <el-button style="margin-left:auto;marginRight:50px;width:140px;" @click="$router.back()" v-if="!isLook">{{$t('Dialog.cancel_btn')}}
-            </el-button> -->
+            <el-button style="margin-left:auto;marginRight:50px;width:140px;" @click="$router.back()" v-if="!isLook">{{$t('Dialog.cancel_btn')}}
+            </el-button>
             <el-button type="primary" style="marginRight:50px;width:140px;" @click="saveAuth" v-if="!isLook">{{$t('Dialog.confirm_save_btn')}}
             </el-button>
         </div>