测试页面布局更新

src/components/Test.vue

@@ -10,9 +10,6 @@
         ></my-input>
         <p>g/min</p>
       </div>
-      <!-- <div class="btn_wrap">
-        <div class="open style-btn" @click="actionSprayLiquidPumpGPMValueChange">更新</div>
-      </div> -->
       <div class="btn_wrap" style="margin-left:10px;">
         <div
           :class="sprayLiquidPumpGPMValue >= 0 ? 'open style-btn mg' : 'close style-btn mg'"
@@ -35,35 +32,20 @@
       </div>
     </div>
 
-    <!-- 气密性空压机 -->
     <div class="common_set switch_wrap">
-      <p class="title">气密性空压机</p>
+      <p class="title">加热片通断电磁阀</p>
       <div class="btn_wrap">
         <div
-          :class="airCompressorPowerCtrl === 1 ? 'open style-btn mg' : 'close style-btn mg'"
-          @click="airTightnessTestAirCompressorPowerCtrl(1)"
+          :class="1 === heaterCtrl ? 'open style-btn mg' : 'close style-btn mg'"
+          @click="actionHeaterCtrlUpdate(1)"
         >打开</div>
         <div
-          :class="airCompressorPowerCtrl == 0 ? 'open style-btn' : 'close style-btn'"
-          @click="airTightnessTestAirCompressorPowerCtrl(0)"
+          :class="0 === heaterCtrl ? 'open style-btn' : 'close style-btn'"
+          @click="actionHeaterCtrlUpdate(0)"
         >关闭</div>
       </div>
     </div>
 
-    <!-- 风机 -->
-    <!-- <div class="common_set switch_wrap">
-      <p class="title"> 风机</p>
-      <div class="btn_wrap">
-        <div class="style-btn"
-          :class="50 === miniPwmBlowerCtrl ? 'open  mg' : 'close style-btn mg'"
-          @click="actionMiniPwmBlowerCtrl(50)"
-        >打开</div>
-        <div
-          :class="0 == miniPwmBlowerCtrl ? 'open style-btn ' : 'close style-btn'"
-          @click="actionMiniPwmBlowerCtrl(0)"
-        >关闭</div>
-      </div>
-    </div> -->
     <div class="common_set switch_wrap">
       <p class="title"> 风机</p>
       <div class="num">
@@ -85,27 +67,18 @@
       </div>
     </div>
 
-    <!-- 加热片 -->
     <div class="common_set switch_wrap">
-      <p class="title">加热片控制</p>
+      <p class="title">加热片安全电磁阀控制</p>
       <div class="btn_wrap">
-        <div
-          :class="1 === heaterCtrl ? 'open style-btn mg' : 'close style-btn mg'"
-          @click="actionHeaterCtrlUpdate(1)"
+        <div :class="heaterCtrlSafeValve == 1 ? 'open style-btn mg' : 'close style-btn mg'"
+          @click="actionHeaterCtrlSafeValveUpdate(1)"
         >打开</div>
-        <div
-          :class="0 === heaterCtrl ? 'open style-btn' : 'close style-btn'"
-          @click="actionHeaterCtrlUpdate(0)"
+        <div :class="heaterCtrlSafeValve == 0 ? 'open style-btn' : 'close style-btn'"
+          @click="actionHeaterCtrlSafeValveUpdate(0)"
         >关闭</div>
       </div>
     </div>
 
-
-
-
-
-
-    <!-- 喷液空压机控制 -->
     <div class="common_set switch_wrap">
       <p class="title">喷液空压机控制</p>
       <div class="btn_wrap">
@@ -117,35 +90,33 @@
         >关闭</div>
       </div>
     </div>
+
+    <div class="common_set info_wrap">
+      <p class="title">加热片</p>
+      <p class="info">电流 {{ testStore.heatingStripCurrent }} A</p>
+      <p class="info">湿度 {{ testStore.heatingStripTemperature }} ℃</p>
+    </div>
     
-    <!-- 加热空压机安全电磁阀控制 -->
     <div class="common_set switch_wrap">
-      <p class="title">加热空压机安全电磁阀控制</p>
+      <p class="title">气密性测试空压机控制</p>
       <div class="btn_wrap">
-        <div :class="heaterCtrlSafeValve == 1 ? 'open style-btn mg' : 'close style-btn mg'"
-          @click="actionHeaterCtrlSafeValveUpdate(1)"
+        <div
+          :class="airCompressorPowerCtrl === 1 ? 'open style-btn mg' : 'close style-btn mg'"
+          @click="airTightnessTestAirCompressorPowerCtrl(1)"
         >打开</div>
-        <div :class="heaterCtrlSafeValve == 0 ? 'open style-btn' : 'close style-btn'"
-          @click="actionHeaterCtrlSafeValveUpdate(0)"
+        <div
+          :class="airCompressorPowerCtrl == 0 ? 'open style-btn' : 'close style-btn'"
+          @click="airTightnessTestAirCompressorPowerCtrl(0)"
         >关闭</div>
       </div>
     </div>
+
     <div class="common_set update_wrap pressure">
-      <div class="title"> 压力1 <p class="num">{{ testStore.pressureSensor1 }}</p></div>
-      <div class="title"> 压力2 <p class="num">{{ testStore.pressureSensor2 }}</p></div>
-      <div class="title"> 压力3 <p class="num">{{ testStore.pressureSensor3 }}</p></div>
-    </div>
-    <div class="common_set info_wrap">
-      <p class="title">加热片</p>
-      <p class="info">电流 {{ testStore.heatingStripCurrent }} A</p>
-      <p class="info">湿度 {{ testStore.heatingStripTemperature }} ℃</p>
-    </div>
-    <div class="common_set info_wrap">
-      <p class="title">仓内</p>
-      <p class="info">温度 {{ deviceStore.binTemperature }} ℃</p>
-      <p class="info">湿度 {{ deviceStore.binHumidity }} ℃</p>
-      <p class="info">过氧化氢浓度 {{ deviceStore.binHP }} PPM</p>
+      <div class="title"> 气路压力计 <p class="num">{{ testStore.pressureSensor1 }}</p></div>
+      <div class="title"> 液路前端压力计 <p class="num">{{ testStore.pressureSensor2 }}</p></div>
+      <div class="title"> 液路后端压力计 <p class="num">{{ testStore.pressureSensor3 }}</p></div>
     </div>
+
     <div class="common_set switch_wrap">
       <p class="title">通道切换</p>
       <div class="btn_wrap">
@@ -163,6 +134,14 @@
         >消毒</div>
       </div>
     </div>
+
+    <div class="common_set info_wrap">
+      <p class="title">仓内</p>
+      <p class="info">温度 {{ deviceStore.binTemperature }} ℃</p>
+      <p class="info">湿度 {{ deviceStore.binHumidity }} ℃</p>
+      <p class="info">过氧化氢浓度 {{ deviceStore.binHP }} PPM</p>
+    </div>
+    
     <van-number-keyboard
       v-model="addLiquidVal"
       @input="val => handleInput(val, 1)"