From bc1bacba044c4dd3d3e0cd5470c6188cd5e2bc12 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 07 四月 2021 11:31:10 +0800
Subject: [PATCH] 附属设施、环保设施 独立显示

---
 src/components/panel/ToolBoxPanel.vue |   45 ++++++++++++++++++---------------------------
 1 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 2a9bf26..3808d49 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="left-top-toolbox-panel">
     <div class="specific-tools">
-      <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 :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="" class="icon" />
+          <span class="span-default">宸ュ叿</span>
       </el-button>
       <transition name="animationChange">
         <el-row v-show="selectGroup" class="specific-tools-group">
@@ -30,7 +29,7 @@
               <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
             </el-button>
             <div class="base-map-inner-panel" v-show="item.index==='2'">
-              <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
+              <div v-for="item in basemapHelper.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)" alt=""/>
                 <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
@@ -262,23 +261,16 @@
       return this.$store.state.map.basemapHelper
     }
   },
-  watch: {
-    basemapHelper (newVal) {
-      if (newVal != null) {
-        this.updateBasemapList()
-      }
-    }
-  },
   methods: {
-    updateBasemapList () {
-      this.basemapList = this.basemapHelper.getBasemapList()
+    init (map) {
+      this.map = map
+      this.toolBoxPanelVisible = true
     },
     changeBasemap (itm) {
       this.active = -1
       const code = itm.code
-      this.basemapList.forEach((item) => {
+      this.basemapHelper.basemapList.forEach((item) => {
         if (item.code === code) {
-          console.log(this.currentBaseMapCode)
           if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
             this.currentBaseMapCode = code
             this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
@@ -286,7 +278,7 @@
             this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
           }
 
-          this.basemapHelper.getBasemapList().forEach((item) => {
+          this.basemapHelper.basemapList.forEach((item) => {
             item.layer.bringToBack()
           })
         }
@@ -297,6 +289,7 @@
         this.drawLayer = this.L.layerGroup().addTo(this.map)
       }
       this.active = index
+      console.log(this.basemapList)
       for (let i = 0; i < this.isShow.length; i++) {
         if (i !== index) {
           this.isShow[i] = false
@@ -304,6 +297,7 @@
       }
       // debugger
       this.isShow[index] = !this.isShow[index]
+      this.isShow[index] ? (this.active = index) : (this.active = '')
     },
     choiceItem (itemT, indexT) {
       this.Selecd = indexT
@@ -427,8 +421,8 @@
 
 .left-top-toolbox-panel {
   position: absolute;
-  left: 0;
-  top: 15px;
+  left: 0.14583rem;
+  top: 0.11979rem;
   z-index: 999;
 
   .specific-tools {
@@ -450,22 +444,18 @@
       .base-map-img:hover {
         cursor: pointer;
       }
-
       img {
         width: 22px;
         height: 22px;
       }
-
       .span-default {
         display: block;
-        color: @color-shadow;
-        font-size: 11px;
+        font-size: 10px;
       }
-
       span {
         display: block;
-        color: @color-over;
-        font-size: 11px;
+        font-size: 10px;
+        color: #0B89B5;
       }
     }
 
@@ -473,7 +463,8 @@
       left: 500px;
       z-index: 999;
       padding: 0;
-      margin: 0 0.015rem;
+      margin: 0;
+      margin-right:0.015rem;
       width: 45px;
       height: 45px;
       background: @background-color;

--
Gitblit v1.8.0