From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop

---
 src/hooks/use-g-map.ts |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/hooks/use-g-map.ts b/src/hooks/use-g-map.ts
index ebb095d..b1b6790 100644
--- a/src/hooks/use-g-map.ts
+++ b/src/hooks/use-g-map.ts
@@ -4,30 +4,35 @@
 
 export function useGMapManage () {
   const state = reactive({
-    mapEntity: null,
-    mapObj: null,
+    aMap: null, // Map类
+    map: null, // 地图对象
     mouseTool: null,
   })
+
   async function initMap (container: string, app:App) {
     AMapLoader.load({
       ...AMapConfig
     }).then((AMap) => {
-      state.mapObj = AMap
-      state.mapEntity = new AMap.Map(container, {
-        center: [113.935913, 22.525335],
+      state.aMap = AMap
+      state.map = new AMap.Map(container, {
+        center: [113.943225499, 22.577673716],
         zoom: 15
       })
-      state.mouseTool = new AMap.MouseTool(state.mapEntity)
-      app.config.globalProperties.$aMap = state.mapEntity
-      app.config.globalProperties.$aMapObj = state.mapObj
+      state.mouseTool = new AMap.MouseTool(state.map)
+
+      // 挂在到全局
+      app.config.globalProperties.$aMap = state.aMap
+      app.config.globalProperties.$map = state.map
       app.config.globalProperties.$mouseTool = state.mouseTool
     }).catch(e => {
       console.log(e)
     })
   }
+
   function globalPropertiesConfig (app:App) {
     initMap('g-container', app)
   }
+
   return {
     globalPropertiesConfig,
   }

--
Gitblit v1.9.3