From b7c33c9816888d3e471509b65d7a25465d523d14 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Fri, 21 Feb 2025 17:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=9F=E9=9B=BE=E6=B5=B8=E6=B0=B4=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86,=E6=8F=90=E7=A4=BA=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeviceControlDialog.vue          |  8 ++++++++
 .../components/DeviceParams.vue                 | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceControlDialog.vue
index da9ce3a3..a8fbc79a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceControlDialog.vue
@@ -24,6 +24,9 @@
       <!-- <el-switch active-color="#01AAFD" inactive-color="#bbbbbb" v-model="reclosing" active-text="开启" inactive-text="关闭" @change="reclosingSwitch"></el-switch> -->
     </div>
    </div>
+   <div class="tips">
+        <p>门禁开关与频闪灯开关一致,当门禁打开时频闪灯也会打开,当门禁关闭时,频闪灯也会关闭。</p>
+      </div>
    </div>
    </Dialog>
 </template>
@@ -346,6 +349,11 @@
 .el-switch {
   /* 这里的样式可以根据您的需求进行调整，例如大小、颜色等 */
   flex-shrink: 0; /* 通常不是必需的，因为开关组件本身有固定大小，但加上也无妨 */
+}
+.tips {
+  margin-top: 20px; /* 根据需要调整上边距 */
+  padding: 20px;
+  color: rgb(231, 237, 244); /* 文字颜色 */
 }
   </style>
   
\ No newline at end of file
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 a42f60bd..629a4b68 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
@@ -18,6 +18,12 @@
           <span>{{ data.text }}</span>
         </template>
       </Descriptions>
+      <h3>烟雾/浸水监测:</h3>
+      <Descriptions :list="monitor" :data="devicesData" style="gap: 18px;" column="6">
+        <template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }">
+          <span>{{ data.text }}</span>
+        </template>
+      </Descriptions>
  
     </div>
   </template>
@@ -48,6 +54,7 @@
         secondLoading: true,
         devicesList: [],
         environment: [],
+        monitor:[],
         devicesData: {},
         activeOption: {
           active: {
@@ -63,6 +70,7 @@
       this.devicesList = [];
       let devs = [];
       let envDevs = []; // 用于临时存储环境数据
+      let mon = []; // 用于临时存储烟雾浸水数据
       // Promise.all([this.getAc('A1'), this.getAc('A2'), this.getAc('A3'), this.getAc('A4'), this.getAc('A5'), this.getAc('A6')]).then(res => {
   
       await request({
@@ -111,6 +119,14 @@
               gridColumn: 3,
             });
             this.devicesData[item.property] = item.formatValue;
+          }else if(item.propertyName === "烟雾报警" || item.propertyName === "烟雾报警阈值"||
+           item.propertyName === "水浸检测"|| item.propertyName === "侵水电压阈值"){
+            mon.push({
+              label: item.propertyName,
+              key: item.property,
+              gridColumn: 3,
+            });
+            this.devicesData[item.property] = item.formatValue;
           } else {
             // 其他数据添加到devicesList集合
             devs.push({
@@ -124,6 +140,7 @@
       });
       this.devicesList = devs;
       this.environment = envDevs; // 将环境数据赋值给environment
+      this.monitor = mon; // 将监测数据赋值给environment
     })
   },
     methods: {