Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

gassafety-web/src/assets/styles/gassafety.scss

@@ -119,7 +119,9 @@
 .right-bottom-data-left {
   .el-table {
     background-color: rgba(0, 0, 0, 0) !important;
-
+    .el-table__body {
+      width: 100% !important;
+    }
     &::before {
       height: 0px !important;
     }
@@ -175,6 +177,39 @@
       }
     }
   }
+  // 滚动条样式
+  .el-table--scrollable-y {
+    .el-table__body-wrapper {
+      &::-webkit-scrollbar {
+        width: 10px;
+        background: #012a53;
+        position: absolute;
+        top: 0;
+      }
+      &::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        // border-radius: 10px;
+        // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        background: #00000052;
+        border-radius: 8px;
+      }
+      &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        // border-radius: 10px;
+        // background-color: red;
+      }
+
+      &::-webkit-scrollbar-button:start {
+        // overflow: hidden;
+      }
+      &::-webkit-scrollbar-button:end {
+        // overflow: hidden;
+      }
+
+      // overflow-y: none !important;
+    }
+  }
 }
 // gis地图里抽屉的搜索样式
 .search-input {
@@ -386,7 +421,6 @@
   }
 }
 
-
 // 设备巡检详情页表格样式
 .inspectiondetail {
   .el-table {
@@ -440,3 +474,37 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+// 滚动条公共样式
+.scrollStyle {
+  &::-webkit-scrollbar {
+    width: 10px;
+    background: rgba(6, 29, 51, 0.8)
+
+    // position: absolute;
+    // top: 0;
+  }
+  &::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    // border-radius: 10px;
+    // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background: #00000053;
+
+    border-radius: 8px;
+  }
+  &::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    // border-radius: 10px;
+    // background-color: red;
+  }
+
+  &::-webkit-scrollbar-button:start {
+    // overflow: hidden;
+  }
+  &::-webkit-scrollbar-button:end {
+    // overflow: hidden;
+  }
+
+  // overflow-y: none !important;
+}

gassafety-web/src/components/PopWindow/lineInfoWindow.vue

@@ -8,7 +8,7 @@
     </div>
 
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <!-- <div :title="obj.pipeName" class="eq-text">

gassafety-web/src/components/PopWindow/markerInfoWindow.vue

@@ -12,7 +12,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content  scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">

gassafety-web/src/components/PopWindowGis/lineInfoWindow.vue

@@ -8,7 +8,7 @@
     </div>
 
     <!-- 报警设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <!-- <div :title="obj.pipeName" class="eq-text">

gassafety-web/src/components/PopWindowGis/lineInfoWindowWarn.vue

@@ -8,7 +8,7 @@
     </div>
 
     <!-- 报警设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <!-- <div :title="obj.pipeName" class="eq-text">

gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content  scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">

gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue

@@ -10,7 +10,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">

gassafety-web/src/components/PopWindowGis/troubleInfoWindowWarn.vue

@@ -10,7 +10,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content  scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">