diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 571ef99..a268eaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -489,12 +489,15 @@
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
   Getproperties.value.dataId = item.dataId || "";
   Getproperties.value.stType = item.stType;
-  Getproperties.value.geometry = item.geometry;
+  Getproperties.value.geometry =
+    item.geometry ||
+    item.geometrys ||
+    Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
-  }else{
-    Getproperties.value.daterange =null
+  } else {
+    Getproperties.value.daterange = null;
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -530,7 +533,10 @@
       Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
       Getproperties.value.dataId = item.dataId || "";
       Getproperties.value.stType = item.stType;
-      Getproperties.value.geometry = item.geometry;
+      Getproperties.value.geometry =
+        item.geometry ||
+        item.geometrys ||
+        Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
       dialogConfig.visible = true;
     }
   });

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 571ef99..a268eaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -489,12 +489,15 @@
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
   Getproperties.value.dataId = item.dataId || "";
   Getproperties.value.stType = item.stType;
-  Getproperties.value.geometry = item.geometry;
+  Getproperties.value.geometry =
+    item.geometry ||
+    item.geometrys ||
+    Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
-  }else{
-    Getproperties.value.daterange =null
+  } else {
+    Getproperties.value.daterange = null;
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -530,7 +533,10 @@
       Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
       Getproperties.value.dataId = item.dataId || "";
       Getproperties.value.stType = item.stType;
-      Getproperties.value.geometry = item.geometry;
+      Getproperties.value.geometry =
+        item.geometry ||
+        item.geometrys ||
+        Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
       dialogConfig.visible = true;
     }
   });
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
index 69002b7..ddfbea9 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
@@ -201,6 +201,7 @@
 let hgEngPlay = ref(false);
 let stepLin = ref("0");
 let stepNum = ref(0);
+let rainPicture = ref([]);
 
 // 降雨日历代码
 function getRainTime() {
@@ -275,7 +276,7 @@
       hoursList.value = res.data;
       hoursList.value.activeIndex = 0;
       let array = [];
-      let picture = [];
+      rainPicture.value = [];
       let list = JSON.parse(JSON.stringify(hoursList.value.rainTrend));
       list.forEach((e, i) => {
         let obj = {
@@ -287,7 +288,7 @@
         array.push(obj);
       });
       hoursList.value.resultList.forEach(e=>{
-        picture.push(e.url)
+        rainPicture.value.push(e.url)
       })
       hoursScale.value = array;
       refresh.value = Math.random();
@@ -296,7 +297,7 @@
 
       !(newfiberMap.RainsLayer) && (newfiberMap.RainsLayer = new mapboxgl1.RainsLayer(
         [114.359445, 30.26976, 114.635417, 30.578213],
-        picture,
+        rainPicture.value,
         self => {
           self.addTo(newfiberMap.map);
           self.hide();
@@ -304,12 +305,11 @@
           console.log('8888888888888888',dataLoad.value);
         }
       ));
-      newfiberMap.RainsLayer.init(picture);
+      newfiberMap.RainsLayer.init(rainPicture.value);
     }
   })
 }
 function runDayTime() {
-  // newfiberMap.map.easeTo(newfiberMap.config_.params.init);
   bus.emit('clearTrajectory')
   hgEndActive.value = "";
   showRainLegend.value = true;
@@ -323,7 +323,7 @@
     hgEngPlay.value = false;
     clearInterval(runDayInterval.value);
   }
-  newfiberMap.RainsLayer.show()
+  newfiberMap.RainsLayer.init(rainPicture.value,(self)=> self.show())
 }
 
 function timeLoop() {
@@ -401,7 +401,7 @@
       // newfiberMap.RainsLayer.init([ 'https://server1.wh-nf.cn:9000/newfiber-donghugaoxin/2024/11/27/2024-07-02-4%E5%B0%8F%E6%97%B6-4_20241127201053A060.tif'])
       newfiberMap.RainsLayer.init([res.data.weatherwarningFileurl.fileUrl],(self)=> self.show())
       dataLoad.value=false
-      debugger
+      // debugger
       console.log("shangtu", res.data);
     }
   }).catch(() => {

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 571ef99..a268eaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -489,12 +489,15 @@
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
   Getproperties.value.dataId = item.dataId || "";
   Getproperties.value.stType = item.stType;
-  Getproperties.value.geometry = item.geometry;
+  Getproperties.value.geometry =
+    item.geometry ||
+    item.geometrys ||
+    Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
-  }else{
-    Getproperties.value.daterange =null
+  } else {
+    Getproperties.value.daterange = null;
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -530,7 +533,10 @@
       Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
       Getproperties.value.dataId = item.dataId || "";
       Getproperties.value.stType = item.stType;
-      Getproperties.value.geometry = item.geometry;
+      Getproperties.value.geometry =
+        item.geometry ||
+        item.geometrys ||
+        Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
       dialogConfig.visible = true;
     }
   });
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
index 69002b7..ddfbea9 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
@@ -201,6 +201,7 @@
 let hgEngPlay = ref(false);
 let stepLin = ref("0");
 let stepNum = ref(0);
+let rainPicture = ref([]);
 
 // 降雨日历代码
 function getRainTime() {
@@ -275,7 +276,7 @@
       hoursList.value = res.data;
       hoursList.value.activeIndex = 0;
       let array = [];
-      let picture = [];
+      rainPicture.value = [];
       let list = JSON.parse(JSON.stringify(hoursList.value.rainTrend));
       list.forEach((e, i) => {
         let obj = {
@@ -287,7 +288,7 @@
         array.push(obj);
       });
       hoursList.value.resultList.forEach(e=>{
-        picture.push(e.url)
+        rainPicture.value.push(e.url)
       })
       hoursScale.value = array;
       refresh.value = Math.random();
@@ -296,7 +297,7 @@
 
       !(newfiberMap.RainsLayer) && (newfiberMap.RainsLayer = new mapboxgl1.RainsLayer(
         [114.359445, 30.26976, 114.635417, 30.578213],
-        picture,
+        rainPicture.value,
         self => {
           self.addTo(newfiberMap.map);
           self.hide();
@@ -304,12 +305,11 @@
           console.log('8888888888888888',dataLoad.value);
         }
       ));
-      newfiberMap.RainsLayer.init(picture);
+      newfiberMap.RainsLayer.init(rainPicture.value);
     }
   })
 }
 function runDayTime() {
-  // newfiberMap.map.easeTo(newfiberMap.config_.params.init);
   bus.emit('clearTrajectory')
   hgEndActive.value = "";
   showRainLegend.value = true;
@@ -323,7 +323,7 @@
     hgEngPlay.value = false;
     clearInterval(runDayInterval.value);
   }
-  newfiberMap.RainsLayer.show()
+  newfiberMap.RainsLayer.init(rainPicture.value,(self)=> self.show())
 }
 
 function timeLoop() {
@@ -401,7 +401,7 @@
       // newfiberMap.RainsLayer.init([ 'https://server1.wh-nf.cn:9000/newfiber-donghugaoxin/2024/11/27/2024-07-02-4%E5%B0%8F%E6%97%B6-4_20241127201053A060.tif'])
       newfiberMap.RainsLayer.init([res.data.weatherwarningFileurl.fileUrl],(self)=> self.show())
       dataLoad.value=false
-      debugger
+      // debugger
       console.log("shangtu", res.data);
     }
   }).catch(() => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
index c9aae19..cbe4223 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
@@ -360,7 +360,7 @@
   console.log(props);
   riskAnalysisReason({
     startTime: Timers.value[0],
-    endTime: Timers[1],
+    endTime: Timers.value[1],
 
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,