zhulizhen 5 years ago
parent
commit
e1c5b62727
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/views/strategy/animationBox.vue
  2. 1 1
      src/views/strategy/bomBox.vue

+ 2 - 2
src/views/strategy/animationBox.vue

@@ -130,8 +130,8 @@ export default {
                 this.dataY2.push(el.meanTindoor == '-9999' ? undefined : el.meanTindoor)
                 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.loadY2.push(el.predictedLoadUpLimit != '-9999' && el.predictedLoadUpLimit != '-9998' ? el.predictedLoadUpLimit : undefined)
+                this.loadY3.push(el.redictedLoadDownLimit != '-9999' && el.redictedLoadDownLimit != '-9998' ? el.redictedLoadDownLimit : undefined)
                 let arr = []
                 arr = arr
                     .concat(this.dataY1)

+ 1 - 1
src/views/strategy/bomBox.vue

@@ -9,7 +9,7 @@
             <div
                 class='bomb-left2'
                 v-if='data.openTime'
-            >开机时间 {{data.openTime?(data.openTime.slice(0,2)+":"+ data.openTime.slice(2,4)):'--'}} - {{data.openTime?(data.openTime.slice(0,2)+":"+ data.openTime.slice(2,4)):'--'}}</div>
+            >开机时间 {{data.onTime?(data.onTime.slice(0,2)+":"+ data.onTime.slice(2,4)):'--'}} - {{data.onTime?(data.onTime.slice(0,2)+":"+ data.onTime.slice(2,4)):'--'}}</div>
             <div
                 class='bomb-left2'
                 v-else-if='data.offTime'