Quellcode durchsuchen

Merge remote-tracking branch 'origin/main'

zhanghao vor 1 Monat
Ursprung
Commit
e27542be7c

+ 2 - 2
src/views/pad/engineering/currentArea.vue

@@ -419,7 +419,7 @@ export default {
       align-items: center;
       font-size:14px;
       color:#00FFFF;
-      width: 504px;
+      width: 515px;
       background: #44f1ff1a;
 
 
@@ -474,7 +474,7 @@ export default {
       align-items: center;
       font-size:14px;
       color:#00FFFF;
-      width: 504px;
+      width: 515px;
       background: #44f1ff1a;
 
     }

+ 24 - 25
src/views/pad/engineering/unitAccessto.vue

@@ -25,14 +25,14 @@
       </div>
     </div>
   </template>
-  
+
   <script>
   import BarChart from "@/components/Echarts/BarChart";
   import LineChart from "@/components/Echarts/LineChart.vue";
   import echarts from "echarts";
   import { getProjectCameraNumList } from '@/api/screen/service'
-  
-  
+
+
   export default {
     name: "UnitAccessTo",
     components: {
@@ -172,9 +172,9 @@
         });
       },
       choose(f){
-  
+
         this.$emit('chooseUnit',f)
-  
+
       },
       handleDataList() {
         this.dataList = [];
@@ -213,7 +213,7 @@
           ];
         },100)
       },
-  
+
       //初始化
       handleUnitDataList() {
         let unitDataList = [];
@@ -254,7 +254,7 @@
         });
         this.unitDataList = unitDataList;
       },
-  
+
       handleCurrentArea() {
         (this.lineData = [
           {
@@ -277,7 +277,7 @@
               width: 2, // 设置线宽
               color: "#00FFFF", // 设置线的颜色
             },
-  
+
             smooth: true,
             data: [40, 60, 80, 50],
           },
@@ -299,7 +299,7 @@
             boundaryGap: false,
           });
       },
-  
+
       handleOnlineData() {
         (this.onlineData = [
           {
@@ -322,7 +322,7 @@
               width: 2, // 设置线宽
               color: "#00FFFF", // 设置线的颜色
             },
-  
+
             smooth: true,
             data: [40, 60, 80, 50],
           },
@@ -347,7 +347,7 @@
     },
   };
   </script>
-  
+
   <style lang="scss" scoped>
   .content-title {
     width: 100%;
@@ -373,14 +373,14 @@
       flex-direction: column;
       padding: 15px 20px 0 15px;
     }
-  
+
     .said{
       width: 1px;
       height: 13px;
       background-color: #00FFFF;
     }
-  
-  
+
+
     .content {
       width: 100%;
       margin-top: 10px;
@@ -449,7 +449,7 @@
           margin-right: 0;
         }
       }
-  
+
       .rate-area {
         position: relative;
         margin-left: 35px;
@@ -496,10 +496,10 @@
       margin-left: 45px;
       margin-right: 5px;
     }
-  
+
     .table-cont{
       width:100%;
-  
+
       .table-top{
         height: 38px;
         background-size: 100% 100%;
@@ -509,12 +509,12 @@
         align-items: center;
         font-size:14px;
         color:#00FFFF;
-        width: 504px;
+        width: 515px;
         background: #44f1ff1a;
       }
       .table-bot{
         width:100%;
-  
+
         .table-list{
           width:100%;
           height:30px;
@@ -531,7 +531,7 @@
           cursor: pointer;
         }
       }
-  
+
       .fir{
         width:40%;
         text-align: left;
@@ -546,19 +546,19 @@
         text-align: left;
       }
     }
-  
+
     ::-webkit-scrollbar {
       display: none;
       width: 3px;
       height: 3px;
     }
-  
+
     ::-webkit-scrollbar-thumb {
       //滑块部分
       // border-radius: 5px;
       background-color: #58cbbb;
     }
-  
+
     ::-webkit-scrollbar-track {
       //轨道部分
       // box-shadow: inset 0 0 5px #ddd;
@@ -567,5 +567,4 @@
     }
   }
   </style>
-  
-  
+

+ 2 - 2
src/views/screen/engineering/currentArea.vue

@@ -419,7 +419,7 @@ export default {
       align-items: center;
       font-size:14px;
       color:#00FFFF;
-      width: 504px;
+      width: 515px;
       background: #44f1ff1a;
 
 
@@ -474,7 +474,7 @@ export default {
       align-items: center;
       font-size:14px;
       color:#00FFFF;
-      width: 504px;
+      width: 515px;
       background: #44f1ff1a;
 
     }

+ 1 - 1
src/views/screen/engineering/unitAccessto.vue

@@ -509,7 +509,7 @@ export default {
       align-items: center;
       font-size:14px;
       color:#00FFFF;
-      width: 504px;
+      width: 515px;
       background: #44f1ff1a;
     }
     .table-bot{