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

zhangshuaibao

2021-03-31 393b2243412842c293c6f633fc327f80bef55c98

 src/components/panel/ToolBoxPanel.vue

@@ -1,38 +1,38 @@
<template>
  <div class="left-top-toolbox-panel">
  <div class="left-top-toolbox-panel" v-if="toolBoxPanelVisible">
    <div class="specific-tools">
      <el-button class="el-button-choice" @click="changeSelect" v-show="selectGroup">
        <img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
        <span>工具</span>
      </el-button>
      <el-button class="el-button-choice" @click="changeSelect" v-show="!selectGroup">
        <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="">
        <a>工具</a>
      <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"
                 @mouseover.enter.native="changeSelectMouse">
        <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt=""/>
        <span class="span-default">工具</span>
      </el-button>
      <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 ? 'tools-panel-choose':''"
                       @click="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index && checked === true"/>
            <el-button slot="reference" class="el-button"
                       :class="active === index? 'tools-panel-choose':''"
                       @click.native="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index"/>
              <img :src="item.icon" alt="" v-else/>
              <span>{{ item.label }}</span>
              <span v-if="active === index">{{ 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 && checked === true"/>
              <img :src="itemT.icon" :title="itemT.title" v-else/>
              <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem" alt=""/>
              <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
            </el-button>
            <div class="base-map-inner-panel" v-show="!isShow&&item.index==='2'">
              <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
            <div class="base-map-inner-panel" v-show="item.index==='2'">
              <div v-for="item in basemapHelper.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)"/>
                     @click="changeBasemap(item)" alt=""/>
                <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
                             label="标注" @change="changeBasemap(item)">
                </el-checkbox>
@@ -85,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'

@@ -92,11 +97,20 @@
  name: 'ToolBoxPanel',
  data () {
    return {
      checked: false,
      checkbuuton: -1,
      isShow: true,
      isShow: [],
      currentBaseMapCode: 'tianditu_img',
      basemapList: [],
      selectGroup: false,
      toolBoxPanelVisible: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
      active: -1,
      checked: false,
      checkbutton: -1,
      checkedItem: false,
      Selecd: -1,
      isSelecd: -1,
      menuList: [
        {
          icon: plot,
@@ -224,30 +238,24 @@
            {
              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纵向'
            }
          ]
        }
      ],
      selectGroup: false,
      drawLayer: null,
      map: null,
      // L: window.L,
      active: -1,
      Selecd: -1
      ]
    }
  },
  computed: {
@@ -255,22 +263,16 @@
      return this.$store.state.map.basemapHelper
    }
  },
  watch: {
    basemapHelper (newVal) {
      if (newVal != null) {
        this.updateBasemapList()
      }
    }
  },
  methods: {
    updateBasemapList () {
      this.basemapList = this.basemapHelper.getBasemapList()
    init (map) {
      this.map = map
      this.toolBoxPanelVisible = true
    },
    changeBasemap (itm) {
      this.active = -1
      const code = itm.code
      this.basemapList.forEach((item) => {
      this.basemapHelper.basemapList.forEach((item) => {
        if (item.code === code) {
          console.log(this.currentBaseMapCode)
          if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
            this.currentBaseMapCode = code
            this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
@@ -278,30 +280,51 @@
            this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
          }

          this.basemapHelper.getBasemapList().forEach((item) => {
          this.basemapHelper.basemapList.forEach((item) => {
            item.layer.bringToBack()
          })
        }
      })
    },
    changeChoose (index) {
      this.active = index
      if (this.drawLayer == null) {
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      if (this.checkbuuton === index) {
        this.checked = !this.checked
      } else {
        if (this.checkbuuton === -1) {
          this.checked = !this.checked
        } else {
          this.checked = true
      // this.isShow[index] = !this.isShow[index]
      // this.isShow[index - 1] = !this.isShow[index - 1]
      // 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
      // console.log(this.isShow[index - 1])
      console.log(this.basemapList)
      for (let i = 0; i < this.isShow.length; i++) {
        if (i !== index) {
          this.isShow[i] = false
        }
      }
      this.checkbuuton = index
      this.isShow[index] = !this.isShow[index]
      this.isShow[index] ? (this.active = index) : (this.active = '')
    },
    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({
@@ -310,33 +333,35 @@
            iconAnchor: [13, 16],
            popupAnchor: [26, -32]
          })
          var drawLayerMarker = this.map.editTools.startMarker()
          drawLayerMarker.setIcon(myIcon)
          this.drawLayer.addLayer(drawLayerMarker)
          this.setLogic(drawLayerMarker)
          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 '线标绘':
          var drawLayerLine = this.map.editTools.startPolyline()
          this.drawLayer.addLayer(drawLayerLine)
          this.setLogic(drawLayerLine)
          this.drawLayer = this.map.editTools.startPolyline()
          this.drawLayerArray.push(this.drawLayer)
          this.setLogic()
          break
        case '多边形':
          var drawLayerPolygonD = this.map.editTools.startPolygon()
          this.drawLayer.addLayer(drawLayerPolygonD)
          this.setLogic(drawLayerPolygonD)
          this.drawLayer = this.map.editTools.startPolygon()
          this.drawLayerArray.push(this.drawLayer)
          this.setLogic()
          break
        case '矩形':
          var drawLayerPolygonJ = this.map.editTools.startRectangle()
          this.drawLayer.addLayer(drawLayerPolygonJ)
          this.setLogic(drawLayerPolygonJ)
          this.drawLayer = this.map.editTools.startRectangle()
          this.drawLayerArray.push(this.drawLayer)
          this.setLogic()
          break
        case '圆形':
          var drawLayerPolygonY = this.map.editTools.startCircle()
          this.drawLayer.addLayer(drawLayerPolygonY)
          this.setLogic(drawLayerPolygonY)
          this.drawLayer = this.map.editTools.startCircle()
          this.drawLayerArray.push(this.drawLayer)
          this.setLogic()
          break
        case '删除':
          this.drawLayer.clearLayers()
          for (let i = 0; i < this.drawLayerArray.length; i++) {
            this.map.removeLayer(this.drawLayerArray[i])
          }
          break
        case '清除':
          Measure.clearMeasure(this.map, this.L)
@@ -350,10 +375,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
@@ -362,7 +386,8 @@
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
            hideControlContainer: true,
            hidden: true
          }).addTo(this.map)
          printerX.printMap('A4Landscape page', '横向')
          break
@@ -371,22 +396,28 @@
            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 (layer) {
      layer.on('dblclick', this.L.DomEvent.stop).on('dblclick', layer.toggleEdit)
      layer.setStyle({
    setLogic () {
      this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
      this.drawLayer.setStyle({
        color: 'red'
      })
    },
    changeSelect () {
      this.selectGroup = !this.selectGroup
      this.selectGroup = false
      this.isShow = !this.isShow
      this.checked = false
      this.active = -1
    },
    changeSelectMouse () {
      this.selectGroup = true
      this.isShow = []
    }
  }
}
@@ -417,8 +448,8 @@
      margin: 0 0.015rem;
      width: 45px;
      height: 45px;
      background: @background-color-tools;
      border: none;
      background: @background-color;
      vertical-align: middle !important;

      .base-map-img {
        position: absolute;
@@ -433,34 +464,39 @@
        height: 22px;
      }

      span {
        display: block;
        color: @color-tool;
      }

      a {
      .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-tools;
      border: 1px solid @color-shadow;
      background: @background-color;
      border: 0.00521rem solid @color-shadow;
    }

    .active-button {
      border: 0.00521rem solid #fff700;
      box-shadow: 0 0 0.03rem #fff700;
    }

    .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;
@@ -477,7 +513,7 @@
          position: absolute;
          margin-left: 2px;
          background-color: rgba(0, 0, 0, .5);
          color: white;
          color: @color-over;

          .el-checkbox__label {
            padding-left: 5px !important;
@@ -516,14 +552,20 @@

        span {
          display: block;
          color: @color-shadow;
        }

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

    .special-button {
      width: 22.5px;
      height: 45px;
      color: @color-over;
      .special-button {
        width: 22px;
        height: 45px;
        color: @color-over;
      }
    }
  }
}