From 446b359632a7749b7be7263a72691579f0aacb41 Mon Sep 17 00:00:00 2001
From: xhf <1424913779@qq.com>
Date: Thu, 6 Mar 2025 10:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9editMap=20=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=20emit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mapPage/realTimeMap/editMap.vue | 15 ++++++++-------
 src/views/mapPage/realTimeMap/index.vue   | 17 +++++++++++------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue
index 366604ac..b29bab4f 100644
--- a/src/views/mapPage/realTimeMap/editMap.vue
+++ b/src/views/mapPage/realTimeMap/editMap.vue
@@ -673,7 +673,7 @@ const mapBackgroundRef = ref()
 const inputBoxRef = ref() //文字输入框
 
 const message = useMessage() // 消息弹窗
-
+const emit = defineEmits(['backMapInfo'])
 // 缩放停止
 const interfaceRefreshed = ref(true)
 const resizeEnd = (locationX, locationY, w, h, item, index) => {
@@ -2327,12 +2327,13 @@ const removeEventListener = () => {
 const router = useRouter()
 onBeforeRouteLeave((to, from) => {
   if (to.path == '/mapPage/realTimeMap' && to.query.mapId != imgBgObj.positionMapId) {
-    router.replace({
-      name: 'MapPageRealTimeMap',
-      query: {
-        mapId: imgBgObj.positionMapId
-      }
-    })
+    // router.replace({
+    //   name: 'MapPageRealTimeMap',
+    //   query: {
+    //     mapId: imgBgObj.positionMapId
+    //   }
+    // })
+    emit('backMapInfo', imgBgObj.positionMapId)
   }
 })
 
diff --git a/src/views/mapPage/realTimeMap/index.vue b/src/views/mapPage/realTimeMap/index.vue
index 7f56f911..e98aa5ea 100644
--- a/src/views/mapPage/realTimeMap/index.vue
+++ b/src/views/mapPage/realTimeMap/index.vue
@@ -23,7 +23,7 @@
   </div>
 
   <!-- 新建任务的弹窗 -->
-  <createTaskDialog v-if="mapValue.length" ref="createTaskDialogRef" :positionMapId="mapValue[1]" />
+  <createTaskDialog v-if="mapValue.length" ref="createTaskDialogRef" @backMapInfo="backMapInfo" :positionMapId="mapValue[1]" />
 </template>
 
 <script setup>
@@ -33,7 +33,7 @@ import { ref, defineComponent, reactive, nextTick, onMounted } from 'vue'
 import * as MapApi from '@/api/map/map'
 import download from '@/utils/download'
 import { ElMessage, ElMessageBox } from 'element-plus'
-
+const mapId = ref(null)
 const message = useMessage() // 消息弹窗
 const route = useRoute()
 const { push } = useRouter()
@@ -87,7 +87,9 @@ const findChildrenByValues = (tree, values) => {
   }
   return null
 }
-
+const backMapInfo = (id) => {
+  mapId.value = id
+}
 //获取地图区域
 const getList = async () => {
   let data = await MapApi.getPositionMapGetMap()
@@ -113,11 +115,14 @@ const getList = async () => {
 
   list.value = mapList
 
-  if (query.mapId) {
-    let item = findDataById(data, Number(query.mapId))
+  // if (query.mapId) {
+  //   let item = findDataById(data, Number(query.mapId))
+  //   mapValue.value = [String(item.floor), Number(item.id)]
+  // }
+  if (mapId.value) {
+    let item = findDataById(data, Number(mapId.value))
     mapValue.value = [String(item.floor), Number(item.id)]
   }
-
   if (mapValue.value.length) {
     handleChangeMap(mapValue.value)
   } else {