diff --git a/src/layout/index.vue b/src/layout/index.vue index da85188..7b92497 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -50,20 +50,20 @@ const onMessage = (res) => { }; onMounted(() => { - const isReload = localStorage.getItem("isReload"); - if (isReload !== "true") { - ElMessageBox.alert("由于浏览器安全策略,用户必须点击屏幕才能播放告警声音", "提示", { - confirmButtonText: "OK", - callback: () => { - localStorage.setItem("isReload", "true"); - }, - }); - } + // const isReload = localStorage.getItem("isReload"); + // if (isReload !== "true") { + // ElMessageBox.alert("由于浏览器安全策略,用户必须点击屏幕才能播放告警声音", "提示", { + // confirmButtonText: "OK", + // callback: () => { + // localStorage.setItem("isReload", "true"); + // }, + // }); + // } - if (ws.socket == null) { - ws.connect(); - } - ws.onMessage(onMessage); + // if (ws.socket == null) { + // ws.connect(); + // } + // ws.onMessage(onMessage); window.addEventListener("beforeunload", handleBeforeUnload); }); diff --git a/src/utils/mapCustom.js b/src/utils/mapCustom.js index d541721..766fe65 100644 --- a/src/utils/mapCustom.js +++ b/src/utils/mapCustom.js @@ -121,12 +121,11 @@ export class MapCustom { return new AMap.Icon({ ...data }) } // 创建marker - marker({ icon, position, offset }) { + marker(option) { return new AMap.Marker({ - icon, - position, map: this.map, offset: new AMap.Pixel(-13, -26), + ...option }) } lngLat(lng, lat) { diff --git a/src/views/monitoringCenter/deviceLocationMap.vue b/src/views/monitoringCenter/deviceLocationMap.vue index 52ab9b4..d52d9d9 100644 --- a/src/views/monitoringCenter/deviceLocationMap.vue +++ b/src/views/monitoringCenter/deviceLocationMap.vue @@ -62,11 +62,11 @@ const getLocateRecord = () => { list.forEach((item, index) => { let marker: any = ""; if (index == 0) { - marker = newMap.marker({ icon: startIcon, position: [item.lng, item.lat] }); + marker = newMap.marker({ icon: startIcon, position: [item.lng, item.lat], zIndex: 13 }); } else if (index == list.length - 1) { - marker = newMap.marker({ icon: endIcon, position: [item.lng, item.lat] }); + marker = newMap.marker({ icon: endIcon, position: [item.lng, item.lat], zIndex: 13 }); } else { - marker = newMap.marker({ icon: ViaIcon, position: [item.lng, item.lat] }); + marker = newMap.marker({ icon: ViaIcon, position: [item.lng, item.lat], zIndex: 12 }); } marker.setMap(newMap.map); marker.on("click", () => { diff --git a/src/views/synthesizeManage/mapLocation/index.vue b/src/views/synthesizeManage/mapLocation/index.vue index 167cf7b..8c65517 100644 --- a/src/views/synthesizeManage/mapLocation/index.vue +++ b/src/views/synthesizeManage/mapLocation/index.vue @@ -68,8 +68,10 @@ import { locateRecord } from "@/api"; import { format } from "@/utils"; import { TLocateRecord } from "@/api/index.d"; import { useRoute } from "vue-router"; -import location from "@/assets/img/location.png"; import InfoWindow from "@/components/InfoWindow.vue"; +import ViaMarker from "@/assets/img/via-marker.png"; +import endMarker from "@/assets/img/end-marker.png"; +import startMarker from "@/assets/img/start-marker.png"; const { query } = useRoute(); let d = new Date(); @@ -105,9 +107,28 @@ const getLocateRecord = () => { newMap.clearMap(); newMap.setCenter([list[0].lng, list[0].lat]); newMap.polyline(list); - let icon = newMap.newIcon(location); - list.forEach((item) => { - let marker = newMap.marker({ icon, position: [item.lng, item.lat] }); + let startIcon = newMap.newIcon({ + image: startMarker, + size: [20, 29], + }); + let endIcon = newMap.newIcon({ + image: endMarker, + size: [20, 29], + }); + let ViaIcon = newMap.newIcon({ + image: ViaMarker, + size: [20, 29], + }); + + list.forEach((item, index) => { + let marker: any = ""; + if (index == 0) { + marker = newMap.marker({ icon: startIcon, position: [item.lng, item.lat], zIndex: 13 }); + } else if (index == list.length - 1) { + marker = newMap.marker({ icon: endIcon, position: [item.lng, item.lat], zIndex: 13 }); + } else { + marker = newMap.marker({ icon: ViaIcon, position: [item.lng, item.lat], zIndex: 12 }); + } marker.setMap(newMap.map); marker.on("click", () => { deviceInfo.value = item;