diff --git a/src/api/manage.ts b/src/api/manage.ts index 2a2818d..bd16d5b 100644 --- a/src/api/manage.ts +++ b/src/api/manage.ts @@ -74,7 +74,7 @@ export const getLiveSnCapacity = async function (id:any): Promise> { diff --git a/src/assets/icons/cloudapi.png b/src/assets/icons/cloudapi.png index 0626bab..5236da8 100644 Binary files a/src/assets/icons/cloudapi.png and b/src/assets/icons/cloudapi.png differ diff --git a/src/assets/icons/m30.png b/src/assets/icons/m30.png index a5932c7..5cc3532 100644 Binary files a/src/assets/icons/m30.png and b/src/assets/icons/m30.png differ diff --git a/src/assets/icons/no-data.png b/src/assets/icons/no-data.png index 36a8fd8..36706c9 100644 Binary files a/src/assets/icons/no-data.png and b/src/assets/icons/no-data.png differ diff --git a/src/hooks/use-g-map-tsa.ts b/src/hooks/use-g-map-tsa.ts index f71217c..feeeefd 100644 --- a/src/hooks/use-g-map-tsa.ts +++ b/src/hooks/use-g-map-tsa.ts @@ -6,6 +6,8 @@ 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 { wgs84togcj02 } from '/@/vendors/coordtransform' +import { GeojsonCoordinate } from '../types/map' export function deviceTsaUpdate () { const root = getRoot() @@ -38,6 +40,14 @@ export function deviceTsaUpdate () { }) } + function wgs84togcj02Fn (lng?: number, lat?: number) { + if (lng !== undefined) { + return wgs84togcj02(lng, lat) as GeojsonCoordinate + } else { + return [121.376134, 31.084440] + } + } + function initMarker (type: number, name: string, sn: string, lng?: number, lat?: number) { if (markers[sn]) { return @@ -45,14 +55,17 @@ export function deviceTsaUpdate () { if (root.$aMap === undefined) { return } + // 121.376134, 31.084440 + const transFn = wgs84togcj02Fn(lng, lat) AMap = root.$aMap markers[sn] = new AMap.Marker({ - position: new AMap.LngLat(lng || 113.943225499, lat || 22.577673716), + position: new AMap.LngLat(transFn[0], transFn[1]), icon: initIcon(type), title: name, anchor: 'top-center', offset: [0, -20], }) + console.log('initMarker', name) root.$map.add(markers[sn]) // markers[sn].on('moving', function (e: any) { // let path = paths[sn] @@ -83,6 +96,7 @@ export function deviceTsaUpdate () { message.error(data.message) return } + console.log('addMarker', data.data) initMarker(data.data.domain, data.data.nickname, sn, lng, lat) }) } @@ -94,7 +108,9 @@ export function deviceTsaUpdate () { marker = markers[sn] return } - marker.moveTo([lng, lat], { + + const transFn = wgs84togcj02Fn(lng, lat) + marker.moveTo([transFn[0], transFn[1]], { duration: 1800, autoRotation: true }) diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue index 26e1fa4..5aa948a 100644 --- a/src/pages/page-web/projects/wayline.vue +++ b/src/pages/page-web/projects/wayline.vue @@ -204,7 +204,7 @@ function selectRoute (wayline: WaylineFile, index:any) { if (res.code === 0) { const path = res.data?.geometry.coordinates path.forEach((item:any, index:any) => { - item = wgs84togcj02( + path[index] = wgs84togcj02( item[0], item[1] ) diff --git a/src/store/index.ts b/src/store/index.ts index dd06fda..25a40d2 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -101,7 +101,6 @@ const getters: GetterTree = { } const mutations: MutationTree = { SET_LAYER_ID (state, info) { - console.log(info) state.layerId = info }, SET_LAYER_INFO (state, info) {