From 7995fd71ae0a0dcd305bbf4cbb765f892803ab87 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 15 Apr 2023 17:16:21 +0800
Subject: [PATCH] 电子沙盘更改

---
 src/views/activity/components/twoDrawBtnBox.vue |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/activity/components/twoDrawBtnBox.vue b/src/views/activity/components/twoDrawBtnBox.vue
index 2a53c24..a02465e 100644
--- a/src/views/activity/components/twoDrawBtnBox.vue
+++ b/src/views/activity/components/twoDrawBtnBox.vue
@@ -361,6 +361,8 @@
             addPlotOverlayData.attrParams = { id: item.id, color: item.color, item }
 
             addPlotOverlayData.on(global.DC.MouseEventType.CLICK, this.$parent.reeditArrowClick)
+            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(' ')
@@ -376,9 +378,6 @@
                     lat: Number(position[1]),
                     alt: Number(height[0]),
                 }
-
-                addPlotOverlayData.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver)
-                addPlotOverlayData.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut)
 
                 this.$parent.isHaveFactor = true
             } else {
@@ -434,8 +433,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
@@ -594,13 +595,16 @@
                     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()

--
Gitblit v1.9.3