diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index e85962e..b97f08c 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -28,6 +28,7 @@
 import headHMAimg from '@/views/sponeScreen/cityGK/headHMAimg.vue'; //头部
 import PhysicalGeography from '@/views/sponeScreen/cityGK/PhysicalGeography.vue'; //头部
 import bus from '@/bus/index';
+import { onBeforeUnmount } from 'vue';
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 
@@ -60,6 +61,22 @@
     ]);
   }, 5000);
 });
+onBeforeUnmount(() => {
+  bus.emit('setIniteLayer', [
+    {
+      layername: 'topography',
+      show: true,
+    },
+    {
+      layername: 'builtCity',
+      show: true,
+    },
+    {
+      layername: 'centerCity',
+      show: true,
+    },
+  ]);
+});
 </script>
 
 <style lang="scss" scoped></style>

diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index e85962e..b97f08c 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -28,6 +28,7 @@
 import headHMAimg from '@/views/sponeScreen/cityGK/headHMAimg.vue'; //头部
 import PhysicalGeography from '@/views/sponeScreen/cityGK/PhysicalGeography.vue'; //头部
 import bus from '@/bus/index';
+import { onBeforeUnmount } from 'vue';
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 
@@ -60,6 +61,22 @@
     ]);
   }, 5000);
 });
+onBeforeUnmount(() => {
+  bus.emit('setIniteLayer', [
+    {
+      layername: 'topography',
+      show: true,
+    },
+    {
+      layername: 'builtCity',
+      show: true,
+    },
+    {
+      layername: 'centerCity',
+      show: true,
+    },
+  ]);
+});
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 6169afe..26c14e1 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -30,6 +30,7 @@
 import RainfallEcharts from '@/views/sponeScreen/Echarts/RainfallEcharts.vue'; //年际降雨变化
 
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
+import { onBeforeUnmount } from 'vue';
 
 const chartData2 = ref({
   xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
@@ -126,6 +127,11 @@
 
 const refresh = ref(1);
 const refresh1 = ref(1);
+onBeforeUnmount(() => {
+  clearInterval(weatherTimer.value);
+  weatherTimer.value = null;
+  newfiberMap.weatherRemove();
+});
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index e85962e..b97f08c 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -28,6 +28,7 @@
 import headHMAimg from '@/views/sponeScreen/cityGK/headHMAimg.vue'; //头部
 import PhysicalGeography from '@/views/sponeScreen/cityGK/PhysicalGeography.vue'; //头部
 import bus from '@/bus/index';
+import { onBeforeUnmount } from 'vue';
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 
@@ -60,6 +61,22 @@
     ]);
   }, 5000);
 });
+onBeforeUnmount(() => {
+  bus.emit('setIniteLayer', [
+    {
+      layername: 'topography',
+      show: true,
+    },
+    {
+      layername: 'builtCity',
+      show: true,
+    },
+    {
+      layername: 'centerCity',
+      show: true,
+    },
+  ]);
+});
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 6169afe..26c14e1 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -30,6 +30,7 @@
 import RainfallEcharts from '@/views/sponeScreen/Echarts/RainfallEcharts.vue'; //年际降雨变化
 
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
+import { onBeforeUnmount } from 'vue';
 
 const chartData2 = ref({
   xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
@@ -126,6 +127,11 @@
 
 const refresh = ref(1);
 const refresh1 = ref(1);
+onBeforeUnmount(() => {
+  clearInterval(weatherTimer.value);
+  weatherTimer.value = null;
+  newfiberMap.weatherRemove();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index e6f1ee1..bcfe520 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -31,6 +31,7 @@
     roll: 0.005453465256790101,
   });
 };
+
 onMounted(() => {
   createIniteMap();
 });

diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index e85962e..b97f08c 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -28,6 +28,7 @@
 import headHMAimg from '@/views/sponeScreen/cityGK/headHMAimg.vue'; //头部
 import PhysicalGeography from '@/views/sponeScreen/cityGK/PhysicalGeography.vue'; //头部
 import bus from '@/bus/index';
+import { onBeforeUnmount } from 'vue';
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 
@@ -60,6 +61,22 @@
     ]);
   }, 5000);
 });
+onBeforeUnmount(() => {
+  bus.emit('setIniteLayer', [
+    {
+      layername: 'topography',
+      show: true,
+    },
+    {
+      layername: 'builtCity',
+      show: true,
+    },
+    {
+      layername: 'centerCity',
+      show: true,
+    },
+  ]);
+});
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 6169afe..26c14e1 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -30,6 +30,7 @@
 import RainfallEcharts from '@/views/sponeScreen/Echarts/RainfallEcharts.vue'; //年际降雨变化
 
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
+import { onBeforeUnmount } from 'vue';
 
 const chartData2 = ref({
   xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
@@ -126,6 +127,11 @@
 
 const refresh = ref(1);
 const refresh1 = ref(1);
+onBeforeUnmount(() => {
+  clearInterval(weatherTimer.value);
+  weatherTimer.value = null;
+  newfiberMap.weatherRemove();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index e6f1ee1..bcfe520 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -31,6 +31,7 @@
     roll: 0.005453465256790101,
   });
 };
+
 onMounted(() => {
   createIniteMap();
 });
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 8659273..2331841 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -3,274 +3,338 @@
 import cityArea from '@/assets/geojson/kaifeng/cityArea.json';
 import riverLake from '@/assets/geojson/kaifeng/riverLake.json';
 import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation';
-
-let cesiumMapLegend = [
-  {
-    title: '基础图层',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '白色地图',
-          url: 'whiteMap_icon.png',
-          layername: 'whiteMap',
-          type: 'background',
-        },
-        {
-          isCheck: true,
-          name: '深色地图',
-          url: 'blackMap_icon.png',
-          layername: 'blackMap',
-          type: 'background',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '影像图',
-          url: 'imageMap_icon.png',
-          layername: 'imageMap',
-          type: 'background',
-        },
-        {
-          isCheck: false,
-          name: '三维建筑',
-          url: 'building_icon.png',
-          layername: 'buildingModel',
-          type: '3dModel',
-          data: ['https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp'],
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '行政区划',
-          url: 'cityArea_icon.png',
-          layername: 'cityArea',
-          type: 'polygon',
-          data: cityArea,
-        },
-        {
-          isCheck: false,
-          name: '建成区',
-          url: 'builtCity_icon.png',
-          layername: 'builtCity',
-          type: 'areaWall',
-          data: builtCity,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '中心城区',
-          url: 'centerCity_icon.png',
-          layername: 'centerCity',
-          type: 'areaWall',
-          data: centerCity,
-        },
-        {
-          isCheck: false,
-          name: '河湖水系',
-          url: 'dynamicWater_icon.png',
-          layername: 'dynamicWater',
-          type: 'dynamicWater',
-          data: riverLake,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区一',
-          url: 'paiShuiArea1_icon.png',
-          layername: 'cesiumPaishuiArea1',
-          type: 'cesiumPaishuiArea',
-        },
-        {
-          isCheck: false,
-          name: '地形地貌',
-          url: 'topography_icon.png',
-          layername: 'topography',
-          type: 'pngImage',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区二',
-          url: 'paiShuiArea2_icon.png',
-          layername: 'cesiumPaishuiArea2',
-          type: 'cesiumPaishuiArea',
-        },
-        {
-          isCheck: false,
-          name: '供水厂',
-          url: 'waterFactory_icon.png',
-          layername: 'waterFactory',
-          type: 'iconPoint',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区三',
-          url: 'paiShuiArea3_icon.png',
-          layername: 'cesiumPaishuiArea3',
-          type: 'cesiumPaishuiArea',
-        },
-      ],
-    ],
-  },
-  {
-    title: '雨水/污水系统',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '雨水管网',
-          layername: 'rainLine',
-          url: 'rainLine_icon.png', //图层+json √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+import bus from '@/bus';
+let YSBZ, WSBZ, HLBZ;
+let legendDataList;
+export default class cesiumMapCommonLegend {
+  //获取站点数据
+  static async getStationData() {
+    //雨水泵站
+    let resRainwater = await oneMapFacilityPumpList();
+    if (resRainwater && resRainwater.code == 200) {
+      let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water');
+      let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water');
+      let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence');
+      YSBZ = this.getGeojsonData(YSBZDataList);
+      WSBZ = this.getGeojsonData(WSBZDataList);
+      HLBZ = this.getGeojsonData(HLBZDataList);
+      //发送图例
+      legendDataList = this.legendData();
+      bus.emit('legendDataList', legendDataList);
+    }
+  }
+  //构建geojson格式
+  static getGeojsonData(dataList) {
+    let features = [];
+    let feature = {};
+    dataList.forEach(data => {
+      if (data.lonLat) {
+        let lonlat = data.lonLat.split(',');
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(lonlat[0]), Number(lonlat[1])],
+          },
+          properties: data,
+        };
+      } else if (data.lon && data.lat) {
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(data.lon), Number(data.lat)],
+          },
+          properties: data,
+        };
+      } else if (data.originalX && data.originalY) {
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(data.originalX), Number(data.originalY)],
+          },
+          properties: data,
+        };
+      }
+      features.push(feature);
+    });
+    return {
+      type: 'FeatureCollection',
+      features: features,
+    };
+  }
+  static legendData() {
+    return [
+      {
+        title: '基础图层',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '白色地图',
+              url: 'whiteMap_icon.png',
+              layername: 'whiteMap',
+              type: 'background',
+            },
+            {
+              isCheck: true,
+              name: '深色地图',
+              url: 'blackMap_icon.png',
+              layername: 'blackMap',
+              type: 'background',
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '雨水泵站',
-          layername: 'YSBZ',
-          url: 'rainBengZhan_icon.png', //图层+json √
-          mapUrl: 'paiLaoBeng.png',
-          type: 'point',
-          //data: YSBZ,
-          //data: ysBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '污水管网',
-          layername: 'sewageLine',
-          url: 'sewageLine_icon.png', //服务  √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+          [
+            {
+              isCheck: false,
+              name: '影像图',
+              url: 'imageMap_icon.png',
+              layername: 'imageMap',
+              type: 'background',
+            },
+            {
+              isCheck: false,
+              name: '三维建筑',
+              url: 'building_icon.png',
+              layername: 'buildingModel',
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp',
+              ],
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '污水泵站', //图层+json   √
-          layername: 'WSBZ',
-          url: 'sewageBenZhan_icon.png',
-          mapUrl: 'wsBeng.png',
-          type: 'point',
-          //data: WSBZ,
-          //data: wsBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '合流管网',
-          layername: 'combineLine',
-          url: 'combineLine_icon.png', //服务  √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
+          [
+            {
+              isCheck: false,
+              name: '行政区划',
+              url: 'cityArea_icon.png',
+              layername: 'cityArea',
+              type: 'polygon',
+              data: cityArea,
+            },
+            {
+              isCheck: false,
+              name: '建成区',
+              url: 'builtCity_icon.png',
+              layername: 'builtCity',
+              type: 'areaWall',
+              data: builtCity,
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '合流泵站', //图层+json   √
-          layername: 'combineBengZhan',
-          url: 'combineBengZhan_icon.png',
-          mapUrl: 'wsBeng.png',
-          type: 'point',
-          //data: WSBZ,
-          //data: wsBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '污水处理厂',
-          layername: 'sewageFactory', //图层+json   √
-          url: 'sewageFactory_icon.png',
-          mapUrl: 'WSC.png',
-          type: 'point',
-          //data: WSCLC,
-          //data: wuShuiChang,
-        },
-        {
-          isCheck: false,
-          name: '管网流向',
-          layername: 'pipeLineFlow',
-          url: 'pipeLineFlow_icon.png',
-          type: 'dynamicLine',
-        },
-      ],
-    ],
-  },
-  {
-    title: '感知监测',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '内涝积水点',
-          layername: 'waterLoging', //图层+json  √
-          url: 'waterLoging_icon.png',
-          mapUrl: 'rain.png',
-          type: 'point',
-          //data: rainStation,
-        },
-        {
-          isCheck: false,
-          name: '河道断面',
-          layername: 'waterCourse',
-          url: 'waterCourse_icon.png', //图层+json  √
-          mapUrl: 'KDJZWMX.png',
-          type: 'point',
-          //data: riverLake,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '雨量站',
-          layername: 'rainStation',
-          url: 'rainStation_icon.png', //图层+json  √
-          mapUrl: 'yuanTou.png',
-          type: 'point',
-          //data: waterSectionInfo,
-        },
-        {
-          isCheck: false,
-          name: '源头地块',
-          layername: 'origine', //图层+json  √
-          url: 'origine_icon.png',
-          mapUrl: 'rainSupervise.png',
-          type: 'point',
-          //data: pipeSupervise,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '海绵设施',
-          layername: 'spongeFacility',
-          url: 'spongeFacility_icon.png', //图层+json  √
-          mapUrl: 'yiLao.png',
-          type: 'point',
-          //data: waterlog,
-        },
-      ],
-    ],
-  },
-];
-export default cesiumMapLegend;
+          [
+            {
+              isCheck: false,
+              name: '中心城区',
+              url: 'centerCity_icon.png',
+              layername: 'centerCity',
+              type: 'areaWall',
+              data: centerCity,
+            },
+            {
+              isCheck: false,
+              name: '河湖水系',
+              url: 'dynamicWater_icon.png',
+              layername: 'dynamicWater',
+              type: 'dynamicWater',
+              data: riverLake,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区一',
+              url: 'paiShuiArea1_icon.png',
+              layername: 'cesiumPaishuiArea1',
+              type: 'cesiumPaishuiArea',
+            },
+            {
+              isCheck: false,
+              name: '地形地貌',
+              url: 'topography_icon.png',
+              layername: 'topography',
+              type: 'pngImage',
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区二',
+              url: 'paiShuiArea2_icon.png',
+              layername: 'cesiumPaishuiArea2',
+              type: 'cesiumPaishuiArea',
+            },
+            {
+              isCheck: false,
+              name: '供水厂',
+              url: 'waterFactory_icon.png',
+              layername: 'waterFactory',
+              type: 'iconPoint',
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区三',
+              url: 'paiShuiArea3_icon.png',
+              layername: 'cesiumPaishuiArea3',
+              type: 'cesiumPaishuiArea',
+            },
+          ],
+        ],
+      },
+      {
+        title: '雨水/污水系统',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '雨水管网',
+              layername: 'rainLine',
+              url: 'rainLine_icon.png', //图层+json √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '雨水泵站',
+              layername: 'YSBZ',
+              url: 'rainBengZhan_icon.png', //图层+json √
+              mapUrl: 'paiLaoBeng.png',
+              type: 'point',
+              data: YSBZ,
+              //data: ysBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '污水管网',
+              layername: 'sewageLine',
+              url: 'sewageLine_icon.png', //服务  √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '污水泵站', //图层+json   √
+              layername: 'WSBZ',
+              url: 'sewageBenZhan_icon.png',
+              mapUrl: 'wsBeng.png',
+              type: 'point',
+              data: WSBZ,
+              //data: wsBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '合流管网',
+              layername: 'combineLine',
+              url: 'combineLine_icon.png', //服务  √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '合流泵站', //图层+json   √
+              layername: 'combineBengZhan',
+              url: 'combineBengZhan_icon.png',
+              mapUrl: 'wsBeng.png',
+              type: 'point',
+              data: HLBZ,
+              //data: wsBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '污水处理厂',
+              layername: 'sewageFactory', //图层+json   √
+              url: 'sewageFactory_icon.png',
+              mapUrl: 'WSC.png',
+              type: 'point',
+              //data: WSCLC,
+              //data: wuShuiChang,
+            },
+            {
+              isCheck: false,
+              name: '管网流向',
+              layername: 'pipeLineFlow',
+              url: 'pipeLineFlow_icon.png',
+              type: 'dynamicLine',
+            },
+          ],
+        ],
+      },
+      {
+        title: '感知监测',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '内涝积水点',
+              layername: 'waterLoging', //图层+json  √
+              url: 'waterLoging_icon.png',
+              mapUrl: 'rain.png',
+              type: 'point',
+              //data: rainStation,
+            },
+            {
+              isCheck: false,
+              name: '河道断面',
+              layername: 'waterCourse',
+              url: 'waterCourse_icon.png', //图层+json  √
+              mapUrl: 'KDJZWMX.png',
+              type: 'point',
+              //data: riverLake,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '雨量站',
+              layername: 'rainStation',
+              url: 'rainStation_icon.png', //图层+json  √
+              mapUrl: 'yuanTou.png',
+              type: 'point',
+              //data: waterSectionInfo,
+            },
+            {
+              isCheck: false,
+              name: '源头地块',
+              layername: 'origine', //图层+json  √
+              url: 'origine_icon.png',
+              mapUrl: 'rainSupervise.png',
+              type: 'point',
+              //data: pipeSupervise,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '海绵设施',
+              layername: 'spongeFacility',
+              url: 'spongeFacility_icon.png', //图层+json  √
+              mapUrl: 'yiLao.png',
+              type: 'point',
+              //data: waterlog,
+            },
+          ],
+        ],
+      },
+    ];
+  }
+}

diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index e85962e..b97f08c 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -28,6 +28,7 @@
 import headHMAimg from '@/views/sponeScreen/cityGK/headHMAimg.vue'; //头部
 import PhysicalGeography from '@/views/sponeScreen/cityGK/PhysicalGeography.vue'; //头部
 import bus from '@/bus/index';
+import { onBeforeUnmount } from 'vue';
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 
@@ -60,6 +61,22 @@
     ]);
   }, 5000);
 });
+onBeforeUnmount(() => {
+  bus.emit('setIniteLayer', [
+    {
+      layername: 'topography',
+      show: true,
+    },
+    {
+      layername: 'builtCity',
+      show: true,
+    },
+    {
+      layername: 'centerCity',
+      show: true,
+    },
+  ]);
+});
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 6169afe..26c14e1 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -30,6 +30,7 @@
 import RainfallEcharts from '@/views/sponeScreen/Echarts/RainfallEcharts.vue'; //年际降雨变化
 
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
+import { onBeforeUnmount } from 'vue';
 
 const chartData2 = ref({
   xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
@@ -126,6 +127,11 @@
 
 const refresh = ref(1);
 const refresh1 = ref(1);
+onBeforeUnmount(() => {
+  clearInterval(weatherTimer.value);
+  weatherTimer.value = null;
+  newfiberMap.weatherRemove();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index e6f1ee1..bcfe520 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -31,6 +31,7 @@
     roll: 0.005453465256790101,
   });
 };
+
 onMounted(() => {
   createIniteMap();
 });
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 8659273..2331841 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -3,274 +3,338 @@
 import cityArea from '@/assets/geojson/kaifeng/cityArea.json';
 import riverLake from '@/assets/geojson/kaifeng/riverLake.json';
 import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation';
-
-let cesiumMapLegend = [
-  {
-    title: '基础图层',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '白色地图',
-          url: 'whiteMap_icon.png',
-          layername: 'whiteMap',
-          type: 'background',
-        },
-        {
-          isCheck: true,
-          name: '深色地图',
-          url: 'blackMap_icon.png',
-          layername: 'blackMap',
-          type: 'background',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '影像图',
-          url: 'imageMap_icon.png',
-          layername: 'imageMap',
-          type: 'background',
-        },
-        {
-          isCheck: false,
-          name: '三维建筑',
-          url: 'building_icon.png',
-          layername: 'buildingModel',
-          type: '3dModel',
-          data: ['https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp'],
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '行政区划',
-          url: 'cityArea_icon.png',
-          layername: 'cityArea',
-          type: 'polygon',
-          data: cityArea,
-        },
-        {
-          isCheck: false,
-          name: '建成区',
-          url: 'builtCity_icon.png',
-          layername: 'builtCity',
-          type: 'areaWall',
-          data: builtCity,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '中心城区',
-          url: 'centerCity_icon.png',
-          layername: 'centerCity',
-          type: 'areaWall',
-          data: centerCity,
-        },
-        {
-          isCheck: false,
-          name: '河湖水系',
-          url: 'dynamicWater_icon.png',
-          layername: 'dynamicWater',
-          type: 'dynamicWater',
-          data: riverLake,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区一',
-          url: 'paiShuiArea1_icon.png',
-          layername: 'cesiumPaishuiArea1',
-          type: 'cesiumPaishuiArea',
-        },
-        {
-          isCheck: false,
-          name: '地形地貌',
-          url: 'topography_icon.png',
-          layername: 'topography',
-          type: 'pngImage',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区二',
-          url: 'paiShuiArea2_icon.png',
-          layername: 'cesiumPaishuiArea2',
-          type: 'cesiumPaishuiArea',
-        },
-        {
-          isCheck: false,
-          name: '供水厂',
-          url: 'waterFactory_icon.png',
-          layername: 'waterFactory',
-          type: 'iconPoint',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区三',
-          url: 'paiShuiArea3_icon.png',
-          layername: 'cesiumPaishuiArea3',
-          type: 'cesiumPaishuiArea',
-        },
-      ],
-    ],
-  },
-  {
-    title: '雨水/污水系统',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '雨水管网',
-          layername: 'rainLine',
-          url: 'rainLine_icon.png', //图层+json √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+import bus from '@/bus';
+let YSBZ, WSBZ, HLBZ;
+let legendDataList;
+export default class cesiumMapCommonLegend {
+  //获取站点数据
+  static async getStationData() {
+    //雨水泵站
+    let resRainwater = await oneMapFacilityPumpList();
+    if (resRainwater && resRainwater.code == 200) {
+      let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water');
+      let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water');
+      let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence');
+      YSBZ = this.getGeojsonData(YSBZDataList);
+      WSBZ = this.getGeojsonData(WSBZDataList);
+      HLBZ = this.getGeojsonData(HLBZDataList);
+      //发送图例
+      legendDataList = this.legendData();
+      bus.emit('legendDataList', legendDataList);
+    }
+  }
+  //构建geojson格式
+  static getGeojsonData(dataList) {
+    let features = [];
+    let feature = {};
+    dataList.forEach(data => {
+      if (data.lonLat) {
+        let lonlat = data.lonLat.split(',');
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(lonlat[0]), Number(lonlat[1])],
+          },
+          properties: data,
+        };
+      } else if (data.lon && data.lat) {
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(data.lon), Number(data.lat)],
+          },
+          properties: data,
+        };
+      } else if (data.originalX && data.originalY) {
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(data.originalX), Number(data.originalY)],
+          },
+          properties: data,
+        };
+      }
+      features.push(feature);
+    });
+    return {
+      type: 'FeatureCollection',
+      features: features,
+    };
+  }
+  static legendData() {
+    return [
+      {
+        title: '基础图层',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '白色地图',
+              url: 'whiteMap_icon.png',
+              layername: 'whiteMap',
+              type: 'background',
+            },
+            {
+              isCheck: true,
+              name: '深色地图',
+              url: 'blackMap_icon.png',
+              layername: 'blackMap',
+              type: 'background',
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '雨水泵站',
-          layername: 'YSBZ',
-          url: 'rainBengZhan_icon.png', //图层+json √
-          mapUrl: 'paiLaoBeng.png',
-          type: 'point',
-          //data: YSBZ,
-          //data: ysBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '污水管网',
-          layername: 'sewageLine',
-          url: 'sewageLine_icon.png', //服务  √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+          [
+            {
+              isCheck: false,
+              name: '影像图',
+              url: 'imageMap_icon.png',
+              layername: 'imageMap',
+              type: 'background',
+            },
+            {
+              isCheck: false,
+              name: '三维建筑',
+              url: 'building_icon.png',
+              layername: 'buildingModel',
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp',
+              ],
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '污水泵站', //图层+json   √
-          layername: 'WSBZ',
-          url: 'sewageBenZhan_icon.png',
-          mapUrl: 'wsBeng.png',
-          type: 'point',
-          //data: WSBZ,
-          //data: wsBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '合流管网',
-          layername: 'combineLine',
-          url: 'combineLine_icon.png', //服务  √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
+          [
+            {
+              isCheck: false,
+              name: '行政区划',
+              url: 'cityArea_icon.png',
+              layername: 'cityArea',
+              type: 'polygon',
+              data: cityArea,
+            },
+            {
+              isCheck: false,
+              name: '建成区',
+              url: 'builtCity_icon.png',
+              layername: 'builtCity',
+              type: 'areaWall',
+              data: builtCity,
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '合流泵站', //图层+json   √
-          layername: 'combineBengZhan',
-          url: 'combineBengZhan_icon.png',
-          mapUrl: 'wsBeng.png',
-          type: 'point',
-          //data: WSBZ,
-          //data: wsBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '污水处理厂',
-          layername: 'sewageFactory', //图层+json   √
-          url: 'sewageFactory_icon.png',
-          mapUrl: 'WSC.png',
-          type: 'point',
-          //data: WSCLC,
-          //data: wuShuiChang,
-        },
-        {
-          isCheck: false,
-          name: '管网流向',
-          layername: 'pipeLineFlow',
-          url: 'pipeLineFlow_icon.png',
-          type: 'dynamicLine',
-        },
-      ],
-    ],
-  },
-  {
-    title: '感知监测',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '内涝积水点',
-          layername: 'waterLoging', //图层+json  √
-          url: 'waterLoging_icon.png',
-          mapUrl: 'rain.png',
-          type: 'point',
-          //data: rainStation,
-        },
-        {
-          isCheck: false,
-          name: '河道断面',
-          layername: 'waterCourse',
-          url: 'waterCourse_icon.png', //图层+json  √
-          mapUrl: 'KDJZWMX.png',
-          type: 'point',
-          //data: riverLake,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '雨量站',
-          layername: 'rainStation',
-          url: 'rainStation_icon.png', //图层+json  √
-          mapUrl: 'yuanTou.png',
-          type: 'point',
-          //data: waterSectionInfo,
-        },
-        {
-          isCheck: false,
-          name: '源头地块',
-          layername: 'origine', //图层+json  √
-          url: 'origine_icon.png',
-          mapUrl: 'rainSupervise.png',
-          type: 'point',
-          //data: pipeSupervise,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '海绵设施',
-          layername: 'spongeFacility',
-          url: 'spongeFacility_icon.png', //图层+json  √
-          mapUrl: 'yiLao.png',
-          type: 'point',
-          //data: waterlog,
-        },
-      ],
-    ],
-  },
-];
-export default cesiumMapLegend;
+          [
+            {
+              isCheck: false,
+              name: '中心城区',
+              url: 'centerCity_icon.png',
+              layername: 'centerCity',
+              type: 'areaWall',
+              data: centerCity,
+            },
+            {
+              isCheck: false,
+              name: '河湖水系',
+              url: 'dynamicWater_icon.png',
+              layername: 'dynamicWater',
+              type: 'dynamicWater',
+              data: riverLake,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区一',
+              url: 'paiShuiArea1_icon.png',
+              layername: 'cesiumPaishuiArea1',
+              type: 'cesiumPaishuiArea',
+            },
+            {
+              isCheck: false,
+              name: '地形地貌',
+              url: 'topography_icon.png',
+              layername: 'topography',
+              type: 'pngImage',
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区二',
+              url: 'paiShuiArea2_icon.png',
+              layername: 'cesiumPaishuiArea2',
+              type: 'cesiumPaishuiArea',
+            },
+            {
+              isCheck: false,
+              name: '供水厂',
+              url: 'waterFactory_icon.png',
+              layername: 'waterFactory',
+              type: 'iconPoint',
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区三',
+              url: 'paiShuiArea3_icon.png',
+              layername: 'cesiumPaishuiArea3',
+              type: 'cesiumPaishuiArea',
+            },
+          ],
+        ],
+      },
+      {
+        title: '雨水/污水系统',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '雨水管网',
+              layername: 'rainLine',
+              url: 'rainLine_icon.png', //图层+json √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '雨水泵站',
+              layername: 'YSBZ',
+              url: 'rainBengZhan_icon.png', //图层+json √
+              mapUrl: 'paiLaoBeng.png',
+              type: 'point',
+              data: YSBZ,
+              //data: ysBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '污水管网',
+              layername: 'sewageLine',
+              url: 'sewageLine_icon.png', //服务  √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '污水泵站', //图层+json   √
+              layername: 'WSBZ',
+              url: 'sewageBenZhan_icon.png',
+              mapUrl: 'wsBeng.png',
+              type: 'point',
+              data: WSBZ,
+              //data: wsBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '合流管网',
+              layername: 'combineLine',
+              url: 'combineLine_icon.png', //服务  √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '合流泵站', //图层+json   √
+              layername: 'combineBengZhan',
+              url: 'combineBengZhan_icon.png',
+              mapUrl: 'wsBeng.png',
+              type: 'point',
+              data: HLBZ,
+              //data: wsBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '污水处理厂',
+              layername: 'sewageFactory', //图层+json   √
+              url: 'sewageFactory_icon.png',
+              mapUrl: 'WSC.png',
+              type: 'point',
+              //data: WSCLC,
+              //data: wuShuiChang,
+            },
+            {
+              isCheck: false,
+              name: '管网流向',
+              layername: 'pipeLineFlow',
+              url: 'pipeLineFlow_icon.png',
+              type: 'dynamicLine',
+            },
+          ],
+        ],
+      },
+      {
+        title: '感知监测',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '内涝积水点',
+              layername: 'waterLoging', //图层+json  √
+              url: 'waterLoging_icon.png',
+              mapUrl: 'rain.png',
+              type: 'point',
+              //data: rainStation,
+            },
+            {
+              isCheck: false,
+              name: '河道断面',
+              layername: 'waterCourse',
+              url: 'waterCourse_icon.png', //图层+json  √
+              mapUrl: 'KDJZWMX.png',
+              type: 'point',
+              //data: riverLake,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '雨量站',
+              layername: 'rainStation',
+              url: 'rainStation_icon.png', //图层+json  √
+              mapUrl: 'yuanTou.png',
+              type: 'point',
+              //data: waterSectionInfo,
+            },
+            {
+              isCheck: false,
+              name: '源头地块',
+              layername: 'origine', //图层+json  √
+              url: 'origine_icon.png',
+              mapUrl: 'rainSupervise.png',
+              type: 'point',
+              //data: pipeSupervise,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '海绵设施',
+              layername: 'spongeFacility',
+              url: 'spongeFacility_icon.png', //图层+json  √
+              mapUrl: 'yiLao.png',
+              type: 'point',
+              //data: waterlog,
+            },
+          ],
+        ],
+      },
+    ];
+  }
+}
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 942bb25..17956e9 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -35,7 +35,7 @@
 
 <script setup>
 import { getImageUrl } from '@/utils/ruoyi';
-import cesiumMapLegend from './cesiumMapLegend.js';
+import cesiumMapCommonLegend from './cesiumMapLegend.js';
 import changeMapStyle from './changeMapStyle.js';
 import topography from '@/assets/newImgs/topography.png';
 import cesiumPaiShuiArea from './cesiumPaiShuiArea.js';
@@ -137,6 +137,9 @@
         newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
       });
     }
+    if (item.type == 'point') {
+      newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername);
+    }
   }
   if (!item.isCheck) {
     if (item.layername == 'topography') {
@@ -154,7 +157,12 @@
   }
 };
 onMounted(() => {
-  legendList.value = cesiumMapLegend;
+  cesiumMapCommonLegend.getStationData();
+  nextTick(() => {
+    bus.on('legendDataList', legendDataList => {
+      legendList.value = legendDataList;
+    });
+  });
   bus.on('setIniteLayer', data => {
     console.log('data---', data);
     let legendList_1 = legendList.value[0]['children']

diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index e85962e..b97f08c 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -28,6 +28,7 @@
 import headHMAimg from '@/views/sponeScreen/cityGK/headHMAimg.vue'; //头部
 import PhysicalGeography from '@/views/sponeScreen/cityGK/PhysicalGeography.vue'; //头部
 import bus from '@/bus/index';
+import { onBeforeUnmount } from 'vue';
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 
@@ -60,6 +61,22 @@
     ]);
   }, 5000);
 });
+onBeforeUnmount(() => {
+  bus.emit('setIniteLayer', [
+    {
+      layername: 'topography',
+      show: true,
+    },
+    {
+      layername: 'builtCity',
+      show: true,
+    },
+    {
+      layername: 'centerCity',
+      show: true,
+    },
+  ]);
+});
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 6169afe..26c14e1 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -30,6 +30,7 @@
 import RainfallEcharts from '@/views/sponeScreen/Echarts/RainfallEcharts.vue'; //年际降雨变化
 
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
+import { onBeforeUnmount } from 'vue';
 
 const chartData2 = ref({
   xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
@@ -126,6 +127,11 @@
 
 const refresh = ref(1);
 const refresh1 = ref(1);
+onBeforeUnmount(() => {
+  clearInterval(weatherTimer.value);
+  weatherTimer.value = null;
+  newfiberMap.weatherRemove();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index e6f1ee1..bcfe520 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -31,6 +31,7 @@
     roll: 0.005453465256790101,
   });
 };
+
 onMounted(() => {
   createIniteMap();
 });
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 8659273..2331841 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -3,274 +3,338 @@
 import cityArea from '@/assets/geojson/kaifeng/cityArea.json';
 import riverLake from '@/assets/geojson/kaifeng/riverLake.json';
 import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation';
-
-let cesiumMapLegend = [
-  {
-    title: '基础图层',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '白色地图',
-          url: 'whiteMap_icon.png',
-          layername: 'whiteMap',
-          type: 'background',
-        },
-        {
-          isCheck: true,
-          name: '深色地图',
-          url: 'blackMap_icon.png',
-          layername: 'blackMap',
-          type: 'background',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '影像图',
-          url: 'imageMap_icon.png',
-          layername: 'imageMap',
-          type: 'background',
-        },
-        {
-          isCheck: false,
-          name: '三维建筑',
-          url: 'building_icon.png',
-          layername: 'buildingModel',
-          type: '3dModel',
-          data: ['https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp'],
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '行政区划',
-          url: 'cityArea_icon.png',
-          layername: 'cityArea',
-          type: 'polygon',
-          data: cityArea,
-        },
-        {
-          isCheck: false,
-          name: '建成区',
-          url: 'builtCity_icon.png',
-          layername: 'builtCity',
-          type: 'areaWall',
-          data: builtCity,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '中心城区',
-          url: 'centerCity_icon.png',
-          layername: 'centerCity',
-          type: 'areaWall',
-          data: centerCity,
-        },
-        {
-          isCheck: false,
-          name: '河湖水系',
-          url: 'dynamicWater_icon.png',
-          layername: 'dynamicWater',
-          type: 'dynamicWater',
-          data: riverLake,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区一',
-          url: 'paiShuiArea1_icon.png',
-          layername: 'cesiumPaishuiArea1',
-          type: 'cesiumPaishuiArea',
-        },
-        {
-          isCheck: false,
-          name: '地形地貌',
-          url: 'topography_icon.png',
-          layername: 'topography',
-          type: 'pngImage',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区二',
-          url: 'paiShuiArea2_icon.png',
-          layername: 'cesiumPaishuiArea2',
-          type: 'cesiumPaishuiArea',
-        },
-        {
-          isCheck: false,
-          name: '供水厂',
-          url: 'waterFactory_icon.png',
-          layername: 'waterFactory',
-          type: 'iconPoint',
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '排水分区三',
-          url: 'paiShuiArea3_icon.png',
-          layername: 'cesiumPaishuiArea3',
-          type: 'cesiumPaishuiArea',
-        },
-      ],
-    ],
-  },
-  {
-    title: '雨水/污水系统',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '雨水管网',
-          layername: 'rainLine',
-          url: 'rainLine_icon.png', //图层+json √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+import bus from '@/bus';
+let YSBZ, WSBZ, HLBZ;
+let legendDataList;
+export default class cesiumMapCommonLegend {
+  //获取站点数据
+  static async getStationData() {
+    //雨水泵站
+    let resRainwater = await oneMapFacilityPumpList();
+    if (resRainwater && resRainwater.code == 200) {
+      let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water');
+      let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water');
+      let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence');
+      YSBZ = this.getGeojsonData(YSBZDataList);
+      WSBZ = this.getGeojsonData(WSBZDataList);
+      HLBZ = this.getGeojsonData(HLBZDataList);
+      //发送图例
+      legendDataList = this.legendData();
+      bus.emit('legendDataList', legendDataList);
+    }
+  }
+  //构建geojson格式
+  static getGeojsonData(dataList) {
+    let features = [];
+    let feature = {};
+    dataList.forEach(data => {
+      if (data.lonLat) {
+        let lonlat = data.lonLat.split(',');
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(lonlat[0]), Number(lonlat[1])],
+          },
+          properties: data,
+        };
+      } else if (data.lon && data.lat) {
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(data.lon), Number(data.lat)],
+          },
+          properties: data,
+        };
+      } else if (data.originalX && data.originalY) {
+        feature = {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(data.originalX), Number(data.originalY)],
+          },
+          properties: data,
+        };
+      }
+      features.push(feature);
+    });
+    return {
+      type: 'FeatureCollection',
+      features: features,
+    };
+  }
+  static legendData() {
+    return [
+      {
+        title: '基础图层',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '白色地图',
+              url: 'whiteMap_icon.png',
+              layername: 'whiteMap',
+              type: 'background',
+            },
+            {
+              isCheck: true,
+              name: '深色地图',
+              url: 'blackMap_icon.png',
+              layername: 'blackMap',
+              type: 'background',
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '雨水泵站',
-          layername: 'YSBZ',
-          url: 'rainBengZhan_icon.png', //图层+json √
-          mapUrl: 'paiLaoBeng.png',
-          type: 'point',
-          //data: YSBZ,
-          //data: ysBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '污水管网',
-          layername: 'sewageLine',
-          url: 'sewageLine_icon.png', //服务  √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+          [
+            {
+              isCheck: false,
+              name: '影像图',
+              url: 'imageMap_icon.png',
+              layername: 'imageMap',
+              type: 'background',
+            },
+            {
+              isCheck: false,
+              name: '三维建筑',
+              url: 'building_icon.png',
+              layername: 'buildingModel',
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp',
+              ],
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '污水泵站', //图层+json   √
-          layername: 'WSBZ',
-          url: 'sewageBenZhan_icon.png',
-          mapUrl: 'wsBeng.png',
-          type: 'point',
-          //data: WSBZ,
-          //data: wsBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '合流管网',
-          layername: 'combineLine',
-          url: 'combineLine_icon.png', //服务  √
-          type: '3dModel',
-          data: [
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-            'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
+          [
+            {
+              isCheck: false,
+              name: '行政区划',
+              url: 'cityArea_icon.png',
+              layername: 'cityArea',
+              type: 'polygon',
+              data: cityArea,
+            },
+            {
+              isCheck: false,
+              name: '建成区',
+              url: 'builtCity_icon.png',
+              layername: 'builtCity',
+              type: 'areaWall',
+              data: builtCity,
+            },
           ],
-        },
-        {
-          isCheck: false,
-          name: '合流泵站', //图层+json   √
-          layername: 'combineBengZhan',
-          url: 'combineBengZhan_icon.png',
-          mapUrl: 'wsBeng.png',
-          type: 'point',
-          //data: WSBZ,
-          //data: wsBengZhan,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '污水处理厂',
-          layername: 'sewageFactory', //图层+json   √
-          url: 'sewageFactory_icon.png',
-          mapUrl: 'WSC.png',
-          type: 'point',
-          //data: WSCLC,
-          //data: wuShuiChang,
-        },
-        {
-          isCheck: false,
-          name: '管网流向',
-          layername: 'pipeLineFlow',
-          url: 'pipeLineFlow_icon.png',
-          type: 'dynamicLine',
-        },
-      ],
-    ],
-  },
-  {
-    title: '感知监测',
-    isCheck: false,
-    children: [
-      [
-        {
-          isCheck: false,
-          name: '内涝积水点',
-          layername: 'waterLoging', //图层+json  √
-          url: 'waterLoging_icon.png',
-          mapUrl: 'rain.png',
-          type: 'point',
-          //data: rainStation,
-        },
-        {
-          isCheck: false,
-          name: '河道断面',
-          layername: 'waterCourse',
-          url: 'waterCourse_icon.png', //图层+json  √
-          mapUrl: 'KDJZWMX.png',
-          type: 'point',
-          //data: riverLake,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '雨量站',
-          layername: 'rainStation',
-          url: 'rainStation_icon.png', //图层+json  √
-          mapUrl: 'yuanTou.png',
-          type: 'point',
-          //data: waterSectionInfo,
-        },
-        {
-          isCheck: false,
-          name: '源头地块',
-          layername: 'origine', //图层+json  √
-          url: 'origine_icon.png',
-          mapUrl: 'rainSupervise.png',
-          type: 'point',
-          //data: pipeSupervise,
-        },
-      ],
-      [
-        {
-          isCheck: false,
-          name: '海绵设施',
-          layername: 'spongeFacility',
-          url: 'spongeFacility_icon.png', //图层+json  √
-          mapUrl: 'yiLao.png',
-          type: 'point',
-          //data: waterlog,
-        },
-      ],
-    ],
-  },
-];
-export default cesiumMapLegend;
+          [
+            {
+              isCheck: false,
+              name: '中心城区',
+              url: 'centerCity_icon.png',
+              layername: 'centerCity',
+              type: 'areaWall',
+              data: centerCity,
+            },
+            {
+              isCheck: false,
+              name: '河湖水系',
+              url: 'dynamicWater_icon.png',
+              layername: 'dynamicWater',
+              type: 'dynamicWater',
+              data: riverLake,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区一',
+              url: 'paiShuiArea1_icon.png',
+              layername: 'cesiumPaishuiArea1',
+              type: 'cesiumPaishuiArea',
+            },
+            {
+              isCheck: false,
+              name: '地形地貌',
+              url: 'topography_icon.png',
+              layername: 'topography',
+              type: 'pngImage',
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区二',
+              url: 'paiShuiArea2_icon.png',
+              layername: 'cesiumPaishuiArea2',
+              type: 'cesiumPaishuiArea',
+            },
+            {
+              isCheck: false,
+              name: '供水厂',
+              url: 'waterFactory_icon.png',
+              layername: 'waterFactory',
+              type: 'iconPoint',
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '排水分区三',
+              url: 'paiShuiArea3_icon.png',
+              layername: 'cesiumPaishuiArea3',
+              type: 'cesiumPaishuiArea',
+            },
+          ],
+        ],
+      },
+      {
+        title: '雨水/污水系统',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '雨水管网',
+              layername: 'rainLine',
+              url: 'rainLine_icon.png', //图层+json √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '雨水泵站',
+              layername: 'YSBZ',
+              url: 'rainBengZhan_icon.png', //图层+json √
+              mapUrl: 'paiLaoBeng.png',
+              type: 'point',
+              data: YSBZ,
+              //data: ysBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '污水管网',
+              layername: 'sewageLine',
+              url: 'sewageLine_icon.png', //服务  √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '污水泵站', //图层+json   √
+              layername: 'WSBZ',
+              url: 'sewageBenZhan_icon.png',
+              mapUrl: 'wsBeng.png',
+              type: 'point',
+              data: WSBZ,
+              //data: wsBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '合流管网',
+              layername: 'combineLine',
+              url: 'combineLine_icon.png', //服务  √
+              type: '3dModel',
+              data: [
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
+              ],
+            },
+            {
+              isCheck: false,
+              name: '合流泵站', //图层+json   √
+              layername: 'combineBengZhan',
+              url: 'combineBengZhan_icon.png',
+              mapUrl: 'wsBeng.png',
+              type: 'point',
+              data: HLBZ,
+              //data: wsBengZhan,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '污水处理厂',
+              layername: 'sewageFactory', //图层+json   √
+              url: 'sewageFactory_icon.png',
+              mapUrl: 'WSC.png',
+              type: 'point',
+              //data: WSCLC,
+              //data: wuShuiChang,
+            },
+            {
+              isCheck: false,
+              name: '管网流向',
+              layername: 'pipeLineFlow',
+              url: 'pipeLineFlow_icon.png',
+              type: 'dynamicLine',
+            },
+          ],
+        ],
+      },
+      {
+        title: '感知监测',
+        isCheck: false,
+        children: [
+          [
+            {
+              isCheck: false,
+              name: '内涝积水点',
+              layername: 'waterLoging', //图层+json  √
+              url: 'waterLoging_icon.png',
+              mapUrl: 'rain.png',
+              type: 'point',
+              //data: rainStation,
+            },
+            {
+              isCheck: false,
+              name: '河道断面',
+              layername: 'waterCourse',
+              url: 'waterCourse_icon.png', //图层+json  √
+              mapUrl: 'KDJZWMX.png',
+              type: 'point',
+              //data: riverLake,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '雨量站',
+              layername: 'rainStation',
+              url: 'rainStation_icon.png', //图层+json  √
+              mapUrl: 'yuanTou.png',
+              type: 'point',
+              //data: waterSectionInfo,
+            },
+            {
+              isCheck: false,
+              name: '源头地块',
+              layername: 'origine', //图层+json  √
+              url: 'origine_icon.png',
+              mapUrl: 'rainSupervise.png',
+              type: 'point',
+              //data: pipeSupervise,
+            },
+          ],
+          [
+            {
+              isCheck: false,
+              name: '海绵设施',
+              layername: 'spongeFacility',
+              url: 'spongeFacility_icon.png', //图层+json  √
+              mapUrl: 'yiLao.png',
+              type: 'point',
+              //data: waterlog,
+            },
+          ],
+        ],
+      },
+    ];
+  }
+}
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 942bb25..17956e9 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -35,7 +35,7 @@
 
 <script setup>
 import { getImageUrl } from '@/utils/ruoyi';
-import cesiumMapLegend from './cesiumMapLegend.js';
+import cesiumMapCommonLegend from './cesiumMapLegend.js';
 import changeMapStyle from './changeMapStyle.js';
 import topography from '@/assets/newImgs/topography.png';
 import cesiumPaiShuiArea from './cesiumPaiShuiArea.js';
@@ -137,6 +137,9 @@
         newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
       });
     }
+    if (item.type == 'point') {
+      newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername);
+    }
   }
   if (!item.isCheck) {
     if (item.layername == 'topography') {
@@ -154,7 +157,12 @@
   }
 };
 onMounted(() => {
-  legendList.value = cesiumMapLegend;
+  cesiumMapCommonLegend.getStationData();
+  nextTick(() => {
+    bus.on('legendDataList', legendDataList => {
+      legendList.value = legendDataList;
+    });
+  });
   bus.on('setIniteLayer', data => {
     console.log('data---', data);
     let legendList_1 = legendList.value[0]['children']
diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
index 10bc931..c592e32 100644
--- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
+++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
@@ -9,12 +9,12 @@
             options: {
               show: true,
               url: icon_url,
-              width: 55,
-              height: 55,
+              width: 30,
+              height: 30,
               pixelOffset: [0, 0],
               distanceDisplayCondition: [Number.MIN_VALUE, 7000000],
             },
-            name: feature.properties.name != ' ' ? feature.properties.name : null,
+            name: feature.properties.name || feature.properties.pumpName,
             id: newfiberId,
             labelOptions: {
               font: '16px PingFang SC',