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 | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/hooks/use-g-map-tsa.ts b/src/hooks/use-g-map-tsa.ts
index fe3a398..f71217c 100644
--- a/src/hooks/use-g-map-tsa.ts
+++ b/src/hooks/use-g-map-tsa.ts
@@ -1,6 +1,6 @@
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'
@@ -9,18 +9,16 @@
export function deviceTsaUpdate () {
const root = getRoot()
- const AMap = root.$aMap
+ let AMap = root.$aMap
const icons = new Map([
- ['sub-device', droneIcon],
- ['gateway', rcIcon],
- ['dock', dockIcon]
+ [EDeviceTypeName.Aircraft, droneIcon],
+ [EDeviceTypeName.Gateway, rcIcon],
+ [EDeviceTypeName.Dock, dockIcon]
])
const markers = store.state.markerInfo.coverMap
const paths = store.state.markerInfo.pathMap
- // Fix: 航迹初始化报错
- // TODO: 从时序上解决
let trackLine = null as any
function getTrackLineInstance () {
if (!trackLine) {
@@ -32,7 +30,7 @@
return trackLine
}
- function initIcon (type: string) {
+ function initIcon (type: number) {
return new AMap.Icon({
image: icons.get(type),
imageSize: new AMap.Size(40, 40),
@@ -40,16 +38,16 @@
})
}
- function initMarker (type: string, name: string, sn: string, lng?: number, lat?: number) {
- if (AMap === undefined) {
- location.reload()
- return
- }
+ function initMarker (type: number, name: string, sn: string, lng?: number, lat?: number) {
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