注氮单位

src/views/vent/monitorManager/compressor/components/nitrogenHome1.vue

@@ -21,14 +21,14 @@
           <div class="monitor-item">
             <span class="monitor-title">累计流量:</span>
             <span class="monitor-val"
-              ><span class="val">{{ monitorData[groupNum - 1]['FluxTotal1'] ? monitorData[groupNum - 1]['FluxTotal1'].toFixed(2) : '-' }}</span
-              ><span class="unit">m³</span></span
+              ><span class="val">{{ monitorData[groupNum - 1]['FluxTotal1'] ? monitorData[groupNum - 1]['FluxTotal1'] ?  parseFloat(monitorData[groupNum - 1]['FluxTotal1']).toFixed(2) : '-' : '-' }}</span
+              ><span class="unit">m³/h</span></span
             >
           </div>
           <div class="monitor-item">
             <span class="monitor-title">氮气纯度:</span>
             <span class="monitor-val"
-              ><span class="val">{{ monitorData[groupNum - 1]['NitrogenPurity'] ? monitorData[groupNum - 1]['NitrogenPurity'].toFixed(2) : '-' }}</span
+              ><span class="val">{{ monitorData[groupNum - 1]['NitrogenPurity'] ? monitorData[groupNum - 1]['NitrogenPurity'] ? parseFloat(monitorData[groupNum - 1]['NitrogenPurity']).toFixed(2) : '-' : '-' }}</span
               ><span class="unit">%</span></span
             >
           </div>
@@ -75,7 +75,7 @@
                       <span class="state-title">{{ Object.values(data)[0] }} :</span>
                       <span class="state-val">{{
                         (monitorData.length > 0 && monitorData[groupNum - 1][Object.keys(data)[0]]) >= 0
-                          ? monitorData[groupNum - 1][Object.keys(data)[0]].toFixed(2)
+                          ? monitorData[groupNum - 1][Object.keys(data)[0]] ?  parseFloat(monitorData[groupNum - 1][Object.keys(data)[0]]).toFixed(2) : '-'
                           : '-'
                       }}</span>
                     </div>
@@ -83,7 +83,7 @@
                       <span class="state-title">{{ Object.values(data)[1] }} :</span>
                       <span class="state-val">{{
                         (monitorData.length > 0 && monitorData[groupNum - 1][Object.keys(data)[1]]) >= 0
-                          ? monitorData[groupNum - 1][Object.keys(data)[1]].toFixed(2)
+                          ? monitorData[groupNum - 1][Object.keys(data)[1]] ? parseFloat(monitorData[groupNum - 1][Object.keys(data)[1]]).toFixed(2) : '-'
                           : '-'
                       }}</span>
                     </div>
@@ -127,14 +127,32 @@
                 <div class="control-item" v-for="(groupNum, index) in monitorDataGroupNum" :key="groupNum">
                   <div class="control-item-title">{{ monitorData[groupNum - 1]['strname'] }}</div>
                   <div class="control-item-state">
-                    <a-switch
+                    <!-- <a-switch
                       v-model="airCompressorState[groupNum - 1][`compressRunSigF1`]"
                       size="small"
                       checked-children="开启"
                       un-checked-children="关闭"
                       :disabled="airCompressorState[groupNum - 1][`controlModel`]"
                       @change="handlerDevice(airCompressorState[groupNum - 1], index)"
-                    />
+                    /> -->
+                    <a-button v-if="index==0" size="small"  type="text" style="color: #fff;" @click="handlerDevice(airCompressorState[groupNum - 1],false)">一键启停</a-button>
+                    <a-button v-else size="small"  type="text" style="color: #fff;" @click="handlerDevice(airCompressorState[groupNum - 1], false)">一键启停</a-button>
+                 
+                  </div>
+                </div>
+                <div class="control-item" v-for="(groupNum, index) in monitorDataGroupNum" :key="groupNum">
+                  <div class="control-item-title">{{ monitorData[groupNum - 1]['strname'] }}</div>
+                  <div class="control-item-state">
+                    <!-- <a-switch
+                      v-model="airCompressorState[groupNum - 1][`compressRunSigF1`]"
+                      size="small"
+                      checked-children="开启"
+                      un-checked-children="关闭"
+                      :disabled="airCompressorState[groupNum - 1][`controlModel`]"
+                      @change="handlerDevice(airCompressorState[groupNum - 1], index)"
+                    /> -->
+                    <a-button v-if="index==0" size="small"  type="text" style="color: #fff;" @click="handlerDevice(airCompressorState[groupNum - 1],true)">一键复位</a-button>
+                    <a-button v-else size="small"  type="text" style="color: #fff;" @click="handlerDevice(airCompressorState[groupNum - 1],true)">一键复位</a-button>
                   </div>
                 </div>
               </div>
@@ -189,7 +207,7 @@
   const loading = ref(true);
   let kzParam = reactive<any>({
     data: {},
-    activeIndex: 0,
+    isFw:null,
   });
   // const kyjs = ['1号空压机', '1号空压机', '1号空压机', '1号空压机'];
 
@@ -270,6 +288,7 @@
   async function getDataSource(systemID) {
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     console.log(res, 'res---------------');
+   
     if (res) {
       const result = res;
       if (!result || result.msgTxt.length < 1) return;
@@ -291,8 +310,8 @@
             airCompressorState.push({
               id: v.deviceID,
               deviceType:v.deviceType,
-              compressRunSigF1: false,
-              controlModel: false,
+              HMIReset:v.readData.HMIReset,
+              HMIStartStop:v.readData.HMIStartStop
             });
           });
         }
@@ -302,19 +321,21 @@
     }
   }
 
-  function handlerDevice(data, index) {
+  function handlerDevice(data,bol) {
+    console.log(bol,'bol-------')
     kzParam.data = data;
-    kzParam.activeIndex = index;
-    if (index == 1) {
+    kzParam.isFw = bol;
+    console.log(kzParam,'kz--------')
+    if ( bol) {
       modalTitle.value = '一键复位';
       modalType.value = '1';
       modalIsShow.value = true;
-      kzParam.data.compressRunSigF1 = !kzParam.data.compressRunSigF1;
+      kzParam.data.HMIReset=!data.HMIReset
     } else {
       modalTitle.value = '一键启停';
       modalType.value = '2';
       modalIsShow.value = true;
-      kzParam.data.compressRunSigF1 = !kzParam.data.compressRunSigF1;
+      kzParam.data.HMIStartStop =!data.HMIStartStop;
     }
   }
   function handleOK(passWord, handlerState) {
@@ -325,19 +346,19 @@
     // }
 
     let data = {};
-    if (kzParam.activeIndex == 1) {
+    if (kzParam.isFw ) {
       data = {
         deviceid: kzParam.data.id,
         devicetype:kzParam.data.deviceType,
         password: passWord,
-        HMIReset: kzParam.data.compressRunSigF1,
+        HMIReset: kzParam.data.HMIReset,
       };
     } else {
       data = {
         deviceid: kzParam.data.id,
         password: passWord,
         devicetype:kzParam.data.deviceType,
-        HMIStartStop: kzParam.data.compressRunSigF1,
+        HMIStartStop: kzParam.data.HMIStartStop,
       };
     }
 
@@ -621,6 +642,7 @@
             flex-wrap: wrap;
 
             .control-item {
+              width: 50%;//lxh
               display: flex;
               flex-direction: column;
               justify-content: center;

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -457,14 +457,13 @@ function goDetail(record?) {
     } else if (systemType.value.indexOf("sys_surface_junya") != -1) {
       const newPage = router.resolve({ path: '/monitorChannel/balancePress-home', query: { id: systemID.value } })
       window.open(newPage.href, '_blank')
-    } else if (systemType.value.indexOf("sys_nitrogen") != -1) {
+    } else if (systemType.value.indexOf("pump_under") != -1 || systemType.value.indexOf("pump_over") != -1) {
       const newPage = router.resolve({ path: '/compressor-home', query: { id: systemID.value } })
       window.open(newPage.href, '_blank')
     } else {
       message.info('待开发。。。')
     }
   }
-
 }
 
 function toHome() {

src/views/vent/monitorManager/gasPumpMonitor/gasPump.data.ts

@@ -92,19 +92,19 @@ export const dewateringPumpData = [
 export const valveCtrlType = [
   {
     title: '进水阀',
-    code: 'WaterInValve',
+    code: 'WaterInValve1',
   },
   {
     title: '排水阀',
-    code: 'WaterOutValve',
+    code: 'WaterOutValve2',
   },
   {
     title: '进气阀',
-    code: 'AirInValve',
+    code: 'AirInValve1',
   },
   {
     title: '排气阀',
-    code: 'AirOutValve',
+    code: 'AirOutValve2',
   },
 ];