Merge branch 'fix' into debug

.gitignore

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

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/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>