Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/supermap/advance-init.js

@@ -1678,7 +1678,6 @@ export function MapFun(mapObj) {
             _removeLayerByLayerName(layerName)
             let selectedLayerList = [];
             let layers = null;
-            let clickDataList = [];
             // 判断是否是聚合图层
             layers = createMarkerClusterLayer('', map)
             const icon1 = createDefaultFeatureStyle({
@@ -1734,6 +1733,7 @@ export function MapFun(mapObj) {
                         //     })
                         // }
                     marker.on('click', e => {
+                        let clickDataList = [];
                         //console.log('点位数据', e)
                         //console.log('点位数据1', e.sourceTarget.resourceData)
                         clickDataList.push(e.sourceTarget.resourceData);

front/src/supermap/map-showResource.js

@@ -83,9 +83,9 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
             maxClusterRadius: 80,
         })
         markerClusterLayer.on('clusterclick', function(a) {
+            let clusterList = [];
             //console.log('cluster ' + a.layer.getAllChildMarkers());
             if (a.layer.getAllChildMarkers().length < 50) {
-                let clusterList = [];
                 for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) {
                     //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData);
                     //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].fData);