From 10a65bdb100ea964d5eff3b67198c89c6c3ba9e7 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 11 九月 2024 16:15:05 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Web/src/views/wcs/wcsAlarmInfo/index.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Web/src/views/wcs/wcsAlarmInfo/index.vue b/Web/src/views/wcs/wcsAlarmInfo/index.vue
index 94f0147..f01cb0e 100644
--- a/Web/src/views/wcs/wcsAlarmInfo/index.vue
+++ b/Web/src/views/wcs/wcsAlarmInfo/index.vue
@@ -55,10 +55,11 @@
<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="" />
- <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