Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 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);
@@ -156,10 +175,10 @@
    padding-top: 5%;
  }

  .container_content .contnet img {
    padding: 5%;
  }

  /*.container_content .contnet img {*/
    /*padding: 5%;*/
  /*}*/
  /**/
  .addclass {
    /*float: left;*/
    /*position: absolute;*/