update

src/views/strategy/index.vue

@@ -28,7 +28,12 @@
             <div class='starte-right'>
                 <p class='strate-right-title'>当前状态</p>
                 <water-unit :data='chillerOrg ' :type='1'></water-unit>
-                <animation-box :data='chillerCommand' :chillerHourList='chillerHourList' :chillerCommandQ='chillerCommand'></animation-box>
+                <animation-box
+                    v-if='Object.keys(chillerCommand).length>0||chillerHourList.length>0'
+                    :data='chillerOrg'
+                    :chillerHourList='chillerHourList'
+                    :chillerCommandQ='chillerCommand'
+                ></animation-box>
             </div>
         </div>
         <el-dialog title='提示' :visible.sync='showTodayStrategy' width='1260px'>
@@ -93,7 +98,7 @@ export default {
                 console.log(res)
                 this.chillerCount = res.chillerCount || 0
                 this.chillerIsNotExecutedCount = res.chillerIsNotExecutedCount ? res.chillerIsNotExecutedCount : 0
-                this.chillerOrg = res.chillerOrg
+                this.chillerOrg = res.chillerOrg || {}
                 this.chillerCommand = res.chillerCommand || {}
                 this.chillerHourList = res.chillerHourList
             })

src/views/strategy/waterUnit.vue

@@ -15,8 +15,9 @@
                     <font
                         v-if='type==1'
                         :class='data.chillWaterOutTempSetOrg=="-9999"?"reds":""'
-                    >{{formatterRes(data.chillWaterOutTempSetOrg,true,1)}} ℃</font>
-                    <font v-if='type==2' :class='data.chillWaterOutTempSet=="-9999"?"reds":""'>{{formatterRes(data.chillWaterOutTempSet,true,1)}} ℃</font>
+                    >{{formatterRes(data.chillWaterOutTempSetOrg,true,1)}}</font>
+                    <font v-if='type==2' :class='data.chillWaterOutTempSet=="-9999"?"reds":""'>{{formatterRes(data.chillWaterOutTempSet,true,1)}}</font>
+                    ℃
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
@@ -37,8 +38,9 @@
                     <font v-if='type==2' :class='data.coolPumpNumSetS=="-9999"?"reds":""'>{{formatterRes(data.coolPumpNumSetS,true,0)}}</font>
                 </p>
                 <p>
-                    <font v-if='type==1' :class='data.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpFreqSetOrg,false,0)}} HZ</font>
-                    <font v-if='type==2' :class='data.coolPumpFreqSet=="-9999"?"reds":""'>{{formatterRes(data.coolPumpFreqSet,false,0)}} HZ</font>
+                    <font v-if='type==1' :class='data.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpFreqSetOrg,false,0)}}</font>
+                    <font v-if='type==2' :class='data.coolPumpFreqSet=="-9999"?"reds":""'>{{formatterRes(data.coolPumpFreqSet,false,0)}}</font>
+                    HZ
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
@@ -59,8 +61,9 @@
                     <font v-if='type==2' :class='data.chillPumpNumSetS=="-9999"?"reds":""'>{{formatterRes(data.chillPumpNumSetS,true,0)}}</font>
                 </p>
                 <p>
-                    <font v-if='type==1' :class='data.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpFreqSetOrg,false,0)}} HZ</font>
-                    <font v-if='type==2' :class='data.chillPumpFreqSet=="-9999"?"reds":""'>{{formatterRes(data.chillPumpFreqSet,false,0)}} HZ</font>
+                    <font v-if='type==1' :class='data.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpFreqSetOrg,false,0)}}</font>
+                    <font v-if='type==2' :class='data.chillPumpFreqSet=="-9999"?"reds":""'>{{formatterRes(data.chillPumpFreqSet,false,0)}}</font>
+                    HZ
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
@@ -81,8 +84,9 @@
                     <font v-if='type==2' :class='data.coolTowerNumSetS=="-9999"?"reds":""'>{{formatterRes(data.coolTowerNumSetS,true,0)}}</font>
                 </p>
                 <p>
-                    <font v-if='type==1' :class='data.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerFreqSetOrg,false,0)}} HZ</font>
-                    <font v-if='type==2' :class='data.coolTowerFreqSet=="-9999"?"reds":""'>{{formatterRes(data.coolTowerFreqSet,false,0)}} HZ</font>
+                    <font v-if='type==1' :class='data.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerFreqSetOrg,false,0)}}</font>
+                    <font v-if='type==2' :class='data.coolTowerFreqSet=="-9999"?"reds":""'>{{formatterRes(data.coolTowerFreqSet,false,0)}}</font>
+                    HZ
                 </p>
             </div>
             <div class='starte-right-box-1-content'>