From e24f70ababdee2b4fdce71c6b80a9bc928fa0331 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 08 May 2023 14:45:08 +0800
Subject: [PATCH] 警情排行调整
---
src/views/activity/components/twoDrawBtnBox.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/src/views/activity/components/twoDrawBtnBox.vue b/src/views/activity/components/twoDrawBtnBox.vue
index 18532aa..2b864c9 100644
--- a/src/views/activity/components/twoDrawBtnBox.vue
+++ b/src/views/activity/components/twoDrawBtnBox.vue
@@ -16,13 +16,10 @@
</button>
</li>
<li>
- <button @click="drawThreeArrow('billboard', 'icon', 'icon1')" title="普通群众">普通群众</button>
+ <button @click="drawThreeArrow('billboard', 'icon', 'icon4')" title="自定义图片标注">自定义图片标注</button>
</li>
<li>
- <button @click="drawThreeArrow('billboard', 'icon', 'icon2')" title="保护对象">保护对象</button>
- </li>
- <li>
- <button @click="drawThreeArrow('billboard', 'icon', 'icon3')" title="危险人物">危险人物</button>
+ <button @click="drawThreeArrow('billboard', 'icon', 'icon5')" title="其他">其他</button>
</li>
</ul>
</div>
@@ -208,6 +205,14 @@
imgUrl = 'wxrw'
material = global.DC.Namespace.Cesium.Color.fromBytes(255, 0, 0, 255)
break
+ case 'icon4':
+ imgUrl = 'custom'
+ material = global.DC.Namespace.Cesium.Color.fromBytes(255, 0, 0, 255)
+ break
+ case 'icon5':
+ imgUrl = 'rest'
+ material = global.DC.Namespace.Cesium.Color.fromBytes(0, 183, 238, 255)
+ break
}
if (type == 'polygon') {
@@ -230,7 +235,8 @@
material: global.DC.Namespace.Cesium.Color.fromBytes(64, 158, 255, 122),
outline: true,
outlineColor: global.DC.Namespace.Cesium.Color.fromBytes(64, 158, 255, 255),
- outlineWidth: 4.0,
+ outlineWidth: 1.0,
+ height: 0
})
} else if (type == 'brokenline') {
drawThreeTool && drawThreeTool.draw('polyline', overlay => {
@@ -353,9 +359,13 @@
addPlotOverlayData.attrParams = { id: item.id, color: item.color, item }
addPlotOverlayData.on(global.DC.MouseEventType.CLICK, this.$parent.reeditArrowClick)
- if (item.type == 6 || item.type == 7 || item.type == 8) {
+ addPlotOverlayData.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
+ addPlotOverlayData.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut)
+ if (item.type == 6 || item.type == 7 || item.type == 8 || item.type == 11) {
const height = item.altitude.split(',')
let position = item.position.slice(12, item.position.length - 2).split(',')[0].split(' ')
+
+ if (item.iconUrl != '') addPlotOverlayData.icon = item.iconUrl
addPlotOverlayData.setStyle({
color: color
@@ -421,8 +431,10 @@
layerName: 'newCarDrawLineLayers',
positions: positionStr,
material: color,
- params: data,
- incident: this.$parent.lineOverlayTypeClick
+ params: { ...data, item: data, data: data },
+ incident: this.$parent.lineOverlayTypeClick,
+ mouseOverIncident: this.$parent.pointMouseOver,
+ mouseOutIncident: this.$parent.pointMouseOut
})
this.$parent.isHaveLine = true
@@ -510,6 +522,18 @@
"font": `${params.width}px sans-serif`
})
}
+
+ if ('icon' in params && params.icon != '') {
+ overlay.icon = params.icon
+ }
+
+ if ('remark' in params && params.remark != '') {
+ overlay.attrParams.item.remark = params.remark
+ }
+
+ if ('type' in params && params.type != '') {
+ overlay.attrParams.item.type = params.type
+ }
},
// 修改警车样式
@@ -573,17 +597,24 @@
overlay.attrParams.polygonPositionStr = positionStr
overlay.attrParams.color = params.color
overlay.attrParams.width = params.width
+ overlay.attrParams.remark = params.remark
this.$EventBus.$emit('layerPolygonAdd', {
layerName: 'newCarDrawLineLayers',
positions: positionStr,
material: color,
- params: overlay.attrParams,
- incident: this.$parent.lineOverlayTypeClick
+ params: { ...overlay.attrParams, item: overlay.attrParams, data: overlay.attrParams },
+ incident: this.$parent.lineOverlayTypeClick,
+ mouseOverIncident: this.$parent.pointMouseOver,
+ mouseOutIncident: this.$parent.pointMouseOut
})
overlay.remove()
}
+ }
+
+ if ('remark' in params) {
+ overlay.attrParams.data.remark = params.remark
}
},
@@ -597,6 +628,7 @@
message: '保存成功',
type: 'success'
})
+ this.$EventBus.$emit('activeDeleteLineOrPoint', 'policecar')
} else {
this.$message({
message: '保存失败',
@@ -616,6 +648,7 @@
message: '保存成功',
type: 'success'
})
+ this.$EventBus.$emit('activeDeleteLineOrPoint', 'policeman')
this.editPoliceStyle(params, overlay)
} else {
this.$message({
@@ -630,6 +663,8 @@
updateSecurityPlot(params).then(res => {
if (res.data.success) {
this.editPlotStyle(params, overlay)
+ this.$EventBus.$emit('activeDeletePolygon')
+
this.$message({
message: '修改成功',
type: 'success'
--
Gitblit v1.9.3