From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
index c118060..b7d8c93 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
@@ -7,7 +7,8 @@
<div class="content_equipment" @click="openDetail(item)">
<div class="equipment_box">
<div>
- <img class="orange" :style="'background-image:url('+ getBackgroundUrl(item.oporation) +')'" :src="getImgUrl(item.equipmentTypePictures)">
+ <img style="width: 11%;" :src="getStatusImgUrl(item.oporation)" alt="">
+ <img class="orange" :src="getImgUrl(item.equipmentTypePictures)">
</div>
</div>
</div>
@@ -53,6 +54,21 @@
return require("../../../../../assets/default.png");
}
return getFileAccessHttpUrl(img)
+ },
+ getStatusImgUrl(imgStaus){
+ if(imgStaus == 1){
+ return require("../../../../../assets/yellow.png");
+ }else if(imgStaus == 2){
+ return require("../../../../../assets/yellow.png");
+ }else if(imgStaus == 3){
+ return require("../../../../../assets/green.png");
+ }else if(imgStaus ==22){
+ return require("../../../../../assets/red.png");
+ }else if(imgStaus ==0){
+ return require("../../../../../assets/gray.png");
+ }else{
+ return require("../../../../../assets/gray.png");
+ }
},
getBackgroundUrl(imgurl){
return require("../../../../../assets/"+imgurl+".gif");
@@ -159,10 +175,10 @@
padding-top: 5%;
}
- .container_content .contnet img {
- padding: 5%;
- }
-
+ /*.container_content .contnet img {*/
+ /*padding: 5%;*/
+ /*}*/
+ /**/
.addclass {
/*float: left;*/
/*position: absolute;*/
--
Gitblit v1.9.3