From f8be2aad4e76069cb3e82b1e5d2197ff9d524f16 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Fri, 30 Dec 2022 16:14:34 +0800
Subject: [PATCH] 1
---
src/views/activity/index.vue | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index 62d6d91..f9c3936 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -129,16 +129,19 @@
<ul>
<li>
<button @click="draw('billboard', 'policeman')">
- <img src="../../../public/img/icon/police.png" style="height:100%" />
+ <img
+ src="../../../public/img/icon/police-people-btn.png"
+ style="height:100%"
+ />
</button>
</li>
<li>
<button @click="draw('billboard', 'policecar')">
- <img src="../../../public/img/icon/car.png" style="height:100%" />
+ <img src="../../../public/img/icon/car-btn.png" style="height:100%" />
</button>
</li>
<li>
- <button @click="draw('polygon', 'policecar')">警车范围</button>
+ <button @click="draw('polyline', 'policecar')">巡逻路线</button>
</li>
</ul>
</div>
@@ -684,7 +687,7 @@
id: item.id,
carId: item.carId
},
- incident: this.overlayTypeClick
+ // incident: this.overlayTypeClick
})
} else if (item.type == 2) {
let positionNewArr = this.convertPolylineOrPolygonPositionDate(item.position, item.type)
@@ -696,7 +699,7 @@
id: item.id,
carId: item.carId
},
- incident: this.overlayTypeClick
+ // incident: this.overlayTypeClick
})
} else if (item.type == 3) {
@@ -800,7 +803,7 @@
if (iconName == 'activity') {
positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 100, url: '/img/icon/activity.png' }
} else if (iconName == 'policeman') {
- positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 100, url: '/img/icon/police.png', id: plotId, policemanId: policeId }
+ positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 100, url: '/img/icon/police-people.png', id: plotId, policemanId: policeId }
} else if (iconName == 'policecar') {
positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 100, url: '/img/icon/car.png', id: plotId, carId: policeId }
}
@@ -1001,13 +1004,13 @@
}
that.policeChooseVisible = true
flag = false
- } else if (flag == true && poltType == 'polygon') {
- if (policeType == 'policecar') {
- that.policeChooseTitle = '选择警车'
- that.policeOption = that.policecarOption
- that.policeChooseVisible = true
- flag = false
- }
+ } else if (flag == true && poltType == 'polyline') {
+ let position = ''
+ overlay._positions.forEach(item => {
+ position += item._lng + ' ' + item._lat + ','
+ })
+ position = position.slice(0, position.length - 1)
+ that.addActivityPolice(this.policeType, position, this.showingSecurityId, 1)
}
}
})
--
Gitblit v1.9.3