Merge remote-tracking branch 'origin/master'

YANGDL

2021-03-19 c88e6fc89736da8faa46d525c8781c0f1dac5384

 src/components/panel/ToolBoxPanel.vue

@@ -15,18 +15,19 @@
              v-for="(item,index) in menuList" :key="index"
              :width="item.index === '2'?230 : 150"
          >
            <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
            <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
                       @click="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index"/>
              <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
              <img :src="item.icon" alt="" v-else/>
              <span>{{ item.label }}</span>
              <span v-if="active === index && checked">{{ item.label }}</span>
              <span v-else class="default-span">{{ item.label }}</span>
            </el-button>
            <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
                       v-show="item.index!=='2'">
              <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT"/>
              <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem"/>
              <img :src="itemT.icon" :title="itemT.title" v-else/>
            </el-button>
            <div class="base-map-inner-panel" v-show="!isShow&&item.index==='2'">
            <div class="base-map-inner-panel" v-show="item.index==='2'">
              <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
                <img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
                     @click="changeBasemap(item)"/>
@@ -89,9 +90,19 @@
  name: 'ToolBoxPanel',
  data () {
    return {
      isShow: true,
      isShow: false,
      currentBaseMapCode: 'tianditu_img',
      basemapList: [],
      selectGroup: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
      active: -1,
      checked: false,
      checkbutton: -1,
      checkedItem: false,
      Selecd: -1,
      isSelecd: -1,
      menuList: [
        {
          icon: plot,
@@ -236,14 +247,7 @@
            }
          ]
        }
      ],
      selectGroup: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
      // L: window.L,
      active: -1,
      Selecd: -1
      ]
    }
  },
  computed: {
@@ -263,6 +267,7 @@
      this.basemapList = this.basemapHelper.getBasemapList()
    },
    changeBasemap (itm) {
      this.active = -1
      const code = itm.code
      this.basemapList.forEach((item) => {
        if (item.code === code) {
@@ -281,13 +286,34 @@
      })
    },
    changeChoose (index) {
      if (this.active === index) {
        console.log('取消当前选中状态')
      if (this.drawLayer == null) {
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      this.active = index
      if (this.checkbutton === index) {
        this.checked = !this.checked
        this.Selecd = -1
      } else {
        if (this.checkbutton === -1) {
          this.checked = !this.checked
        } else {
          this.checked = true
        }
      }
      this.checkbutton = index
    },
    choiceItem (itemT, indexT) {
      this.Selecd = indexT
      if (this.isSelecd === indexT) {
        this.checkedItem = !this.checkedItem
      } else {
        if (this.isSelecd === -1) {
          this.checkedItem = !this.checkedItem
        } else {
          this.checkedItem = true
        }
      }
      this.isSelecd = indexT
      switch (itemT.label) {
        case '点标绘':
          var myIcon = this.L.icon({
@@ -299,6 +325,7 @@
          this.drawLayer = this.map.editTools.startMarker()
          this.drawLayer.setIcon(myIcon)
          this.drawLayerArray.push(this.drawLayer)
          this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
          break
        case '线标绘':
          this.drawLayer = this.map.editTools.startPolyline()
@@ -337,10 +364,9 @@
        case '全屏':
          // this.map.toggleFullscreen()
          var printer = this.L.easyPrint({
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
            hideControlContainer: true,
            hidden: true
          }).addTo(this.map)
          printer.printMap('CurrentSize', '全屏')
          break
@@ -349,7 +375,8 @@
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
            hideControlContainer: true,
            hidden: true
          }).addTo(this.map)
          printerX.printMap('A4Landscape page', '横向')
          break
@@ -358,11 +385,13 @@
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
            hideControlContainer: true,
            hidden: true
          }).addTo(this.map)
          printerY.printMap('A4Portrait page', '纵向')
          break
      }
      this.active = -1
    },
    setLogic () {
      this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
@@ -373,6 +402,7 @@
    changeSelect () {
      this.selectGroup = false
      this.isShow = !this.isShow
      this.active = -1
    },
    changeSelectMouse () {
      this.selectGroup = true
@@ -407,7 +437,6 @@
      width: 45px;
      height: 45px;
      background: @background-color;
      //border: 1px solid @color-shadow;
      vertical-align: middle !important;

      .base-map-img {
@@ -426,22 +455,25 @@
      .span-default {
        display: block;
        color: @color-shadow;
        font-size: 11px;
      }

      span {
        display: block;
        color: @color-over;
        font-size: 11px;
      }
    }

    .el-button-choice {
      left: 500px;
      z-index: 999;
      padding: 0;
      margin: 0 0.015rem;
      width: 45px;
      height: 45px;
      background: @background-color;
      border: 1px solid @color-shadow;
      border: 0.00521rem solid @color-shadow;
    }

    .active-button {
@@ -451,11 +483,8 @@

    .specific-tools-group {
      z-index: 1;
      //.tools-panel-content {
      //  width:220px!important;
      //}

      .base-map-inner-panel {
        //width: 230px!important;
        display: flex;
        justify-content: center;
        align-items: center;
@@ -513,6 +542,11 @@
          display: block;
          color: @color-shadow;
        }

        .default-span {
          display: block;
          color: @color-over;
        }
      }

      .special-button {