From 71fcf04ff3c7a84124a78394830915cf5a5e6878 Mon Sep 17 00:00:00 2001
From: SmileXin <13622060635@163.com>
Date: Sun, 9 Feb 2025 22:54:22 +0800
Subject: [PATCH] 25.02.09

---
 src/pages/BaseMap/LayerData/index.js | 17 +++++++++++------
 src/pages/BaseMap/index.js           |  5 +++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pages/BaseMap/LayerData/index.js b/src/pages/BaseMap/LayerData/index.js
index 7e1cd8b7..87d6c8e6 100644
--- a/src/pages/BaseMap/LayerData/index.js
+++ b/src/pages/BaseMap/LayerData/index.js
@@ -160,7 +160,7 @@ class LayerData extends React.Component {
     // 选中图层
     selectLayer = (e) => {
         // 修改选中状态
-        console.log('selectLayer✈····· ',e);
+        console.log('selectLayer✈····· ', parseInt(e.key.split('(')[2].split(')')[0]));
         let menuData = this.state.menuData;
         this.setState({ menuData: [] })    // 将图层列表的数据清空（不清空组件不更新数据）
         for (let i in menuData) {       // 将选中图层的小眼睛改为打开状态（重新写入数据）
@@ -174,14 +174,19 @@ class LayerData extends React.Component {
             }
         }
 
-        // 改变选择状态并改变地图上的图层
         let layerId = e.key.split('-')[1];
-        if (e.item.props.typee === 1 || e.item.props.typee === 4) {
-            this.props.getLayerPoints(layerId, true, e.item.props.typee);
-        } else if (e.item.props.typee === 2) {
-            this.props.getLayerShapes(layerId, true);
+        // 从e.key中获取图层的点位数量，并判断是否大于零
+        if (parseInt(e.key.split('(')[2].split(')')[0]) > 0) {
+            // 改变选择状态并改变地图上的图层(API请求，加载动画)
+            if (e.item.props.typee === 1 || e.item.props.typee === 4) {
+                this.props.getLayerPoints(layerId, true, e.item.props.typee);
+            } else if (e.item.props.typee === 2) {
+                this.props.getLayerShapes(layerId, true);
+            }
         }
 
+
+
         // 将选中图层写入选中图层列表
         let selectLayerList = [];
         let selectLayerIdList = [];
diff --git a/src/pages/BaseMap/index.js b/src/pages/BaseMap/index.js
index 554a6c06..4a0275fb 100644
--- a/src/pages/BaseMap/index.js
+++ b/src/pages/BaseMap/index.js
@@ -182,11 +182,13 @@ class BaseMap extends React.Component {
     // 获取图层明细点位数据/热力图数据
     getLayerPoints = (layerId, selected, nodeType) => {
         if (selected) {
-            this.startLoading();
+            this.startLoading();    // 开启加载动画
             getLayerPointsApi({
                 adcode: this.state.districtAdcode || this.state.cityAdcode || this.state.provinceAdcode,
                 layerId: layerId
             }).then((e) => {
+                console.log("网络请求完成")
+                // 获取点位数据
                 let layerPointsData = e.data || [];
                 layerPointsData = layerPointsData.map((item) => {
                     item.lng = item.location.split(',')[0];
@@ -196,7 +198,6 @@ class BaseMap extends React.Component {
                 });
                 if (nodeType === 1) {
                     // 在地图上添加点位
-                    console.log("layerPointsData", layerPointsData)
                     this.setMarkers(layerPointsData, layerId);
                 } else if (nodeType === 4) {
                     // this.setHeatMap(layerPointsData, layerId);