Merge remote-tracking branch 'origin/master'

徐旺旺

2021-03-15 633192815fc213c1ef45e394973fe2d0f95280b6

Merge remote-tracking branch 'origin/master'

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

@@ -3,7 +3,9 @@
@color-gray:#C0C4CC;
@color-title:white;
@color-over:white;
@color-tool:#C0C4CC;
@background-color:rgba(0,16,30,.8);
@background-color-light:rgba(40,50,100,.4);
@background-color-split:rgba(0,255,246,.14);
@background-color-tools: #1A4951;
@border-radius: .03rem;

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

@@ -136,3 +136,20 @@
  margin-block-start: 0;
  margin-block-end: 0;
}
.tools-panel-content {
  border: 1px solid @background-color-tools;
  background: @background-color-tools;
  padding: 0;
  .el-button {
    padding: 0;
    margin: 10px;
    width: 45px;
    height: 45px;
    background: @background-color-tools;
    vertical-align: middle !important;
    img {
      width: 16px;
      height: 16px;
    }
  }
}

 src/assets/images/map-pages/icon/toolbox/biaohui.png

 src/assets/images/map-pages/icon/toolbox/celiang1.png

 src/assets/images/map-pages/icon/toolbox/circle.png

 src/assets/images/map-pages/icon/toolbox/ditu.png

 src/assets/images/map-pages/icon/toolbox/fullscreen.png

Binary files differ

 src/assets/images/map-pages/icon/toolbox/ju.png

 src/assets/images/map-pages/icon/toolbox/legend.png

Binary files differ

 src/assets/images/map-pages/icon/toolbox/line.png

 src/assets/images/map-pages/icon/toolbox/location.png

Binary files differ

 src/assets/images/map-pages/icon/toolbox/map.png

 src/assets/images/map-pages/icon/toolbox/polygon.png

 src/assets/images/map-pages/icon/toolbox/square.png

Binary files differ

 src/assets/images/map-pages/icon/toolbox/tool.png

 src/assets/images/map-pages/icon/toolbox/xiazai.png

 src/components/panel/BaseNavMenuItem.vue

@@ -12,6 +12,7 @@
      </template>

      <template v-else>

        <el-menu-item :index="item.index" :key="index">

          <!--          <el-radio></el-radio>-->

          {{ item.label }}

        </el-menu-item>

      </template>

@@ -33,24 +34,26 @@
</script>



<style lang="less" scoped>

.el-menu--popup {

  min-width: 100px;

}

.base-nav-menu {

  height: 38px;

  line-height: 38px;

  display: flex;

  align-items: center;

  justify-content: space-around;

  justify-content: center;

  outline: none;

  border: none;



  .el-submenu {

    .el-submenu__title {

      border-radius: 50%;



      .el-icon-arrow-down {

        display: none;

  //margin-left: 20px;

  padding: 0;

  .el-menu--popup {

    min-width: 100px;

  }

      }



    }

.el-menu--horizontal {

  .el-menu--popup {

    min-width: 100px;

  }

}

</style>


 src/components/panel/ToolBoxPanel.vue

@@ -1,86 +1,109 @@
<template>
  <div class="lefttop-toolbox-panel">
    <div>
      <div class="init-choose" @click="changeSelect()">
        <img src="@/assets/images/map-pages/icon/toolbox/circle.png" alt=""/>
      </div>
      <el-menu class="el-menu"
               mode="horizontal"
               :collapse="isCollapse"
               unique-opened
               @open="handleOpen"
               @close="handleClose"
               @select="handleSelect"
               v-show='selectGroup'
  <div class="left-top-toolbox-panel">
    <div class="specific-tools">
      <el-button @click="changeSelect">
        <!--        <i class="el-icon-s-tools"></i>-->
        <img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
        <span>工具</span>
      </el-button>
      <el-row v-show="selectGroup" class="specific-tools-group">
        <el-popover
            placement="bottom"
            width="200"
            trigger="click"
            :popper-class="'tools-panel-content'"
            v-for="(item,index) in menuList" :key="index"
      >
        <base-nav-menu-item :menuList='menuList'></base-nav-menu-item>
      </el-menu>
          <el-button slot="reference" class="tools-panel-choose">
            <img :src="item.icon" alt=""/>
            <span>{{ item.label }}</span>
          </el-button>
          <el-button v-for="(itemT,indexT) in item.items" :key="indexT">
            <!--            <i class="el-icon-s-tools"></i>-->
            <img :src="itemT.icon" alt=""/>
            <!--            <span>{{ itemT.label }}</span>-->
          </el-button>
        </el-popover>
      </el-row>
      <el-button @click="changeSelect" class="special-button">
        <i :class="selectGroup === false ? 'el-icon-d-arrow-right':'el-icon-d-arrow-left'"></i>
      </el-button>
    </div>
    <!--文字标注弹框-->
    <!--    <TextBounced v-show="this.bouncedText" @changeBounced="gitBounced"></TextBounced>-->
  </div>
</template>

<script>
// import legend from '@/assets/images/map-pages/icon/toolbox/legend.png'
import plot from '@assets/images/map-pages/icon/toolbox/biaohui.png'
import polygon from '@assets/images/map-pages/icon/toolbox/celiang1.png'
import location from '@assets/images/map-pages/icon/toolbox/ditu.png'
import fullscreen from '@assets/images/map-pages/icon/toolbox/xiazai.png'

// 标绘的可选择数据
import marker from '@assets/images/map-pages/icon/toolbox/map.png'
import line from '@assets/images/map-pages/icon/toolbox/line.png'

// import square from '@/assets/images/map-pages/icon/toolbox/square.png'
import circle from '@assets/images/map-pages/icon/toolbox/circle.png'
import location from '@assets/images/map-pages/icon/toolbox/location.png'
import polygon from '@assets/images/map-pages/icon/toolbox/polygon.png'
import fullscreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'

// 测量的方法
import '@/components/plugin/leaflet-measure-path/leaflet-measure-path.css'
import Measure from '@/components/plugin/MeaSure'

// import '@/components/plugin/leaflet-measure-path/leaflet-measure-path.css'
// import Measure from '@/components/plugin/MeaSure'
// 标注的方法
import MakeTation from '@components/plugin/MakeTation'

// import MakeTation from '@components/plugin/MakeTation'
// 封装的选择弹框
import BaseNavMenuItem from '@components/panel/BaseNavMenuItem'
// import BaseNavMenuItem from '@components/panel/BaseNavMenuItem'

export default {
  name: 'ToolBoxPanel',
  components: { BaseNavMenuItem },
  // components: { BaseNavMenuItem },
  data () {
    return {
      menuList: [
        {
          icon: circle,
          icon: plot,
          label: '标绘',
          index: '1',
          items: [
            {
              index: '1-1',
              label: '点标绘'
              label: '点标绘',
              icon: marker
            },
            {
              index: '1-2',
              label: '线标绘'
              label: '线标绘',
              icon: line
            },
            {
              index: '1-3',
              label: '面标绘',
              items: [
                {
                  index: '1-3-1',
                  label: '圆形'
                },
                {
                  index: '1-3-2',
              index: '1-4',
                  label: '多边形'
                },
                {
                  index: '1-3-3',
              index: '1-5',
                  label: '矩形'
                }
              ]
        },
        {
          icon: polygon,
          label: '测量',
          index: '3',
          items: [
            {
              index: '3-1',
              label: '距离'
            },
            {
              index: '3-2',
              label: '面积'
            }
          ]
        },
        {
          icon: location,
          label: '切换底图',
          label: '地图',
          index: '2',
          items: [
            {
@@ -116,29 +139,6 @@
          ]
        },
        {
          icon: polygon,
          label: '管网',
          index: '3',
          items: [
            {
              index: '3-1',
              label: '连通性分析'
            },
            {
              index: '3-2',
              label: '爆管分析'
            },
            {
              index: '3-3',
              label: '流向分析'
            },
            {
              index: '3-4',
              label: '横断面分析'
            }
          ]
        },
        {
          icon: fullscreen,
          label: '下载',
          index: '4',
@@ -162,151 +162,135 @@
      selectGroup: false,
      drawLayer: null,
      map: null,
      L: window.L,
      // 控制工具栏 文字标注 的弹框是否显示
      bouncedText: false
      L: window.L
    }
  },
  methods: {
    handleOpen () {
    },
    handleClose () {
    },
    handleSelect (index, indexPath) {

    },
    // handleSelect (index) {
    //   console.log(index)
    //   switch (index) {
    //     case '4-1':
    //       // this.map.toggleFullscreen()
    //       var printer = this.L.easyPrint({
    //         sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
    //         filename: 'map_image',
    //         exportOnly: true,
    //         hideControlContainer: true
    //       }).addTo(this.map)
    //       printer.printMap('CurrentSize', 'MyManualPrint')
    //       break
    //     case '4-2':
    //       var printerX = this.L.easyPrint({
    //         sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
    //         filename: 'map_image',
    //         exportOnly: true,
    //         hideControlContainer: true
    //       }).addTo(this.map)
    //       printerX.printMap('A4Landscape page', 'MyManualPrint')
    //       break
    //     case '4-3':
    //       var printerY = this.L.easyPrint({
    //         sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
    //         filename: 'map_image',
    //         exportOnly: true,
    //         hideControlContainer: true
    //       }).addTo(this.map)
    //       printerY.printMap('A4Portrait page', 'MyManualPrint')
    //       break
    //     case '1-2':
    //       this.drawLayer = this.map.editTools.startPolyline()
    //       this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
    //       Measure.startMeasureLen(this.map, this.L)
    //       break
    //     case '1-3-1':
    //       // alert('圆形')
    //       this.drawLayer = this.map.editTools.circleMarker()
    //       this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
    //       break
    //     case '1-3-2':
    //       this.drawLayer = this.map.editTools.startPolygon()
    //       this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
    //       break
    //     case '1-1':
    //       MakeTation.StartPointAnnotation(this.map, this.L)
    //       break
    //     case '图标标注':
    //       this.drawLayer = this.map.editTools.startIcon()
    //       this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
    //       break
    //     case '文字标注':
    //       this.bouncedText = true
    //       MakeTation.startMakeText(this.map, this.L)
    //       break
    //     case '距离测量':
    //       Measure.startMeasureLen(this.map, this.L)
    //       break
    //     case '面积测量':
    //       Measure.startMeasureArea(this.map, this.L)
    //       break
    //   }
    // },
    // 文字标注控制
    gitBounced (params) {
      this.bouncedText = params
    },
    // 左上功能控制
    changeSelect () {
      this.selectGroup = !this.selectGroup
    },
    handleSelects (command) {
      console.log(command)
      switch (command) {
        case '全屏':
          // this.map.toggleFullscreen()
          var printer = this.L.easyPrint({
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
          }).addTo(this.map)
          printer.printMap('CurrentSize', 'MyManualPrint')
          break
        case 'A4横向':
          var printerX = this.L.easyPrint({
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
          }).addTo(this.map)
          printerX.printMap('A4Landscape page', 'MyManualPrint')
          break
        case 'A4纵向':
          var printerY = this.L.easyPrint({
            sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
            filename: 'map_image',
            exportOnly: true,
            hideControlContainer: true
          }).addTo(this.map)
          printerY.printMap('A4Portrait page', 'MyManualPrint')
          break
        case '线标绘':
          this.drawLayer = this.map.editTools.startPolyline()
          this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
          Measure.startMeasureLen(this.map, this.L)
          break
        case '面标绘':
          this.drawLayer = this.map.editTools.startPolygon()
          this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
          break
        case '多边形':
          alert('多边形')
          break
        case '点标绘':
          MakeTation.StartPointAnnotation(this.map, this.L)
          break
        case '图标标注':
          this.drawLayer = this.map.editTools.startIcon()
          this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
          break
        case '文字标注':
          this.bouncedText = true
          MakeTation.startMakeText(this.map, this.L)
          break
        case '距离测量':
          Measure.startMeasureLen(this.map, this.L)
          break
        case '面积测量':
          Measure.startMeasureArea(this.map, this.L)
          break
      }
    }
  }
}
</script>

<style lang="less">

.lefttop-toolbox-panel {
<style lang="less" scoped>
.left-top-toolbox-panel {
  position: absolute;
  left: 15px;
  left: 0;
  top: 15px;
  z-index: 999;

  div {
    width: 100%;
    height: 55px;
    line-height: 55px;
  .specific-tools {
    display: flex;
    align-items: center;
    justify-content: space-around;
    justify-content: space-evenly;

    .init-choose {
      background: @background-color;
      width: 35px;
      height: 35px;
      border-radius: 50%;
      border: 2px skyblue solid;
      display: flex;
      align-items: center;
      justify-content: center;
      z-index: 999;
    }

    .el-menu {
      width: 80%;
      background: none;
      z-index: 1;
    .el-button {
      padding: 0;
      margin: 0 0.015rem;
      width: 45px;
      height: 45px;
      background: @background-color-tools;
      border: none;
      background: #305B62;
      border-radius: 50px;
      box-shadow: 0 0 0.03rem #00fff6;

      img {
        width: 22px;
        height: 22px;
      }

      span {
        display: block;
        font-size: 0.012rem;
        color: @color-tool;
    }
  }

  //.transition {
  //  @keyframes bounce-in {
  //    0% {
  //      transform: scale(0);
  //      opacity: 0.3;
  //    }
  //    100% {
  //      transform: scale(1);
  //      opacity: 1;
  //    }
  //  }
  //
  //  .fade-enter-active {
  //    transform-origin: left center;
  //    animation: bounce-in .2s;
  //  }
  //
  //  .fade-leave-active {
  //    transform-origin: left;
  //    animation: bounce-in .2s reverse;
  //  }
  //}
    .special-button {
      width: 22.5px;
      height: 45px;
      color: @color-over;
    }

    .tools-panel-choose {
      img {
        width: 16px;
        height: 16px;
      }

      span {
        display: block;
      }
    }
  }
}
</style>

 src/components/plugin/Editable.js

@@ -301,6 +301,7 @@
      // 🍂method startPolyline(latlng: L.LatLng, options: hash): L.Polyline
      // Start drawing a Polyline. If `latlng` is given, a first point will be added. In any case, continuing on user click.
      // If `options` is given, it will be passed to the Polyline class constructor.
      // 画线
      startPolyline: function (latlng, options) {
        const line = this.createPolyline([], options)
        line.enableEdit(this.map).newShape(latlng)
@@ -316,6 +317,12 @@
        return polygon
      },

      // circleMarker :function (latlng,options) {
      //   const yuan = this.circleMarker(latlng,options)
      //   yuan.enableEdit(this.map).newShape(latlng)
      //   return yuan
      // }

      // 🍂method startMarker(latlng: L.LatLng, options: hash): L.Marker
      // Start adding a Marker. If `latlng` is given, the Marker will be shown first at this point.
      // In any case, it will follow the user mouse, and will have a final `latlng` on next click (or touch).