From a96e7a6704cb34ece8835066ff9f069014062e3d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 21:32:36 +0800
Subject: [PATCH] 文件合并方法

---
 src/components/panel/ToolBoxPanel.vue |   76 ++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 018e8c4..0e88c14 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/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">
@@ -18,21 +15,22 @@
               v-for="(item,index) in menuList" :key="index"
               :width="item.index === '2'?230 : 150"
           >
-            <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
+            <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
                        @click="changeChoose(index)">
-              <img :src="item.iconSelecd" alt="" v-if="active === index && checked === true"/>
+              <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'">
-              <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checked === true"/>
-              <img :src="itemT.icon" :title="itemT.title" v-else/>
+              <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem" alt=""/>
+              <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
             </el-button>
-            <div class="base-map-inner-panel" v-show="!isShow&&item.index==='2'">
+            <div class="base-map-inner-panel" v-show="item.index==='2'">
               <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
                 <img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
-                     @click="changeBasemap(item)"/>
+                     @click="changeBasemap(item)" alt=""/>
                 <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
                              label="鏍囨敞" @change="changeBasemap(item)">
                 </el-checkbox>
@@ -92,11 +90,19 @@
   name: 'ToolBoxPanel',
   data () {
     return {
-      checked: false,
-      checkbuuton: -1,
-      isShow: true,
+      isShow: false,
       currentBaseMapCode: 'tianditu_img',
       basemapList: [],
+      selectGroup: false,
+      drawLayer: null,
+      drawLayerArray: [],
+      map: null,
+      active: -1,
+      checked: false,
+      checkbutton: -1,
+      checkedItem: false,
+      Selecd: -1,
+      isSelecd: -1,
       menuList: [
         {
           icon: plot,
@@ -241,14 +247,7 @@
             }
           ]
         }
-      ],
-      selectGroup: false,
-      drawLayer: null,
-      drawLayerArray: [],
-      map: null,
-      // L: window.L,
-      active: -1,
-      Selecd: -1
+      ]
     }
   },
   computed: {
@@ -266,8 +265,10 @@
   methods: {
     updateBasemapList () {
       this.basemapList = this.basemapHelper.getBasemapList()
+      console.log()
     },
     changeBasemap (itm) {
+      this.active = -1
       const code = itm.code
       this.basemapList.forEach((item) => {
         if (item.code === code) {
@@ -290,22 +291,30 @@
         this.drawLayer = this.L.layerGroup().addTo(this.map)
       }
       this.active = index
-      if (this.drawLayer == null) {
-        this.drawLayer = this.L.layerGroup().addTo(this.map)
-      }
-      if (this.checkbuuton === index) {
+      if (this.checkbutton === index) {
         this.checked = !this.checked
+        this.Selecd = -1
       } else {
-        if (this.checkbuuton === -1) {
+        if (this.checkbutton === -1) {
           this.checked = !this.checked
         } else {
           this.checked = true
         }
       }
-      this.checkbuuton = index
+      this.checkbutton = index
     },
     choiceItem (itemT, indexT) {
       this.Selecd = indexT
+      if (this.isSelecd === indexT) {
+        this.checkedItem = !this.checkedItem
+      } else {
+        if (this.isSelecd === -1) {
+          this.checkedItem = !this.checkedItem
+        } else {
+          this.checkedItem = true
+        }
+      }
+      this.isSelecd = indexT
       switch (itemT.label) {
         case '鐐规爣缁�':
           var myIcon = this.L.icon({
@@ -383,6 +392,7 @@
           printerY.printMap('A4Portrait page', '绾靛悜')
           break
       }
+      this.active = -1
     },
     setLogic () {
       this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
@@ -457,6 +467,7 @@
     }
 
     .el-button-choice {
+      left: 500px;
       z-index: 999;
       padding: 0;
       margin: 0 0.015rem;
@@ -532,7 +543,8 @@
           display: block;
           color: @color-shadow;
         }
-        a {
+
+        .default-span {
           display: block;
           color: @color-over;
         }

--
Gitblit v1.8.0