From efd177828ad3b7bbf04b2d48a118f2056abf0926 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 03 九月 2024 13:14:40 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
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