From 404b9d331ba10fd1683e77c916c01aaa4cba4f0b Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:12:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/views/MapTemplate.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index ce51726..5463f63 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,9 +16,9 @@
     <summary-sheets></summary-sheets>
     <enterprise></enterprise>
     <!--    <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
-<!--    <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
-<!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
-<!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
+    <!--    <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
+    <!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
+    <!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
     <PublicBounced ref="PublicBounced"></PublicBounced>
   </div>
 </template>
@@ -133,6 +133,7 @@
     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 +153,9 @@
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
       this.vectorLayerHelper.initVectorLayers(this.config)
 
-      // 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