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

XingChuan

2021-05-30 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936

 src/components/LayerController/LayerController.vue

@@ -3,7 +3,8 @@

    <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="图层控制" placement="left">
      <div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style="  position: absolute;top:0;left: 0;">
        <img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon">
        <!--  <img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon"> -->
        <i class="icon iconfont iconlayer-group"></i>
        <!--        <span class="icon-name">图层</span>-->
      </div>
    </el-tooltip>
@@ -264,7 +265,7 @@
    background:@background-color4;
    color:@color-tool;
    position: absolute;
    top:24px;
    top:20px;
    right:0.02rem;
    border:none;//1px solid @color-tool;
    width: 0.2rem;
@@ -282,7 +283,7 @@
    color:@color;
  }
  .legend-content{
    width: 1.79167rem;
    //width: 1.79167rem;
  }
}