From 0c9979075994d553695e1027b0d31566c838aff7 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 12 三月 2021 11:32:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/LayerController/modules/LcServiceLayerFilter.vue |   46 ++++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index a108102..c116585 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -5,12 +5,14 @@
                 <div class="title"><input type="checkbox" :value="item.code" :checked="item.checked"
                                           @change="swAllSubFilter(item)">{{item.name}}
                 </div>
+              <el-scrollbar style="height:100%">
                 <div class="content">
                     <div v-for="filter in item.layers" :key="filter.code">
                         <input type="checkbox" :value="filter.code" :checked="filter.checked" @change="swSubFilter(item.url,filter)"><label
                             :title="filter.name">{{filter.name}}</label>
                     </div>
                 </div>
+              </el-scrollbar>
             </div>
         </div>
     </div>
@@ -92,7 +94,7 @@
                 margin-right: 5px;
 
                 .title {
-                    height: '25px';
+                    height: 25px;
                     background-color: #091331;
                     border: 1px solid #10488c;
                 }
@@ -101,28 +103,28 @@
                     background-color: rgba(44, 62, 80, 0.6);
                     border: 1px solid #10488c;
                     max-height: 200px;
-                    overflow-y: auto;
+                    //overflow-y: hidden;
                 }
-
-                ::-webkit-scrollbar {
-                    width: 7px;
-                    height: 5px !important;
-                }
-
-                ::-webkit-scrollbar-thumb {
-                    /*婊氬姩鏉¢噷闈㈠皬鏂瑰潡*/
-                    border-radius: 10px;
-                    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-                    background: #0661AE;
-                    border: 1px solid transparent;
-                }
-
-                ::-webkit-scrollbar-track {
-                    /*婊氬姩鏉¢噷闈㈣建閬�*/
-                    // box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
-                    border-radius: 0px;
-                    background: #0E3565;
-                }
+                //
+                //::-webkit-scrollbar {
+                //    width: 7px;
+                //    height: 5px !important;
+                //}
+                //
+                //::-webkit-scrollbar-thumb {
+                //    /*婊氬姩鏉¢噷闈㈠皬鏂瑰潡*/
+                //    border-radius: 10px;
+                //    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+                //    background: #0661AE;
+                //    border: 1px solid transparent;
+                //}
+                //
+                //::-webkit-scrollbar-track {
+                //    /*婊氬姩鏉¢噷闈㈣建閬�*/
+                //    // box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
+                //    border-radius: 0px;
+                //    background: #0E3565;
+                //}
             }
         }
     }

--
Gitblit v1.8.0