Ver código fonte

修复预测提前一小时

guoxiaohuan 4 anos atrás
pai
commit
6ad9a8aaac
1 arquivos alterados com 16 adições e 8 exclusões
  1. 16 8
      src/components/strategyLine.vue

+ 16 - 8
src/components/strategyLine.vue

@@ -91,11 +91,17 @@ export default {
                     predictedLoadDownLimit:
                         el.predictedLoadDownLimit != '-9999' && el.predictedLoadDownLimit != '-9998' ? el.predictedLoadDownLimit : undefined
                 })
-                this.loadY4 = this.loadY2.map(value => {
-                    return value.predictedLoadUpLimit - value.predictedLoadDownLimit
-                })
                 this.loadY3.push(el.predictedLoadDownLimit != '-9999' && el.predictedLoadDownLimit != '-9998' ? el.predictedLoadDownLimit : undefined)
             })
+            this.loadY4 = this.loadY2.map(value => {
+                if (value.predictedLoadUpLimit != undefined && value.predictedLoadDownLimit != undefined) {
+                    return value.predictedLoadUpLimit - value.predictedLoadDownLimit
+                } else {
+                    return undefined
+                }
+            })
+            this.loadY3.unshift(undefined, undefined, undefined, undefined)
+            this.loadY4.unshift(undefined, undefined, undefined, undefined)
             let arr = []
             arr = arr
                 .concat(this.dataY1)
@@ -219,21 +225,23 @@ export default {
                             val3 = ''
                         data.forEach(i => {
                             if (i.seriesName == '预测冷量上限') {
-                                val1 = `${i.value != undefined ? i.value.toFixed(1) : '--'}`
+                                val1 = `${i.value != undefined ? i.value.toFixed(1) : ''}`
                             }
                             if (i.seriesName == '预测冷量下限') {
-                                val2 = `${i.value != undefined ? i.value.toFixed(1) : '--'}`
+                                val2 = `${i.value != undefined ? i.value.toFixed(1) : ''}`
                             }
                             if (i.seriesName == '实际供冷量') {
-                                val3 = `${i.value != undefined ? i.value.toFixed(1) : '--'}`
+                                val3 = `${i.value != undefined ? i.value.toFixed(1) : ''}`
                             }
                         })
                         if (val1 && val2) {
                             val1 = (Number(val1) + Number(val2)).toFixed(1)
                         } else {
-                            val1 = Number(val1).toFixed(1) || Number(val2).toFixed(1)
+                            val1 = ''
                         }
-                        return `${data[0].name}<br/>预测冷量上限:${val1 ? val1 : '--'}<br/>预测冷量下限:${val2}<br/>实际供冷量:${val3}`
+                        return `${data[0].name}<br/>预测冷量上限:${val1 ? val1 : '--'}<br/>预测冷量下限:${val2 ? val2 : '--'}<br/>实际供冷量:${
+                            val3 ? val3 : '--'
+                        }`
                     }
                 },
                 grid: {