From 9a058de28d63647fc5ccc9fd179a523cfec32d47 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 15 七月 2025 15:08:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue |   51 +++++++--------------------------------------------
 1 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
index b7d8c93..68476e3 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
@@ -25,9 +25,6 @@
 <script>
   import EqumentDetaiModel from './EqumentDetaiModel'
   import {getFileAccessHttpUrl} from '@/api/manage';
-  import {
-    getAction
-  } from '@/api/manage'
 
   export default {
     name: 'EquipmentLayout',
@@ -55,6 +52,7 @@
         }
         return getFileAccessHttpUrl(img)
       },
+
       getStatusImgUrl(imgStaus){
         if(imgStaus == 1){
           return require("../../../../../assets/yellow.png");
@@ -70,12 +68,9 @@
           return require("../../../../../assets/gray.png");
         }
       },
-      getBackgroundUrl(imgurl){
-        return require("../../../../../assets/"+imgurl+".gif");
-      },
+
       openDetail(item) {
         if(item.oporation == 0){
-          // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
           this.$notification.warning({
             message:'娑堟伅',
             description:"璁惧澶勪簬鍏虫満鐘舵�侊紒"
@@ -85,15 +80,8 @@
         console.log(item);
         this.$refs.equmentDetaiModel.initData(item.id);
         this.$refs.equmentDetaiModel.timerModel(item.id);
-        // this.equipMessageTimer = setInterval(() => {
-        //   setTimeout( this.$refs.equmentDetaiModel.initData(item.equipmentId),0)
-        // },1000*10)
       }
     },
-    beforeDestroy(){
-      // clearInterval(this.equipMessageTimer);
-      // this.equipMessageTimer = null
-    }
   }
 </script>
 <style scoped>
@@ -124,42 +112,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;
   }
 
@@ -168,34 +152,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