diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 713321d..33c593b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -58,8 +59,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -300,14 +305,13 @@
   }
 };
 const getChartsData = () => {
+  debugger;
   getEchart({
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,20 +338,62 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
-
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "dxssrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 713321d..33c593b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -58,8 +59,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -300,14 +305,13 @@
   }
 };
 const getChartsData = () => {
+  debugger;
   getEchart({
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,20 +338,62 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
-
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "dxssrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index ca7cf12..75d8d65 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,11 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+import { forEach } from "jszip";
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -57,6 +61,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
+  JKSZ: 0,
+  PFBZ: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -86,8 +96,8 @@
         },
       },
       grid: {
-        left: 60,
-        right: 100,
+        left: 100,
+        right: 60,
         bottom: 20,
         containLabel: true,
       },
@@ -134,7 +144,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -157,7 +167,10 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.JKSZ ? value.max : AllData.JKSZ;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -178,7 +191,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -226,6 +239,10 @@
             color: "#FFC155", // 数据点颜色
             width: 4,
           },
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
         {
           name: AllData.yAxis3_Name,
@@ -245,6 +262,39 @@
         },
       ],
     };
+    if (AllData.JKSZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.JKSZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#FFC155", // 线的颜色
+        },
+        label: {
+          show: true,
+          formatter: "进口水质:" + AllData.JKSZ,
+          color: "#FFC155",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.PFBZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.PFBZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#99FF55", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "排放标准:" + AllData.PFBZ,
+          color: "#99FF55",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -256,16 +306,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -276,6 +321,14 @@
             break;
           case "cond":
             AllData.yAxis2 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "进口COD水质") {
+                AllData.JKSZ = Number(element.lineValue);
+              }
+              if (element.lineName == "排放标准") {
+                AllData.PFBZ = Number(element.lineValue);
+              }
+            });
             break;
           case "pn05":
             AllData.yAxis = element.datas;
@@ -289,16 +342,61 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime: "2024-07-01 00:00:00",
-    endTime: "2024-07-01 23:59:59",
-    stCode: "",
-    menuType: "",
-  }).then((res) => {});
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "szycfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[1];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 713321d..33c593b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -58,8 +59,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -300,14 +305,13 @@
   }
 };
 const getChartsData = () => {
+  debugger;
   getEchart({
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,20 +338,62 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
-
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "dxssrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index ca7cf12..75d8d65 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,11 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+import { forEach } from "jszip";
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -57,6 +61,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
+  JKSZ: 0,
+  PFBZ: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -86,8 +96,8 @@
         },
       },
       grid: {
-        left: 60,
-        right: 100,
+        left: 100,
+        right: 60,
         bottom: 20,
         containLabel: true,
       },
@@ -134,7 +144,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -157,7 +167,10 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.JKSZ ? value.max : AllData.JKSZ;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -178,7 +191,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -226,6 +239,10 @@
             color: "#FFC155", // 数据点颜色
             width: 4,
           },
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
         {
           name: AllData.yAxis3_Name,
@@ -245,6 +262,39 @@
         },
       ],
     };
+    if (AllData.JKSZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.JKSZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#FFC155", // 线的颜色
+        },
+        label: {
+          show: true,
+          formatter: "进口水质:" + AllData.JKSZ,
+          color: "#FFC155",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.PFBZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.PFBZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#99FF55", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "排放标准:" + AllData.PFBZ,
+          color: "#99FF55",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -256,16 +306,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -276,6 +321,14 @@
             break;
           case "cond":
             AllData.yAxis2 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "进口COD水质") {
+                AllData.JKSZ = Number(element.lineValue);
+              }
+              if (element.lineName == "排放标准") {
+                AllData.PFBZ = Number(element.lineValue);
+              }
+            });
             break;
           case "pn05":
             AllData.yAxis = element.datas;
@@ -289,16 +342,61 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime: "2024-07-01 00:00:00",
-    endTime: "2024-07-01 23:59:59",
-    stCode: "",
-    menuType: "",
-  }).then((res) => {});
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "szycfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[1];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index c867578..89c6d37 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -59,8 +60,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -305,10 +310,8 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,21 +337,63 @@
 };
 const getFenXiData = () => {
   console.log(props);
-  riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
 
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "wszrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+      debugger;
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 713321d..33c593b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -58,8 +59,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -300,14 +305,13 @@
   }
 };
 const getChartsData = () => {
+  debugger;
   getEchart({
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,20 +338,62 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
-
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "dxssrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index ca7cf12..75d8d65 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,11 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+import { forEach } from "jszip";
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -57,6 +61,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
+  JKSZ: 0,
+  PFBZ: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -86,8 +96,8 @@
         },
       },
       grid: {
-        left: 60,
-        right: 100,
+        left: 100,
+        right: 60,
         bottom: 20,
         containLabel: true,
       },
@@ -134,7 +144,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -157,7 +167,10 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.JKSZ ? value.max : AllData.JKSZ;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -178,7 +191,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -226,6 +239,10 @@
             color: "#FFC155", // 数据点颜色
             width: 4,
           },
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
         {
           name: AllData.yAxis3_Name,
@@ -245,6 +262,39 @@
         },
       ],
     };
+    if (AllData.JKSZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.JKSZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#FFC155", // 线的颜色
+        },
+        label: {
+          show: true,
+          formatter: "进口水质:" + AllData.JKSZ,
+          color: "#FFC155",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.PFBZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.PFBZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#99FF55", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "排放标准:" + AllData.PFBZ,
+          color: "#99FF55",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -256,16 +306,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -276,6 +321,14 @@
             break;
           case "cond":
             AllData.yAxis2 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "进口COD水质") {
+                AllData.JKSZ = Number(element.lineValue);
+              }
+              if (element.lineName == "排放标准") {
+                AllData.PFBZ = Number(element.lineValue);
+              }
+            });
             break;
           case "pn05":
             AllData.yAxis = element.datas;
@@ -289,16 +342,61 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime: "2024-07-01 00:00:00",
-    endTime: "2024-07-01 23:59:59",
-    stCode: "",
-    menuType: "",
-  }).then((res) => {});
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "szycfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[1];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index c867578..89c6d37 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -59,8 +60,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -305,10 +310,8 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,21 +337,63 @@
 };
 const getFenXiData = () => {
   console.log(props);
-  riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
 
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "wszrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+      debugger;
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 3446d99..9cba41b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,27 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+const props = defineProps({
+  // 数据id
+  dataID: {
+    type: String,
+  },
+  dataCode: {
+    type: String,
+  },
+  arrstcode: {
+    type: Array,
+  },
+  arrid: {
+    type: Array,
+  },
+  Getproperties: {
+    type: Object,
+  },
+});
 
 const AllData = reactive({
   chart: null,
@@ -37,10 +57,13 @@
   yAxis_Name: "降雨量",
   yAxis2: [],
   yAxis2_Name: "流速",
-
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -119,7 +142,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -141,7 +164,7 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -162,7 +185,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -241,16 +264,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -271,9 +289,65 @@
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "ydfxfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
+};
 onMounted(() => {
   nextTick(() => {
     getChartsData();
+    getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 713321d..33c593b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -58,8 +59,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -300,14 +305,13 @@
   }
 };
 const getChartsData = () => {
+  debugger;
   getEchart({
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,20 +338,62 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
-
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "dxssrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index ca7cf12..75d8d65 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,11 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+import { forEach } from "jszip";
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -57,6 +61,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
+  JKSZ: 0,
+  PFBZ: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -86,8 +96,8 @@
         },
       },
       grid: {
-        left: 60,
-        right: 100,
+        left: 100,
+        right: 60,
         bottom: 20,
         containLabel: true,
       },
@@ -134,7 +144,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -157,7 +167,10 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.JKSZ ? value.max : AllData.JKSZ;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -178,7 +191,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -226,6 +239,10 @@
             color: "#FFC155", // 数据点颜色
             width: 4,
           },
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
         {
           name: AllData.yAxis3_Name,
@@ -245,6 +262,39 @@
         },
       ],
     };
+    if (AllData.JKSZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.JKSZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#FFC155", // 线的颜色
+        },
+        label: {
+          show: true,
+          formatter: "进口水质:" + AllData.JKSZ,
+          color: "#FFC155",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.PFBZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.PFBZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#99FF55", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "排放标准:" + AllData.PFBZ,
+          color: "#99FF55",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -256,16 +306,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -276,6 +321,14 @@
             break;
           case "cond":
             AllData.yAxis2 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "进口COD水质") {
+                AllData.JKSZ = Number(element.lineValue);
+              }
+              if (element.lineName == "排放标准") {
+                AllData.PFBZ = Number(element.lineValue);
+              }
+            });
             break;
           case "pn05":
             AllData.yAxis = element.datas;
@@ -289,16 +342,61 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime: "2024-07-01 00:00:00",
-    endTime: "2024-07-01 23:59:59",
-    stCode: "",
-    menuType: "",
-  }).then((res) => {});
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "szycfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[1];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index c867578..89c6d37 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -59,8 +60,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -305,10 +310,8 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,21 +337,63 @@
 };
 const getFenXiData = () => {
   console.log(props);
-  riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
 
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "wszrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+      debugger;
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 3446d99..9cba41b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,27 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+const props = defineProps({
+  // 数据id
+  dataID: {
+    type: String,
+  },
+  dataCode: {
+    type: String,
+  },
+  arrstcode: {
+    type: Array,
+  },
+  arrid: {
+    type: Array,
+  },
+  Getproperties: {
+    type: Object,
+  },
+});
 
 const AllData = reactive({
   chart: null,
@@ -37,10 +57,13 @@
   yAxis_Name: "降雨量",
   yAxis2: [],
   yAxis2_Name: "流速",
-
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -119,7 +142,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -141,7 +164,7 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -162,7 +185,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -241,16 +264,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -271,9 +289,65 @@
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "ydfxfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
+};
 onMounted(() => {
   nextTick(() => {
     getChartsData();
+    getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
index c670786..4e0c515 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
@@ -75,6 +75,8 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  MGSW: 0,
+  GSW: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -153,7 +155,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -175,7 +177,10 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.MGSW ? value.max : AllData.MGSW;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -222,9 +227,48 @@
           itemStyle: {
             color: "#99FF55", // 数据点颜色
           },
+          // yAxisIndex: 1,
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
       ],
     };
+    if (AllData.MGSW > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.MGSW, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "red", // 线的颜色
+        },
+        label: {
+          show: true,
+          // formatter: "满管水位" + props.data.yAxis6_YJ,
+          formatter: "满管水位:" + AllData.MGSW,
+          color: "red",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.GSW > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.GSW, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "yellow", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "高水位:" + AllData.GSW,
+          color: "yellow",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -239,17 +283,24 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
       res.data.datas.forEach((element) => {
         switch (element.dataKey) {
           case "z":
+            debugger;
             AllData.yAxis3 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "满管水位") {
+                AllData.MGSW = Number(element.lineValue);
+              }
+              if (element.lineName == "高水位") {
+                AllData.GSW = Number(element.lineValue);
+              }
+            });
             break;
 
           case "pn05":

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 713321d..33c593b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -58,8 +59,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -300,14 +305,13 @@
   }
 };
 const getChartsData = () => {
+  debugger;
   getEchart({
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,20 +338,62 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
-
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "dxssrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index ca7cf12..75d8d65 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,11 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+import { forEach } from "jszip";
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -57,6 +61,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
+  JKSZ: 0,
+  PFBZ: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -86,8 +96,8 @@
         },
       },
       grid: {
-        left: 60,
-        right: 100,
+        left: 100,
+        right: 60,
         bottom: 20,
         containLabel: true,
       },
@@ -134,7 +144,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -157,7 +167,10 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.JKSZ ? value.max : AllData.JKSZ;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -178,7 +191,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -226,6 +239,10 @@
             color: "#FFC155", // 数据点颜色
             width: 4,
           },
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
         {
           name: AllData.yAxis3_Name,
@@ -245,6 +262,39 @@
         },
       ],
     };
+    if (AllData.JKSZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.JKSZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#FFC155", // 线的颜色
+        },
+        label: {
+          show: true,
+          formatter: "进口水质:" + AllData.JKSZ,
+          color: "#FFC155",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.PFBZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.PFBZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#99FF55", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "排放标准:" + AllData.PFBZ,
+          color: "#99FF55",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -256,16 +306,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -276,6 +321,14 @@
             break;
           case "cond":
             AllData.yAxis2 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "进口COD水质") {
+                AllData.JKSZ = Number(element.lineValue);
+              }
+              if (element.lineName == "排放标准") {
+                AllData.PFBZ = Number(element.lineValue);
+              }
+            });
             break;
           case "pn05":
             AllData.yAxis = element.datas;
@@ -289,16 +342,61 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime: "2024-07-01 00:00:00",
-    endTime: "2024-07-01 23:59:59",
-    stCode: "",
-    menuType: "",
-  }).then((res) => {});
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "szycfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[1];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index c867578..89c6d37 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -59,8 +60,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -305,10 +310,8 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,21 +337,63 @@
 };
 const getFenXiData = () => {
   console.log(props);
-  riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
 
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "wszrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+      debugger;
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 3446d99..9cba41b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,27 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+const props = defineProps({
+  // 数据id
+  dataID: {
+    type: String,
+  },
+  dataCode: {
+    type: String,
+  },
+  arrstcode: {
+    type: Array,
+  },
+  arrid: {
+    type: Array,
+  },
+  Getproperties: {
+    type: Object,
+  },
+});
 
 const AllData = reactive({
   chart: null,
@@ -37,10 +57,13 @@
   yAxis_Name: "降雨量",
   yAxis2: [],
   yAxis2_Name: "流速",
-
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -119,7 +142,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -141,7 +164,7 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -162,7 +185,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -241,16 +264,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -271,9 +289,65 @@
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "ydfxfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
+};
 onMounted(() => {
   nextTick(() => {
     getChartsData();
+    getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
index c670786..4e0c515 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
@@ -75,6 +75,8 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  MGSW: 0,
+  GSW: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -153,7 +155,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -175,7 +177,10 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.MGSW ? value.max : AllData.MGSW;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -222,9 +227,48 @@
           itemStyle: {
             color: "#99FF55", // 数据点颜色
           },
+          // yAxisIndex: 1,
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
       ],
     };
+    if (AllData.MGSW > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.MGSW, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "red", // 线的颜色
+        },
+        label: {
+          show: true,
+          // formatter: "满管水位" + props.data.yAxis6_YJ,
+          formatter: "满管水位:" + AllData.MGSW,
+          color: "red",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.GSW > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.GSW, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "yellow", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "高水位:" + AllData.GSW,
+          color: "yellow",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -239,17 +283,24 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
       res.data.datas.forEach((element) => {
         switch (element.dataKey) {
           case "z":
+            debugger;
             AllData.yAxis3 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "满管水位") {
+                AllData.MGSW = Number(element.lineValue);
+              }
+              if (element.lineName == "高水位") {
+                AllData.GSW = Number(element.lineValue);
+              }
+            });
             break;
 
           case "pn05":
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
index 18312c2..50822b9 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,27 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+const props = defineProps({
+  // 数据id
+  dataID: {
+    type: String,
+  },
+  dataCode: {
+    type: String,
+  },
+  arrstcode: {
+    type: Array,
+  },
+  arrid: {
+    type: Array,
+  },
+  Getproperties: {
+    type: Object,
+  },
+});
 
 const AllData = reactive({
   chart: null,
@@ -42,6 +62,10 @@
   yAxis4: [],
   yAxis4_Name: "COD",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -76,7 +100,7 @@
         },
       },
       grid: {
-        left: 60,
+        left: 100,
         right: 100,
         bottom: 20,
         containLabel: true,
@@ -124,7 +148,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -147,7 +171,7 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -168,7 +192,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -189,7 +213,7 @@
         {
           name: AllData.yAxis4_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -283,16 +307,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -316,9 +335,66 @@
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "yszrfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
+};
 onMounted(() => {
   nextTick(() => {
+    getFenXiData();
     getChartsData();
+    getWatherData();
+
     window.addEventListener("resize", resizeTheChart);
   });
 });

diff --git a/src/api/login.js b/src/api/login.js
index 5fff136..69bc74a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -42,7 +42,7 @@
     url: '/code',
     headers: { isToken: false },
     method: 'get',
-    timeout: 20000,
+    timeout: 200000,
   });
 }
 
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1cde2c4..571ef99 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -214,18 +214,18 @@
       name: "dp_gwfx", //管网风险
       value: "rainwater_pipeline_water_level", //雨水管网液位
     },
-    // {
-    //   name: "dp_gwfx", //管网风险
-    //   value: "rainwater_pipeline_quality", //雨水管网水质
-    // },
+    {
+      name: "dp_gwfx", //管网风险
+      value: "rainwater_pipeline_quality", //雨水管网水质
+    },
     {
       name: "dp_wsgwfx", //大屏污水管网风险分析弹框
       value: "sewage_pipeline_quality", //雨水管网水质
     },
-    {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
-    },
+    // {
+    //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
+    //   value: "rainwater_pipeline_quality", //雨水管网水质
+    // },
   ];
   return arr.find((item) => item.value == type)?.name || null;
 };
@@ -493,6 +493,8 @@
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
+  }else{
+    Getproperties.value.daterange =null
   }
   console.log("Getproperties", Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
@@ -509,7 +511,6 @@
   allScreen();
   useStore.getsewageData();
   bus.on("DynamicBus", (item) => {
-    // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
     dialogConfig.title = item.stName || item.name;
@@ -539,6 +540,8 @@
   bus.on("changeData", (e) => {
     // switchArr();
   });
+  // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 });
 
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
index c69e2c2..330184f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue
@@ -6,33 +6,44 @@
         <div class="distext">
           <span>总数</span>
         </div>
-        <div class="sum colorBlue">{{sumObj.totalNum}}</div>
+        <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>高水位运行</span>
         </div>
-        <div class="sum colorOrange">{{sumObj.gswyxNum}}</div>
+        <div class="sum colorOrange">{{ sumObj.gswyxNum }}</div>
       </div>
       <div class="eachSum">
         <div class="distext">
           <span>溢流风险</span>
         </div>
-        <div class="sum colorRed">{{sumObj.ylfxNum}}</div>
+        <div class="sum colorRed">{{ sumObj.ylfxNum }}</div>
       </div>
     </div>
     <!-- 列表 -->
-    <div class="waterloggingList flex-1" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
+    <div
+      class="waterloggingList flex-1"
+      v-loading="loading"
+      element-loading-background="rgba(11, 18, 52, 0.3)"
+    >
+      <div
+        class="eachData"
+        v-for="item in listData"
+        :key="item.id"
+        @click="popUpFun(item)"
+      >
         <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{item.stName}}</div>
-
+            <div class="name" :title="item.stName">{{ item.stName }}</div>
           </div>
-           <div class="equipmentStats onColor" v-if="item.onlineStatus=='online'">在线</div>
-            <div class="equipmentStats offColor" v-if="item.onlineStatus=='offline'" >离线</div>
+          <div class="equipmentStats onColor" v-if="item.onlineStatus == 'online'">
+            在线
+          </div>
+          <div class="equipmentStats offColor" v-if="item.onlineStatus == 'offline'">
+            离线
+          </div>
           <!-- <div class="rightCon">
             <div class="weixiu"></div>
             <div class="tongji"></div>
@@ -41,12 +52,12 @@
         <div class="waterLevelInfo">
           <div class="waterDepth">
             <!-- 水深背景 -->
-            <div class="depthBgc" :style="{ height: item.percentum  + '%' }"></div>
-            <div class="sign"  :style="{ bottom: (item.percentum - 40) + '%' }">
+            <div class="depthBgc" :style="{ height: item.percentum + '%' }"></div>
+            <div class="sign" :style="{ bottom: item.percentum - 40 + '%' }">
               <div class="arrowsL"></div>
               <div class="">
                 <div class="depthSum">
-                  <span>{{item.z}}</span>
+                  <span>{{ item.z }}</span>
                   <span class="unit">m</span>
                 </div>
                 <div class="depthText">水深</div>
@@ -54,8 +65,21 @@
             </div>
           </div>
           <!-- 高水位运行  满管    满溢风险  满溢 -->
-          <div class="gradeText " :class="item.warnInfoCode=='1'?'gsw':item.warnInfoCode=='2'?'mg':item.warnInfoCode=='3'?'myfx':item.warnInfoCode=='4'?'my':'wfx'">
-            {{item.warnInfo}}
+          <div
+            class="gradeText"
+            :class="
+              item.warnInfoCode == '1'
+                ? 'gsw'
+                : item.warnInfoCode == '2'
+                ? 'mg'
+                : item.warnInfoCode == '3'
+                ? 'myfx'
+                : item.warnInfoCode == '4'
+                ? 'my'
+                : 'wfx'
+            "
+          >
+            {{ item.warnInfo }}
           </div>
         </div>
       </div>
@@ -63,12 +87,9 @@
   </div>
 </template>
 <script setup name="Gwfx">
-import { ref, reactive, onMounted } from 'vue';
-import {
-
-  drainageDispatchMonitorData,
-} from '@/api/FloodControlAndDrainage.js';
-import _bus from '@/bus';
+import { ref, reactive, onMounted } from "vue";
+import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
+import _bus from "@/bus";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -78,56 +99,62 @@
     },
   },
 });
-const sumObj=ref({})
+const sumObj = ref({});
 watch(
   () => props.atSum,
   (newVal, oldVal) => {
     if (newVal) {
-      sumObj.value=newVal
+      sumObj.value = newVal;
     }
   },
   { immediate: true }
 );
 // 获取数据
-const loading=ref(false)
-const listData=ref([])
+const loading = ref(false);
+const listData = ref([]);
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    monitorType:'gwfx'
-  }
-  drainageDispatchMonitorData(params).then(res => {
-    console.log('获取监测预警 管网数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
-      listData.value.map((e)=>{
-        let wellDepth=e.wellDepth||2;
-        e.percentum=(e.z/wellDepth*100).toFixed(2)
-      })
-      console.log('listData.value',listData.value);
+  loading.value = true;
+  let params = {
+    monitorType: "gwfx",
+  };
+  drainageDispatchMonitorData(params).then(
+    (res) => {
+      console.log("获取监测预警 管网数据", res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+        listData.value.map((e) => {
+          let wellDepth = e.wellDepth || 2;
+          e.percentum = ((e.z / wellDepth) * 100).toFixed(2);
+        });
+        console.log("listData.value", listData.value);
+      }
+    },
+    (error) => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
-function popUpFun(item){
-  console.log('点击管网风险数据',item);
-  _bus.emit("panelDataToMap", {...item,name:item.stName,id:undefined})
+function popUpFun(item) {
+  console.log("点击管网风险数据", item);
+  _bus.emit("panelDataToMap", { ...item, name: item.stName, id: undefined });
   _bus.emit("DynamicBus", item);
+
+  // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
 </script>
 <style lang="scss" scoped>
 .Gwfx {
-     height: calc(100% - 100px);
+  height: calc(100% - 100px);
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
+    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
+      no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -136,23 +163,18 @@
       .distext {
         width: 101px;
         height: 18px;
-                background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
           top: -11px;
           left: 10px;
-                              font-weight: bold;
-font-size: 14px;
-color: #CCDFFF;
+          font-weight: bold;
+          font-size: 14px;
+          color: #ccdfff;
         }
       }
       .sum {
-
         font-weight: bold;
         font-size: 30px;
         color: #2cb7ff;
@@ -200,32 +222,32 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
+          .name {
             max-width: 300px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
+            overflow: hidden; //溢出隐藏
+            text-overflow: ellipsis; //超出显示省略号
+            white-space: nowrap; //强制文本在一行内显示
           }
           .dingweiicon {
             width: 25px;
             height: 28px;
-            background: url('@/assets/images/pictureOnMap/dingweiicon.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
+              center;
             background-size: 100% 100%;
           }
-
         }
         .equipmentStats {
-            padding-left: 10px;
+          padding-left: 10px;
 
-            font-weight: 500;
-            font-size: 14px;
-          }
-          .onColor {
-            color: #24ff62;
-          }
-          .offColor {
-            color: #ea3f54;
-          }
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .onColor {
+          color: #24ff62;
+        }
+        .offColor {
+          color: #ea3f54;
+        }
         .rightCon {
           padding-right: 23px;
           display: flex;
@@ -233,14 +255,14 @@
           .weixiu {
             width: 20px;
             height: 19px;
-            background: url('@/assets/images/pictureOnMap/weixiu.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/weixiu.png") no-repeat center;
             background-size: 100% 100%;
             cursor: pointer;
           }
           .tongji {
             width: 18px;
             height: 18px;
-            background: url('@/assets/images/pictureOnMap/tongji.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/tongji.png") no-repeat center;
             background-size: 100% 100%;
             margin-left: 15px;
             cursor: pointer;
@@ -256,18 +278,17 @@
         justify-content: space-between;
         align-items: center;
 
-
         .waterDepth {
           width: 100px;
           height: 58px;
-          background: url('@/assets/images/pictureOnMap/shuiBgcNo.png') no-repeat center;
+          background: url("@/assets/images/pictureOnMap/shuiBgcNo.png") no-repeat center;
           background-size: 100% 100%;
           position: relative;
           .depthBgc {
             position: absolute;
             // height: 30px;
             width: 100%;
-            background: url('@/assets/images/pictureOnMap/shuiBgc.png') no-repeat center;
+            background: url("@/assets/images/pictureOnMap/shuiBgc.png") no-repeat center;
             background-size: 100% 100%;
             left: 0;
             bottom: 0;
@@ -281,24 +302,21 @@
             .arrowsL {
               width: 7px;
               height: 10px;
-              background: url('@/assets/images/pictureOnMap/arrowsL.png') no-repeat center;
+              background: url("@/assets/images/pictureOnMap/arrowsL.png") no-repeat center;
               background-size: 100% 100%;
               margin-right: 10px;
             }
             .depthText {
-
               font-weight: 500;
               font-size: 14px;
               color: #89afff;
             }
             .depthSum {
-
-font-weight: 500;
-font-size: 20px;
-color: #DAE4F9;
-.unit {
-
-}
+              font-weight: 500;
+              font-size: 20px;
+              color: #dae4f9;
+              .unit {
+              }
             }
           }
         }
@@ -311,33 +329,51 @@
           display: flex;
           justify-content: center;
           padding-left: 30px;
-        align-items: center;
-         clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
+          align-items: center;
+          clip-path: polygon(25% 0%, 100% 0%, 100% 100%, 0% 100%);
         }
         .my {
-          background: linear-gradient(0deg, rgba(234, 63, 84, 0.3) 0%, rgba(234, 63, 84, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(234, 63, 84, 0.3) 0%,
+            rgba(234, 63, 84, 0) 100%
+          );
           color: #ea3f54;
         }
         .myfx {
-          background: linear-gradient(0deg, rgba(237, 127, 31, 0.3) 0%, rgba(237, 142, 59, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(237, 127, 31, 0.3) 0%,
+            rgba(237, 142, 59, 0) 100%
+          );
           color: #e37311;
         }
         .mg {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #fa9640;
         }
         .gsw {
-          background: linear-gradient(0deg, rgba(250, 150, 64, 0.3) 0%, rgba(250, 150, 64, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(250, 150, 64, 0.3) 0%,
+            rgba(250, 150, 64, 0) 100%
+          );
           color: #ff993e;
         }
         .wfx {
-          background: linear-gradient(0deg, rgba(58, 229, 139, 0.3) 0%, rgba(58, 229, 139, 0) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(58, 229, 139, 0.3) 0%,
+            rgba(58, 229, 139, 0) 100%
+          );
           color: #3ae58b;
         }
-
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 8abe8e0..0bfd2ac 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -12,14 +12,14 @@
   refresh: {
     type: [String, Number],
     default: 1,
-    ClickData: String,
-    TypeID: String,
   },
   //数据
   echartData: {
     type: Object,
     default: {},
   },
+  ClickData: String,
+  TypeID: String,
 });
 
 const id = guid();
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 324fc4f..19db56f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -185,7 +185,7 @@
             v-if="dialogConfig.activeName == 'gwhj'"
           ></Gwhj>
         </el-tab-pane>
-        <el-tab-pane label="其它类型" name="qt">
+        <el-tab-pane label="其它缺陷" name="qt">
           <Qt
             :TypeID="AllData.TypeID"
             :FenQuData="AllData.TitleName"
@@ -339,7 +339,8 @@
   Timers: [
     // "2024-07-01",
     // "2024-07-02",
-    moment().subtract(3, "day").format("YYYY-MM-DD"),
+    // moment().subtract(3, "day").format("YYYY-MM-DD"),
+    moment().format("YYYY-MM-DD"),
     moment().format("YYYY-MM-DD"),
   ],
   // 污水/雨水切换 sewage / rain
@@ -510,6 +511,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = ["2024-07-01", "2024-07-07"];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
@@ -546,6 +548,7 @@
     AllData.TitleName[0].grade = "one"; //分区层级-静态
     AllData.TitleName[0].sort = 0; //面包屑的顺序
     AllData.TitleName[0].Name = []; //面包屑的顺序
+    AllData.Timers = [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")];
     // 将2,3,4级分区清空
     AllData.TitleName[1] = {
       abbreviation: "",
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
index a2a1cab..28a1ed0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue
@@ -288,8 +288,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "dxssrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
index 4e737d0..7fb5943 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "ylfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
index d4588e7..4cd425f 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "szycfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 
 // 打开周边全景
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
index 3a5bca3..639d263 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = "yszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
index 8dbcaa2..d877529 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue
@@ -287,8 +287,9 @@
 
 const rowIgnore = (item) => {
   item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX";
+  item.daterange = [item.tt + " 00:00:00", item.tt + " 23:59:59"];
   bus.emit("DynamicBus", item);
-  localStorage.setItem("JCFXDialogTimer", item.tt);
+  // localStorage.setItem("JCFXDialogTimer", item.tt);
 };
 // 打开周边全景
 const ClickZBQJ2 = (item) => {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
index 035b865..e5386ea 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gwpmContent flex">
-    <div class="flex-1 leftTop">
+    <div class="leftTop">
       <div id="SwDiv">
         <!-- <div id="BG_BOX" ref="BgBox"></div> -->
         <div id="ST_Box">
@@ -191,7 +191,9 @@
   overflow: hidden;
   height: 100%;
   .leftTop {
-    padding-top: 20px;
+    padding-top:40px;
+    margin-left: 20px;
+    width: 600px;
     overflow: hidden;
   }
   #SwDiv {
@@ -220,7 +222,7 @@
       height: 20px;
       position: absolute;
       top: -16px;
-      left: 25px;
+      left:70px;
       background: url(@/assets/images/donghu/gwjg.png) no-repeat;
       background-size: 100% 100%;
       z-index: 10;
@@ -352,7 +354,7 @@
   #DataInfo {
     width: 100%;
     height: 100%;
-    background: rgba(0, 125, 142, 0.15);
+    // background: rgba(0, 125, 142, 0.15);
     padding-right: 50px;
     .DataInfoList {
       overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 713321d..33c593b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -58,8 +59,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -300,14 +305,13 @@
   }
 };
 const getChartsData = () => {
+  debugger;
   getEchart({
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,20 +338,62 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
-
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "dxssrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index ca7cf12..75d8d65 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,11 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+import { forEach } from "jszip";
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -57,6 +61,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
+  JKSZ: 0,
+  PFBZ: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -86,8 +96,8 @@
         },
       },
       grid: {
-        left: 60,
-        right: 100,
+        left: 100,
+        right: 60,
         bottom: 20,
         containLabel: true,
       },
@@ -134,7 +144,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -157,7 +167,10 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.JKSZ ? value.max : AllData.JKSZ;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -178,7 +191,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -226,6 +239,10 @@
             color: "#FFC155", // 数据点颜色
             width: 4,
           },
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
         {
           name: AllData.yAxis3_Name,
@@ -245,6 +262,39 @@
         },
       ],
     };
+    if (AllData.JKSZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.JKSZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#FFC155", // 线的颜色
+        },
+        label: {
+          show: true,
+          formatter: "进口水质:" + AllData.JKSZ,
+          color: "#FFC155",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.PFBZ > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.PFBZ, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "#99FF55", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "排放标准:" + AllData.PFBZ,
+          color: "#99FF55",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -256,16 +306,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -276,6 +321,14 @@
             break;
           case "cond":
             AllData.yAxis2 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "进口COD水质") {
+                AllData.JKSZ = Number(element.lineValue);
+              }
+              if (element.lineName == "排放标准") {
+                AllData.PFBZ = Number(element.lineValue);
+              }
+            });
             break;
           case "pn05":
             AllData.yAxis = element.datas;
@@ -289,16 +342,61 @@
 const getFenXiData = () => {
   console.log(props);
   riskAnalysisReason({
-    startTime: "2024-07-01 00:00:00",
-    endTime: "2024-07-01 23:59:59",
-    stCode: "",
-    menuType: "",
-  }).then((res) => {});
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "szycfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[1];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index c867578..89c6d37 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,8 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
 import moment from "moment";
 const props = defineProps({
   // 数据id
@@ -59,8 +60,12 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   yAxis4: [],
-  yAxis4_Name: "COD",
+  yAxis4_Name: "电导率",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -305,10 +310,8 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -334,21 +337,63 @@
 };
 const getFenXiData = () => {
   console.log(props);
-  riskAnalysisReason({
-    startTime:props.Getproperties.daterange?props.Getproperties.daterange[0]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    endTime:props.Getproperties.daterange?props.Getproperties.daterange[1]:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
 
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
     menuType: "wszrfxJCFX",
-  }).then((res) => {});
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+      debugger;
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
 };
 onMounted(() => {
   nextTick(() => {
     getChartsData();
     getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 3446d99..9cba41b 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,27 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+const props = defineProps({
+  // 数据id
+  dataID: {
+    type: String,
+  },
+  dataCode: {
+    type: String,
+  },
+  arrstcode: {
+    type: Array,
+  },
+  arrid: {
+    type: Array,
+  },
+  Getproperties: {
+    type: Object,
+  },
+});
 
 const AllData = reactive({
   chart: null,
@@ -37,10 +57,13 @@
   yAxis_Name: "降雨量",
   yAxis2: [],
   yAxis2_Name: "流速",
-
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -119,7 +142,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -141,7 +164,7 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -162,7 +185,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -241,16 +264,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -271,9 +289,65 @@
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "ydfxfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
+};
 onMounted(() => {
   nextTick(() => {
     getChartsData();
+    getFenXiData();
+    getWatherData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
index c670786..4e0c515 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
@@ -75,6 +75,8 @@
   yAxis3: [],
   yAxis3_Name: "水深",
   xAxis: [],
+  MGSW: 0,
+  GSW: 0,
 });
 const init = () => {
   //先获取Dom上的实例
@@ -153,7 +155,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -175,7 +177,10 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
+          max: function (value) {
+            return value.max > AllData.MGSW ? value.max : AllData.MGSW;
+          },
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -222,9 +227,48 @@
           itemStyle: {
             color: "#99FF55", // 数据点颜色
           },
+          // yAxisIndex: 1,
+          markLine: {
+            data: [],
+            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+          },
         },
       ],
     };
+    if (AllData.MGSW > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.MGSW, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "red", // 线的颜色
+        },
+        label: {
+          show: true,
+          // formatter: "满管水位" + props.data.yAxis6_YJ,
+          formatter: "满管水位:" + AllData.MGSW,
+          color: "red",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
+    if (AllData.GSW > 0) {
+      option.series[1].markLine.data.push({
+        yAxis: AllData.GSW, // 这是水平线的 Y 轴值
+        lineStyle: {
+          type: "dashed",
+          color: "yellow", // 线的颜色
+          cap: "round",
+        },
+        label: {
+          show: true,
+          formatter: "高水位:" + AllData.GSW,
+          color: "yellow",
+          fontSize: 12,
+          position: "middle",
+        },
+      });
+    }
     option && chartDom.setOption(option, true);
     AllData.chart = chartDom;
   }
@@ -239,17 +283,24 @@
     stType: props.Getproperties.stType,
     stCode: props.Getproperties.stCode,
     dataCode: props.Getproperties.dataCode,
-    start:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00",
-    end:
-      moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59",
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
       res.data.datas.forEach((element) => {
         switch (element.dataKey) {
           case "z":
+            debugger;
             AllData.yAxis3 = element.datas;
+            element.cordonLineList.forEach((element) => {
+              if (element.lineName == "满管水位") {
+                AllData.MGSW = Number(element.lineValue);
+              }
+              if (element.lineName == "高水位") {
+                AllData.GSW = Number(element.lineValue);
+              }
+            });
             break;
 
           case "pn05":
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
index 18312c2..50822b9 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
@@ -5,20 +5,19 @@
     <div id="BodyFenXi">
       <div class="list1">
         <div class="listLabel">问题日期</div>
-        <div class="listValue">2024年7月1日</div>
+        <div class="listValue">{{ AllData.WTRQ }}</div>
       </div>
       <div class="list1">
         <div class="listLabel">天气情况</div>
-        <div class="listValue">暴雨(24小时降雨量100mm)</div>
+        <div class="listValue">{{ AllData.TQ }}</div>
       </div>
       <div class="list2">
         <div class="listLabel">问题分析</div>
         <div class="listValue">
           <p>条件库：</p>
-          1、雨天降雨； 2、污水管正常满管运行；
-          3、降雨期间COD浓度降低，且降雨结束2小时后浓度回升雨前浓度
+          {{ AllData.TJK }}
           <p>推论库：</p>
-          疑似是雨水注入到污水管网所致
+          {{ AllData.TLK }}
         </div>
       </div>
     </div>
@@ -30,6 +29,27 @@
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
 import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
+import { rainCalendar } from "@/api/FloodControlAndDrainage";
+
+import moment from "moment";
+const props = defineProps({
+  // 数据id
+  dataID: {
+    type: String,
+  },
+  dataCode: {
+    type: String,
+  },
+  arrstcode: {
+    type: Array,
+  },
+  arrid: {
+    type: Array,
+  },
+  Getproperties: {
+    type: Object,
+  },
+});
 
 const AllData = reactive({
   chart: null,
@@ -42,6 +62,10 @@
   yAxis4: [],
   yAxis4_Name: "COD",
   xAxis: [],
+  TJK: "",
+  TLK: "",
+  WTRQ: "",
+  TQ: "",
 });
 const init = () => {
   //先获取Dom上的实例
@@ -76,7 +100,7 @@
         },
       },
       grid: {
-        left: 60,
+        left: 100,
         right: 100,
         bottom: 20,
         containLabel: true,
@@ -124,7 +148,7 @@
         {
           name: AllData.yAxis_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -147,7 +171,7 @@
         {
           name: AllData.yAxis2_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -168,7 +192,7 @@
         {
           name: AllData.yAxis3_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -189,7 +213,7 @@
         {
           name: AllData.yAxis4_Name,
           type: "value",
-          minInterval: 1,
+          // minInterval: 1,
           axisLabel: {
             color: "#AAC1CF",
             show: true,
@@ -283,16 +307,11 @@
 };
 const getChartsData = () => {
   getEchart({
-    // stType: props.Getproperties.stType,
-    // stCode: props.Getproperties.stCode,
-    // dataCode: props.Getproperties.dataCode,
-    // start: "2024-07-01 00:00:00",
-    // end: "2024-07-01 23:59:59",
-    stType: "rainwater_pipeline_quality",
-    stCode: "0201460323",
-    dataCode: "pipePoint",
-    start: "2024-11-26 11:10:03",
-    end: "2024-11-27 11:10:03",
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    start: props.Getproperties.daterange[0],
+    end: props.Getproperties.daterange[1],
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
@@ -316,9 +335,66 @@
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: props.Getproperties.daterange[0],
+    endTime: props.Getproperties.daterange[1],
+
+    stCode: props.Getproperties.stCode,
+    dataCode: props.Getproperties.dataCode,
+    menuType: "yszrfxJCFX",
+  }).then((res) => {
+    if (res && res.code == 200) {
+      let A = 1;
+      let AFont = "";
+      let B = 1;
+      let BFont = "";
+      if (res.data.reasonList.length > 0) {
+        res.data.reasonList.forEach((element) => {
+          AFont += `${A}:${element},`;
+          A++;
+        });
+      } else {
+        AFont = "无";
+      }
+
+      if (res.data.inferList.length > 0) {
+        res.data.inferList.forEach((element) => {
+          BFont += `${B}:${element},`;
+          B++;
+        });
+      } else {
+        BFont = "无";
+      }
+
+      AllData.TJK = AFont;
+      AllData.TLK = BFont;
+    }
+  });
+};
+const getWatherData = () => {
+  AllData.WTRQ = props.Getproperties.daterange[0];
+  rainCalendar({
+    queryTime: AllData.WTRQ,
+  }).then((res) => {
+    console.log(res);
+    res.forEach((element) => {
+      if (element.date == AllData.WTRQ) {
+        AllData.TQ =
+          element.value == 0
+            ? element.weather
+            : element.weather + "(" + element.value + "mm)";
+      }
+    });
+  });
+};
 onMounted(() => {
   nextTick(() => {
+    getFenXiData();
     getChartsData();
+    getWatherData();
+
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/vite.config.js b/vite.config.js
index 67e99b0..02ad574 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -9,7 +9,7 @@
 // let ipLink = 'http://192.168.16.135:9100';
 // let ipLink = 'http://192.168.16.124:9100';
 // let ipLink = 'http://192.168.20.43:9100';
-
+/*  */
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {
   const env = loadEnv(mode, process.cwd());