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

chenyabin

2021-04-13 3c93d885a3bc6a84079cc347bb30888d5fb98f11

 src/components/LayerController/LayerController.vue

@@ -21,7 +21,7 @@

import iconSetting from '@/assets/images/map-pages/icon/setting.png'
import LcServiceLayer from './modules/LcServiceLayer'

import bus from '@/eventBus'
export default {
  name: 'LayerController',
  components: { LcServiceLayer },
@@ -55,9 +55,22 @@
      }
    }
  },
  mounted () {
    const that = this
    bus.$on('changeState', function (state) {
      if (state.num !== 3 && state.type) {
        that.layerControllerVisible = false
      }
    })
  },
  methods: {
    showPanel () {
      this.layerControllerVisible = !this.layerControllerVisible
      const state = {
        type: this.layerControllerVisible,
        num: 3
      }
      bus.$emit('changeState', state)
    },
    switchPanel () {
      this.panelSwitch.main = !this.panelSwitch.main
@@ -247,14 +260,19 @@
    background: #0E3565;
  }
  .el-button--default{
    padding: 15px 3px;
    padding: 0;
    background:@background-color4;
    color:@color-tool;
    position: absolute;
    top:0;
    left: 100%;
    margin-left: .02rem;
    border:1px solid @color-tool;
    top:24px;
    right:0.02rem;
    border:none;//1px solid @color-tool;
    width: 0.2rem;
    height: 0.2rem;
    text-align: center;
    line-height: 0.2rem;
    margin-top: -0.1rem;
    border-radius: 50%;
    // border-radius: 0.03rem 50% 50% 0.03rem;
  }
  .el-button--default:hover{