From 159bc3a3c9fc8f30ad9a46222f41315458617861 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 4 Nov 2024 09:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B7=BB=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/warnMessage/components/warnDialog.vue | 8 ++++++++
 src/views/homePage/warnMessage/index.vue                 | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/homePage/warnMessage/components/warnDialog.vue b/src/views/homePage/warnMessage/components/warnDialog.vue
index b3d5354d..3ad552f6 100644
--- a/src/views/homePage/warnMessage/components/warnDialog.vue
+++ b/src/views/homePage/warnMessage/components/warnDialog.vue
@@ -101,6 +101,14 @@
           </el-table-column>
 
           <el-table-column align="center" prop="warnValue" label="当前值">
+            <template slot-scope="scope">
+              <span v-if="scope.row.unit">
+                {{ scope.row.warnValue }}{{ scope.row.unit }}
+              </span>
+              <span v-else>
+                {{ scope.row.warnValue }}
+              </span>
+            </template>
           </el-table-column>
           <el-table-column align="center" prop="triggerDesc" label="触发条件">
           </el-table-column>
diff --git a/src/views/homePage/warnMessage/index.vue b/src/views/homePage/warnMessage/index.vue
index bf77777a..9cecafdc 100644
--- a/src/views/homePage/warnMessage/index.vue
+++ b/src/views/homePage/warnMessage/index.vue
@@ -73,7 +73,14 @@
             <span>{{ item.warnTime }}</span>
             <span>{{ item.zsbName }}</span>
             <span :title="item.warnDesc">{{ item.warnDesc }}</span>
-            <span>{{ item.warnValue }}</span>
+            <span>
+              <span v-if="item.unit">
+                {{ item.warnValue }}{{ item.unit }}
+              </span>
+              <span v-else>
+                {{ item.warnValue }}
+              </span></span
+            >
             <span :title="item.triggerDesc">{{ item.triggerDesc }}</span>
             <span>{{ item.threshold }}</span>
             <!-- <span>