From 215fdd3dcc7fd6b43c8cfc224b974894dae01b4e Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 9 Jan 2024 23:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/map/index.vue       | 10 +++++++---
 src/views/components/newEvent/index.vue |  7 ++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index fa69b5d..9853098 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -397,7 +397,7 @@
     <!-- <video-wall ref="videoWall"></video-wall> -->
     <alone-video ref="aloneVideo"></alone-video>
     <shop ref="shop" width="50%" title="商铺详情查看" />
-    <new-event ref="newEvent"></new-event>
+    <new-event ref="newEvent" @cancel="cancel"></new-event>
     <!-- 强制观摩弹框 -->
     <el-dialog 
       :visible.sync="showVideo" 
@@ -827,7 +827,7 @@ export default {
               // console.log(addressName,'this.addressName');
               if(this.layers.layer4) {
                 // e.target.getExtData().name;     e.target.getExtData()获取给图层设置的extData属性的name
-                this.$refs.newEvent.open({lnglat:e.lnglat,address:addressName,meshOccurs:e.target.getExtData().name});
+                this.$refs.newEvent.open({lnglat:e.lnglat,address:addressName,meshOccurs:e.target.getExtData().name,marker:marker});
                 this.isPositioning = false;
               }
             })
@@ -1822,7 +1822,7 @@ export default {
             // console.log(addressName,'this.addressName');
             if(this.layers.layer4) {
               // e.target.getExtData().name;     e.target.getExtData()获取给图层设置的extData属性的name
-              this.$refs.newEvent.open({lnglat:latlng,address:addressName,meshOccurs:name});
+              this.$refs.newEvent.open({lnglat:latlng,address:addressName,meshOccurs:name,marker:marker});
               this.isPositioning = false;
             }
           })
@@ -2737,6 +2737,10 @@ export default {
       this.isPositioning = true;
       // this.$refs.videoWall.open();
     },
+    // 弹框点击取消事件
+    cancel(marker){
+      this.layers.layer4.removeOverlay(marker)
+    },
     // 切换地图事件
     changeMap(id) {
       this.actionMap = id;
diff --git a/src/views/components/newEvent/index.vue b/src/views/components/newEvent/index.vue
index 0b6f569..78f19de 100644
--- a/src/views/components/newEvent/index.vue
+++ b/src/views/components/newEvent/index.vue
@@ -1427,6 +1427,7 @@ export default {
           ]
         },
       ],
+      marker:null,
     }
   },
   methods:{
@@ -1434,7 +1435,8 @@ export default {
       // console.log(obj,'obj');
       this.$refs.dialog5.open('3');
       this.$nextTick(()=>{
-        this.formInline.reportEventObj.address = obj?.address
+        this.formInline.reportEventObj.address = obj?.address;
+        this.marker = obj?.marker;
       })
     },
     Close() {
@@ -1445,6 +1447,9 @@ export default {
     cancel(refForm){
       this.$refs[refForm].resetFields();
       this.$refs.dialog5.Close();
+      if(this.marker) {
+        this.$emit('cancel',this.marker)
+      }
     },
     // 确定按钮
     confirm(formName){