Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwo...

chenzeping

2021-03-17 2d9a0acec2da0d6caf81083e900f5eb111623304

Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into master


 Conflicts:

	src/components/panel/ToolBoxPanel.vue

 src/components/panel/ToolBoxPanel.vue

@@ -1,10 +1,13 @@
<template>
  <div class="left-top-toolbox-panel">
    <div class="specific-tools">
      <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 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>
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
@@ -17,14 +20,13 @@
          >
            <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"/>
              <img :src="item.iconSelecd" alt="" v-if="active === index && checked === true"/>
              <img :src="item.icon" alt="" v-else/>
              <span v-if="active === index && checked">{{ item.label }}</span>
              <span v-else>{{ item.label }}</span>
              <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 && checked === true"/>
              <img :src="itemT.icon" :title="itemT.title" v-else/>
            </el-button>
            <div class="base-map-inner-panel" v-show="!isShow&&item.index==='2'">
@@ -91,17 +93,10 @@
  data () {
    return {
      checked: false,
      checkbuuton: -1,
      isShow: true,
      currentBaseMapCode: 'tianditu_img',
      basemapList: [],
      selectGroup: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
      active: -1,
      Selecd: -1,
      isSelecd: false,
      checkbutton: -1,
      menuList: [
        {
          icon: plot,
@@ -246,7 +241,14 @@
            }
          ]
        }
      ]
      ],
      selectGroup: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
      // L: window.L,
      active: -1,
      Selecd: -1
    }
  },
  computed: {
@@ -288,16 +290,19 @@
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      this.active = index
      if (this.checkbutton === index) {
      if (this.drawLayer == null) {
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      if (this.checkbuuton === index) {
        this.checked = !this.checked
      } else {
        if (this.checkbutton === -1) {
        if (this.checkbuuton === -1) {
          this.checked = !this.checked
        } else {
          this.checked = true
        }
      }
      this.checkbutton = index
      this.checkbuuton = index
    },
    choiceItem (itemT, indexT) {
      this.Selecd = indexT