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

src/views/vent/dataCenter/deviceCenter/index.vue

@@ -49,8 +49,8 @@
                     }
                   "
                 >
-                  <DownOutlined v-if="expandedRowKeys.includes(record.id)" />
-                  <RightOutlined v-else />
+                  <DownCircleTwoTone v-if="expandedRowKeys.includes(record.id)" />
+                  <RightCircleTwoTone v-else />
                 </a-button>
               </template>
 
@@ -94,7 +94,7 @@ import { AesEncryption } from '/@/utils/cipher';
 import { loginCipher } from '/@/settings/encryptionSetting';
 import { message, TreeProps } from 'ant-design-vue';
 import { getDeviceTypeList, getDeviceListByType, getDevMonitorListById } from './device.api';
-import { DownOutlined, RightOutlined } from '@ant-design/icons-vue';
+import { RightCircleTwoTone, DownCircleTwoTone } from '@ant-design/icons-vue';
 import { alignElement } from 'dom-align';
 import { active } from 'sortablejs';
 
@@ -113,7 +113,6 @@ const isRefresh = ref(true);
 const treeNodeTitle = ref(''); // 选中的树形标题
 const deviceList = ref<any[]>([]); // 设备列表
 const monitorList = ref<any[]>([]); // 监测数据列表
-let timer: null | NodeJS.Timeout = undefined;
 // 当前展开的行key数组
 const expandedRowKeys = ref([]);
 
@@ -207,23 +206,6 @@ const onSelect: TreeProps['onSelect'] = (keys, e) => {
     if (deviceType.value != e.node.type) deviceType.value = e.node.type;
   }
   getDeviceList(deviceType.value);
-  // clearTimeout(timer);
-  // timer = undefined;
-  // if (startMonitorTimer) {
-  //   clearTimeout(startMonitorTimer);
-  // }
-  // dataSource.value = [];
-  // // monitorTable.value.resetPagination();
-  // if (!startMonitorTimer) {
-  //   startMonitorTimer = setTimeout(() => {
-  //     expandedKeys.value = keys;
-  //     selectedKeys.value = keys;
-  //     treeNodeTitle.value = e.node.title;
-  //     if (e.node.children?.length < 1 && timer) {
-  //       // getMonitor(true);
-  //     }
-  //   }, 1000);
-  // }
 };
 
 async function findTreeDataValue(obj) {
@@ -278,12 +260,6 @@ async function findTreeDataValue(obj) {
     expandedKeys.value = [defaultData.key as string];
     treeNodeTitle.value = defaultData.title;
   }
-
-  // if (timer === undefined) {
-  //   timer = null;
-  //   await getDataSource();
-  //   getMonitor(true);
-  // }
 }
 // 获取树形菜单数据
 async function getDeviceType(sysType?) {
@@ -326,6 +302,10 @@ async function getDeviceType(sysType?) {
 // 根据选择设备获取设备列表
 async function getDeviceList(deviceTypeVal?) {
   if (!deviceTypeVal) return;
+  if (timer) {
+    clearInterval(timer);
+    timer = undefined;
+  }
   const params: any = {
     devKind: deviceTypeVal,
   };
@@ -406,6 +386,10 @@ const toggleExpand = (deviceId) => {
   if (index > -1) {
     // 如果已经展开，则关闭
     expandedRowKeys.value.splice(index, 1);
+    if (timer) {
+      clearInterval(timer);
+      timer = undefined;
+    }
   } else {
     // 如果未展开，则打开
     expandedRowKeys.value.push(deviceId);
@@ -413,24 +397,36 @@ const toggleExpand = (deviceId) => {
   }
 };
 // 加载监测数据
-const loadMonitoringData = async (deviceId) => {
-  const device = deviceList.value.find((d) => d.id === deviceId);
-
-  loadingMap[deviceId] = true;
-  try {
-    const result = await getDevMonitorListById({ devId: deviceId.toString() });
-    monitorList.value = Object.values(result.readData);
-  } catch (error) {
-    console.error(`加载设备 ${deviceId} 数据失败:`, error);
-  } finally {
-    loadingMap[deviceId] = false;
+let timer: null | NodeJS.Timeout = null;
+async function loadMonitoringData(deviceId: string) {
+  // 先清除之前的定时器
+  if (timer) {
+    clearInterval(timer);
+    timer = null;
   }
-};
+  // 定时器会在1秒后开始，所以先手动加载一次
+  refreshData(deviceId);
+  // 设置新的定时器
+  timer = setInterval(() => {
+    refreshData(deviceId);
+  }, 1000);
+}
+async function refreshData(deviceId: string) {
+  // 这里实现具体的请求逻辑
+  const device = deviceList.value.find((d) => d.id === deviceId);
+  const result = await getDevMonitorListById({ devId: deviceId.toString() });
+  monitorList.value = Object.values(result.readData);
+}
 
 onMounted(async () => {
   await getDeviceType();
 });
-onUnmounted(() => {});
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+    timer = undefined;
+  }
+});
 // 监听分页变化
 watch(
   () => [paginationState.value.current, paginationState.value.pageSize],

src/views/vent/dataCenter/stationCenter/index.vue

@@ -11,7 +11,7 @@
           <div class="left-box">
             <div class="left-content">
               <div class="card-box" v-for="(item, index) in cardList" :key="index">
-                <div :class="item.linkstatus ? 'card-itemL' : 'card-itemD'" @click="cardClick(item, index)">
+                <div :class="activeIndex1 === index ? 'card-itemD' : 'card-itemL'" @click="cardClick(item, index)">
                   <div class="card-item-label">{{ item.strname }}</div>
                 </div>
               </div>
@@ -42,8 +42,8 @@
                     }
                   "
                 >
-                  <DownOutlined v-if="expandedRowKeys.includes(record.id)" />
-                  <RightOutlined v-else />
+                  <DownCircleTwoTone v-if="expandedRowKeys.includes(record.id)" />
+                  <RightCircleTwoTone v-else />
                 </a-button>
               </template>
 
@@ -82,7 +82,8 @@ import customHeader from '/@/components/vent/customHeader.vue';
 import { message, TreeProps } from 'ant-design-vue';
 import { getDeviceList, getDeviceListByType, getDevMonitorListById } from './device.api';
 import { subStationList } from './device.api';
-import { DownOutlined, RightOutlined } from '@ant-design/icons-vue';
+import { RightCircleTwoTone, DownCircleTwoTone } from '@ant-design/icons-vue';
+import Index from '/@/layouts/page/index.vue';
 const { hasPermission } = usePermission();
 let activeKey = ref('device');
 //当前左侧激活菜单的索引
@@ -161,6 +162,7 @@ async function getSubStationList() {
   let res = await subStationList({ pageSize: 1000, pageNo: 1 });
   if (res.length != 0) {
     cardList.value = [...res];
+    getDeviceList(cardList.value[0].id);
     openNum.value = cardList.value?.filter((v) => v.linkstatus == 1)['length'];
     clsoeNum.value = cardList.value?.filter((v) => v.linkstatus == 0)['length'];
   } else {
@@ -169,7 +171,11 @@ async function getSubStationList() {
 }
 //菜单选项切换
 function cardClick(item, ind) {
-  activeIndex1.value = item;
+  if (timer) {
+    clearInterval(timer);
+    timer = undefined;
+  }
+  activeIndex1.value = ind;
   getDeviceList(item.id);
 }
 // 当前展开的行key数组
@@ -178,10 +184,9 @@ const expandedRowKeys = ref([]);
 // 加载状态映射
 const loadingMap = reactive({});
 // 根据选择设备获取设备列表
-async function getDeviceList(deviceTypeVal?) {
-  // if (!deviceTypeVal) return;
+async function getDeviceList(ID?) {
   const params: any = {
-    subId: deviceTypeVal.toString(),
+    subId: ID.toString(),
   };
   const result = await getDeviceListByType(params);
   deviceList.value = result.records;
@@ -266,24 +271,40 @@ const toggleExpand = (deviceId) => {
   }
 };
 // 加载监测数据
-const loadMonitoringData = async (deviceId) => {
-  const device = deviceList.value.find((d) => d.id === deviceId);
-
-  loadingMap[deviceId] = true;
-  try {
-    const result = await getDevMonitorListById({ devId: deviceId.toString() });
-    monitorList.value = Object.values(result.readData);
-  } catch (error) {
-    console.error(`加载设备 ${deviceId} 数据失败:`, error);
-  } finally {
-    loadingMap[deviceId] = false;
+let timer: null | NodeJS.Timeout = null;
+async function loadMonitoringData(deviceId: string) {
+  // 先清除之前的定时器
+  if (timer) {
+    clearInterval(timer);
+    timer = null;
   }
-};
+
+  // 立即请求一次数据
+  // 这里可以加上初始加载，避免等待1秒的间隔
+  // 定时器会在1秒后开始，所以先手动加载一次
+  refreshData(deviceId);
+
+  // 设置新的定时器
+  timer = setInterval(() => {
+    refreshData(deviceId);
+  }, 1000);
+}
+async function refreshData(deviceId: string) {
+  // 这里实现具体的请求逻辑
+  const device = deviceList.value.find((d) => d.id === deviceId);
+  const result = await getDevMonitorListById({ devId: deviceId.toString() });
+  monitorList.value = Object.values(result.readData);
+}
 onMounted(async () => {
-  getSubStationList();
-  getDeviceList();
+  await getSubStationList();
+  await getDeviceList();
+});
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+    timer = undefined;
+  }
 });
-onUnmounted(() => {});
 </script>
 
 <style lang="less" scoped>

src/views/vent/home/configurable/ceshi.json

@@ -1,548 +1,1225 @@
 {
-  "msgTxt": [
-    {
-      "datalist": [
-        {
-          "msgType": null,
-          "deviceID": "1983780099434459137",
-          "strname": "球阀2",
-          "strinstallpos": "球阀2",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": "1",
-          "warnFlag": "0",
-          "warnLevel": "0",
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "endArea": "18m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "areaName": "分区1",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀2",
-            "deviceid": "12",
-            "tempMax": "34.4",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "21.3",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099438653442",
-          "strname": "球阀3",
-          "strinstallpos": "球阀3",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区2",
-            "endArea": "24m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀3",
-            "deviceid": "3",
-            "tempMax": "34.4",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "21.4",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099438653443",
-          "strname": "球阀4",
-          "strinstallpos": "球阀4",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区3",
-            "endArea": "36m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀4",
-            "deviceid": "4",
-            "tempMax": "34.7",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "21.6",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099472207873",
-          "strname": "球阀8",
-          "strinstallpos": "球阀8",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区4",
-            "endArea": "66m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀8",
-            "deviceid": "8",
-            "tempMax": "35.4",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.7",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099476402178",
-          "strname": "球阀9",
-          "strinstallpos": "球阀9",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区5",
-            "endArea": "86m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀9",
-            "deviceid": "9",
-            "tempMax": "36.0",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.9",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099476402179",
-          "strname": "球阀10",
-          "strinstallpos": "球阀10",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区6",
-            "endArea": "92m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀10",
-            "deviceid": "10",
-            "tempMax": "36.0",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.9",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099476402180",
-          "strname": "球阀11",
-          "strinstallpos": "球阀11",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区7",
-            "endArea": "98m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀11",
-            "deviceid": "11",
-            "tempMax": "36.2",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.9",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099480596482",
-          "strname": "球阀12",
-          "strinstallpos": "球阀12",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区8",
-            "endArea": "104m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀12",
-            "deviceid": "2",
-            "tempMax": "36.4",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.8",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099480596483",
-          "strname": "球阀13",
-          "strinstallpos": "球阀13",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区9",
-            "endArea": "110m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀13",
-            "deviceid": "13",
-            "tempMax": "36.4",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.8",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099480596484",
-          "strname": "球阀14",
-          "strinstallpos": "球阀14",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区10",
-            "endArea": "116m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀14",
-            "deviceid": "14",
-            "tempMax": "36.5",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.6",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099484790785",
-          "strname": "球阀15",
-          "strinstallpos": "球阀15",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区11",
-            "endArea": "156m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀15",
-            "deviceid": "15",
-            "tempMax": "37.6",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "20.6",
-            "tempMin": "40.0"
-          }
-        },
-        {
-          "msgType": null,
-          "deviceID": "1983780099392516097",
-          "strname": "球阀1",
-          "strinstallpos": "球阀1",
-          "fsectarea": "null",
-          "planedVa": null,
-          "regulation": null,
-          "stationname": "机电硐室防灭火系统",
-          "stationtype": "http",
-          "deviceType": "ballvalve_auto",
-          "typeName": "球阀",
-          "netStatus": 1,
-          "warnFlag": 0,
-          "warnLevel": 0,
-          "warnLevel_str": "正常",
-          "syswarnLevel": null,
-          "syswarnLevel_str": null,
-          "syswarnLevel_des": null,
-          "warnTime": null,
-          "readTime": "2025-10-30 15:35:35",
-          "warnDes": "",
-          "frontGateOpenCtrl": null,
-          "rearGateOpenCtrl": null,
-          "readData": {
-            "areaName": "分区12",
-            "endArea": "12m",
-            "deviceSTAT": "0",
-            "sign": "0",
-            "tempStart": "80.0",
-            "smokePattern": "烟雾模式",
-            "tTime": "2025-10-30 15:35:35",
-            "deviceName": "球阀1",
-            "deviceid": "1",
-            "tempMax": "38.4",
-            "devicelocation": "中央变电所",
-            "smokeSensorStatus": "False",
-            "tempStop": "40.00",
-            "isWarn": "1",
-            "isRun": "-2",
-            "tempAvg": "22.0",
-            "tempMin": "40.0"
-          }
-        }
-      ],
-      "avginfo": {
-        "warnFlag": {
-          "value": "0"
-        }
-      },
-      "typeName": "球阀",
-      "type": "ballvalve_auto"
-    },
-    {
-      "subtype": "sys_dongshi",
-      "typeName": "综合监测系统",
-      "type": "sys"
+        "cmd": "monitordata",
+        "msgTxt": [
+            {
+                "datalist": [
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099434459137",
+                        "strname": "球阀2",
+                        "strinstallpos": "球阀2",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "12m",
+                            "sign": "0",
+                            "tempRealtime": "21.6",
+                            "deviceName": "球阀2",
+                            "CORealtime": "0.0",
+                            "tempMax": "34.4",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区2",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "18m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "12",
+                             "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.6",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099438653442",
+                        "strname": "球阀3",
+                        "strinstallpos": "球阀3",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "18m",
+                            "sign": "0",
+                            "tempRealtime": "21.8",
+                            "deviceName": "球阀3",
+                            "CORealtime": "0.0",
+                            "tempMax": "34.4",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区3",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "24m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "3",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.8",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099438653443",
+                        "strname": "球阀4",
+                        "strinstallpos": "球阀4",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "24m",
+                            "sign": "0",
+                            "tempRealtime": "21.8",
+                            "deviceName": "球阀4",
+                            "CORealtime": "0.0",
+                            "tempMax": "34.7",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区4",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "36m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "4",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.8",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099472207873",
+                        "strname": "球阀8",
+                        "strinstallpos": "球阀8",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "60m",
+                            "sign": "0",
+                            "tempRealtime": "21.0",
+                            "deviceName": "球阀8",
+                            "CORealtime": "0.0",
+                            "tempMax": "35.4",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区8",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "66m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "8",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.0",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099476402178",
+                        "strname": "球阀9",
+                        "strinstallpos": "球阀9",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "66m",
+                            "sign": "0",
+                            "tempRealtime": "21.4",
+                            "deviceName": "球阀9",
+                            "CORealtime": "0.0",
+                            "tempMax": "36.0",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区9",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "86m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "9",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.4",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099476402179",
+                        "strname": "球阀10",
+                        "strinstallpos": "球阀10",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "86m",
+                            "sign": "0",
+                            "tempRealtime": "21.4",
+                            "deviceName": "球阀10",
+                            "CORealtime": "0.0",
+                            "tempMax": "36.0",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区10",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "92m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "10",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.4",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099476402180",
+                        "strname": "球阀11",
+                        "strinstallpos": "球阀11",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "92m",
+                            "sign": "0",
+                            "tempRealtime": "21.4",
+                            "deviceName": "球阀11",
+                            "CORealtime": "0.0",
+                            "tempMax": "36.2",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区11",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "98m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "11",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.4",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099480596482",
+                        "strname": "球阀12",
+                        "strinstallpos": "球阀12",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "98m",
+                            "sign": "0",
+                            "tempRealtime": "21.3",
+                            "deviceName": "球阀12",
+                            "CORealtime": "0.0",
+                            "tempMax": "36.4",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区12",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "104m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "2",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.3",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099480596483",
+                        "strname": "球阀13",
+                        "strinstallpos": "球阀13",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "104m",
+                            "sign": "0",
+                            "tempRealtime": "21.4",
+                            "deviceName": "球阀13",
+                            "CORealtime": "0.0",
+                            "tempMax": "36.4",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区13",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "110m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "13",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.4",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099480596484",
+                        "strname": "球阀14",
+                        "strinstallpos": "球阀14",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "110m",
+                            "sign": "0",
+                            "tempRealtime": "21.2",
+                            "deviceName": "球阀14",
+                            "CORealtime": "0.0",
+                            "tempMax": "36.5",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区14",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "116m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "14",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.2",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099484790785",
+                        "strname": "球阀15",
+                        "strinstallpos": "球阀15",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "110m",
+                            "sign": "0",
+                            "tempRealtime": "21.2",
+                            "deviceName": "球阀15",
+                            "CORealtime": "0.0",
+                            "tempMax": "37.6",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:39",
+                                "hourMinTime": "2025-11-04 09:42:39",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:39",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:39"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区15",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "156m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "15",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "21.2",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    },
+                    {
+                        "msgType": null,
+                        "deviceID": "1983780099392516097",
+                        "strname": "球阀1",
+                        "strinstallpos": "球阀1",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": "机电硐室防灭火系统",
+                        "stationtype": "http",
+                        "deviceType": "ballvalve_auto",
+                        "typeName": "球阀",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": "",
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "startArea": "6m",
+                            "sign": "0",
+                            "tempRealtime": "22.2",
+                            "deviceName": "球阀1",
+                            "CORealtime": "0.0",
+                            "tempMax": "38.4",
+                            "tempStop_dayAvg": 1040.0,
+                            "tempStop_datainfo": {
+                                "dayMaxTime": "2025-11-04 09:42:40",
+                                "hourMinTime": "2025-11-04 09:42:40",
+                                "hourNum": 26,
+                                "dayAvg": 1040.0,
+                                "dayMin": 40.0,
+                                "hourMax": 40.0,
+                                "hourAvg": 1040.0,
+                                "hourMin": 40.0,
+                                "dayNum": 26,
+                                "hourMaxTime": "2025-11-04 09:42:40",
+                                "dayMax": 40.0,
+                                "dayMinTime": "2025-11-04 09:42:40"
+                            },
+                            "tempStop_hourAvg": 1040.0,
+                            "areaName": "分区1",
+                            "tempStop": "40.00",
+                            "warnUp": "80.0",
+                            "endArea": "12m",
+                            "deviceSTAT": "0",
+                            "tempStart": "80.0",
+                            "smokePattern": "烟雾模式",
+                            "tTime": "2025-11-10 10:15:57",
+                            "warnLow": "40.0",
+                            "deviceid": "1",
+                            "devicelocation": "中央变电所",
+                            "recordTime": "2025-11-10 10:16:11",
+                            "smokeSensorStatus": "False",
+                            "isWarn": "1",
+                            "isRun": "-2",
+                            "tempAvg": "22.2",
+                            "tempMin": "40.0"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": null,
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": 0,
+                        "testFlag": 0,
+                        "strRemark": null
+                    }
+                ],
+                "avginfo": {
+                    "tempStop_datainfo": {
+                        "dayMaxTime": "2025-11-04 09:42:39",
+                        "minHourName": "球阀2",
+                        "dayAvg": 1040.0,
+                        "dayMin": 40.0,
+                        "minDayName": "球阀2",
+                        "minDayID": "1983780099434459137",
+                        "dayMinTime": "2025-11-04 09:42:39",
+                        "minHourID": "1983780099434459137",
+                        "avgHour": 40.0,
+                        "maxHourName": "球阀2",
+                        "maxHourID": "1983780099434459137",
+                        "hourMinTime": "2025-11-04 09:42:39",
+                        "hourNum": 26,
+                        "hourMax": 40.0,
+                        "hourAvg": 1040.0,
+                        "hourMin": 40.0,
+                        "dayNum": 26,
+                        "hourMaxTime": "2025-11-04 09:42:39",
+                        "dayMax": 40.0,
+                        "maxDayID": "1983780099434459137",
+                        "avgDay": 40.0,
+                        "maxDayName": "球阀2"
+                    },
+                    "warnFlag": {
+                        "value": 0
+                    }
+                },
+                "typeName": "球阀",
+                "type": "ballvalve_auto"
+            },
+            {
+                "subtype": "sys_dongshi",
+                "datalist": [
+                    {
+                        "msgType": null,
+                        "deviceID": "1983795733195030530",
+                        "strname": "机电硐室防灭火系统",
+                        "strinstallpos": "机电硐室防灭火系统",
+                        "fsectarea": "null",
+                        "planedVa": null,
+                        "regulation": null,
+                        "stationname": null,
+                        "stationtype": null,
+                        "deviceType": "sys_dongshi",
+                        "typeName": "硐室",
+                        "netStatus": 1,
+                        "warnFlag": 0,
+                        "warnLevel": 0,
+                        "warnLevel_str": "正常",
+                        "syswarnLevel": null,
+                        "syswarnLevel_str": null,
+                        "syswarnLevel_des": null,
+                        "warnTime": null,
+                        "readTime": "2025-11-10 10:18:48",
+                        "warnDes": null,
+                        "frontGateOpenCtrl": null,
+                        "rearGateOpenCtrl": null,
+                        "readData": {
+                            "sign": "0",
+                            "tTime": "2025-11-10 10:18:36",
+                            "isRun": "-2"
+                        },
+                        "readDataDes": null,
+                        "limits": null,
+                        "summaryHour": [],
+                        "summaryDay": [],
+                        "history": [],
+                        "dayhistory": [],
+                        "totalInfo": {
+                            "unitNum": 0
+                        },
+                        "sign": null,
+                        "cameras": [],
+                        "links": [],
+                        "avgParam": {},
+                        "other1": null,
+                        "other2": null,
+                        "other3": null,
+                        "remarkInfo": null,
+                        "linkInfo": null,
+                        "addrIndex": null,
+                        "warnLogNotOkCount": 0,
+                        "otherInfo": null,
+                        "orderNum": null,
+                        "testFlag": null,
+                        "strRemark": null,
+                        "ventRationality": "",
+                        "cuteyeLength": "",
+                        "totalGasVolume": "",
+                        "gasLevel": "",
+                        "supportNum": "",
+                        "totalComplteQuantity": "",
+                        "stepIn1": "",
+                        "stepIn2": "",
+                        "totalOutM3": "",
+                        "coalReserves": "",
+                        "faceIntM3": "",
+                        "cumulativeScalar": "",
+                        "totalIntM3": "",
+                        "totalAverageRate": "",
+                        "equalarea": "",
+                        "coalSpoCha": "",
+                        "thickness": "",
+                        "faceRetM3": "",
+                        "coalProduction": "",
+                        "coalSeamThick": "",
+                        "unitNum": "",
+                        "goafName": "",
+                        "faceLen": "",
+                        "linkEmptyFlag": "",
+                        "totalDate": "",
+                        "mainCoalseam": "",
+                        "stepOut1": "",
+                        "drillingType": "",
+                        "coalSeam": "",
+                        "stepOut2": "",
+                        "pressureRationality1": "",
+                        "pressureRationality2": "",
+                        "userM3": "",
+                        "gasReserves": "",
+                        "linkEmpty": "",
+                        "beginDrainageDate": "",
+                        "dischargeGasEmission": "",
+                        "goafManage": "",
+                        "useM3": "",
+                        "ventCapacity": "",
+                        "stepMid2": "",
+                        "stepMid1": "",
+                        "zoneRationality1": "",
+                        "manageCoalMethod": "",
+                        "miningArea": "",
+                        "zoneRationality2": "",
+                        "cumulativeFlow": "",
+                        "minFirePeriod": "",
+                        "scalarRecognition": "",
+                        "coalSeamAngle": "",
+                        "coalThickness": "",
+                        "strikelength": "",
+                        "totalDrillingType": "",
+                        "drillinFootage": "",
+                        "totalRetM3": "",
+                        "useM3Perent": "",
+                        "workingFaceZouxiangLength": "",
+                        "workingFaceQieyanLength": "",
+                        "coalseam": "",
+                        "leakage": "",
+                        "workingFaceHeight": "",
+                        "originalGasContent": "",
+                        "totalPlanM3": "",
+                        "facePlanM3": "",
+                        "workingFaceLengeh": "",
+                        "coalSeamThickness": "",
+                        "panel": "",
+                        "flength": ""
+                    }
+                ],
+                "typeName": "综合监测系统",
+                "type": "sys"
+            }
+        ]
     }
-  ]
-}

src/views/vent/home/configurable/components/content.vue

@@ -114,7 +114,7 @@
           <cardList class="content__module" :cardData="config.data" />
         </template>
           <template v-else-if="config.name === 'generalist'">
-            <generalList class="content__module"></generalList>
+            <generalList class="content__module" :generalData="config.data"></generalList>
           </template>
         <!-- <template v-if="config.key === 'fire_control'">
         <FIreControl class="content__module" />

src/views/vent/home/configurable/components/partition-top.vue

@@ -6,8 +6,14 @@
     <div class="nav-content">
       <div class="content-tr" v-for="(ite, ind) in countTr" :key="ind">
         <div class="content-td" v-for="(m, n) in tempData" :key="n">
-          <div v-if="ind==2">{{ m.tempStart || '---' }}</div>
-          <div v-if="ind==7">{{ m.tempStop || '---' }}</div>
+          <div v-if="ind==2" >
+           <div> {{ m.tempStart || '---' }}</div>
+           <div v-if="m.tempStart" class="td-line"></div>
+          </div>
+          <div v-if="ind==7">
+            <div>{{ m.tempStop || '---' }}</div>
+            <div v-if="m.tempStop" class="td-line"></div>
+          </div>
         </div>
       </div>
       <canvas  ref="canvas" style="position: absolute;width:100%;height:100%" ></canvas>
@@ -158,6 +164,11 @@ onMounted(() => {
         height: 100%;
         border-right: 1px solid rgba(85, 118, 193, .4);
       }
+      .td-line{
+        width: 100%;
+        height: 1px;
+        background-color: red;
+      }
     }
   }
 

src/views/vent/home/configurable/components/preset/generalList.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="general-list">
-    <div class="general-content-box" v-for="(item, index) in generalList" :key="index">
-      <div class="general-icon" :class="index % 2 == 0 ? 'icon-green' : 'icon-blue'"></div>
-      <div class="general-label">{{ }}</div>
-      <div class="general-status">{{ }}</div>
+    <div class="general-content-box" v-for="(item, index) in generalData" :key="index">
+      <div class="general-icon" :class="index % 2 == 0 ? 'icon-blue' : 'icon-green'"></div>
+      <div class="general-label">{{ item.areaName }}</div>
+      <div class="general-status" :class="index % 2 == 0 ? 'text-blue' : 'text-green'">{{ item.CORealtime || '-' }}</div>
     </div>
   </div>
 </template>
@@ -11,20 +11,14 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 
-let generalList = ref<any[]>([
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-  { label: '分区1', status: '正常' },
-])
+let props = defineProps({
+  generalData: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  }
+})
 
 </script>
 
@@ -56,6 +50,8 @@ let generalList = ref<any[]>([
     width: 100%;
     height: 36px;
     margin-bottom: 10px;
+    display: flex;
+    align-items: center;
 
     &:nth-child(odd) {
       background: var(--image-bg-blue) no-repeat;
@@ -66,13 +62,48 @@ let generalList = ref<any[]>([
       background: var(--image-bg-green) no-repeat;
       background-size: 100% 100%;
     }
+
+    .general-label {
+      position: absolute;
+      left: 60px;
+    }
+
+    .general-status {
+      position: absolute;
+      right: 98px;
+    }
+
   }
 
   .general-icon {
-    width: 25px;
-    height: 25px;
+    position: absolute;
+    width: 22px;
+    height: 22px;
+    left: 12px;
+    top: 50%;
+    transform: translate(0, -50%);
   }
 
-  .icon-green {}
+  .icon-green {
+    background: var(--image-bg-green-icon) no-repeat;
+    background-size: 100% 100%;
+  }
+
+  .icon-blue {
+    background: var(--image-bg-blue-icon) no-repeat;
+    background-size: 100% 100%;
+  }
+
+  .text-green {
+    font-size: 12px;
+    font-family: 'douyuFont';
+    color: #2af7d7;
+  }
+
+  .text-blue {
+    font-size: 12px;
+    font-family: 'douyuFont';
+    color: #91e0ff;
+  }
 }
 </style>

src/views/vent/home/configurable/configurable.api.ts

@@ -638,7 +638,8 @@ export const getElectroData = (params) => {
     return {
       areaName: el.readData.areaName,
       tempStart: el.readData.tempStart,
-      tempStop: el.readData.tempStop
+      tempStop: el.readData.tempStop,
+      CORealtime:el.readData.CORealtime
     }
   })
 
@@ -650,7 +651,7 @@ export const getElectroData = (params) => {
     })
     res.chartData=res.datalist.map(el=>{
       return {
-        time:el.readData.tTime,
+        time:el.readData.areaName,
         coRealTime:el.readData.CORealtime,
         coWarn:el.readData.COWarn,
       }

src/views/vent/home/configurable/configurable.data.ts

@@ -5627,7 +5627,7 @@ export const testConfigElectro: Config[] = [
       gallery_list: [],
       preset: [
         {
-          readFrom: 'cardData',
+          readFrom: 'tempData',
          
         }
         ],