Przeglądaj źródła

[Feat 0000] 布尔台注氮以及瓦斯抽采泵添加监测框并修复位置错误问题

houzekong 2 dni temu
rodzic
commit
eb4c94e12a

+ 0 - 1
src/views/vent/monitorManager/compressor/components/nitrogenHome.vue

@@ -336,7 +336,6 @@
   function handlerControlModel(data) {}
 
   watch([monitorDataGroupNum, loading], ([newMonitorDataGroupNum, newLoading]) => {
-    debugger;
     nextTick(() => {
       if (newMonitorDataGroupNum && !newLoading) {
         setModelType(props.modalType, newMonitorDataGroupNum);

+ 12 - 9
src/views/vent/monitorManager/compressor/index.vue

@@ -8,7 +8,12 @@
     >
       智能注氮管控系统
     </customHeader>
-    <nitrogenHome v-if="activeKey == 'nitrogen_page' && optionValue" :device-id="optionValue" :modal-type="modalType" :module-type-name="moduleTypeName" />
+    <nitrogenHome
+      v-if="activeKey == 'nitrogen_page' && optionValue"
+      :device-id="optionValue"
+      :modal-type="modalType"
+      :module-type-name="moduleTypeName"
+    />
     <nitrogenEcharts v-if="activeKey == 'yfj_monitor_echarts'" />
     <nitrogenHistory ref="historyTable" :device-id="optionValue" :device-type="optionType" v-if="activeKey == 'yfj_history'" />
     <nitrogenHandleHistory ref="alarmHistoryTable" v-if="activeKey == 'yfj_handler_history'" />
@@ -46,9 +51,9 @@
   const options = ref();
   const optionValue = ref('');
   const optionType = ref('');
-  const modalType = ref('');
+  const modalType = ref('nitrogenUnderground');
   const isRefresh = ref(true);
-  let moduleTypeName=ref('')
+  let moduleTypeName = ref('');
 
   function changeActive(activeValue) {
     activeKey.value = activeValue;
@@ -99,8 +104,6 @@
 
   // 切换检测数据
   async function getSelectRow(deviceID) {
-    console.log(deviceID,'deviceID---')
-    console.log(options.value,'options.value')
     const currentData = options.value.find((item: any) => {
       return item.id == deviceID;
     });
@@ -115,12 +118,12 @@
     if (currentData['strsystype'] == '1') {
       // 空压机
       // modalType.value = 'nitrogen';
-      moduleTypeName.value='KYJ'
-    } else  {
+      moduleTypeName.value = 'KYJ';
+    } else {
       // 制氮机
       // modalType.value = 'nitrogenUnderground';
-      moduleTypeName.value='ZDJ'
-    } 
+      moduleTypeName.value = 'ZDJ';
+    }
   }
 
   onMounted(async () => {

+ 61 - 0
src/views/vent/monitorManager/gasPumpMonitor/gasPump.data.bet.ts

@@ -106,6 +106,67 @@ export const leftMonitor = [
       },
     ],
   },
+  {
+    type: 'list',
+    title: '抑爆器',
+    stateHeader: [],
+    children: [
+      {
+        title: '',
+        childTitle: ['1#抑爆器'],
+        key: ['ExplosionSS1'],
+        list: [
+          {
+            title: '火焰传感器',
+            code: '_FS1_str',
+            type: 'txt',
+          },
+          {
+            title: '报警状态',
+            code: '_SysFault_str',
+            type: 'txt',
+          },
+          {
+            title: '1-1抑爆器',
+            code: '_EV1_str',
+            type: 'txt',
+          },
+          {
+            title: '1-2抑爆器',
+            code: '_EV2_str',
+            type: 'txt',
+          },
+        ],
+      },
+      {
+        title: '',
+        childTitle: ['2#抑爆器'],
+        key: ['ExplosionSS2'],
+        list: [
+          {
+            title: '火焰传感器',
+            code: '_FS1_str',
+            type: 'txt',
+          },
+          {
+            title: '报警状态',
+            code: '_SysFault_str',
+            type: 'txt',
+          },
+          {
+            title: '2-1抑爆器',
+            code: '_EV1_str',
+            type: 'txt',
+          },
+          {
+            title: '2-2抑爆器',
+            code: '_EV2_str',
+            type: 'txt',
+          },
+        ],
+      },
+    ],
+  },
 ];
 
 export const rightMonitor = [

+ 2 - 2
src/views/vent/monitorManager/nitrogen/nitrogen.data.1.ts

@@ -19,12 +19,12 @@ export function getNitrogenHome() {
     case 'sdmtjtjjmk':
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome.vue'));
       return nitrogenHome;
-       case 'sxmyhgjtlhky'://龙华
+    case 'sxmyhgjtlhky': //龙华
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHomeLh.vue'));
       return nitrogenHome;
     default:
       //nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome.vue')); //测试完,请置于该组件
-       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHomeLh.vue'));
+      nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHomeLh.vue'));
       return nitrogenHome;
   }
 }