From bbb9ee296e5ca96d80eed76173c3d76ebc14fc5f Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 17 May 2023 09:50:08 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs
---
src/views/activity/components/twoDrawBtnBox.vue | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/views/activity/components/twoDrawBtnBox.vue b/src/views/activity/components/twoDrawBtnBox.vue
index e58b54d..fb067a0 100644
--- a/src/views/activity/components/twoDrawBtnBox.vue
+++ b/src/views/activity/components/twoDrawBtnBox.vue
@@ -6,26 +6,17 @@
<span>要素资源：</span>
<ul>
<li>
- <button
- @click="drawThreeArrow('billboard', 'police', 'policeman')"
- title="警员"
- >
+ <button @click="drawThreeArrow('billboard', 'police', 'policeman')" title="警员">
<img src="/img/icon/police-people-btn.png" style="height:100%" />
</button>
</li>
<li>
- <button
- @click="drawThreeArrow('billboard', 'police', 'policecar')"
- title="警车"
- >
+ <button @click="drawThreeArrow('billboard', 'police', 'policecar')" title="警车">
<img src="/img/icon/car-btn.png" style="height:100%" />
</button>
</li>
<li>
- <button
- @click="drawThreeArrow('billboard', 'icon', 'icon4')"
- title="自定义图片标注"
- >自定义图片标注</button>
+ <button @click="drawThreeArrow('billboard', 'icon', 'icon4')" title="自定义图片标注">自定义图片标注</button>
</li>
<li>
<button @click="drawThreeArrow('billboard', 'icon', 'icon5')" title="其他">其他</button>
@@ -48,16 +39,10 @@
<button @click="drawArrow('tailed_attack_arrow', 4)" title="燕尾箭头">燕尾箭头</button>
</li>
<li>
- <button
- @click="drawThreeArrow('polygon', 'polygon', 'polygon')"
- title="多边形"
- >多边形</button>
+ <button @click="drawThreeArrow('polygon', 'polygon', 'polygon')" title="多边形">多边形</button>
</li>
<li>
- <button
- @click="drawThreeArrow('brokenline', 'brokenline', 'brokenline')"
- title="折线"
- >折线</button>
+ <button @click="drawThreeArrow('brokenline', 'brokenline', 'brokenline')" title="折线">折线</button>
</li>
</ul>
</div>
@@ -442,6 +427,13 @@
addPlotOverlayData.attrParams = data
+ this.$EventBus.$emit('layerPolygonArrowsAdd', {
+ layerName: 'newCarDrawLineLayers',
+ positions: positionNewArr,
+ material: color,
+ params: { ...data, item: data, data: data },
+ })
+
this.$EventBus.$emit('layerPolygonAdd', {
layerName: 'newCarDrawLineLayers',
positions: positionStr,
@@ -614,6 +606,13 @@
overlay.attrParams.width = params.width
overlay.attrParams.remark = params.remark
+ this.$EventBus.$emit('layerPolygonArrowsAdd', {
+ layerName: 'newCarDrawLineLayers',
+ positions: linePosition,
+ material: color,
+ params: { ...overlay.attrParams, item: overlay.attrParams, data: overlay.attrParams },
+ })
+
this.$EventBus.$emit('layerPolygonAdd', {
layerName: 'newCarDrawLineLayers',
positions: positionStr,
@@ -734,7 +733,7 @@
.right {
height: 100%;
- & > div {
+ &>div {
display: flex;
}
--
Gitblit v1.9.3