From 6a565d42c5e53485afe2ed81fc23ff7d3362ff8c Mon Sep 17 00:00:00 2001
From: mbp <360013221@qq.com>
Date: Sat, 14 Sep 2024 16:19:50 +0800
Subject: [PATCH] update new gis map

---
 ruoyi-ui/package.json                            |  2 +-
 .../Home/components/RoadAndEvents/utils/map.js   | 16 ++++++++++------
 ruoyi-ui/vue.config.js                           |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 7003123c..81355aa3 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -64,7 +64,7 @@
     "fuse.js": "6.4.3",
     "gis-map-admin": "^0.9.2",
     "gis-map-tunnel": "^0.1.3",
-    "gis-map-universal": "^0.5.4",
+    "gis-map-universal": "^0.5.5",
     "highlight.js": "9.18.5",
     "html-docx-js": "^0.3.1",
     "imports-loader": "^0.8.0",
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 eb977312..184417f8 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
@@ -55,11 +55,11 @@ export class MarkerCluster {
   async addData(data, isDefault) {
     this.infoWindow?.close?.();
 
-    data.forEach(e => {
-      const lnglat = getLnglat(e.extData);
-      e.extData.longitude = lnglat[0];//点坐标经度    【必传字段】
-      e.extData.latitude = lnglat[1];
-    });
+    //data.forEach(e => {
+    //  const lnglat = getLnglat(e.extData);
+    //  e.extData.longitude = lnglat[0];//点坐标经度    【必传字段】
+    //  e.extData.latitude = lnglat[1];
+    //});
     marksAddInGraph(data);
   
     if (!data) return;
@@ -137,7 +137,11 @@ export class MarkerCluster {
           offset: [0,-48], 
           size: [42,100], 
           GGoffsetX: 0, 
-          GGoffsetY: 20, 
+          GGoffsetY: -5,
+          GGimgOffset:[0,0],
+          GGimgsize:[42,103],
+          GGstakeOffsetY:45,
+          stakeOffsetY:25,
           otherInfo: {
             ...e,
             stake: _stake,
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 7ce00f5e..a6b997b0 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -38,9 +38,9 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:8087`,
         // target:`http://localhost:3001`,
+         target:`http://10.0.111.11:8097`,
         // target:`http://10.0.111.11:8097`,
-        // target:`http://10.0.111.11:8097`,
-         target: `http://10.168.66.196:8087`, //刘文阁
+        // target: `http://10.168.66.196:8087`, //刘文阁
         // target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟凡峰