From 6c010905f5e26438ea41a3faa62181975c89c9df Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 10 九月 2024 16:46:10 +0800
Subject: [PATCH] 解决冲突

---
 Web/src/views/wcs/wcsAlarmInfo/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Web/src/views/wcs/wcsAlarmInfo/index.vue b/Web/src/views/wcs/wcsAlarmInfo/index.vue
index 0eac6fd..f01cb0e 100644
--- a/Web/src/views/wcs/wcsAlarmInfo/index.vue
+++ b/Web/src/views/wcs/wcsAlarmInfo/index.vue
@@ -59,7 +59,7 @@
         <el-table-column prop="alarmCode" label="鎶ヨ缂栧彿" show-overflow-tooltip="" />
         <el-table-column prop="alarmName" label="鎶ヨ鎻忚堪" show-overflow-tooltip="" />
         <el-table-column prop="ledIP" label="鏄剧ず灞廼p鍦板潃" show-overflow-tooltip="" />
-        <el-table-column prop="status" label="鐘舵��" show-overflow-tooltip="">
+        <el-table-column prop="status" label="鏄惁鎶ヨ" show-overflow-tooltip="">
           <template #default="scope">
             <el-tag :type="dv('YesNoEnum', scope.row.status)?.tagType"> {{ dv('YesNoEnum',
               scope.row.status)?.name}}</el-tag>

--
Gitblit v1.8.0