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

ChenZeping

2021-05-08 3ec2e48009c84474ead34a82713ccc8c46f05d26

 src/components/LayerController/modules/LcServiceLayer.vue

@@ -129,9 +129,11 @@
        .wms-panel {

            .wms-panel-scrollbar{
                height: 600px;
                // height: 600px;
                //width: 285px;
                width: 1.79rem;
               // width: 1.79rem;
                height: 70vh;
                width:2.1rem;
                font-size: 14px;
            }
            .layerbox {