兼容分辨率

src/layout/components/Sidebar.vue

@@ -35,22 +35,22 @@ export default {
 
 <style lang="scss" scoped>
 .siderbar-contaiter {
-  width: 90px !important;
+  width: 80px !important ;/*no*/
   height: 100%;
-  padding: 0 5px;
+  // padding: 0 5px;/*no*/
   box-sizing: border-box;
   overflow: hidden;
-  margin-top: 16px;
+  margin-top: 16px;/*no*/
   .routerlink {
     display: flex;
     flex-direction: column;
-    width: 80px;
-    height: 80px;
+    width: 80px;/*no*/
+    height: 80px;/*no*/
     align-items: center;
     justify-content: space-evenly;
     img {
-      width: 24px;
-      height: 24px;
+      width: 24px;/*no*/
+      height: 24px;/*no*/
     }
     span {
       width: 100%;
@@ -68,8 +68,8 @@ export default {
     }
   }
   .routerlink:hover {
-    width: 80px;
-    height: 80px;
+    width: 80px;/*no*/
+    height: 80px;/*no*/
     background-color: #1c263a;
     box-sizing: border-box;
   }
@@ -77,24 +77,24 @@ export default {
     background-color: #636c97;
   }
 }
-@media screen and (max-width: 1400px) {
-  .siderbar-contaiter {
-    .routerlink {
-      span {
-        transform: scale(0.8);
-        width: calc(100% + 60px);
-      }
-    }
-  }
-}
-@media screen and(max-width:1279px) {
-  .siderbar-contaiter {
-    .routerlink {
-      span {
-        transform: scale(0.7);
-        width: calc(100% + 60px);
-      }
-    }
-  }
-}
+// @media screen and (max-width: 1400px) {
+//   .siderbar-contaiter {
+//     .routerlink {
+//       span {
+//         transform: scale(0.8);
+//         width: calc(100% + 60px);
+//       }
+//     }
+//   }
+// }
+// @media screen and(max-width:1279px) {
+//   .siderbar-contaiter {
+//     .routerlink {
+//       span {
+//         transform: scale(0.7);
+//         width: calc(100% + 60px);
+//       }
+//     }
+//   }
+// }
 </style>

src/views/equipment-monitoring/index.scss

@@ -183,18 +183,25 @@
       overflow: hidden;
       min-height: 685px;
       height: calc(100vh - 410px); //740 600多
-      @media screen and(max-height:770px) and (max-width: 1400px) and (min-width:1280px) {
-        min-height: 660px;
-      }
-      @media screen and(max-height:750px) and (max-width: 1300px) and (min-width:1160px) {
-        min-height: 680px;
-      }
       // box-sizing: border-box;
       .storagebox {
         width: 100%;
         display: flex;
       }
     }
+    @media screen and(max-height:800px){
+      .storage-bottom {
+        min-height: 680px;
+      }
+    }
+    @media screen and(max-height:760px){
+      .storage-bottom {
+        min-height: 660px;
+      }
+      .info-left{
+        margin-bottom: 10px;
+      }
+    }
     .storage-page {
       text-align: right;
       color: #fff;
@@ -488,7 +495,7 @@
     li:nth-child(2)
     .signal-status
     .signal-status-list {
-    padding-right: 35px;
+    padding-right: 10px;
     white-space: nowrap;
     text-align: center;
     .signal-text {
@@ -540,6 +547,7 @@
   }
   .storage-item .container {
     .info-left .info-text {
+      white-space: nowrap;
       transform: scale(0.9);
     }
     .info-left .info-electric {
@@ -551,6 +559,7 @@
   .power .power-text {
     span {
       transform: scale(0.9);
+      white-space: nowrap;
     }
   }
   .battery-number {

src/views/manage-log/robot.vue

@@ -409,6 +409,8 @@ export default {
 }
 ::v-deep .el-table th.is-leaf{
   font-size: 15px !important;
+  height: 36px !important;
+  line-height: 36px !important;
 }
 /* .serch{
   min-width: 70px;