Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-07 cd80929f0ae8882a98cfe3936b2a96bded1c12d8

 src/components/LayerController/modules/LcServiceLayer.vue

@@ -1,13 +1,11 @@
<template>
    <div class="inner-panel">
        <div class="title">
            图层控制
        </div>
        <div class="panel-title"> 图层控制 </div>
        <div class="wms-panel">
            <el-scrollbar class="wms-panel-scrollbar">
                <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
                    <!-- 一级图层遍历 -->
                    <div>
                    <div style="padding-left:10px;padding-top:10px">
                        <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
                               @change="swAllLayers(item)"/>{{ item.name }}
                    </div>
@@ -105,13 +103,6 @@

<style scoped lang="less">
    .inner-panel {
        .title{
            color: @color-title;
            font-size: 18px;
            margin: 10px;
            text-align: center;
        }

        .btn-filter {
            cursor: pointer;
            color: #ffffff;
@@ -120,13 +111,14 @@
        .wms-panel {

            .wms-panel-scrollbar{
                height: 50vh;
                height: 457px;
                width: 100%;
                font-size: 14px;
            }
            .layerbox {
                width: 100%;
                .layerbox-item {
                    padding-left: 20px;
                    padding-left: 30px;
                    padding-top: 5px;
                    .basemap-layer-item {
                        margin-bottom: 5px;