From ac19ae903dd740bdaf1499ae40ef4039fdb4e6ad Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Fri, 31 Mar 2023 22:00:21 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs
---
src/components/map/index.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f30a154..3d50ded 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 17:00:30
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-03-30 16:23:23
+ * @LastEditTime: 2023-03-31 17:07:34
* @FilePath: \srs-police-affairs\src\components\map\index.vue
* @Description: 公用地图组件
*
@@ -76,6 +76,8 @@
<activity-police-popup></activity-police-popup>
<video-list-popup></video-list-popup>
+
+ <map-search-popup></map-search-popup>
<y-tool-tip></y-tool-tip>
@@ -198,13 +200,14 @@
import mapPopup from './components/mapPopup.vue'
import activityPolicePopup from './components/activityPolicePopup.vue'
import videoListPopup from './components/videoListPopup.vue'
+import mapSearchPopup from './components/mapSearchPopup.vue'
import yToolTip from './components/yToolTip.vue'
import createTools from '@/utils/tools/index'
export default {
name: 'mapBox',
- components: { mapPopup, activityPolicePopup, videoListPopup, yToolTip },
+ components: { mapPopup, activityPolicePopup, videoListPopup, mapSearchPopup, yToolTip },
data () {
return {
@@ -487,7 +490,7 @@
this.$EventBus.$on('layerPointAdd', (params) => {
// eslint-disable-next-line no-unused-vars
- that.layerPointAdd(params.layerName, params.type, params.layerType, params.params, params.distanceDisplayCondition, params.incident, params.mouseOverIncident, params.mouseOutIncident)
+ that.layerPointAdd(params.layerName, params.type, params.layerType, params.params, params.distanceDisplayCondition, params.incident, params.mouseOverIncident, params.mouseOutIncident, params.pointMouseMove)
})
this.$EventBus.$on('layerPolygonAdd', (params) => {
@@ -857,7 +860,7 @@
layerPointAdd (layerName, type, layerType = 'VectorLayer', params, distanceDisplayCondition = {
near: 0, //最近距离
far: Number.MAX_VALUE //最远距离
- }, incident = (e) => { }, mouseOverIncident = (e) => { }, mouseOutIncident = (e) => { }) {
+ }, incident = (e) => { }, mouseOverIncident = (e) => { }, mouseOutIncident = (e) => { }, pointMouseMove = (e) => { }) {
if (!layersObjcect[layerName] || layersObjcect[layerName] == null) {
this.mapAddLayer(layerName, layerType)
}
@@ -870,15 +873,16 @@
if (type == "billboard") {
// pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.url)
pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), 4), params.url)
- // pointElement.setStyle({
- // disableDepthTestDistance: 0
- // })
+ pointElement.setStyle({
+ disableDepthTestDistance: Number.POSITIVE_INFINITY
+ })
pointElement.size = [32, 32]
pointElement.attrParams = params
layersObjcect[layerName].addOverlay(pointElement)
pointElement.on(global.DC.MouseEventType.CLICK, incident)
pointElement.on(global.DC.MouseEventType.MOUSE_OVER, mouseOverIncident)
pointElement.on(global.DC.MouseEventType.MOUSE_OUT, mouseOutIncident)
+ pointElement.on(global.DC.MouseEventType.MOUSE_MOVE, pointMouseMove)
} else if (type == "label") {
// labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.text)
labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), 4), params.text)
--
Gitblit v1.9.3