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-tsa.ts | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/hooks/use-g-map-tsa.ts b/src/hooks/use-g-map-tsa.ts
index cb29ff8..f71217c 100644
--- a/src/hooks/use-g-map-tsa.ts
+++ b/src/hooks/use-g-map-tsa.ts
@@ -1,16 +1,15 @@
import store from '/@/store'
import { getRoot } from '/@/root'
-import { ELocalStorageKey } from '/@/types'
+import { ELocalStorageKey, EDeviceTypeName } from '/@/types'
import { getDeviceBySn } from '/@/api/manage'
import { message } from 'ant-design-vue'
import dockIcon from '/@/assets/icons/dock.png'
import rcIcon from '/@/assets/icons/rc.png'
import droneIcon from '/@/assets/icons/drone.png'
-import { EDeviceTypeName } from '/@/types'
export function deviceTsaUpdate () {
const root = getRoot()
- const AMap = root.$aMap
+ let AMap = root.$aMap
const icons = new Map([
[EDeviceTypeName.Aircraft, droneIcon],
@@ -43,8 +42,12 @@
if (markers[sn]) {
return
}
+ if (root.$aMap === undefined) {
+ return
+ }
+ AMap = root.$aMap
markers[sn] = new AMap.Marker({
- position: new AMap.LngLat(lng || 113.935913, lat || 22.525335),
+ position: new AMap.LngLat(lng || 113.943225499, lat || 22.577673716),
icon: initIcon(type),
title: name,
anchor: 'top-center',
--
Gitblit v1.9.3