From 29a5477f5c121541ff30bf6b4e8da3b2e218d4b7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 15 Mar 2023 11:44:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/views/activity/components/drawBtnBox.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/views/activity/components/drawBtnBox.vue b/src/views/activity/components/drawBtnBox.vue
index af715b0..13f4923 100644
--- a/src/views/activity/components/drawBtnBox.vue
+++ b/src/views/activity/components/drawBtnBox.vue
@@ -157,15 +157,13 @@
global.viewer.tooltip.enable = true
- // this.policeType = '' // ?
-
plot && plot.draw(poltType, overlay => {
if (isAddLabel) return
if (poltType == 'billboard' && policeType == 'policeman') {
overlay.icon = '/img/icon/man3.png'
} else if (poltType == 'billboard' && policeType == 'policecar') {
- overlay.icon = '/img/car3.png'
+ overlay.icon = '/img/icon/car3.png'
}
if (overlay) {
@@ -195,6 +193,7 @@
} else if (policeType == 'policecar') {
that.$emit('setPoliceOption')
that.$parent.chooseCarColor = '#FF0000'
+ that.$parent.policeType = ''
that.$parent.policeChooseCarVisible = true
}
flag = false
@@ -348,13 +347,20 @@
// 删除所有地图绘制元素
removeDraw () {
+ addPoliceIconOverlayData!= null && !addPoliceIconOverlayData.attrParams && addPoliceIconOverlayData.remove()
+ },
+
+ clearDraw(){
drawLayers != null && drawLayers.clear()
},
removeDrawArrow () {
- // drawArrowLayers != null && drawArrowLayers.clear()
addPlotOverlayData != null && addPlotOverlayData.remove()
labelOverLayerID = []
+ },
+
+ clearDrawArrow() {
+ drawArrowLayers != null && drawArrowLayers.clear()
},
// 编辑标绘位置
@@ -473,7 +479,7 @@
addNewPolice(data,type){
let positionObj = this.$parent.convertBillboardPositionDate(data, type)
- let positionArr = data.position.slice(12, data.position.length - 2).split(',')[0].split(' ')
+ let positionArr = data.position.slice(7, data.position.length - 2).split(',')[0].split(' ')
let position = new global.DC.Position(Number(positionArr[0]), Number(positionArr[1]))
let point = new global.DC.Point(position)
let color = ''
@@ -485,26 +491,26 @@
let b = parseInt(data.color.slice(5, 7), 16)
color = global.DC.Namespace.Cesium.Color.fromBytes(r, g, b, 255)
}
- console.log(positionObj,position,point,999);
point.attrParams = positionObj
drawLayers.addOverlay(point)
point.setStyle({
- "color": global.DC.Namespace.Cesium.Color.fromBytes(255, 0, 0, 150), //颜色
+ "color": color, //颜色
"outlineColor": color, //边框颜色
"outlineWidth": 0, //边框大小，
- "pixelSize": 82,
+ "pixelSize": 32,
})
- point.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick)
+ // point.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick)
point.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
point.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut)
addPoliceIconOverlayData.attrParams = positionObj
+ addPoliceIconOverlayData.attrParams.pointOverlayData = point
addPoliceIconOverlayData.position = {
lng: Number(positionArr[0]),
lat: Number(positionArr[1]),
alt: 0.5,
}
addPoliceIconOverlayData.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick)
- addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
+ // addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut)
},
--
Gitblit v1.9.3