From d0223045d2dd1cccc26c995c972e80e60bd19b26 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 08:45:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue b/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue
index 3bd6fe9..2764f0d 100644
--- a/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue
+++ b/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue
@@ -29,7 +29,7 @@
<thead>
<tr>
<th>璁惧缂栧彿</th>
- <th>璁惧鍚嶇О</th>
+ <th>瀹夎浣嶇疆</th>
</tr>
</thead>
@@ -64,9 +64,9 @@
<table>
<tr>
<td>璁惧鍚嶇О</td>
- <a-tooltip :title="setTooltipTittle(equipmentStatusAndInfoObj.equipmentName)">
- <td :style="{color:setNullValueFontColor(equipmentStatusAndInfoObj.equipmentName)}">
- {{equipmentStatusAndInfoObj.equipmentName|filterNullValue}}
+ <a-tooltip :title="setTooltipTittle(equipmentStatusAndInfoObj.equipmentAddress)">
+ <td :style="{color:setNullValueFontColor(equipmentStatusAndInfoObj.equipmentAddress)}">
+ {{equipmentStatusAndInfoObj.equipmentAddress|filterNullValue}}
</td>
</a-tooltip>
</tr>
--
Gitblit v1.9.3