update

src/views/strategy/index.vue

@@ -94,7 +94,7 @@ export default {
                 this.chillerCount = res.chillerCount || 0
                 this.chillerIsNotExecutedCount = res.chillerIsNotExecutedCount ? res.chillerIsNotExecutedCount : 0
                 this.chillerOrg = res.chillerOrg
-                this.chillerCommand = res.chillerOrg || {}
+                this.chillerCommand = res.chillerCommand || {}
                 this.chillerHourList = res.chillerHourList
             })
         },

src/views/strategy/waterUnit.vue

@@ -4,13 +4,19 @@
             <div class='starte-right-box-1-title' :class='type==2?"title1":""'>冷水机组</div>
             <div class='starte-right-box-1-content1' v-if='data'>
                 <p>
-                    <font :class='data.chillerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.chillerNumSetLOrg,true,0)}}</font>
+                    <font v-if='type==1' :class='data.chillerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.chillerNumSetLOrg,true,0)}}</font>
+                    <font v-if='type==2' :class='data.chillerNumSetL=="-9999"?"reds":""'>{{formatterRes(data.chillerNumSetL,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.chillerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.chillerNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==1' :class='data.chillerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.chillerNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==2' :class='data.chillerNumSetS=="-9999"?"reds":""'>{{formatterRes(data.chillerNumSetS,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.chillWaterOutTempSetOrg=="-9999"?"reds":""'>{{formatterRes(data.chillWaterOutTempSetOrg,true,1)}}</font> ℃
+                    <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>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
@@ -23,13 +29,16 @@
             <div class='starte-right-box-1-title' :class='type==2?"title1":""'>冷冻水泵</div>
             <div class='starte-right-box-1-content1' v-if='data'>
                 <p>
-                    <font :class='data.coolPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpNumSetLOrg ,true,0)}}</font>
+                    <font v-if='type==1' :class='data.coolPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpNumSetLOrg ,true,0)}}</font>
+                    <font v-if='type==2' :class='data.coolPumpNumSetL=="-9999"?"reds":""'>{{formatterRes(data.coolPumpNumSetL,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.coolPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==1' :class='data.coolPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==2' :class='data.coolPumpNumSetS=="-9999"?"reds":""'>{{formatterRes(data.coolPumpNumSetS,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpFreqSetOrg,false,0)}}</font> HZ
+                    <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>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
@@ -42,13 +51,16 @@
             <div class='starte-right-box-1-title' :class='type==2?"title1":""'>冷却水泵</div>
             <div class='starte-right-box-1-content1' v-if='data'>
                 <p>
-                    <font :class='data.chillPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpNumSetLOrg,true,0)}}</font>
+                    <font v-if='type==1' :class='data.chillPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpNumSetLOrg,true,0)}}</font>
+                    <font v-if='type==2' :class='data.chillPumpNumSetL=="-9999"?"reds":""'>{{formatterRes(data.chillPumpNumSetL,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.chillPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==1' :class='data.chillPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==2' :class='data.chillPumpNumSetS=="-9999"?"reds":""'>{{formatterRes(data.chillPumpNumSetS,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpFreqSetOrg,false,0)}}</font> HZ
+                    <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>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
@@ -61,13 +73,16 @@
             <div class='starte-right-box-1-title' :class='type==2?"title1":""'>冷却塔</div>
             <div class='starte-right-box-1-content1' v-if='data'>
                 <p>
-                    <font :class='data.coolTowerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerNumSetLOrg,true,0)}}</font>
+                    <font v-if='type==1' :class='data.coolTowerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerNumSetLOrg,true,0)}}</font>
+                    <font v-if='type==2' :class='data.coolTowerNumSetL=="-9999"?"reds":""'>{{formatterRes(data.coolTowerNumSetL,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.coolTowerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==1' :class='data.coolTowerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerNumSetSOrg,true,0)}}</font>
+                    <font v-if='type==2' :class='data.coolTowerNumSetS=="-9999"?"reds":""'>{{formatterRes(data.coolTowerNumSetS,true,0)}}</font>
                 </p>
                 <p>
-                    <font :class='data.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerFreqSetOrg,false,0)}}</font> HZ
+                    <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>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>