zhulizhen 5 years ago
parent
commit
4afec87037

+ 1 - 0
src/views/doBusiness/index.vue

@@ -27,6 +27,7 @@
           </el-time-picker>
         </div>
         </template>
+
         <div class="dataJoin">{{ data.day.split('-').slice(2).join('')}}</div>
       </template>
     </el-calendar>

+ 22 - 7
src/views/evaluate/evIndoorTemperature.vue

@@ -49,21 +49,36 @@ export default {
             el.energySavingRate ? el.energySavingRate.toFixed(2) : 0
           );
           if (el.chillerExecuteRateReal >= 75) {
+            //绿色
             this.strategy1.push(2);
-          } else {
+            this.strategy2.push(null);
+            this.strategy3.push(null);
+          } else if (el.chillerExecuteRate >= 75) {
+            // 灰色
             this.strategy1.push(null);
-          }
-          if (el.chillerExecuteRate >= 75) {
-            this.strategy2.push(2);
-          } else {
             this.strategy2.push(null);
-          }
-          if (el.chillerExecuteRateReal < 75 || el.chillerExecuteRate < 75) {
             this.strategy3.push(2);
           } else {
+            this.strategy1.push(null);
+            this.strategy2.push(2);
             this.strategy3.push(null);
           }
+          // if (el.chillerExecuteRateReal < 75 && el.chillerExecuteRate >= 75) {
+          //   //红色
+          //   this.strategy2.push(2);
+          // } else {
+          //   this.strategy2.push(null);
+          // }
+          // if (el.chillerExecuteRateReal < 75 || el.chillerExecuteRate < 75) {
+          //   //灰色
+          //   this.strategy3.push(2);
+          // } else {
+          //   this.strategy3.push(null);
+          // }
         });
+         console.log(this.strategy1)
+          console.log(this.strategy2)
+          console.log(this.strategy3)
         this.drawIt();
       }
     },

+ 5 - 9
src/views/strategy/animationBox.vue

@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div class="side-r" v-if="data.isExecuted!=0">
+    <div class="side-r" v-if="data.isExecuted">
       <div v-if="!showDraw" class="float-r" @click="showDraw = true">
         <img src="../../assets/open.png" alt />
         <p>当前策略</p>
@@ -85,19 +85,15 @@ export default {
         el.value = el.time.slice(0, 2) + ":" + el.time.slice(2, 4);
         this.dataX.push(el.value);
         this.loadX.push(el.value);
-        this.dataY1.push(el.tout);
+        this.dataY1.push(el.tout=='-9999'?0:el.tout);
         this.dataY2.push(el.meanTindoor);
         this.dataY3.push(el.maxTindoor);
         this.loadY1.push(
-          el.nowPlantLoad
-            ? el.nowPlantLoad == "-9999"
-              ? "-9999"
-              : el.nowPlantLoad
-            : 0
+          el.nowPlantLoad == '-9999'?0:wl.nowPlantLoad
         );
-        this.loadY2.push(el.predictedLoadUpLimit ? el.predictedLoadUpLimit : 0);
+        this.loadY2.push(el.predictedLoadUpLimit!='-9999' ? el.predictedLoadUpLimit : 0);
         this.loadY3.push(
-          el.redictedLoadDownLimit ? el.redictedLoadDownLimit : 0
+          el.redictedLoadDownLimit!='-9999' ? el.redictedLoadDownLimit : 0
         );
       });
     },