jwyu 8 luni în urmă
părinte
comite
41be6c19fb

+ 1 - 0
src/views/intervalAnalysis/addChart.vue

@@ -45,6 +45,7 @@
           :computedType="computedType"
           @showBatchSelectEdb="handleShowBatchSelectEdb"
           @closeChart="handleCloseChart"
+          @computed="handleComputed"
           ref="edbComputedWrap"
         />
       </div>

+ 7 - 0
src/views/intervalAnalysis/components/edbComputedWrap.vue

@@ -23,6 +23,7 @@
         style="width: 92%; margin-top: 10px; display: block"
         :remote-method="searchHandle"
         @click.native="inputFocusHandle"
+        @change="handleSelectSingleEdb"
       >
         <i slot="prefix" class="el-input__icon el-icon-search"></i>
         <el-option
@@ -538,11 +539,17 @@ export default {
     }
   },
   methods: {
+    // 单指标选择指标后计算一次
+    handleSelectSingleEdb(){
+      this.$emit('computed')
+    },
+
     // 更新多指标计算时的数据
     initMultipleEdbParams(data) {
       this.dateRangeType = 0
       this.edbList = data.edbList
       this.seriesName = data.seriesName
+      this.$emit('computed')
     },
     handleShowEditBatchSelectEbd() {
       this.$emit('showBatchSelectEdb', {

+ 1 - 1
src/views/mychart_manage/components/chartDetailDia.vue

@@ -199,7 +199,7 @@
                 class="span-item"
                 style="margin-left: 7px"
                 @click="openLangInfoDia"
-                v-if="chartInfo.Source!==11"
+                v-if="![11,12].includes(chartInfo.Source)"
               >
                 <span> <img style="width: 16px;vertical-align: middle" :src="$icons.to_en" />&nbsp;<!-- 编辑信息 -->{{$t('Edb.detail_en_btn')}} </span>
               </span>

+ 13 - 0
src/views/ppt_manage/mixins/mixins.js

@@ -276,6 +276,19 @@ export default {
       this.setSectionalCombinationChart()
     },
 
+    // 区间分析
+    initIntervalAnalysisChartData(data){
+      // 
+      console.log('初始化区间分析数据');
+      this.intervalAnalysisChartData=data.DataResp
+      this.setLimitData(this.tableData)
+      this.setIntervalAnalysisChart()
+    },
+    setIntervalAnalysisChart(){
+      console.log('渲染区间分析图表');
+      this.setDefaultChart(this.tableData)
+    },
+
     /* 曲线 */
     setDefaultChart() {
 

+ 4 - 1
src/views/ppt_manage/mixins/pptMixins.js

@@ -280,7 +280,7 @@ export default {
       if(!Data) return 
       this.chartInfo = Data.ChartInfo;
       if(!this.chartInfo) return
-      if([1,11].includes(this.chartInfo.Source)) { //常规图
+      if([1,11,12].includes(this.chartInfo.Source)) { //常规图
         //处理下历史默认来源
         this.setDefaultSourceFrom();
         //季节性图处理SeasonAverageConfig,SeasonRightEdbConfig
@@ -302,6 +302,9 @@ export default {
         //截面组合图
         this.chartInfo.ChartType===14 && this.initSectionalCombinationChart(res.Data)
 
+        // 区间分析
+        this.chartInfo.ChartType===1&&this.initIntervalAnalysisChartData(res.Data)
+
         // 时序组合图控制是否堆叠
         if(this.chartInfo.ChartType===6){
           this.IsHeap=res.Data.DataResp.IsHeap===1?true:false