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

chenyabin

2021-03-31 2596ad89b4a57d2129f0a58cbc77d364eeaf412d

 src/components/panel/ToolBoxPanel.vue

@@ -9,14 +9,16 @@
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
          <el-popover
              trigger="manual"
              placement="bottom"
              trigger="click"
              :popper-class="'tools-panel-content'"
              v-for="(item,index) in menuList" :key="index"
              :width="item.index === '2'?230 : 150"
              v-model="isShow[index]"
          >
            <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
                       @click="changeChoose(index)">
            <el-button slot="reference" class="el-button"
                       :class="active === index && checked? 'tools-panel-choose':''"
                       @click.native="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
              <img :src="item.icon" alt="" v-else/>
              <span v-if="active === index && checked">{{ item.label }}</span>
@@ -83,6 +85,11 @@
import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'

// 下载
import FullScreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
import cross from '@assets/images/map-pages/icon/toolbox/cross.png'
import vertical from '@assets/images/map-pages/icon/toolbox/vertical.png'

// 测量的方法
import Measure from '@/components/plugin/MeaSure'

@@ -90,7 +97,7 @@
  name: 'ToolBoxPanel',
  data () {
    return {
      isShow: false,
      isShow: [],
      currentBaseMapCode: 'tianditu_img',
      basemapList: [],
      selectGroup: false,
@@ -230,19 +237,19 @@
            {
              index: '4-1',
              label: '全屏',
              icon: '',
              icon: FullScreen,
              title: '全屏'
            },
            {
              index: '4-2',
              label: 'A4横向',
              icon: '',
              icon: cross,
              title: 'A4横向'
            },
            {
              index: '4-3',
              label: 'A4纵向',
              icon: '',
              icon: vertical,
              title: 'A4纵向'
            }
          ]
@@ -265,7 +272,6 @@
  methods: {
    updateBasemapList () {
      this.basemapList = this.basemapHelper.getBasemapList()
      console.log()
    },
    changeBasemap (itm) {
      this.active = -1
@@ -291,6 +297,7 @@
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      this.active = index
      this.isShow[index] = !this.isShow[index]
      if (this.checkbutton === index) {
        this.checked = !this.checked
        this.Selecd = -1