From eacc7b20f5ed09a4e721129e011fae0b94f23869 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 21 一月 2025 10:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/DeviceBaseInfo.vue | 2 +-
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/DeviceBaseInfo.vue b/src/views/mdc/base/DeviceBaseInfo.vue
index 50e897e..519651b 100644
--- a/src/views/mdc/base/DeviceBaseInfo.vue
+++ b/src/views/mdc/base/DeviceBaseInfo.vue
@@ -101,7 +101,7 @@
color: '#fff'
},
{
- label: '澶т慨銆侀」淇暟',
+ label: '寮傚父',
value: 88
}
]// 璁惧鐘舵�佹寚绀虹伅鍒楄〃锛�
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue
index f8099d1..8945c24 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue
@@ -7,13 +7,13 @@
<div class="content_equipment" @click="openDetail(item)">
<div class="equipment_box">
<div>
- <img style="width: 11%;" :src="getStatusImgUrl(item.oporation)" alt="">
+ <img style="width: 11%;" v-if='item.oporation!==88' :src="getStatusImgUrl(item.oporation)" alt="">
<img class="orange" :src="getImgUrl(item.equipmentTypePictures)">
</div>
</div>
</div>
<p style="margin-top: 5px;">
- <span ref="message">{{item.equipmentName}}({{item.equipmentId}})</span>
+ <span :style="{color:item.oporation===88?'#f00':''}" ref="message">{{item.equipmentName}}({{item.equipmentId}})</span>
</p>
</div>
</div>
--
Gitblit v1.9.3