diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index c89d90d..a39f881 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -64,11 +64,11 @@
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
+const type = ref('ktsdmmj');
 
 const tabClick = item => {
   curTab.value = item.id;
-  getjb();
-  getkhzn();
+
   bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
     type.value = 'ktsdmmj';
@@ -91,8 +91,9 @@
       });
     }, 500);
   }
+  getjb();
+  getkhzn();
 };
-const type = ref('ktsdmmj');
 
 // 产出绩效公共指标信息
 async function getjb() {

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index c89d90d..a39f881 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -64,11 +64,11 @@
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
+const type = ref('ktsdmmj');
 
 const tabClick = item => {
   curTab.value = item.id;
-  getjb();
-  getkhzn();
+
   bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
     type.value = 'ktsdmmj';
@@ -91,8 +91,9 @@
       });
     }, 500);
   }
+  getjb();
+  getkhzn();
 };
-const type = ref('ktsdmmj');
 
 // 产出绩效公共指标信息
 async function getjb() {
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 97878ec..8fe67af 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 厂站设施弹窗 -->
-  <div class="cesiumPopup" id="cesiumPopupID" v-show="allData.popupShow">
+  <div class="cesiumPopup" id="cesiumPopupAll" v-show="allData.popupShow">
     <div class="title">
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
@@ -304,12 +304,12 @@
     allData.popupShow = false;
   });
   bus.on('popupcontent', params => {
-    console.log('popup接收地图标注点值---111', params);
+    console.log('popup接收地图标注点值---', params);
     allData.dataList = params.popupInfo;
-    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    let pipePopupDiv = document.getElementById('cesiumPopupAll');
 
     let popupCenter, center, offsets;
-    if (allData.dataList.geometry) {
+    if (allData.dataList.geometry && params.popupType != 'FXWZ') {
       popupCenter = Terraformer.WKT.parse(allData.dataList.geometry).coordinates;
       center = [popupCenter[0], popupCenter[1] + 0.005];
       offsets = [-130, 200];
@@ -321,7 +321,7 @@
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
       allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
     }
-
+    console.log(allData.dataList, popupCenter);
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index c89d90d..a39f881 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -64,11 +64,11 @@
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
+const type = ref('ktsdmmj');
 
 const tabClick = item => {
   curTab.value = item.id;
-  getjb();
-  getkhzn();
+
   bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
     type.value = 'ktsdmmj';
@@ -91,8 +91,9 @@
       });
     }, 500);
   }
+  getjb();
+  getkhzn();
 };
-const type = ref('ktsdmmj');
 
 // 产出绩效公共指标信息
 async function getjb() {
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 97878ec..8fe67af 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 厂站设施弹窗 -->
-  <div class="cesiumPopup" id="cesiumPopupID" v-show="allData.popupShow">
+  <div class="cesiumPopup" id="cesiumPopupAll" v-show="allData.popupShow">
     <div class="title">
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
@@ -304,12 +304,12 @@
     allData.popupShow = false;
   });
   bus.on('popupcontent', params => {
-    console.log('popup接收地图标注点值---111', params);
+    console.log('popup接收地图标注点值---', params);
     allData.dataList = params.popupInfo;
-    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    let pipePopupDiv = document.getElementById('cesiumPopupAll');
 
     let popupCenter, center, offsets;
-    if (allData.dataList.geometry) {
+    if (allData.dataList.geometry && params.popupType != 'FXWZ') {
       popupCenter = Terraformer.WKT.parse(allData.dataList.geometry).coordinates;
       center = [popupCenter[0], popupCenter[1] + 0.005];
       offsets = [-130, 200];
@@ -321,7 +321,7 @@
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
       allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
     }
-
+    console.log(allData.dataList, popupCenter);
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue
index 76bd8eb..b3db09a 100644
--- a/src/views/sponeScreen/longYW/ManualSampling.vue
+++ b/src/views/sponeScreen/longYW/ManualSampling.vue
@@ -49,30 +49,28 @@
 
           <Vue3SeamlessScroll :list="tableData" :singleHeight="53" :singleWaitTime="1500" :hover="true" class="scroll">
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '土壤'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.num }}</p>
               <p class="ellipsis">{{ item.porosity }}</p>
               <p class="ellipsis">{{ item.Soilbulk }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '下垫面'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '海绵设施'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index c89d90d..a39f881 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -64,11 +64,11 @@
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
+const type = ref('ktsdmmj');
 
 const tabClick = item => {
   curTab.value = item.id;
-  getjb();
-  getkhzn();
+
   bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
     type.value = 'ktsdmmj';
@@ -91,8 +91,9 @@
       });
     }, 500);
   }
+  getjb();
+  getkhzn();
 };
-const type = ref('ktsdmmj');
 
 // 产出绩效公共指标信息
 async function getjb() {
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 97878ec..8fe67af 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 厂站设施弹窗 -->
-  <div class="cesiumPopup" id="cesiumPopupID" v-show="allData.popupShow">
+  <div class="cesiumPopup" id="cesiumPopupAll" v-show="allData.popupShow">
     <div class="title">
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
@@ -304,12 +304,12 @@
     allData.popupShow = false;
   });
   bus.on('popupcontent', params => {
-    console.log('popup接收地图标注点值---111', params);
+    console.log('popup接收地图标注点值---', params);
     allData.dataList = params.popupInfo;
-    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    let pipePopupDiv = document.getElementById('cesiumPopupAll');
 
     let popupCenter, center, offsets;
-    if (allData.dataList.geometry) {
+    if (allData.dataList.geometry && params.popupType != 'FXWZ') {
       popupCenter = Terraformer.WKT.parse(allData.dataList.geometry).coordinates;
       center = [popupCenter[0], popupCenter[1] + 0.005];
       offsets = [-130, 200];
@@ -321,7 +321,7 @@
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
       allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
     }
-
+    console.log(allData.dataList, popupCenter);
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue
index 76bd8eb..b3db09a 100644
--- a/src/views/sponeScreen/longYW/ManualSampling.vue
+++ b/src/views/sponeScreen/longYW/ManualSampling.vue
@@ -49,30 +49,28 @@
 
           <Vue3SeamlessScroll :list="tableData" :singleHeight="53" :singleWaitTime="1500" :hover="true" class="scroll">
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '土壤'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.num }}</p>
               <p class="ellipsis">{{ item.porosity }}</p>
               <p class="ellipsis">{{ item.Soilbulk }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '下垫面'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '海绵设施'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 24e0206..d5bfe45 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -133,11 +133,9 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
-    console.log(e);
-    console.log('clickfeature--', clickfeature.properties);
     bus.emit('popupcontent', {
       popupShow: true,
-      point: [e.lngLat.lng, e.lngLat.lat],
+      popupType: 'FXWZ',
       popupInfo: clickfeature.properties,
     });
   });

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index c89d90d..a39f881 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -64,11 +64,11 @@
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
+const type = ref('ktsdmmj');
 
 const tabClick = item => {
   curTab.value = item.id;
-  getjb();
-  getkhzn();
+
   bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
     type.value = 'ktsdmmj';
@@ -91,8 +91,9 @@
       });
     }, 500);
   }
+  getjb();
+  getkhzn();
 };
-const type = ref('ktsdmmj');
 
 // 产出绩效公共指标信息
 async function getjb() {
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 97878ec..8fe67af 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 厂站设施弹窗 -->
-  <div class="cesiumPopup" id="cesiumPopupID" v-show="allData.popupShow">
+  <div class="cesiumPopup" id="cesiumPopupAll" v-show="allData.popupShow">
     <div class="title">
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
@@ -304,12 +304,12 @@
     allData.popupShow = false;
   });
   bus.on('popupcontent', params => {
-    console.log('popup接收地图标注点值---111', params);
+    console.log('popup接收地图标注点值---', params);
     allData.dataList = params.popupInfo;
-    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    let pipePopupDiv = document.getElementById('cesiumPopupAll');
 
     let popupCenter, center, offsets;
-    if (allData.dataList.geometry) {
+    if (allData.dataList.geometry && params.popupType != 'FXWZ') {
       popupCenter = Terraformer.WKT.parse(allData.dataList.geometry).coordinates;
       center = [popupCenter[0], popupCenter[1] + 0.005];
       offsets = [-130, 200];
@@ -321,7 +321,7 @@
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
       allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
     }
-
+    console.log(allData.dataList, popupCenter);
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue
index 76bd8eb..b3db09a 100644
--- a/src/views/sponeScreen/longYW/ManualSampling.vue
+++ b/src/views/sponeScreen/longYW/ManualSampling.vue
@@ -49,30 +49,28 @@
 
           <Vue3SeamlessScroll :list="tableData" :singleHeight="53" :singleWaitTime="1500" :hover="true" class="scroll">
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '土壤'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.num }}</p>
               <p class="ellipsis">{{ item.porosity }}</p>
               <p class="ellipsis">{{ item.Soilbulk }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '下垫面'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '海绵设施'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 24e0206..d5bfe45 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -133,11 +133,9 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
-    console.log(e);
-    console.log('clickfeature--', clickfeature.properties);
     bus.emit('popupcontent', {
       popupShow: true,
-      point: [e.lngLat.lng, e.lngLat.lat],
+      popupType: 'FXWZ',
       popupInfo: clickfeature.properties,
     });
   });
diff --git a/src/views/sponeScreen/waterFlood/futureRisk.vue b/src/views/sponeScreen/waterFlood/futureRisk.vue
index ef0fa42..f41647f 100644
--- a/src/views/sponeScreen/waterFlood/futureRisk.vue
+++ b/src/views/sponeScreen/waterFlood/futureRisk.vue
@@ -27,12 +27,14 @@
 
 <script setup>
 import { query24hourRainToYuAn } from '@/api/floodSys/floodYP';
+import bus from '@/bus/index';
 const { proxy } = getCurrentInstance();
 const timeContList = ref([]);
 const processVal = ref(0);
 const ifStart = ref(true);
 const isdisabled = ref(false);
 const timer = ref(null);
+const riskTimer = ref(null);
 const timelineList = ref([]);
 const featureStep = ref(0);
 const gisJsonData = ref({});
@@ -47,6 +49,8 @@
 });
 let maxPoint = '114.4022666731237,34.84413283884892,0.0';
 let minPoint = '114.29210083997283,34.7401307666175,0.0';
+const isMaterialShow = ref(false);
+
 //内涝风险评估 地图内涝渲染模拟
 const gisModuleData = () => {
   query24hourRainToYuAn(gisParams.value).then(res => {
@@ -118,6 +122,9 @@
 function startImitate() {
   ifStart.value = false;
   startTimer(); // 定时器开启
+  // 清除图层
+  isMaterialShow.value = true;
+  materialShow();
 }
 // 开启定时器
 function startTimer() {
@@ -165,6 +172,9 @@
 function stopImitate() {
   ifStart.value = true;
   stopTimer();
+  // 显示图层
+  isMaterialShow.value = false;
+  materialShow();
 }
 // 定时器清除
 function stopTimer() {
@@ -172,16 +182,41 @@
     clearInterval(timer.value);
   }
 }
+// 图层清除
+let initeLayerList = [
+  { layername: 'YSBZ', show: false }, //雨水泵站
+  { layername: 'combineBengZhan', show: false }, //合流泵站
+  { layername: 'sewageFactory', show: false }, //污水处理厂
+  { layername: 'ysLine1', show: false }, //雨水管网
+  { layername: 'hsLine1', show: false }, //合流管网
+  { layername: 'pipeline_info_flow', show: false }, //管网流向
+  { layername: 'pipeMonitor', show: false }, //管网监测
+  { layername: 'waterCourse', show: false }, //河道水位计
+];
+const materialShow = () => {
+  if (isMaterialShow.value) {
+    initeLayerList.forEach(item => {
+      item.show = isMaterialShow.value;
+    });
+    bus.emit('setIniteLayer', initeLayerList);
+  } else {
+    initeLayerList.forEach(item => {
+      item.show = isMaterialShow.value;
+    });
+    bus.emit('setIniteLayer', initeLayerList);
+  }
+};
 
 onMounted(() => {
-  let riskTimer = setInterval(() => {
+  riskTimer.value = setInterval(() => {
     if (!newfiberMapbox) return;
     gisModuleData();
-    clearInterval(riskTimer);
+    clearInterval(riskTimer.value);
   }, 100);
 });
 onBeforeMount(() => {
   stopTimer();
+  if (riskTimer.value) clearInterval(riskTimer.value);
 });
 </script>
 

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index c89d90d..a39f881 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -64,11 +64,11 @@
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
+const type = ref('ktsdmmj');
 
 const tabClick = item => {
   curTab.value = item.id;
-  getjb();
-  getkhzn();
+
   bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
     type.value = 'ktsdmmj';
@@ -91,8 +91,9 @@
       });
     }, 500);
   }
+  getjb();
+  getkhzn();
 };
-const type = ref('ktsdmmj');
 
 // 产出绩效公共指标信息
 async function getjb() {
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 97878ec..8fe67af 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 厂站设施弹窗 -->
-  <div class="cesiumPopup" id="cesiumPopupID" v-show="allData.popupShow">
+  <div class="cesiumPopup" id="cesiumPopupAll" v-show="allData.popupShow">
     <div class="title">
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
@@ -304,12 +304,12 @@
     allData.popupShow = false;
   });
   bus.on('popupcontent', params => {
-    console.log('popup接收地图标注点值---111', params);
+    console.log('popup接收地图标注点值---', params);
     allData.dataList = params.popupInfo;
-    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    let pipePopupDiv = document.getElementById('cesiumPopupAll');
 
     let popupCenter, center, offsets;
-    if (allData.dataList.geometry) {
+    if (allData.dataList.geometry && params.popupType != 'FXWZ') {
       popupCenter = Terraformer.WKT.parse(allData.dataList.geometry).coordinates;
       center = [popupCenter[0], popupCenter[1] + 0.005];
       offsets = [-130, 200];
@@ -321,7 +321,7 @@
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
       allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
     }
-
+    console.log(allData.dataList, popupCenter);
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue
index 76bd8eb..b3db09a 100644
--- a/src/views/sponeScreen/longYW/ManualSampling.vue
+++ b/src/views/sponeScreen/longYW/ManualSampling.vue
@@ -49,30 +49,28 @@
 
           <Vue3SeamlessScroll :list="tableData" :singleHeight="53" :singleWaitTime="1500" :hover="true" class="scroll">
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '土壤'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.num }}</p>
               <p class="ellipsis">{{ item.porosity }}</p>
               <p class="ellipsis">{{ item.Soilbulk }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '下垫面'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '海绵设施'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 24e0206..d5bfe45 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -133,11 +133,9 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
-    console.log(e);
-    console.log('clickfeature--', clickfeature.properties);
     bus.emit('popupcontent', {
       popupShow: true,
-      point: [e.lngLat.lng, e.lngLat.lat],
+      popupType: 'FXWZ',
       popupInfo: clickfeature.properties,
     });
   });
diff --git a/src/views/sponeScreen/waterFlood/futureRisk.vue b/src/views/sponeScreen/waterFlood/futureRisk.vue
index ef0fa42..f41647f 100644
--- a/src/views/sponeScreen/waterFlood/futureRisk.vue
+++ b/src/views/sponeScreen/waterFlood/futureRisk.vue
@@ -27,12 +27,14 @@
 
 <script setup>
 import { query24hourRainToYuAn } from '@/api/floodSys/floodYP';
+import bus from '@/bus/index';
 const { proxy } = getCurrentInstance();
 const timeContList = ref([]);
 const processVal = ref(0);
 const ifStart = ref(true);
 const isdisabled = ref(false);
 const timer = ref(null);
+const riskTimer = ref(null);
 const timelineList = ref([]);
 const featureStep = ref(0);
 const gisJsonData = ref({});
@@ -47,6 +49,8 @@
 });
 let maxPoint = '114.4022666731237,34.84413283884892,0.0';
 let minPoint = '114.29210083997283,34.7401307666175,0.0';
+const isMaterialShow = ref(false);
+
 //内涝风险评估 地图内涝渲染模拟
 const gisModuleData = () => {
   query24hourRainToYuAn(gisParams.value).then(res => {
@@ -118,6 +122,9 @@
 function startImitate() {
   ifStart.value = false;
   startTimer(); // 定时器开启
+  // 清除图层
+  isMaterialShow.value = true;
+  materialShow();
 }
 // 开启定时器
 function startTimer() {
@@ -165,6 +172,9 @@
 function stopImitate() {
   ifStart.value = true;
   stopTimer();
+  // 显示图层
+  isMaterialShow.value = false;
+  materialShow();
 }
 // 定时器清除
 function stopTimer() {
@@ -172,16 +182,41 @@
     clearInterval(timer.value);
   }
 }
+// 图层清除
+let initeLayerList = [
+  { layername: 'YSBZ', show: false }, //雨水泵站
+  { layername: 'combineBengZhan', show: false }, //合流泵站
+  { layername: 'sewageFactory', show: false }, //污水处理厂
+  { layername: 'ysLine1', show: false }, //雨水管网
+  { layername: 'hsLine1', show: false }, //合流管网
+  { layername: 'pipeline_info_flow', show: false }, //管网流向
+  { layername: 'pipeMonitor', show: false }, //管网监测
+  { layername: 'waterCourse', show: false }, //河道水位计
+];
+const materialShow = () => {
+  if (isMaterialShow.value) {
+    initeLayerList.forEach(item => {
+      item.show = isMaterialShow.value;
+    });
+    bus.emit('setIniteLayer', initeLayerList);
+  } else {
+    initeLayerList.forEach(item => {
+      item.show = isMaterialShow.value;
+    });
+    bus.emit('setIniteLayer', initeLayerList);
+  }
+};
 
 onMounted(() => {
-  let riskTimer = setInterval(() => {
+  riskTimer.value = setInterval(() => {
     if (!newfiberMapbox) return;
     gisModuleData();
-    clearInterval(riskTimer);
+    clearInterval(riskTimer.value);
   }, 100);
 });
 onBeforeMount(() => {
   stopTimer();
+  if (riskTimer.value) clearInterval(riskTimer.value);
 });
 </script>
 
diff --git a/src/views/sponeScreen/waterFlood/rainFutureHour.vue b/src/views/sponeScreen/waterFlood/rainFutureHour.vue
index d471080..635a71b 100644
--- a/src/views/sponeScreen/waterFlood/rainFutureHour.vue
+++ b/src/views/sponeScreen/waterFlood/rainFutureHour.vue
@@ -21,7 +21,7 @@
 const chartOption = ref({
   tooltip: {
     trigger: 'axis',
-    show: false,
+    show: true,
   },
   grid: {
     top: 40,
@@ -93,7 +93,7 @@
   series: [
     {
       data: [],
-      name: '降雨量',
+      name: '降雨量mm',
       type: 'bar',
       yAxisIndex: 0,
       barGap: '10%', // Make series be overlap
@@ -133,7 +133,7 @@
     },
     {
       data: [],
-      name: '温度',
+      name: '温度℃',
       type: 'line',
       smooth: true,
       color: '#FFB049',
@@ -148,13 +148,16 @@
   xfEachHour().then(res => {
     let datas = JSON.parse(res.data).result.hourly_fcsts;
     let data1 = [],
+      dataText = [],
       axisList = [],
       tempData = [],
       rainData = [],
       markPointList = [];
+    console.log(datas);
     datas.map((item, index) => {
       let value = item.temp_fc;
       data1.push(value);
+      dataText.push(item.text);
       rainData.push(item.prec); //降水量
       axisList.push(item.data_time.slice(11, 16));
       markPointList.push({
@@ -166,11 +169,11 @@
       tempData.push(item.temp_fc);
     });
     chartOption.value.xAxis.data = axisList; //x轴日期
-    chartOption.value.yAxis[0].max = Math.max(...data1);
-    chartOption.value.series[1].data = data1; //天气数据降雨量
+    chartOption.value.series[0].data = rainData; //降水量
+    chartOption.value.yAxis[0].max = Math.max(...rainData);
+    chartOption.value.series[1].data = dataText; //天气现象
     chartOption.value.series[1].markPoint.data = markPointList; //天气标记点
     chartOption.value.series[2].data = tempData; //温度数据
-    chartOption.value.series[0].data = rainData; //降水量
     chartDom.clear();
     chartDom.setOption(chartOption.value, true);
   });

diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index 6161d55..bede4b2 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -122,7 +122,7 @@
   });
   chartOption.option4.xAxis.data = xData;
   chartOption.option4.series[0].data = yData;
-  chartOption.option4.yAxis.max = Math.max(...yData);
+  chartOption.option4.yAxis[0].max = Math.max(...yData) + 0.2;
   if (xData.length > 0) {
     chartOption.option4.graphic.invisible = true;
   } else {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 059c2f0..cda4aaa 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="first">
     <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`"></gisMap2D>
     </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
@@ -116,7 +116,8 @@
 import CoordTransform from '@/utils/gis/CoorTransform.js';
 import point_start from '@/assets/newImgs/point_start.png';
 import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
+import point_project from '@/assets/images/gisMap/in.png';
+
 const props = defineProps({
   // 数据
   DataList: {
@@ -188,6 +189,38 @@
     },
   });
 };
+
+// 添加项目点位
+const addProjectPoint = (map, data, layerId) => {
+  newfiberMap_risk.map.loadImage(point_project, (error, image) => {
+    if (error) throw error;
+    !!!map.getSource(layerId) && map.addImage(layerId, image);
+    !!!map.getSource(layerId) && map.addSource(layerId, { type: 'geojson', data: data });
+    !!!map.getLayer(layerId) &&
+      map.addLayer({
+        id: layerId,
+        type: 'symbol',
+        source: layerId,
+        layout: {
+          'text-field': '{name}',
+          'text-font': ['KlokanTech Noto Sans Regular'],
+          'text-size': 16,
+          'text-line-height': 2,
+          'text-anchor': 'bottom',
+          'text-offset': [0, 3],
+          'text-max-width': 50,
+          'icon-image': layerId,
+          'icon-size': 0.2,
+        },
+        paint: {
+          'text-color': 'rgba(127, 11, 147, 1)',
+          'text-halo-color': 'rgba(255, 255, 255, 1)',
+          'text-halo-width': 2,
+        },
+      });
+  });
+};
+
 watch(
   () => props.DataList,
   val => {
@@ -231,7 +264,6 @@
   () => props.pathData,
   val => {
     if (val) {
-      console.log('val-----', val);
       setTimeout(() => {
         if (newfiberMap_risk.map.getLayer('point_start')) {
           newfiberMap_risk.map.removeLayer('point_start');
@@ -242,9 +274,18 @@
           newfiberMap_risk.map.removeImage('point_end_icon');
         }
       }, 1000);
+      let drewPoint = turf.featureCollection([turf.point(props.DataList.projectLocation.split(',').map(Number))]);
+      console.log('----', drewPoint);
+      addProjectPoint(newfiberMap_risk.map, drewPoint, 'point_project'); // 添加项目点位
+      setTimeout(() => {
+        newfiberMap_risk.map.easeTo({
+          center: props.DataList.projectLocation.split(','),
+          zoom: 15,
+        });
+      }, 2000);
 
       if (!val.length) return;
-
+      console.log('val----', val);
       //起止点
       let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
       let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index c89d90d..a39f881 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -64,11 +64,11 @@
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
+const type = ref('ktsdmmj');
 
 const tabClick = item => {
   curTab.value = item.id;
-  getjb();
-  getkhzn();
+
   bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
     type.value = 'ktsdmmj';
@@ -91,8 +91,9 @@
       });
     }, 500);
   }
+  getjb();
+  getkhzn();
 };
-const type = ref('ktsdmmj');
 
 // 产出绩效公共指标信息
 async function getjb() {
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 97878ec..8fe67af 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 厂站设施弹窗 -->
-  <div class="cesiumPopup" id="cesiumPopupID" v-show="allData.popupShow">
+  <div class="cesiumPopup" id="cesiumPopupAll" v-show="allData.popupShow">
     <div class="title">
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
@@ -304,12 +304,12 @@
     allData.popupShow = false;
   });
   bus.on('popupcontent', params => {
-    console.log('popup接收地图标注点值---111', params);
+    console.log('popup接收地图标注点值---', params);
     allData.dataList = params.popupInfo;
-    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    let pipePopupDiv = document.getElementById('cesiumPopupAll');
 
     let popupCenter, center, offsets;
-    if (allData.dataList.geometry) {
+    if (allData.dataList.geometry && params.popupType != 'FXWZ') {
       popupCenter = Terraformer.WKT.parse(allData.dataList.geometry).coordinates;
       center = [popupCenter[0], popupCenter[1] + 0.005];
       offsets = [-130, 200];
@@ -321,7 +321,7 @@
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
       allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
     }
-
+    console.log(allData.dataList, popupCenter);
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue
index 76bd8eb..b3db09a 100644
--- a/src/views/sponeScreen/longYW/ManualSampling.vue
+++ b/src/views/sponeScreen/longYW/ManualSampling.vue
@@ -49,30 +49,28 @@
 
           <Vue3SeamlessScroll :list="tableData" :singleHeight="53" :singleWaitTime="1500" :hover="true" class="scroll">
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '土壤'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.num }}</p>
               <p class="ellipsis">{{ item.porosity }}</p>
               <p class="ellipsis">{{ item.Soilbulk }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '下垫面'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
             </div>
             <div class="scrollCont flex" v-for="item in tableData" :key="item.id" v-if="activedname == '海绵设施'">
-              <p class="ellipsis">{{ item.start }}</p>
+              <p class="ellipsis" :title="item.start">{{ item.start }}</p>
               <p class="ellipsis">{{ item.Ph }}</p>
               <p class="ellipsis">{{ item.ss }}</p>
               <p class="ellipsis">{{ item.COD }}</p>
               <p class="ellipsis">{{ item.TN }}</p>
-
               <p class="ellipsis">{{ item.TP }}</p>
               <p class="ellipsis">{{ item.AN }}</p>
               <p class="ellipsis">{{ item.time }}</p>
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 24e0206..d5bfe45 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -133,11 +133,9 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
-    console.log(e);
-    console.log('clickfeature--', clickfeature.properties);
     bus.emit('popupcontent', {
       popupShow: true,
-      point: [e.lngLat.lng, e.lngLat.lat],
+      popupType: 'FXWZ',
       popupInfo: clickfeature.properties,
     });
   });
diff --git a/src/views/sponeScreen/waterFlood/futureRisk.vue b/src/views/sponeScreen/waterFlood/futureRisk.vue
index ef0fa42..f41647f 100644
--- a/src/views/sponeScreen/waterFlood/futureRisk.vue
+++ b/src/views/sponeScreen/waterFlood/futureRisk.vue
@@ -27,12 +27,14 @@
 
 <script setup>
 import { query24hourRainToYuAn } from '@/api/floodSys/floodYP';
+import bus from '@/bus/index';
 const { proxy } = getCurrentInstance();
 const timeContList = ref([]);
 const processVal = ref(0);
 const ifStart = ref(true);
 const isdisabled = ref(false);
 const timer = ref(null);
+const riskTimer = ref(null);
 const timelineList = ref([]);
 const featureStep = ref(0);
 const gisJsonData = ref({});
@@ -47,6 +49,8 @@
 });
 let maxPoint = '114.4022666731237,34.84413283884892,0.0';
 let minPoint = '114.29210083997283,34.7401307666175,0.0';
+const isMaterialShow = ref(false);
+
 //内涝风险评估 地图内涝渲染模拟
 const gisModuleData = () => {
   query24hourRainToYuAn(gisParams.value).then(res => {
@@ -118,6 +122,9 @@
 function startImitate() {
   ifStart.value = false;
   startTimer(); // 定时器开启
+  // 清除图层
+  isMaterialShow.value = true;
+  materialShow();
 }
 // 开启定时器
 function startTimer() {
@@ -165,6 +172,9 @@
 function stopImitate() {
   ifStart.value = true;
   stopTimer();
+  // 显示图层
+  isMaterialShow.value = false;
+  materialShow();
 }
 // 定时器清除
 function stopTimer() {
@@ -172,16 +182,41 @@
     clearInterval(timer.value);
   }
 }
+// 图层清除
+let initeLayerList = [
+  { layername: 'YSBZ', show: false }, //雨水泵站
+  { layername: 'combineBengZhan', show: false }, //合流泵站
+  { layername: 'sewageFactory', show: false }, //污水处理厂
+  { layername: 'ysLine1', show: false }, //雨水管网
+  { layername: 'hsLine1', show: false }, //合流管网
+  { layername: 'pipeline_info_flow', show: false }, //管网流向
+  { layername: 'pipeMonitor', show: false }, //管网监测
+  { layername: 'waterCourse', show: false }, //河道水位计
+];
+const materialShow = () => {
+  if (isMaterialShow.value) {
+    initeLayerList.forEach(item => {
+      item.show = isMaterialShow.value;
+    });
+    bus.emit('setIniteLayer', initeLayerList);
+  } else {
+    initeLayerList.forEach(item => {
+      item.show = isMaterialShow.value;
+    });
+    bus.emit('setIniteLayer', initeLayerList);
+  }
+};
 
 onMounted(() => {
-  let riskTimer = setInterval(() => {
+  riskTimer.value = setInterval(() => {
     if (!newfiberMapbox) return;
     gisModuleData();
-    clearInterval(riskTimer);
+    clearInterval(riskTimer.value);
   }, 100);
 });
 onBeforeMount(() => {
   stopTimer();
+  if (riskTimer.value) clearInterval(riskTimer.value);
 });
 </script>
 
diff --git a/src/views/sponeScreen/waterFlood/rainFutureHour.vue b/src/views/sponeScreen/waterFlood/rainFutureHour.vue
index d471080..635a71b 100644
--- a/src/views/sponeScreen/waterFlood/rainFutureHour.vue
+++ b/src/views/sponeScreen/waterFlood/rainFutureHour.vue
@@ -21,7 +21,7 @@
 const chartOption = ref({
   tooltip: {
     trigger: 'axis',
-    show: false,
+    show: true,
   },
   grid: {
     top: 40,
@@ -93,7 +93,7 @@
   series: [
     {
       data: [],
-      name: '降雨量',
+      name: '降雨量mm',
       type: 'bar',
       yAxisIndex: 0,
       barGap: '10%', // Make series be overlap
@@ -133,7 +133,7 @@
     },
     {
       data: [],
-      name: '温度',
+      name: '温度℃',
       type: 'line',
       smooth: true,
       color: '#FFB049',
@@ -148,13 +148,16 @@
   xfEachHour().then(res => {
     let datas = JSON.parse(res.data).result.hourly_fcsts;
     let data1 = [],
+      dataText = [],
       axisList = [],
       tempData = [],
       rainData = [],
       markPointList = [];
+    console.log(datas);
     datas.map((item, index) => {
       let value = item.temp_fc;
       data1.push(value);
+      dataText.push(item.text);
       rainData.push(item.prec); //降水量
       axisList.push(item.data_time.slice(11, 16));
       markPointList.push({
@@ -166,11 +169,11 @@
       tempData.push(item.temp_fc);
     });
     chartOption.value.xAxis.data = axisList; //x轴日期
-    chartOption.value.yAxis[0].max = Math.max(...data1);
-    chartOption.value.series[1].data = data1; //天气数据降雨量
+    chartOption.value.series[0].data = rainData; //降水量
+    chartOption.value.yAxis[0].max = Math.max(...rainData);
+    chartOption.value.series[1].data = dataText; //天气现象
     chartOption.value.series[1].markPoint.data = markPointList; //天气标记点
     chartOption.value.series[2].data = tempData; //温度数据
-    chartOption.value.series[0].data = rainData; //降水量
     chartDom.clear();
     chartDom.setOption(chartOption.value, true);
   });
diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue
index 0d0c9b3..adf9d14 100644
--- a/src/views/sponeScreen/waterFlood/rainReport.vue
+++ b/src/views/sponeScreen/waterFlood/rainReport.vue
@@ -3,9 +3,21 @@
   <div class="rainReportPage">
     <div class="partTitleHM">
       降雨报告
-      <el-button size="small" style="float: right; width: 70px; margin: 10px 60px 0px 0px" @click="dialogShowModal = true">
+      <el-button size="small" style="float: right; width: 70px; margin: 10px 50px 0px 0px" @click="dialogShowModal = true">
         内涝模型
       </el-button>
+      <el-select
+        filterable
+        clearable
+        v-model="timeIndex"
+        placeholder="请选择日期"
+        @change="checkTime"
+        @clear="getJYData"
+        size="small"
+        style="margin: 10px 10px 0px 0px; width: 160px; float: right"
+      >
+        <el-option v-for="item in allList" :key="item.id" :label="item.startTime" :value="item.id" />
+      </el-select>
     </div>
     <div class="partContHM">
       <div class="scrollMapHM">
@@ -16,8 +28,8 @@
           <p>累计降雨量</p>
           <p>操作</p>
         </div>
-        <Vue3SeamlessScroll :list="dataList" :singleHeight="50" :singleWaitTime="1500" :hover="true" class="scroll">
-          <div class="scrollCont flex" v-for="item in dataList" :key="item.id">
+        <div class="scrollContent">
+          <div class="scrollCont flex flex-justcontent-spacebetween" v-for="item in dataList" :key="item.id">
             <p class="ellipsis" :title="item.startTime" style="width: 108px">{{ item.startTime }}</p>
             <p class="ellipsis" :title="item.endTime">{{ item.endTime }}</p>
             <p class="ellipsis">
@@ -26,7 +38,7 @@
             <p class="ellipsis">{{ item.accumulate }}mm</p>
             <p class="ellipsis reports" @click="checkReport(item)">查看报告</p>
           </div>
-        </Vue3SeamlessScroll>
+        </div>
       </div>
     </div>
     <!-- 查看报告单 -->
@@ -42,8 +54,6 @@
 
 <script setup>
 import { rainfallSessionInfoList } from '@/api/publicService/index';
-
-import { Vue3SeamlessScroll } from 'vue3-seamless-scroll';
 import ReportDetail from '@/views/floodSys/floodYP/historyEventDetail.vue'; //查看报告单
 import RiskDetail from '@/views/floodSys/floodYP/riskAsses.vue'; //内涝模型
 
@@ -52,14 +62,16 @@
 const dialogShowDetail = ref(false);
 const dialogShowModal = ref(false);
 const rainId = ref('');
-
 const dataList = ref([]);
+const allList = ref([]);
+const timeIndex = ref('');
 
 // 获取降雨报告数据
 async function getJYData() {
   let res = await rainfallSessionInfoList();
   if (res && res.code == 200) {
-    dataList.value = res.data;
+    allList.value = res.data;
+    dataList.value = allList.value;
   }
 }
 
@@ -69,6 +81,11 @@
   dialogShowDetail.value = true;
 }
 
+// 点击日期选择
+async function checkTime() {
+  dataList.value = allList.value.filter(item => item.id == timeIndex.value);
+}
+
 onMounted(() => {
   getJYData();
 });
@@ -78,6 +95,11 @@
 .rainReportPage {
   width: 100%;
   .scrollMapHM {
+    height: 245px;
+    .scrollContent {
+      height: 200px;
+      overflow: auto;
+    }
     p {
       width: 18%;
     }