From 8872fbb3b6def931350d18515bf6d40f4dab0ce1 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 18 Apr 2023 15:34:42 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs
---
src/views/activity/components/twoDrawBtnBox.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/views/activity/components/twoDrawBtnBox.vue b/src/views/activity/components/twoDrawBtnBox.vue
index a02465e..9d5f17b 100644
--- a/src/views/activity/components/twoDrawBtnBox.vue
+++ b/src/views/activity/components/twoDrawBtnBox.vue
@@ -16,16 +16,10 @@
</button>
</li>
<li>
- <button @click="drawThreeArrow('billboard', 'icon', 'icon1')" title="普通群众">普通群众</button>
- </li>
- <li>
- <button @click="drawThreeArrow('billboard', 'icon', 'icon2')" title="保护对象">保护对象</button>
- </li>
- <li>
- <button @click="drawThreeArrow('billboard', 'icon', 'icon3')" title="危险人物">危险人物</button>
- </li>
- <li>
<button @click="drawThreeArrow('billboard', 'icon', 'icon4')" title="自定义图片标注">自定义图片标注</button>
+ </li>
+ <li>
+ <button @click="drawThreeArrow('billboard', 'icon', 'icon5')" title="其他">其他</button>
</li>
</ul>
</div>
@@ -214,6 +208,10 @@
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
}
@@ -626,6 +624,7 @@
message: '保存成功',
type: 'success'
})
+ this.$EventBus.$emit('activeDeleteLineOrPoint', 'policecar')
} else {
this.$message({
message: '保存失败',
@@ -645,6 +644,7 @@
message: '保存成功',
type: 'success'
})
+ this.$EventBus.$emit('activeDeleteLineOrPoint', 'policeman')
this.editPoliceStyle(params, overlay)
} else {
this.$message({
@@ -659,6 +659,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