From 811fc5e4e89c9a5222e895587bfa1c2e9fcc08f4 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 15 三月 2021 19:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/panel/ToolBoxPanel.vue |  380 ++++++++++++++++++++++++++---------------------------
 1 files changed, 185 insertions(+), 195 deletions(-)

diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index ac33f0f..7707776 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,86 +1,115 @@
 <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'
-      >
-        <base-nav-menu-item :menuList='menuList'></base-nav-menu-item>
-      </el-menu>
+  <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=""
+            trigger="click"
+            :popper-class="'tools-panel-content'"
+            v-for="(item,index) in menuList" :key="index"
+        >
+          <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 polygonJ from '@assets/images/map-pages/icon/toolbox/polygon.png'
+import polygonS from '@assets/images/map-pages/icon/toolbox/ju.png'
+import polygonY from '@assets/images/map-pages/icon/toolbox/circle.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-4',
+              label: '澶氳竟褰�',
+              icon: polygonJ
+            },
+            {
+              index: '1-5',
+              label: '鐭╁舰',
+              icon: polygonS
             },
             {
               index: '1-3',
-              label: '闈㈡爣缁�',
-              items: [
-                {
-                  index: '1-3-1',
-                  label: '鍦嗗舰'
-                },
-                {
-                  index: '1-3-2',
-                  label: '澶氳竟褰�'
-                },
-                {
-                  index: '1-3-3',
-                  label: '鐭╁舰'
-                }
-              ]
+              label: '鍦嗗舰',
+              icon: polygonY
+            }
+          ]
+        },
+        {
+          icon: polygon,
+          label: '娴嬮噺',
+          index: '3',
+          items: [
+            {
+              index: '3-1',
+              label: '璺濈'
+            },
+            {
+              index: '3-2',
+              label: '闈㈢Н'
             }
           ]
         },
         {
           icon: location,
-          label: '鍒囨崲搴曞浘',
+          label: '鍦板浘',
           index: '2',
           items: [
             {
@@ -116,29 +145,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 +168,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-button {
+      padding: 0;
+      margin: 0 0.015rem;
+      width: 45px;
+      height: 45px;
+      background: @background-color-tools;
+      border: none;
+      box-shadow: 0 0 0.03rem #00fff6;
+
+      img {
+        width: 22px;
+        height: 22px;
+      }
+
+      span {
+        display: block;
+        font-size: 0.012rem;
+        color: @color-tool;
+      }
     }
 
-    .el-menu {
-      width: 80%;
-      background: none;
-      z-index: 1;
-      border: none;
-      background: #305B62;
-      border-radius: 50px;
+    .special-button {
+      width: 22.5px;
+      height: 45px;
+      color: @color-over;
+    }
+
+    .tools-panel-choose {
+      img {
+        width: 16px;
+        height: 16px;
+      }
+
+      span {
+        display: block;
+      }
     }
   }
-
-  //.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;
-  //  }
-  //}
-
 }
 </style>

--
Gitblit v1.8.0