Merge remote-tracking branch 'origin/master'

wangqi

2021-03-12 0c9979075994d553695e1027b0d31566c838aff7

 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 {
                    /*滚动条里面轨道*/
                //
                //::-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);
                    border-radius: 0px;
                    background: #0E3565;
                }
                //    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;
                //}
            }
        }
    }