From 1f0cfb009e7348929325cb3f2af0107e4e524a52 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 15 Mar 2023 11:06:00 +0800
Subject: [PATCH] 警员新增修改

---
 src/views/activity/components/drawBtnBox.vue |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/activity/components/drawBtnBox.vue b/src/views/activity/components/drawBtnBox.vue
index 10a7365..13f4923 100644
--- a/src/views/activity/components/drawBtnBox.vue
+++ b/src/views/activity/components/drawBtnBox.vue
@@ -157,15 +157,13 @@
 
             global.viewer.tooltip.enable = true
 
-            // this.policeType = ''  // ?
-
             plot && plot.draw(poltType, overlay => {
                 if (isAddLabel) return
 
                 if (poltType == 'billboard' && policeType == 'policeman') {
                     overlay.icon = '/img/icon/man3.png'
                 } else if (poltType == 'billboard' && policeType == 'policecar') {
-                    overlay.icon = '/img/car3.png'
+                    overlay.icon = '/img/icon/car3.png'
                 }
 
                 if (overlay) {
@@ -195,6 +193,7 @@
                                 } else if (policeType == 'policecar') {
                                     that.$emit('setPoliceOption')
                                     that.$parent.chooseCarColor = '#FF0000'
+                                    that.$parent.policeType = ''
                                     that.$parent.policeChooseCarVisible = true
                                 }
                                 flag = false
@@ -348,8 +347,11 @@
 
         // 删除所有地图绘制元素
         removeDraw () {
-            // drawLayers != null && drawLayers.clear()
             addPoliceIconOverlayData!= null && !addPoliceIconOverlayData.attrParams && addPoliceIconOverlayData.remove()
+        },
+
+        clearDraw(){
+            drawLayers != null && drawLayers.clear()
         },
 
         removeDrawArrow () {
@@ -497,17 +499,18 @@
                     "outlineWidth": 0, //边框大小,
                     "pixelSize": 32,
                 })
-                point.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick)
+                // point.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick)
                 point.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
                 point.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut)
                 addPoliceIconOverlayData.attrParams = positionObj
+                addPoliceIconOverlayData.attrParams.pointOverlayData = point
                 addPoliceIconOverlayData.position = {
                  lng: Number(positionArr[0]),
                  lat: Number(positionArr[1]),
                  alt: 0.5,
                 }
                 addPoliceIconOverlayData.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick)
-                addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
+                // addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
                 addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut)
         },
 

--
Gitblit v1.9.3