From 0645797cebf73c129913e1caf8d64f16de8f8a82 Mon Sep 17 00:00:00 2001
From: 李红刚 <p-honggang.li@pcitc.com>
Date: 星期四, 18 三月 2021 10:34:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/panel/ToolBoxPanel.vue |   63 ++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 37a43a2..8499841 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -17,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'">
@@ -92,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,
@@ -236,14 +245,7 @@
             }
           ]
         }
-      ],
-      selectGroup: false,
-      drawLayer: null,
-      drawLayerArray: [],
-      map: null,
-      // L: window.L,
-      active: -1,
-      Selecd: -1
+      ]
     }
   },
   computed: {
@@ -281,10 +283,20 @@
       })
     },
     changeChoose (index) {
-      if (this.active === index) {
-        console.log('鍙栨秷褰撳墠閫変腑鐘舵��')
+      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
@@ -373,6 +387,7 @@
     changeSelect () {
       this.selectGroup = false
       this.isShow = !this.isShow
+      this.active = -1
     },
     changeSelectMouse () {
       this.selectGroup = true
@@ -407,7 +422,6 @@
       width: 45px;
       height: 45px;
       background: @background-color;
-      //border: 1px solid @color-shadow;
       vertical-align: middle !important;
 
       .base-map-img {
@@ -426,11 +440,13 @@
       .span-default {
         display: block;
         color: @color-shadow;
+        font-size: 11px;
       }
 
       span {
         display: block;
         color: @color-over;
+        font-size: 11px;
       }
     }
 
@@ -441,7 +457,7 @@
       width: 45px;
       height: 45px;
       background: @background-color;
-      border: 1px solid @color-shadow;
+      border: 0.00521rem solid @color-shadow;
     }
 
     .active-button {
@@ -451,11 +467,8 @@
 
     .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;
@@ -513,6 +526,10 @@
           display: block;
           color: @color-shadow;
         }
+        .default-span {
+          display: block;
+          color: @color-over;
+        }
       }
 
       .special-button {

--
Gitblit v1.8.0