Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/monitorManager/gasPumpMonitor/components/gasPumpHomeCC.vue

@@ -317,13 +317,15 @@
   watch(
     () => props.deviceType,
     () => {
-      nextTick(async () => {
-        if (props.deviceType == 'pump_over') {
-          setModelType('gasPump');
-        } else if (props.deviceType?.startsWith('pump_under')) {
-          setModelType('gasPumpUnder');
-        }
-        deviceProperty.value = await getMonitorData(props.deviceType);
+      getMonitorData(props.deviceType).then((data) => {
+        deviceProperty.value = data;
+        nextTick(() => {
+          if (props.deviceType == 'pump_over') {
+            setModelType('gasPump');
+          } else if (props.deviceType?.startsWith('pump_under')) {
+            setModelType('gasPumpUnder');
+          }
+        });
       });
     }
   );

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

@@ -305,7 +305,7 @@ export const getModelMonitorTags = () => {
           code: 'DRS13_GVL1_OpenLimit',
           type: 'sign',
           // value: '0',
-          position: [-5.26, 0.28, 0.6],
+          position: [-8.75, 0.3, 0.6],
         },
         {
           domId: 'jsf2',
@@ -313,7 +313,7 @@ export const getModelMonitorTags = () => {
           code: 'DRS13_GVL2_OpenLimit',
           type: 'sign',
           // value: '0',
-          position: [-8.75, 0.3, 0.6],
+          position: [-5.26, 0.28, 0.6],
         },
         {
           domId: 'csf1',
@@ -321,7 +321,7 @@ export const getModelMonitorTags = () => {
           code: 'DRS13_GVL1_OpenLimit',
           type: 'sign',
           // value: '0',
-          position: [-5.74, 0.35, 0.27],
+          position: [-9.42, 0.35, 0.3],
         },
         {
           domId: 'csf2',
@@ -329,39 +329,39 @@ export const getModelMonitorTags = () => {
           code: 'DRS13_GVL2_OpenLimit',
           type: 'sign',
           // value: '0',
-          position: [-9.42, 0.35, 0.3],
+          position: [-5.74, 0.35, 0.27],
         },
         {
           domId: 'jqf1',
-          title: '进气阀1#开度',
+          title: '进气阀1#',
           code: 'DRS13_GVL4_OpenLimit',
-          type: 'value',
+          type: 'sign',
           // value: '0',
-          position: [-4.41, 1.28, 0.03],
+          position: [-7.7, 1.31, -0.14],
         },
         {
           domId: 'jqf2',
-          title: '进气阀2#开度',
+          title: '进气阀2#',
           code: 'DRS13_GVL6_OpenLimit',
-          type: 'value',
+          type: 'sign',
           // value: '0',
-          position: [-7.7, 1.31, -0.14],
+          position: [-4.41, 1.28, 0.03],
         },
         {
           domId: 'cqf1',
-          title: '出气阀1#开度',
-          code: 'DRS13_GVL43_OpenLimit',
-          type: 'value',
+          title: '出气阀1#',
+          code: 'DRS13_GVL3_OpenLimit',
+          type: 'sign',
           // value: '0',
-          position: [-6.2, 1.55, 0.06],
+          position: [-9.58, 1.55, -0.13],
         },
         {
           domId: 'cqf2',
-          title: '出气阀2#开度',
+          title: '出气阀2#',
           code: 'DRS13_GVL5_OpenLimit',
-          type: 'value',
+          type: 'sign',
           // value: '0',
-          position: [-9.58, 1.55, -0.13],
+          position: [-6.2, 1.55, 0.06],
         },
       ];
     case 'sdmtjtcctrk': // 布尔台
@@ -522,8 +522,8 @@ export function getComponent() {
 }
 
 export async function getMonitorData(deviceType) {
-  // const { sysOrgCode } = useGlobSetting();
-  const sysOrgCode = 'sdmtjtcctmk';
+  const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtcctmk';
   switch (sysOrgCode) {
     case 'sdmtjtcctmk':
       return await import('./gasPump.dataCc');

src/views/vent/monitorManager/gasPumpMonitor/gasPump.threejs.under.ts

@@ -120,11 +120,11 @@ class gasPumpUnder {
       this.airInR?.showElement();
       this.airInL?.showElement();
     } else if (jqf1Open) {
-      this.airInB?.showElement();
-      this.airInR?.showElement();
-    } else if (jqf2Open) {
       this.airInA?.showElement();
       this.airInL?.showElement();
+    } else if (jqf2Open) {
+      this.airInB?.showElement();
+      this.airInR?.showElement();
     }
 
     // 出气动画控制
@@ -136,11 +136,11 @@ class gasPumpUnder {
       this.airOutR?.showElement();
       this.airOutL?.showElement();
     } else if (cqf1Open) {
-      this.airOutB?.showElement();
-      this.airOutR?.showElement();
-    } else if (cqf2Open) {
       this.airOutA?.showElement();
       this.airOutL?.showElement();
+    } else if (cqf2Open) {
+      this.airOutB?.showElement();
+      this.airOutR?.showElement();
     }
 
     // 进水动画控制
@@ -152,11 +152,11 @@ class gasPumpUnder {
       this.waterInR?.showElement();
       this.waterInL?.showElement();
     } else if (jsf1Open) {
-      this.waterInB?.showElement();
-      this.waterInR?.showElement();
-    } else if (jsf2Open) {
       this.waterInA?.showElement();
       this.waterInL?.showElement();
+    } else if (jsf2Open) {
+      this.waterInB?.showElement();
+      this.waterInR?.showElement();
     }
 
     // 出水动画控制
@@ -168,11 +168,11 @@ class gasPumpUnder {
       this.waterOutR?.showElement();
       this.waterOutL?.showElement();
     } else if (csf1Open) {
-      this.waterOutB?.showElement();
-      this.waterOutR?.showElement();
-    } else if (csf2Open) {
       this.waterOutA?.showElement();
       this.waterOutL?.showElement();
+    } else if (csf2Open) {
+      this.waterOutB?.showElement();
+      this.waterOutR?.showElement();
     }
   }
 

src/views/vent/monitorManager/gasPumpMonitor/index.vue

@@ -1,31 +1,56 @@
 <template>
-  <div class="bg"
-    style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center; overflow: hidden">
+  <div class="bg" style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center; overflow: hidden">
     <a-spin :spinning="loading" />
-    <div id="gasPump3D" v-show="activeKey == 'monitor'"
-      style="width: 100%; height: 100%; position: absolute; overflow: hidden"> </div>
-    <div id="gas3DCSS"
+    <div id="gasPump3D" v-show="activeKey == 'monitor'" style="width: 100%; height: 100%; position: absolute; overflow: hidden"> </div>
+    <div
+      id="gas3DCSS"
       v-show="activeKey == 'monitor' && !loading && (currentDeviceType.startsWith('pump_under') || currentDeviceType == 'pump_n12m2pq')"
-      style="width: 100%; height: 100%; top: 0; left: 0; position: absolute; overflow: hidden; pointer-events: none;">
+      style="width: 100%; height: 100%; top: 0; left: 0; position: absolute; overflow: hidden; pointer-events: none"
+    >
     </div>
   </div>
   <div class="scene-box">
-    <customHeader :fieldNames="{ label: 'strinstallpos', value: 'deviceID', options: 'children' }" :options="options"
-      @change="getSelectRow" :optionValue="optionValue">瓦斯抽采泵站监测与管控</customHeader>
+    <customHeader
+      :fieldNames="{ label: 'strinstallpos', value: 'deviceID', options: 'children' }"
+      :options="options"
+      @change="getSelectRow"
+      :optionValue="optionValue"
+      >瓦斯抽采泵站监测与管控</customHeader
+    >
     <div class="center-container">
       <gasPumpHome v-if="activeKey == 'monitor'" :deviceId="optionValue" :device-type="currentDeviceType" />
       <div v-else class="history-group">
         <div class="device-button-group" v-if="deviceList.length > 0">
-          <div class="device-button" :class="{ 'device-active': deviceActive == device.deviceType }"
-            v-for="(device, index) in deviceList" :key="index" @click="deviceChange(index)">{{ device.deviceName }}
+          <div
+            class="device-button"
+            :class="{ 'device-active': deviceActive == device.deviceType }"
+            v-for="(device, index) in deviceList"
+            :key="index"
+            @click="deviceChange(index)"
+            >{{ device.deviceName }}
           </div>
         </div>
-        <gasPumpHistory v-if="activeKey == 'monitor_history'" ref="historyTable" class="vent-margin-t-20"
-          :device-type="currentDeviceType" :device-id="optionValue" />
-        <gasPumpHandleHistoryVue v-if="activeKey == 'handler_history'" ref="alarmHistoryTable" class="vent-margin-t-20"
-          :deviceId="optionValue" :device-type="currentDeviceType" />
-        <gasPumpAlarmHistory v-if="activeKey == 'faultRecord'" ref="handlerHistoryTable" class="vent-margin-t-20"
-          :deviceId="optionValue" :device-type="currentDeviceType" />
+        <gasPumpHistory
+          v-if="activeKey == 'monitor_history'"
+          ref="historyTable"
+          class="vent-margin-t-20"
+          :device-type="currentDeviceType"
+          :device-id="optionValue"
+        />
+        <gasPumpHandleHistoryVue
+          v-if="activeKey == 'handler_history'"
+          ref="alarmHistoryTable"
+          class="vent-margin-t-20"
+          :deviceId="optionValue"
+          :device-type="currentDeviceType"
+        />
+        <gasPumpAlarmHistory
+          v-if="activeKey == 'faultRecord'"
+          ref="handlerHistoryTable"
+          class="vent-margin-t-20"
+          :deviceId="optionValue"
+          :device-type="currentDeviceType"
+        />
       </div>
     </div>
     <BottomMenu @change="changeActive" />