From d9e59ed2e947aff29b7c21a9b0e8b6e12d741692 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 30 八月 2024 14:54:18 +0800
Subject: [PATCH] 解决冲突
---
Web/src/views/wcs/wcsAlarmInfo/index.vue | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Web/src/views/wcs/wcsAlarmInfo/index.vue b/Web/src/views/wcs/wcsAlarmInfo/index.vue
index 94f0147..0eac6fd 100644
--- a/Web/src/views/wcs/wcsAlarmInfo/index.vue
+++ b/Web/src/views/wcs/wcsAlarmInfo/index.vue
@@ -55,6 +55,7 @@
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column prop="plcIP" label="PLCIP鍦板潃" show-overflow-tooltip="" />
<el-table-column prop="plcPort" label="PLCIP绔彛" show-overflow-tooltip="" />
+ <el-table-column prop="stationNum" label="宸ヤ綅鍙�" show-overflow-tooltip="" />
<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="" />
--
Gitblit v1.8.0