From 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 11:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/Sgis.js |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Sgis.js b/src/Sgis.js
index d46bfc2..64977a5 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,9 +1,7 @@
-
 // 鍒濆鍖栨樉绀�
-
-import MapConfig from '@/conf/MapConfig'
+import MapConfig from './conf/MapConfig'
 import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘
-import DownLoad from '@components/plugin/DownLoad'
+import DownLoad from './components/plugin/DownLoad'
 // 娴嬮噺
 import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
 
@@ -16,8 +14,10 @@
 import '@/components/plugin/magicMarker.css'
 import '@components/plugin/pulse/Pulse' // marker 澶栧湀娉�
 import '@components/plugin/pulse/Pulse.css' // marker 澶栧湀娉� css
-import BasemapHelper from '@components/helpers/BasemapHelper'
-import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
+import BasemapHelper from './components/helpers/BasemapHelper'
+import VectorLayerHelper from './components/helpers/VectorLayerHelper'
+// import eventBus from './eventBus'
+
 let map = null
 const L = window.L
 const initMap = (div, mapOption) => {
@@ -28,9 +28,7 @@
   const option = mapOption || MapConfig.mapOptions
   map = L.map(div, option)
 
-  map.on('click', (event, a, b) => {
-    console.log(event, a, b)
-  })
+  // eventBus.$emit('map-obj', map)
 
   window.map = map
   window.L = L

--
Gitblit v1.8.0