diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 29e9d95..40824b5 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -63,7 +63,6 @@
     getStreetImg();
   }
 };
-const a = ref("");
 //获取全景静态图
 const getStreetImg = async () => {
   AllData.poiImages = [];

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 29e9d95..40824b5 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -63,7 +63,6 @@
     getStreetImg();
   }
 };
-const a = ref("");
 //获取全景静态图
 const getStreetImg = async () => {
   AllData.poiImages = [];
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a268eaf..e1c864f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -52,6 +52,7 @@
 import usepartitionStore from "@/store/modules/partition";
 
 import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import { FALSE } from "ol/functions";
 
 const useStore = usepartitionStore();
 
@@ -494,6 +495,7 @@
     item.geometrys ||
     Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 29e9d95..40824b5 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -63,7 +63,6 @@
     getStreetImg();
   }
 };
-const a = ref("");
 //获取全景静态图
 const getStreetImg = async () => {
   AllData.poiImages = [];
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a268eaf..e1c864f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -52,6 +52,7 @@
 import usepartitionStore from "@/store/modules/partition";
 
 import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import { FALSE } from "ol/functions";
 
 const useStore = usepartitionStore();
 
@@ -494,6 +495,7 @@
     item.geometrys ||
     Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index 28a1ed0..07243e5 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -289,6 +289,7 @@
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -314,6 +315,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 29e9d95..40824b5 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -63,7 +63,6 @@
     getStreetImg();
   }
 };
-const a = ref("");
 //获取全景静态图
 const getStreetImg = async () => {
   AllData.poiImages = [];
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a268eaf..e1c864f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -52,6 +52,7 @@
 import usepartitionStore from "@/store/modules/partition";
 
 import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import { FALSE } from "ol/functions";
 
 const useStore = usepartitionStore();
 
@@ -494,6 +495,7 @@
     item.geometrys ||
     Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index 28a1ed0..07243e5 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -289,6 +289,7 @@
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -314,6 +315,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 7fb5943..815a684 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -288,6 +288,7 @@
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -313,6 +314,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 29e9d95..40824b5 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -63,7 +63,6 @@
     getStreetImg();
   }
 };
-const a = ref("");
 //获取全景静态图
 const getStreetImg = async () => {
   AllData.poiImages = [];
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a268eaf..e1c864f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -52,6 +52,7 @@
 import usepartitionStore from "@/store/modules/partition";
 
 import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import { FALSE } from "ol/functions";
 
 const useStore = usepartitionStore();
 
@@ -494,6 +495,7 @@
     item.geometrys ||
     Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index 28a1ed0..07243e5 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -289,6 +289,7 @@
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -314,6 +315,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 7fb5943..815a684 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -288,6 +288,7 @@
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -313,6 +314,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 639d263..4b7818f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -288,6 +288,7 @@
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -312,6 +313,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 29e9d95..40824b5 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -63,7 +63,6 @@
     getStreetImg();
   }
 };
-const a = ref("");
 //获取全景静态图
 const getStreetImg = async () => {
   AllData.poiImages = [];
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a268eaf..e1c864f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -52,6 +52,7 @@
 import usepartitionStore from "@/store/modules/partition";
 
 import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import { FALSE } from "ol/functions";
 
 const useStore = usepartitionStore();
 
@@ -494,6 +495,7 @@
     item.geometrys ||
     Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index 28a1ed0..07243e5 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -289,6 +289,7 @@
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -314,6 +315,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 7fb5943..815a684 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -288,6 +288,7 @@
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -313,6 +314,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 639d263..4b7818f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -288,6 +288,7 @@
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
   item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
   // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
@@ -312,6 +313,7 @@
     },
   ];
   item.comIDs = ["zhoubianjiejing", "guanwangpoumian"];
+  item.GWDADataNow = true; //管网风险
   bus.emit("DynamicBus", item);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index 046142b..39c52bb 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -7,10 +7,13 @@
 </template>
 
 <script setup name="guanwangpoumian">
-import moment from 'moment';
-import commonUnderGround from '@/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue';
+import moment from "moment";
+import commonUnderGround from "@/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue";
 const { proxy } = getCurrentInstance();
-import { getSectionByWellCode ,getSectionByWellCodeDetail} from '@/api/MonitorAssetsOnMap';
+import {
+  getSectionByWellCode,
+  getSectionByWellCodeDetail,
+} from "@/api/MonitorAssetsOnMap";
 
 const props = defineProps({
   Getproperties: {
@@ -21,24 +24,22 @@
 
 function GWpoumian() {
   let wellcode = props.Getproperties.wellcode ? props.Getproperties.wellcode : "";
-  // let wellcode = props.Getproperties.wellcode ? props.Getproperties.wellcode : 'YS77721510';
   if (wellcode) {
-    
-    if(props.Getproperties.daterange){
-      let params={
+    if (props.Getproperties.daterange && props.Getproperties.GWDADataNow) {
+      let params = {
         wellcode,
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
-        id:props.Getproperties.id
-      }
-      getSectionByWellCodeDetail(params).then(res => {
+        id: props.Getproperties.id,
+      };
+      getSectionByWellCodeDetail(params).then((res) => {
         if (res && res.code == 200) {
-          console.log('res.data', res.data);
+          console.log("res.data", res.data);
           GetpoumianList.value = res.data;
         }
       });
-    }else{
-      getSectionByWellCode(wellcode).then(res => {
-        console.log('res.data', res.data);
+    } else {
+      getSectionByWellCode(wellcode).then((res) => {
+        console.log("res.data", res.data);
         GetpoumianList.value = res.data;
       });
     }