From 65113eae10994702a740a79e7461539d7bcbba08 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 19:02:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

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

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e3e491d..ce51726 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -39,7 +39,7 @@
 import LegendPanel from '@components/panel/LegendPanel'
 import Enterprise from '../components/table/enterprise'
 // 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+
 import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
 import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
 // // 鍏叡灞曠ず鏁版嵁
@@ -68,7 +68,8 @@
       lcServiceLayerVisible: false,
       basemapHelper: {},
       serviceLayerHelper: {},
-      vectorLayerHelper: {}
+      vectorLayerHelper: {},
+      toolBoxVisible: false
     }
   },
   computed: {
@@ -82,18 +83,6 @@
     })
   },
   methods: {
-    ChangeState () {
-      const data = {
-        companyId: 3900100145,
-        userCode: 'wenchun.deng',
-        name: '',
-        marginWarr: '',
-        longDayWarr: ''
-      }
-      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
-      AddSolidWaste.requestData(data)
-      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
-    },
     AddGasHelper () {
       const data = {
         companyId: 3900100145,
@@ -144,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({
@@ -164,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