From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
index bca1e3b..71d216f 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
@@ -7,12 +7,12 @@
<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>
<p style="margin-top: 5px;">
- <!--<span ref="message">{{item.equipmentName}}</span>-->
<span ref="message">{{item.equipmentName}}({{item.equipmentId}})</span>
</p>
</div>
@@ -55,12 +55,31 @@
}
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");
},
openDetail(item) {
if(item.oporation == 0){
- this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
+ // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璁惧澶勪簬鍏虫満鐘舵�侊紒"
+ });
return false;
}
console.log(item);
@@ -105,42 +124,38 @@
.equipment_box img{
width: 45%;
}
+
+ .containerequip{
+ overflow: auto;
+ }
+
@media screen and (min-width: 1920px){
.containerequip{
height: 640px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.containerequip{
height: 640px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.containerequip{
height: 493px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.containerequip{
height: 493px!important;
- overflow: scroll;
}
}
@media screen and (max-width: 1280px){
.containerequip{
height: 394px!important;
- overflow: scroll;
}
}
.container_content {
width: 100%;
- /*display: flex;*/
- /*flex-wrap: wrap;*/
- /*justify-content: space-between;*/
- /*align-items: center;*/
position: relative;
}
@@ -149,34 +164,13 @@
display: inline-block;
text-align: center;
margin-bottom: 5%;
- /*float: left;*/
}
.container_content .contnet p {
padding-top: 5%;
}
- .container_content .contnet img {
- padding: 5%;
- }
-
- .addclass {
- /*float: left;*/
- /*position: absolute;*/
- /*top: 0;*/
- /*left: 0;*/
- }
-
- .noaddclass {
- /*float: left;*/
- }
-
- /*.addclass .content_equipment img {*/
- /*border-bottom: 2px solid #e957ff;*/
- /*!*padding-bottom: 8%;*!*/
- /*}*/
.addclass p {
border-bottom: 2px solid #e957ff;
- /*padding-bottom: 8%;*/
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3