xusl 1 anno fa
parent
commit
3a98f30a7e

+ 8 - 58
ipfcst/ipfcst-reportquery/src/main/frontend/views/datav/bottomEcharts.vue

@@ -153,32 +153,6 @@ export default {
             symbol: 'none', // 这句就是去掉点的
             data: []
 
-          },
-          {
-            name: '可用功率',
-            type: 'line',
-            stack: '',
-            smooth: false,
-            symbol: 'none', // 这句就是去掉点的
-            data: []
-
-          },
-          {
-            name: '理论功率',
-            type: 'line',
-            stack: '',
-            smooth: false,
-            symbol: 'none', // 这句就是去掉点的
-            data: []
-          },
-          {
-            name: '轮毂高度风速',
-            yAxisIndex: 1,
-            type: 'line',
-            stack: '',
-            smooth: false,
-            symbol: 'none', // 这句就是去掉点的
-            data: []
           }]
       }
     }
@@ -219,38 +193,14 @@ export default {
     },
     getCompositeData() {
         this.$axios.get('/dashboard/getCompositeData/'+ this.efiType).then(res => {
-          if (res.data.displayKyLl === '1') {
-            this.option.legend.data = ['超短期预测功率', '短期预测功率', '实际功率', '可用功率', '理论功率']
-            this.option.color = [cc.cdq, cc.dq, cc.sj, cc.kygl, cc.llgl]
-            this.option.xAxis.data = res.data.timeList
-            this.option.series[0].data = res.data.cdqList
-            this.option.series[1].data = res.data.dqList
-            this.option.series[2].data = res.data.sjList
-            this.option.series[3].data = res.data.kyList
-            this.option.series[4].data = res.data.llList
-            if (res.data.displayLggdfs === '1'){
-              this.option.legend.data = ['超短期预测功率', '短期预测功率', '实际功率', '可用功率', '理论功率','轮毂高度风速']
-              this.option.yAxis[1].show = true
-              this.option.series[5].data = res.data.lggdfsList
-              this.option.color = [cc.cdq, cc.dq, cc.sj, cc.kygl, cc.llgl,cc.lggdfs]
-            }
-          }else if (res.data.displayLggdfs === '1'){
-            this.option.legend.data = ['超短期预测功率', '短期预测功率', '实际功率','轮毂高度风速']
-            this.option.color = [cc.cdq, cc.dq, cc.sj,null,null,cc.lggdfs]
-            this.option.xAxis.data = res.data.timeList
-            this.option.yAxis[1].show = true
-            this.option.series[0].data = res.data.cdqList
-            this.option.series[1].data = res.data.dqList
-            this.option.series[2].data = res.data.sjList
-            this.option.series[5].data = res.data.lggdfsList
-          } else {
-            this.option.legend.data = ['超短期预测功率', '短期预测功率', '实际功率']
-            this.option.color = [cc.cdq, cc.dq, cc.sj]
-            this.option.xAxis.data = res.data.timeList
-            this.option.series[0].data = res.data.cdqList
-            this.option.series[1].data = res.data.dqList
-            this.option.series[2].data = res.data.sjList
-          }
+
+          this.option.legend.data = ['超短期预测功率', '短期预测功率', '实际功率']
+          this.option.color = [cc.cdq, cc.dq, cc.sj]
+          this.option.xAxis.data = res.data.timeList
+          this.option.series[0].data = res.data.cdqList
+          this.option.series[1].data = res.data.dqList
+          this.option.series[2].data = res.data.sjList
+
           this.$nextTick(function () {
             this.drawcharts()
           })