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

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

@@ -48,15 +48,16 @@
             <div class='rightL'>
                 <div class='rightLengend'>
                     <i class='reactCool'></i> 实际供冷量
-                    <i class='preCool'></i> 预测冷量
+                    <i class='preCool'></i>
+                    预测冷量
                 </div>
                 <div id='rightLine' style='width:100%;height:350px;'></div>
             </div>
         </div>
 
-        <div class='side-r' :class='data.hasOwnProperty("isExcuted")?(data.isExecuted?"green":"red"):"gray"'>
+        <div class='side-r' :class='chillerCommandQ.hasOwnProperty("isExecuted")?(chillerCommandQ.isExecuted?"green":"red"):"gray"'>
             <div v-if='!showDraw' class='float-r' @click='showDraw = true'>
-                <div class='float-line' :class='data.hasOwnProperty("isExcuted")?(data.isExecuted?"green":"red"):"gray"'></div>
+                <div class='float-line' :class='chillerCommandQ.hasOwnProperty("isExecuted")?(chillerCommandQ.isExecuted?"green":"red"):"gray"'></div>
                 <img src='../../assets/open.png' alt />
                 <p>当前策略</p>
             </div>

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

@@ -1,11 +1,11 @@
 <template>
     <div class='bomb'>
-        <div class='bomb-line' :class='data.hasOwnProperty("isExcuted")?(data.isExecuted?"green":"red"):"gray"'></div>
+        <div class='bomb-line' :class='data.hasOwnProperty("isExecuted")?(data.isExecuted?"green":"red"):"gray"'></div>
         <div class='close' @click='$emit("close")'>
             <img src='../../assets/close.png' alt />
         </div>
         <div class='bomb-left'>
-            <div class='bomb-left1'>当前策略</div>
+            <div class='bomb-left1'>当前策略{{data.isExecuted}}</div>
             <div
                 class='bomb-left2'
             >开机时间 {{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>