优化生活水泵界面

src/views/hotWater/waterMonitor/waterMonitorDetails.vue

@@ -588,9 +588,9 @@
                 src="../../../assets/flowimg/supply-move3.gif"
                 alt=""
                 v-if="
-                  [1, 2, '1', '2'].includes(threePumpObj.upWaterState1) ||
+                  [1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState1) ||
-                  [1, 2, '1', '2'].includes(threePumpObj.upWaterState2) ||
+                  [1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState2) ||
-                  [1, 2, '1', '2'].includes(threePumpObj.upWaterState3)
+                  [1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState3)
                 "
               />
               <img
@@ -604,11 +604,11 @@
                 class="warning"
                 src="../../../assets/images/warning.png"
                 alt=""
-                v-if="[1, '1'].includes(threePumpObj.isWarning)"
+                v-if="[1, '1','1.000'].includes(threePumpObj.isWarning)"
               />
               <div
                 class="flow-text warning-text"
-                v-if="[1, '1'].includes(threePumpObj.isWarning)"
+                v-if="[1, '1','1.000'].includes(threePumpObj.isWarning)"
               >
                 当前有报警信号触发
               </div>
@@ -618,11 +618,11 @@
                 class="coolpum1"
                 src="../../../assets/flowimg/startpum.png"
                 alt=""
-                v-if="[1, 2, '1', '2'].includes(threePumpObj.upWaterState1)"
+                v-if="[1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState1)"
               />
               <img
                 class="coolpum1"
-                v-else-if="[3, '3'].includes(threePumpObj.upWaterState1)"
+                v-else-if="[3, '3','3.000'].includes(threePumpObj.upWaterState1)"
                 src="../../../assets/flowimg/badpum.png"
                 alt=""
               />
@@ -635,8 +635,8 @@
               <div class="pumpName1 flow-text">
                 泵1<span
                   class="pumpHz flow-text"
-                  v-if="[1, 2, '1', '2'].includes(threePumpObj.upWaterState1)"
+                  v-if="[1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState1)"
-                  >:{{ threePumpObj.upWaterState1.freq1 }}Hz</span
+                  >:{{ Number(threePumpObj.freq1) }}Hz</span
                 >
               </div>
               <!-- 泵2定位 -->
@@ -644,7 +644,7 @@
                 class="coolpum2"
                 src="../../../assets/flowimg/startpum.png"
                 alt=""
-                v-if="[1, 2, '1', '2'].includes(threePumpObj.upWaterState2)"
+                v-if="[1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState2)"
               />
               <img
                 class="coolpum2"
@@ -661,8 +661,8 @@
               <div class="pumpName2 flow-text">
                 泵2<span
                   class="pumpHz flow-text"
-                  v-if="[1, 2, '1', '2'].includes(threePumpObj.upWaterState2)"
+                  v-if="[1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState2)"
-                  >:{{ threePumpObj.upWaterState1.freq2 }}Hz</span
+                  >:{{ Number(threePumpObj.freq2) }}Hz</span
                 >
               </div>
               <!-- 泵3定位 -->
@@ -670,11 +670,11 @@
                 class="coolpum3"
                 src="../../../assets/flowimg/startpum.png"
                 alt=""
-                v-if="[1, 2, '1', '2'].includes(threePumpObj.upWaterState3)"
+                v-if="[1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState3)"
               />
               <img
                 class="coolpum3"
-                v-else-if="[3, '3'].includes(threePumpObj.upWaterState3)"
+                v-else-if="[3, '3','3.000'].includes(threePumpObj.upWaterState3)"
                 src="../../../assets/flowimg/badpum.png"
                 alt=""
               />
@@ -687,8 +687,8 @@
               <div class="pumpName3 flow-text">
                 泵3<span
                   class="pumpHz flow-text"
-                  v-if="[1, 2, '1', '2'].includes(threePumpObj.upWaterState3)"
+                  v-if="[1, 2, '1', '2', '1.000', '2.000'].includes(threePumpObj.upWaterState3)"
-                  >:{{ threePumpObj.upWaterState1.freq3 }}Hz</span
+                  >:{{ Number(threePumpObj.freq3) }}Hz</span
                 >
               </div>
               <!-- 冷水水箱定位 -->