From dcea093a466fb6d8ded62de1c0953762b1acbd5f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 17 Mar 2023 16:06:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/views/activity/components/drawBtnBox.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/activity/components/drawBtnBox.vue b/src/views/activity/components/drawBtnBox.vue
index e3b6aaf..fec733d 100644
--- a/src/views/activity/components/drawBtnBox.vue
+++ b/src/views/activity/components/drawBtnBox.vue
@@ -528,6 +528,8 @@
areaPolygon.on(global.DC.MouseEventType.CLICK, this.$parent.lineOverlayTypeClick)
} else {
let positionObj = this.$parent.convertBillboardPositionDate(data, type)
+ positionObj.lng = positionObj.lng.slice(1,positionObj.lng.length-1)
+ positionObj.lat = positionObj.lat.slice(0,positionObj.lat.length-2)
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)
@@ -598,7 +600,7 @@
// 修改警车样式
editPoliceStyle(params,overlay) {
if('color' in params && 'pointOverlayData' in overlay.attrParams){
- overlay.attrParams.color = params.color
+ overlay.attrParams.data.color = params.color
overlay.attrParams.pointOverlayData.attrParams.color = params.color
let r = parseInt(params.color.slice(1, 3), 16)
let g = parseInt(params.color.slice(3, 5), 16)
@@ -621,10 +623,11 @@
}
if('width' in params){
+ if(overlay.attrParams&&overlay.attrParams.data&&overlay.attrParams.data.type&&overlay.attrParams.data.type == 3) return
let linePosition = ''
if('position' in params){
linePosition = params.position.replace(/,/g, ";").replace(/ /g, ",")
- }else{
+ } else {
linePosition = overlay.attrParams.linePositionStr
}
let coords = global.DC.GeoTools.polylineBuffer(linePosition, params.width)
--
Gitblit v1.9.3