From 26385d2c91d763259eb1ef55c3255e5ca01717a5 Mon Sep 17 00:00:00 2001
From: ZhAkps <46207005+ZhAkps@users.noreply.github.com>
Date: 星期二, 06 二月 2024 18:18:08 +0800
Subject: [PATCH] Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb

---
 src/utils/map2.js |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/utils/map2.js b/src/utils/map2.js
index cbe393c..9d08ec4 100644
--- a/src/utils/map2.js
+++ b/src/utils/map2.js
@@ -8,7 +8,7 @@
 import Vue from 'vue';
 import axios from "axios";
 import _GLOBAL from '@/assets/GLOBAL2';
-import poiLayer2 from '@/components/poplayer/main2';
+import poiLayer from '@/components/poplayer/main';
 import store from "@/utils/store2";
 import { Message } from 'element-ui';
 let tdglLine, qiyexinxi, qysl, ydbm, ydlx, cyfx, crzt, ydmj, crnx, crnf, rjl, jzxg, jzmd;
@@ -16,7 +16,7 @@
 var clickEvent;
 
 window.tdglLine = tdglLine
-let PoiLayerConstructor = Vue.extend(poiLayer2);
+let PoiLayerConstructor = Vue.extend(poiLayer);
 /**鏍稿績鍖� */
 export function loadHXQ() {
     let urls = window.gisBaseUrl + "/gisserver/wmsserver/YZ_BJ60";
@@ -2203,6 +2203,7 @@
 
 
 //openlayer 鍒涘缓鐐逛綅
+window.pointArr = [];
 export function createPointMarker(position, obj) {
     let startFeature = new ol.Feature({
         geometry: new ol.geom.Point(position),
@@ -2210,6 +2211,12 @@
     startFeature.setProperties({
         desc: obj,
     });
+    if (window.pointArr && window.pointArr.length > 0) {
+        window.pointArr.forEach(item => {
+            window.map.removeLayer(item)
+        })
+        window.pointArr = []
+    }
     let MarkerLayer = new ol.layer.Vector({
         id: 'LocationPoint',
         name: '鏍囪鐐�',
@@ -2229,6 +2236,7 @@
         }),
         zIndex: 1099,
     })
+    window.pointArr.push(MarkerLayer)
     return MarkerLayer;
 }
 
@@ -2364,11 +2372,9 @@
                     lon: obj.lng,
                     lat: obj.lat
                 }
-
-                store.setTdglShow(false);
-                store.setTdlgInfo({});
-                store.setdwShow(true);
-                store.setdwInfo(objdata);
+                overlay.setPosition(e.coordinate);
+                store.setPoplayerShowAction(true);
+                store.setPoplayerListAction(objdata);
                 // if (window.instance) {
                 //     window.instance.$destroy();
                 // }

--
Gitblit v1.9.3