Merge remote-tracking branch 'origin/master'

李红刚

2021-03-18 0645797cebf73c129913e1caf8d64f16de8f8a82

Merge remote-tracking branch 'origin/master'

 src/assets/css/map/_map-variable.less

@@ -5,7 +5,7 @@
@color-over: white;
@color-tool: #C0C4CC;
@color-shadow: #00fff6;
@background-color: rgba(0, 16, 30, .8);
@background-color: rgba(0, 16, 30, .5);
@background-color-light: rgba(40, 50, 100, .4);
@background-color-split: rgba(0, 255, 246, .14);
@background-color-tools: #1A4951;

 src/assets/css/map/map-panel-style.less

@@ -183,3 +183,6 @@
.el-popper[x-placement^=bottom] .popper__arrow::after {
  border-bottom-color: @background-color-tools;
}
.leaflet-control-easyPrint .leaflet-bar .leaflet-control {
  display: none;
}

 src/components/panel/ToolBoxPanel.vue

@@ -1,13 +1,10 @@
<template>
  <div class="left-top-toolbox-panel">
    <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">
@@ -20,9 +17,10 @@
          >
            <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"/>
              <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'">
@@ -95,6 +93,14 @@
      isShow: true,
      currentBaseMapCode: 'tianditu_img',
      basemapList: [],
      selectGroup: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
      active: -1,
      Selecd: -1,
      checked: false,
      checkbutton: -1,
      menuList: [
        {
          icon: plot,
@@ -239,14 +245,7 @@
            }
          ]
        }
      ],
      selectGroup: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
      // L: window.L,
      active: -1,
      Selecd: -1
      ]
    }
  },
  computed: {
@@ -284,7 +283,20 @@
      })
    },
    changeChoose (index) {
      if (this.drawLayer == null) {
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      this.active = index
      if (this.checkbutton === index) {
        this.checked = !this.checked
      } else {
        if (this.checkbutton === -1) {
          this.checked = !this.checked
        } else {
          this.checked = true
        }
      }
      this.checkbutton = index
    },
    choiceItem (itemT, indexT) {
      this.Selecd = indexT
@@ -299,6 +311,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 +350,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 +361,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,7 +371,8 @@
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
            hideControlContainer: true,
            hidden: true
          }).addTo(this.map)
          printerY.printMap('A4Portrait page', '纵向')
          break
@@ -371,8 +385,12 @@
      })
    },
    changeSelect () {
      this.selectGroup = !this.selectGroup
      this.selectGroup = false
      this.isShow = !this.isShow
      this.active = -1
    },
    changeSelectMouse () {
      this.selectGroup = true
    }
  }
}
@@ -403,8 +421,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;
@@ -419,14 +437,16 @@
        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;
      }
    }

@@ -436,17 +456,19 @@
      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;
@@ -463,7 +485,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;
@@ -502,15 +524,20 @@

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

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