Browse Source

分站管理启用状态,通讯状态修改提交

lxh 3 months ago
parent
commit
8ce0274859

+ 5 - 4
src/views/vent/safetyList/common/detail.vue

@@ -663,15 +663,16 @@ async function getStationList1() {
     let res = await getList({ subId: stationId.value, pageNo: pagination.current, pageSize: pagination.pageSize, })
     res.forEach(el => {
         el.key = el.id
-        el.linkstatusC = el.linkstatus ? '连接' : '未连接'
+        el.linkIdC = el.linkId || ''
+        el.linkstatusC = el.linkstatus ? '连接' : '断开'
         el.gdmsC = el.gdms == '1' ? '直流供电' : el.gdms == '0' ? '交流供电' : ''
         el.debugTitle = '调试'
         el.children = el.devInfoList
         el.children.forEach(v => {
             v.key = v.id
-            v.linkstatus = v.linkId
             v.debugTitle = '调试'
-            v.linkstatusC = v.linkstatus == '0' ? '待启用' : v.linkstatus == '1' ? '连接' : '断开'
+            v.linkstatusC = v.netStatus ? '连接' : '断开'
+            v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : ''
             v.updateTime = v.time
             v.gdmsC = v.gdms == '1' ? '直流供电' : v.gdms == '0' ? '交流供电' : ''
             v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}Pa,压差:${v.difPress || ''}Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`
@@ -829,7 +830,7 @@ onUnmounted(() => {
         clearTimeout(timer);
         timer = undefined;
     }
-    if(timer1){
+    if (timer1) {
         clearTimeout(timer1);
         timer1 = undefined;
     }

+ 4 - 3
src/views/vent/safetyList/index.vue

@@ -218,15 +218,16 @@ async function getStationList() {
   let res = await getList({ subId: stationId.value, pageNo: pagination.current, pageSize: pagination.pageSize, })
   res.forEach(el => {
     el.key = el.id
-    el.linkstatusC = el.linkstatus ? '连接' : '未连接'
     el.gdmsC = el.gdms == '1' ? '直流供电' : el.gdms == '0' ? '交流供电' : ''
+    el.linkIdC = el.linkId || ''
+    el.linkstatusC = el.linkstatus ? '连接' : '断开'
     el.debugTitle = '调试'
     el.children = el.devInfoList
     el.children.forEach(v => {
       v.key = v.id
-      v.linkstatus = v.linkId
       v.debugTitle = '调试'
-      v.linkstatusC = v.linkstatus == '0' ? '待启用' : v.linkstatus == '1' ? '连接' : '断开'
+      v.linkstatusC = v.netStatus ? '连接' : '断开'
+      v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : ''
       v.updateTime = v.time
       v.gdmsC = v.gdms == '1' ? '直流供电' : v.gdms == '0' ? '交流供电' : ''
       v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}Pa,压差:${v.difPress || ''}Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`

+ 10 - 2
src/views/vent/safetyList/safetyList.data.ts

@@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [
         title: '供电模式',
         dataIndex: 'gdmsC',
         key: 'gdmsC',
-        width: 100,
+        width: 90,
         align: 'center',
     },
     {
@@ -34,12 +34,20 @@ export const columns: BasicColumn[] = [
         align: 'center',
     },
     {
-        title: '连接状态',
+        title: '启用状态',
+        dataIndex: 'linkIdC',
+        key: 'linkIdC',
+        width: 80,
+        align: 'center',
+    },
+    {
+        title: '通讯状态',
         dataIndex: 'linkstatusC',
         key: 'linkstatusC',
         width: 80,
         align: 'center',
     },
+
     {
         title: '时间',
         dataIndex: 'updateTime',

BIN
分站管理通讯状态,连接状态修改.zip