From 48a4f9cb2122e74b87a47c6b6539ba8a132647dd Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 18:40:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/ToolBoxPanel.vue           |   22 ++++++++--------------
 src/components/LayerController/logic/Company.js |   21 ++++++++++++++-------
 src/views/MapTemplate.vue                       |    8 ++++----
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 7ccce20..a9a51c9 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -19,10 +19,10 @@
       layer: layer
     })
     const res = await mapApi.getCompany()
-    console.log(res)
+    // console.log(res)
     const data = res.Result.DataInfo || {}
     for (let i = 0; i < data.length; i++) {
-      console.log(data[i])
+      // console.log(data[i])
       // 缁忕含搴� 浣嶇疆
       const positionX = data[i].Latitude
       const positionY = data[i].Longitude
@@ -33,7 +33,14 @@
           iconUrl: iconUrl,
           iconSize: [50, 50],
           iconAnchor: [25, 25]
-        })
+        }),
+        test: data[i]
+      })
+      marker.bindTooltip(data[i].name, {
+        permanent: true,
+        offset: [0, -16],
+        direction: 'top',
+        className: ''
       })
 
       layer.addLayer(marker)
@@ -41,13 +48,13 @@
   }
 
   this.bindTooltip = (layer) => {
-    console.log(layer)
-    return '浼佷笟'
+    // console.log(layer)
+    // return layer.options.test.name
   }
 
   this.clickListener = (e) => {
-    this.animalService.pulseEffect(e.latlng)
+    // this.animalService.pulseEffect(e.latlng)
     console.log(e)
-    return this.PublicBounced.$el
+    // return this.PublicBounced.$el
   }
 }
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 1e47999..62a5442 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="left-top-toolbox-panel">
+  <div class="left-top-toolbox-panel" v-if="toolBoxPanelVisible">
     <div class="specific-tools">
       <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"
                  @mouseover.enter.native="changeSelectMouse">
@@ -30,7 +30,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"
@@ -101,6 +101,7 @@
       currentBaseMapCode: 'tianditu_img',
       basemapList: [],
       selectGroup: false,
+      toolBoxPanelVisible: false,
       drawLayer: null,
       drawLayerArray: [],
       map: null,
@@ -262,23 +263,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 +280,7 @@
             this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
           }
 
-          this.basemapHelper.getBasemapList().forEach((item) => {
+          this.basemapHelper.basemapList.forEach((item) => {
             item.layer.bringToBack()
           })
         }
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index c3a06ce..ce51726 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -68,7 +68,8 @@
       lcServiceLayerVisible: false,
       basemapHelper: {},
       serviceLayerHelper: {},
-      vectorLayerHelper: {}
+      vectorLayerHelper: {},
+      toolBoxVisible: false
     }
   },
   computed: {
@@ -132,7 +133,6 @@
     init () {
       const mapcontainer = this.$refs.rootmap
       this.map = Sgis.initMap(mapcontainer)
-      this.$refs.toolBox.map = this.map
 
       window.popupComp = this.$refs.popup
       var layerFactory = new LayerFactory({
@@ -152,10 +152,10 @@
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
       this.vectorLayerHelper.initVectorLayers(this.config)
 
-      this.ChangeState()
+      // this.ChangeState()
       // this.AddGasHelper()
       // this.ChangeWaterState()
-
+      this.$refs.toolBox.init(this.map)
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
       // this.setBasemapHelper(this.basemapHelper)

--
Gitblit v1.8.0