guoxiaohuan 4 anos atrás
pai
commit
c5c9769253
2 arquivos alterados com 33 adições e 16 exclusões
  1. 30 16
      src/components/strategyLine.vue
  2. 3 0
      src/views/strategy/animationBox.vue

+ 30 - 16
src/components/strategyLine.vue

@@ -84,7 +84,7 @@ export default {
                 this.dataY3.push(el.maxTindoor == '-9999' ? undefined : el.maxTindoor)
                 this.loadY1.push(el.nowPlantLoad == '-9999' && el.nowPlantLoad == '-9998' ? undefined : el.nowPlantLoad)
                 this.loadY2.push(el.predictedLoadUpLimit != '-9999' && el.predictedLoadUpLimit != '-9998' ? el.predictedLoadUpLimit : undefined)
-                this.loadY3.push(el.redictedLoadDownLimit != '-9999' && el.redictedLoadDownLimit != '-9998' ? el.redictedLoadDownLimit : undefined)
+                this.loadY3.push(el.predictedLoadDownLimit != '-9999' && el.predictedLoadDownLimit != '-9998' ? el.predictedLoadDownLimit : undefined)
             })
             let arr = []
             arr = arr
@@ -207,11 +207,14 @@ export default {
                             val2 = '',
                             val3 = ''
                         data.forEach(i => {
-                            if (i.seriesName == '预测冷量') {
-                                val1 = `<br/>预测冷量:${i.value ? i.value.toFixed(1) : '--'}`
+                            if (i.seriesName == '预测冷量上限') {
+                                val1 = `<br/>预测冷量上限:${i.value ? i.value.toFixed(1) : '--'}`
+                            }
+                            if (i.seriesName == '预测冷量下限') {
+                                val2 = `<br/>预测冷量下限:${i.value ? i.value.toFixed(1) : '--'}`
                             }
                             if (i.seriesName == '实际供冷量') {
-                                val2 = `<br/>实际供冷量:${i.value ? i.value.toFixed(1) : '--'}`
+                                val3 = `<br/>实际供冷量:${i.value ? i.value.toFixed(1) : '--'}`
                             }
                         })
                         return `${data[0].name}${val1}${val2}${val3}`
@@ -237,25 +240,36 @@ export default {
                 },
                 series: [
                     {
-                        name: '预测冷量',
+                        name: '实际供冷量',
+                        type: 'line',
+                        data: this.loadY1,
+                        itemStyle: {
+                            color: '#0091FF'
+                        }
+                    },
+                    {
+                        name: '预测冷量上限',
                         type: 'line',
                         data: this.loadY2,
                         color: '#B6E0FF',
-                        opacity: 0.29,
+                        lineStyle: {
+                            opacity: 0
+                        },
+                        stack: 'confidence-band',
+                        symbol: 'none'
+                    },
+                    {
+                        name: '预测冷量下限',
+                        type: 'line',
+                        data: this.loadY3,
+                        color: '#B6E0FF',
                         areaStyle: {
                             normal: {
                                 color: '#B6E0FF'
                             }
-                        }
-                    },
-
-                    {
-                        name: '实际供冷量',
-                        type: 'line',
-                        data: this.loadY1,
-                        itemStyle: {
-                            color: '#0091FF'
-                        }
+                        },
+                        stack: 'confidence-band',
+                        symbol: 'none'
                     }
                 ]
             })

+ 3 - 0
src/views/strategy/animationBox.vue

@@ -86,6 +86,9 @@ export default {
             } else {
                 this.showDraw = false
             }
+            if (this.chillerCommandQ.isExecuted) {
+                this.showDraw = false
+            }
         }
     },
     props: ['data', 'chillerHourList', 'chillerCommandQ']