diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceParams.vue index 6acd2980..43d917ae 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceParams.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceParams.vue @@ -1,6 +1,7 @@ @@ -39,6 +47,7 @@ return { secondLoading: true, devicesList: [], + environment: [], devicesData: {}, activeOption: { active: { @@ -53,6 +62,7 @@ async created() { this.devicesList = []; let devs = []; + let envDevs = []; // 用于临时存储环境数据 // Promise.all([this.getAc('A1'), this.getAc('A2'), this.getAc('A3'), this.getAc('A4'), this.getAc('A5'), this.getAc('A6')]).then(res => { await request({ @@ -91,7 +101,18 @@ }).then(result => { if (result.code != 200) return Message.error("操作失败"); result.data.forEach(item => { - if (item.propertyName) { + if (item.propertyName) { + if (item.propertyName === "温湿度状态-湿度" || item.propertyName === "温湿度状态-温度" + ||item.propertyName === "环境温度"||item.propertyName === "环境光度"||item.propertyName === "环境湿度"||item.propertyName === "系统状态-环境(温湿度等)") { + // 如果是环境相关的数据,添加到environment集合 + envDevs.push({ + label: item.propertyName, + key: item.property, + gridColumn: 3, + }); + this.devicesData[item.property] = item.formatValue; + } else { + // 其他数据添加到devicesList集合 devs.push({ label: item.propertyName, key: item.property, @@ -99,10 +120,12 @@ }); this.devicesData[item.property] = item.formatValue; } - }); - this.devicesList = devs; - }) - }, + } + }); + this.devicesList = devs; + this.environment = envDevs; // 将环境数据赋值给environment + }) + }, methods: { getAc() { return request({ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/index.vue index 4be96889..b6b4b501 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/index.vue @@ -8,7 +8,7 @@ - +