From aa57f41ee1e34b38d2a946023209f1aa21b76be0 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 1 Apr 2024 17:58:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=8C=E5=87=BB=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E5=87=BA=E5=8F=91=E5=BC=B9=E7=AA=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/RoadAndEvents/utils/map.js     | 14 ++++++++++++--
 .../pages/Home/components/Thumbnail/index.vue      |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index e5c69034..ff81bccc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -202,7 +202,7 @@ export class MarkerCluster {
     </div>`);
     window.infoWindow = this.infoWindow;
     this.infoWindow.open(map, currentPageData[0].lnglat);
-
+    window.openInfoWindow = true;
     this.infoWindow.dom.querySelector(".info-close").onclick = () =>
       this.infoWindow.close();
 
@@ -237,11 +237,21 @@ export class MarkerCluster {
     let hasClick = false;
 
     const reset = () => {
-      this.infoWindow?.close?.();
+      if (!window.openInfoWindow) {
+        this.infoWindow?.close?.();
+      }
     };
 
     map.on("zoomstart", reset);
     map.on("mapmove", reset);
+    map.on("moveend", async () => {
+      if (window.openInfoWindow) {
+        console.log("窗口位移结束");
+        window.openInfoWindow = false;
+        await new Promise((resolve) => setTimeout(resolve, 340));
+        window.infoWindow?.open?.();
+      }
+    });
 
     const markerCluster = new AMap.MarkerCluster(map, [], {
       // gridSize: 15,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
index 978a89a2..b91a768d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
@@ -13,7 +13,7 @@ import { actualLocationList, canvasList } from "./data.js";
 const mouseenterDebounceFunc = debounce(({ node }) => {
   if (["custom-html"].indexOf(node.shape) >= 0) {
     node.setZIndex(100);
-    console.log(node);
+    // console.log(node);
   }
 }, 0);
 const mouseleaveDebounceFunc = debounce(({ node }) => {