diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 45e2825..4adccc8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -192,7 +192,7 @@
       top: nowSize(50, 1920),
       bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小
       left: nowSize(40, 1920),
-      right: nowSize(10, 1920),
+      right: nowSize(20, 1920),
       containLabel: true,
     },
     xAxis: [

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 45e2825..4adccc8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -192,7 +192,7 @@
       top: nowSize(50, 1920),
       bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小
       left: nowSize(40, 1920),
-      right: nowSize(10, 1920),
+      right: nowSize(20, 1920),
       containLabel: true,
     },
     xAxis: [
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
index 124fbb9..58327c8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
@@ -53,9 +53,9 @@
         />
       </div>
       </div> -->
-      <div class="ChartHeight" v-loading="loadingEchart" element-loading-background="rgba(11, 18, 52, 0.3)">
-        <MonitoringAnalysisChart
-          v-if="isEchart"
+       <div class="ChartHeight"  v-loading="loadingEchart"
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
           :refresh="chartInfo2.refresh"
           :DataName="chartInfo2.DataName"
           :XAxis="chartInfo2.XAxis"
@@ -63,11 +63,11 @@
           :typeName="chartInfo2.typeName"
           :typeName2="chartInfo2.typeName2"
           :YAxis2="chartInfo2.YAxis2"
-          :marklineJYL="chartInfo2.marklineJYL"
-          :marklineSS="chartInfo2.marklineSS"
-          XnameTop="-480"
-        />
-      </div>
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
+    </div>
     </div>
   </div>
 </template>
@@ -77,7 +77,7 @@
 
 import { siteHistoryMonitorDataAnalysis } from '@/api/FloodControlAndDrainage';
 import { getRELAList, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
+import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
 
@@ -173,20 +173,23 @@
 };
 const chartInfo2 = ref({
   refresh: 1,
-  // DataName: "",
-  XAxis: [],
-  typeName: '5分钟降雨量(mm)',
-  typeName2: '黄海水位(m)',
-  YAxis: [],
-  YAxis2: [],
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
   loading: false,
-  marklineJYL: [],
-  marklineSS: [],
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
 });
-let isEchart = ref(false);
-let loadingEchart = ref(false);
+ let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart() {
-  loadingEchart.value = true;
+ showecharts.value = false;
+ loadingEchart.value=true
   let params = {
     stType: props.Getproperties.stType,
     stCode: Search_form.stCode,
@@ -194,122 +197,24 @@
     end: Search_form.Timers[1],
   };
   console.log('params', params);
-  getEchart(params).then(
-    res => {
-      isEchart.value = true;
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-      let res1 = {
-        code: 200,
-        msg: '操作成功',
-        data: {
-          datas: [
-            {
-              dataKey: 'z',
-              dataName: '黄海水位',
-              unit: '(m)',
-              datas: ['0', '0', '1', '0', '2', '0.5', '0', '0', '0', '0.2'],
-              cordonLineList: [
-                {
-                  id: '1856620587907244131',
-                  cordonId: '1856647503229968394',
-                  lineName: '正常蓄水位',
-                  lineValue: '1.3',
-                  lineType: '2',
-                  lineColor: 'rgba(0, 255, 68, 1)',
-                  systemDefault: '0',
-                  code: 'normal_water_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587932409132',
-                  cordonId: '1856647503229968394',
-                  lineName: '设计洪水位',
-                  lineValue: '1.8',
-                  lineType: '1',
-                  lineColor: 'rgba(221, 255, 0, 1)',
-                  systemDefault: '0',
-                  code: 'design_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604135',
-                  cordonId: '1856647503229968394',
-                  lineName: '校核洪水位',
-                  lineValue: '1.98',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 191, 0, 1)',
-                  systemDefault: '0',
-                  code: 'verify_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604134',
-                  cordonId: '1856647503229968394',
-                  lineName: '坝顶高程',
-                  lineValue: '2.8',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 81, 0, 1)',
-                  systemDefault: '0',
-                  code: 'dam_hight',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-              ],
-            },
-            {
-              dataKey: 'pn05',
-              dataName: '降雨量',
-              unit: 'mm',
-              datas: ['10', '5', '11', '2', '2', '20', '15', '0', '0', '0.2'],
-              cordonLineList: [],
-            },
-          ],
-          times: [
-            '1732291200000',
-            '1732291200000',
-            '1732291800000',
-            '1732292100000',
-            '1732292400000',
-            '1732292700000',
-            '1732293000000',
-            '1732293300000',
-            '1732293600000',
-            '1732293900000',
-          ],
-        },
-      };
-      console.log('监测分析统计res', res);
-      loadingEchart.value = false;
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-      if (res && res.code == 200) {
-        let data = res.data;
-        let pn05Arr = data.datas.find(item => item.dataKey == 'pn05') || []; //降雨
-        let zArr = data.datas.find(item => item.dataKey == 'z') || []; //水深
-        if (pn05Arr) {
-          chartInfo2.value.YAxis = pn05Arr.datas;
-          chartInfo2.value.marklineJYL = pn05Arr.cordonLineList;
-        }
-        if (zArr) {
-          chartInfo2.value.YAxis2 = zArr.datas;
-          chartInfo2.value.marklineSS = zArr.cordonLineList;
-        }
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-        chartInfo2.value.XAxis = data.times;
-        // console.log('chartInfo2123',chartInfo2.value);
-        chartInfo2.value.refresh = Math.random();
-      }
-    },
-    error => {
-      loadingEchart.value = false;
-    }
-  );
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
+
+    chartInfo2.value.refresh = Math.random();
+  },(error)=>{
+    loadingEchart.value=false
+  });
 }
 onMounted(() => {
   console.log('props.Getproperties.id', props.Getproperties);

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 45e2825..4adccc8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -192,7 +192,7 @@
       top: nowSize(50, 1920),
       bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小
       left: nowSize(40, 1920),
-      right: nowSize(10, 1920),
+      right: nowSize(20, 1920),
       containLabel: true,
     },
     xAxis: [
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
index 124fbb9..58327c8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
@@ -53,9 +53,9 @@
         />
       </div>
       </div> -->
-      <div class="ChartHeight" v-loading="loadingEchart" element-loading-background="rgba(11, 18, 52, 0.3)">
-        <MonitoringAnalysisChart
-          v-if="isEchart"
+       <div class="ChartHeight"  v-loading="loadingEchart"
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
           :refresh="chartInfo2.refresh"
           :DataName="chartInfo2.DataName"
           :XAxis="chartInfo2.XAxis"
@@ -63,11 +63,11 @@
           :typeName="chartInfo2.typeName"
           :typeName2="chartInfo2.typeName2"
           :YAxis2="chartInfo2.YAxis2"
-          :marklineJYL="chartInfo2.marklineJYL"
-          :marklineSS="chartInfo2.marklineSS"
-          XnameTop="-480"
-        />
-      </div>
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
+    </div>
     </div>
   </div>
 </template>
@@ -77,7 +77,7 @@
 
 import { siteHistoryMonitorDataAnalysis } from '@/api/FloodControlAndDrainage';
 import { getRELAList, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
+import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
 
@@ -173,20 +173,23 @@
 };
 const chartInfo2 = ref({
   refresh: 1,
-  // DataName: "",
-  XAxis: [],
-  typeName: '5分钟降雨量(mm)',
-  typeName2: '黄海水位(m)',
-  YAxis: [],
-  YAxis2: [],
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
   loading: false,
-  marklineJYL: [],
-  marklineSS: [],
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
 });
-let isEchart = ref(false);
-let loadingEchart = ref(false);
+ let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart() {
-  loadingEchart.value = true;
+ showecharts.value = false;
+ loadingEchart.value=true
   let params = {
     stType: props.Getproperties.stType,
     stCode: Search_form.stCode,
@@ -194,122 +197,24 @@
     end: Search_form.Timers[1],
   };
   console.log('params', params);
-  getEchart(params).then(
-    res => {
-      isEchart.value = true;
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-      let res1 = {
-        code: 200,
-        msg: '操作成功',
-        data: {
-          datas: [
-            {
-              dataKey: 'z',
-              dataName: '黄海水位',
-              unit: '(m)',
-              datas: ['0', '0', '1', '0', '2', '0.5', '0', '0', '0', '0.2'],
-              cordonLineList: [
-                {
-                  id: '1856620587907244131',
-                  cordonId: '1856647503229968394',
-                  lineName: '正常蓄水位',
-                  lineValue: '1.3',
-                  lineType: '2',
-                  lineColor: 'rgba(0, 255, 68, 1)',
-                  systemDefault: '0',
-                  code: 'normal_water_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587932409132',
-                  cordonId: '1856647503229968394',
-                  lineName: '设计洪水位',
-                  lineValue: '1.8',
-                  lineType: '1',
-                  lineColor: 'rgba(221, 255, 0, 1)',
-                  systemDefault: '0',
-                  code: 'design_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604135',
-                  cordonId: '1856647503229968394',
-                  lineName: '校核洪水位',
-                  lineValue: '1.98',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 191, 0, 1)',
-                  systemDefault: '0',
-                  code: 'verify_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604134',
-                  cordonId: '1856647503229968394',
-                  lineName: '坝顶高程',
-                  lineValue: '2.8',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 81, 0, 1)',
-                  systemDefault: '0',
-                  code: 'dam_hight',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-              ],
-            },
-            {
-              dataKey: 'pn05',
-              dataName: '降雨量',
-              unit: 'mm',
-              datas: ['10', '5', '11', '2', '2', '20', '15', '0', '0', '0.2'],
-              cordonLineList: [],
-            },
-          ],
-          times: [
-            '1732291200000',
-            '1732291200000',
-            '1732291800000',
-            '1732292100000',
-            '1732292400000',
-            '1732292700000',
-            '1732293000000',
-            '1732293300000',
-            '1732293600000',
-            '1732293900000',
-          ],
-        },
-      };
-      console.log('监测分析统计res', res);
-      loadingEchart.value = false;
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-      if (res && res.code == 200) {
-        let data = res.data;
-        let pn05Arr = data.datas.find(item => item.dataKey == 'pn05') || []; //降雨
-        let zArr = data.datas.find(item => item.dataKey == 'z') || []; //水深
-        if (pn05Arr) {
-          chartInfo2.value.YAxis = pn05Arr.datas;
-          chartInfo2.value.marklineJYL = pn05Arr.cordonLineList;
-        }
-        if (zArr) {
-          chartInfo2.value.YAxis2 = zArr.datas;
-          chartInfo2.value.marklineSS = zArr.cordonLineList;
-        }
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-        chartInfo2.value.XAxis = data.times;
-        // console.log('chartInfo2123',chartInfo2.value);
-        chartInfo2.value.refresh = Math.random();
-      }
-    },
-    error => {
-      loadingEchart.value = false;
-    }
-  );
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
+
+    chartInfo2.value.refresh = Math.random();
+  },(error)=>{
+    loadingEchart.value=false
+  });
 }
 onMounted(() => {
   console.log('props.Getproperties.id', props.Getproperties);
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index bfae944..366f1c6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -26,7 +26,7 @@
       let params = {
         wellcode,
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
-        id: props.Getproperties.id,
+        id: props.Getproperties.gwMonitorId,
       };
       getSectionByWellCodeDetail(params).then(res => {
         if (res && res.code == 200) {

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 45e2825..4adccc8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -192,7 +192,7 @@
       top: nowSize(50, 1920),
       bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小
       left: nowSize(40, 1920),
-      right: nowSize(10, 1920),
+      right: nowSize(20, 1920),
       containLabel: true,
     },
     xAxis: [
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
index 124fbb9..58327c8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
@@ -53,9 +53,9 @@
         />
       </div>
       </div> -->
-      <div class="ChartHeight" v-loading="loadingEchart" element-loading-background="rgba(11, 18, 52, 0.3)">
-        <MonitoringAnalysisChart
-          v-if="isEchart"
+       <div class="ChartHeight"  v-loading="loadingEchart"
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
           :refresh="chartInfo2.refresh"
           :DataName="chartInfo2.DataName"
           :XAxis="chartInfo2.XAxis"
@@ -63,11 +63,11 @@
           :typeName="chartInfo2.typeName"
           :typeName2="chartInfo2.typeName2"
           :YAxis2="chartInfo2.YAxis2"
-          :marklineJYL="chartInfo2.marklineJYL"
-          :marklineSS="chartInfo2.marklineSS"
-          XnameTop="-480"
-        />
-      </div>
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
+    </div>
     </div>
   </div>
 </template>
@@ -77,7 +77,7 @@
 
 import { siteHistoryMonitorDataAnalysis } from '@/api/FloodControlAndDrainage';
 import { getRELAList, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
+import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
 
@@ -173,20 +173,23 @@
 };
 const chartInfo2 = ref({
   refresh: 1,
-  // DataName: "",
-  XAxis: [],
-  typeName: '5分钟降雨量(mm)',
-  typeName2: '黄海水位(m)',
-  YAxis: [],
-  YAxis2: [],
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
   loading: false,
-  marklineJYL: [],
-  marklineSS: [],
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
 });
-let isEchart = ref(false);
-let loadingEchart = ref(false);
+ let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart() {
-  loadingEchart.value = true;
+ showecharts.value = false;
+ loadingEchart.value=true
   let params = {
     stType: props.Getproperties.stType,
     stCode: Search_form.stCode,
@@ -194,122 +197,24 @@
     end: Search_form.Timers[1],
   };
   console.log('params', params);
-  getEchart(params).then(
-    res => {
-      isEchart.value = true;
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-      let res1 = {
-        code: 200,
-        msg: '操作成功',
-        data: {
-          datas: [
-            {
-              dataKey: 'z',
-              dataName: '黄海水位',
-              unit: '(m)',
-              datas: ['0', '0', '1', '0', '2', '0.5', '0', '0', '0', '0.2'],
-              cordonLineList: [
-                {
-                  id: '1856620587907244131',
-                  cordonId: '1856647503229968394',
-                  lineName: '正常蓄水位',
-                  lineValue: '1.3',
-                  lineType: '2',
-                  lineColor: 'rgba(0, 255, 68, 1)',
-                  systemDefault: '0',
-                  code: 'normal_water_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587932409132',
-                  cordonId: '1856647503229968394',
-                  lineName: '设计洪水位',
-                  lineValue: '1.8',
-                  lineType: '1',
-                  lineColor: 'rgba(221, 255, 0, 1)',
-                  systemDefault: '0',
-                  code: 'design_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604135',
-                  cordonId: '1856647503229968394',
-                  lineName: '校核洪水位',
-                  lineValue: '1.98',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 191, 0, 1)',
-                  systemDefault: '0',
-                  code: 'verify_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604134',
-                  cordonId: '1856647503229968394',
-                  lineName: '坝顶高程',
-                  lineValue: '2.8',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 81, 0, 1)',
-                  systemDefault: '0',
-                  code: 'dam_hight',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-              ],
-            },
-            {
-              dataKey: 'pn05',
-              dataName: '降雨量',
-              unit: 'mm',
-              datas: ['10', '5', '11', '2', '2', '20', '15', '0', '0', '0.2'],
-              cordonLineList: [],
-            },
-          ],
-          times: [
-            '1732291200000',
-            '1732291200000',
-            '1732291800000',
-            '1732292100000',
-            '1732292400000',
-            '1732292700000',
-            '1732293000000',
-            '1732293300000',
-            '1732293600000',
-            '1732293900000',
-          ],
-        },
-      };
-      console.log('监测分析统计res', res);
-      loadingEchart.value = false;
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-      if (res && res.code == 200) {
-        let data = res.data;
-        let pn05Arr = data.datas.find(item => item.dataKey == 'pn05') || []; //降雨
-        let zArr = data.datas.find(item => item.dataKey == 'z') || []; //水深
-        if (pn05Arr) {
-          chartInfo2.value.YAxis = pn05Arr.datas;
-          chartInfo2.value.marklineJYL = pn05Arr.cordonLineList;
-        }
-        if (zArr) {
-          chartInfo2.value.YAxis2 = zArr.datas;
-          chartInfo2.value.marklineSS = zArr.cordonLineList;
-        }
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-        chartInfo2.value.XAxis = data.times;
-        // console.log('chartInfo2123',chartInfo2.value);
-        chartInfo2.value.refresh = Math.random();
-      }
-    },
-    error => {
-      loadingEchart.value = false;
-    }
-  );
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
+
+    chartInfo2.value.refresh = Math.random();
+  },(error)=>{
+    loadingEchart.value=false
+  });
 }
 onMounted(() => {
   console.log('props.Getproperties.id', props.Getproperties);
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index bfae944..366f1c6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -26,7 +26,7 @@
       let params = {
         wellcode,
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
-        id: props.Getproperties.id,
+        id: props.Getproperties.gwMonitorId,
       };
       getSectionByWellCodeDetail(params).then(res => {
         if (res && res.code == 200) {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
index b7b35a2..2dc702a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
@@ -2,32 +2,7 @@
   <!-- 泵站分析 -->
   <div class="jiancefenxiBZ">
     <!-- 泵站目前没有接入  没有监测数据20241126 -->
-    <!-- <div class="dateDatetimerange">
-    <el-date-picker
-      v-model="Timers"
-      type="datetimerange"
-      range-separator="至"
-      :clearable="false"
-      value-format="YYYY-MM-DD HH:mm:ss"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      @change="datetimerangeChange"
-    />
-    </div>
-    <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
-    </div> -->
+
     <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
         <div class="name">所属雨水分区:</div>
@@ -78,7 +53,6 @@
 
 <script setup name="jiancefenxiBZ">
 import { drainageDispatchRainAnalysisByBz, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 45e2825..4adccc8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -192,7 +192,7 @@
       top: nowSize(50, 1920),
       bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小
       left: nowSize(40, 1920),
-      right: nowSize(10, 1920),
+      right: nowSize(20, 1920),
       containLabel: true,
     },
     xAxis: [
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
index 124fbb9..58327c8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
@@ -53,9 +53,9 @@
         />
       </div>
       </div> -->
-      <div class="ChartHeight" v-loading="loadingEchart" element-loading-background="rgba(11, 18, 52, 0.3)">
-        <MonitoringAnalysisChart
-          v-if="isEchart"
+       <div class="ChartHeight"  v-loading="loadingEchart"
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
           :refresh="chartInfo2.refresh"
           :DataName="chartInfo2.DataName"
           :XAxis="chartInfo2.XAxis"
@@ -63,11 +63,11 @@
           :typeName="chartInfo2.typeName"
           :typeName2="chartInfo2.typeName2"
           :YAxis2="chartInfo2.YAxis2"
-          :marklineJYL="chartInfo2.marklineJYL"
-          :marklineSS="chartInfo2.marklineSS"
-          XnameTop="-480"
-        />
-      </div>
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
+    </div>
     </div>
   </div>
 </template>
@@ -77,7 +77,7 @@
 
 import { siteHistoryMonitorDataAnalysis } from '@/api/FloodControlAndDrainage';
 import { getRELAList, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
+import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
 
@@ -173,20 +173,23 @@
 };
 const chartInfo2 = ref({
   refresh: 1,
-  // DataName: "",
-  XAxis: [],
-  typeName: '5分钟降雨量(mm)',
-  typeName2: '黄海水位(m)',
-  YAxis: [],
-  YAxis2: [],
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
   loading: false,
-  marklineJYL: [],
-  marklineSS: [],
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
 });
-let isEchart = ref(false);
-let loadingEchart = ref(false);
+ let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart() {
-  loadingEchart.value = true;
+ showecharts.value = false;
+ loadingEchart.value=true
   let params = {
     stType: props.Getproperties.stType,
     stCode: Search_form.stCode,
@@ -194,122 +197,24 @@
     end: Search_form.Timers[1],
   };
   console.log('params', params);
-  getEchart(params).then(
-    res => {
-      isEchart.value = true;
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-      let res1 = {
-        code: 200,
-        msg: '操作成功',
-        data: {
-          datas: [
-            {
-              dataKey: 'z',
-              dataName: '黄海水位',
-              unit: '(m)',
-              datas: ['0', '0', '1', '0', '2', '0.5', '0', '0', '0', '0.2'],
-              cordonLineList: [
-                {
-                  id: '1856620587907244131',
-                  cordonId: '1856647503229968394',
-                  lineName: '正常蓄水位',
-                  lineValue: '1.3',
-                  lineType: '2',
-                  lineColor: 'rgba(0, 255, 68, 1)',
-                  systemDefault: '0',
-                  code: 'normal_water_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587932409132',
-                  cordonId: '1856647503229968394',
-                  lineName: '设计洪水位',
-                  lineValue: '1.8',
-                  lineType: '1',
-                  lineColor: 'rgba(221, 255, 0, 1)',
-                  systemDefault: '0',
-                  code: 'design_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604135',
-                  cordonId: '1856647503229968394',
-                  lineName: '校核洪水位',
-                  lineValue: '1.98',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 191, 0, 1)',
-                  systemDefault: '0',
-                  code: 'verify_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604134',
-                  cordonId: '1856647503229968394',
-                  lineName: '坝顶高程',
-                  lineValue: '2.8',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 81, 0, 1)',
-                  systemDefault: '0',
-                  code: 'dam_hight',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-              ],
-            },
-            {
-              dataKey: 'pn05',
-              dataName: '降雨量',
-              unit: 'mm',
-              datas: ['10', '5', '11', '2', '2', '20', '15', '0', '0', '0.2'],
-              cordonLineList: [],
-            },
-          ],
-          times: [
-            '1732291200000',
-            '1732291200000',
-            '1732291800000',
-            '1732292100000',
-            '1732292400000',
-            '1732292700000',
-            '1732293000000',
-            '1732293300000',
-            '1732293600000',
-            '1732293900000',
-          ],
-        },
-      };
-      console.log('监测分析统计res', res);
-      loadingEchart.value = false;
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-      if (res && res.code == 200) {
-        let data = res.data;
-        let pn05Arr = data.datas.find(item => item.dataKey == 'pn05') || []; //降雨
-        let zArr = data.datas.find(item => item.dataKey == 'z') || []; //水深
-        if (pn05Arr) {
-          chartInfo2.value.YAxis = pn05Arr.datas;
-          chartInfo2.value.marklineJYL = pn05Arr.cordonLineList;
-        }
-        if (zArr) {
-          chartInfo2.value.YAxis2 = zArr.datas;
-          chartInfo2.value.marklineSS = zArr.cordonLineList;
-        }
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-        chartInfo2.value.XAxis = data.times;
-        // console.log('chartInfo2123',chartInfo2.value);
-        chartInfo2.value.refresh = Math.random();
-      }
-    },
-    error => {
-      loadingEchart.value = false;
-    }
-  );
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
+
+    chartInfo2.value.refresh = Math.random();
+  },(error)=>{
+    loadingEchart.value=false
+  });
 }
 onMounted(() => {
   console.log('props.Getproperties.id', props.Getproperties);
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index bfae944..366f1c6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -26,7 +26,7 @@
       let params = {
         wellcode,
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
-        id: props.Getproperties.id,
+        id: props.Getproperties.gwMonitorId,
       };
       getSectionByWellCodeDetail(params).then(res => {
         if (res && res.code == 200) {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
index b7b35a2..2dc702a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
@@ -2,32 +2,7 @@
   <!-- 泵站分析 -->
   <div class="jiancefenxiBZ">
     <!-- 泵站目前没有接入  没有监测数据20241126 -->
-    <!-- <div class="dateDatetimerange">
-    <el-date-picker
-      v-model="Timers"
-      type="datetimerange"
-      range-separator="至"
-      :clearable="false"
-      value-format="YYYY-MM-DD HH:mm:ss"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      @change="datetimerangeChange"
-    />
-    </div>
-    <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
-    </div> -->
+
     <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
         <div class="name">所属雨水分区:</div>
@@ -78,7 +53,6 @@
 
 <script setup name="jiancefenxiBZ">
 import { drainageDispatchRainAnalysisByBz, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
index 2cc36f6..4f62703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
@@ -14,18 +14,19 @@
     />
     </div>
     <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
+          :refresh="chartInfo2.refresh"
+          :DataName="chartInfo2.DataName"
+          :XAxis="chartInfo2.XAxis"
+          :YAxis="chartInfo2.YAxis"
+          :typeName="chartInfo2.typeName"
+          :typeName2="chartInfo2.typeName2"
+          :YAxis2="chartInfo2.YAxis2"
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
     </div>
     <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
@@ -80,7 +81,6 @@
 import { drainageDispatchRainAnalysisByGwjcd,getEchart } from '@/api/MonitorAssetsOnMap';
 import { Back } from '@element-plus/icons-vue';
 
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
@@ -165,24 +165,27 @@
         }
           return text
 }
-const  chartInfo2=ref({
-        refresh: 1,
-        // DataName: "",
-        XAxis: [
 
-        ],
-        typeName: '5分钟降雨量(mm)',
-        typeName2: '水深(m)',
-        YAxis: [],
-        YAxis2: [],
-        loading: false,
-        marklineJYL:[],
-        marklineSS:[],
-})
-      let isEchart=ref(false)
+const chartInfo2 = ref({
+  refresh: 1,
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
+  loading: false,
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
+});
+  
       let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart(){
-  loadingEchart.value=true
+ showecharts.value = false;
+ loadingEchart.value=true
     let params={
 
       stType:props.Getproperties.stType,
@@ -197,110 +200,26 @@
       end:Timers.value[1],
     }
     console.log('params',params);
-   getEchart(params).then(res => {
-    isEchart.value=true
+    
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-    let res1={
-    "code":200,
-    "msg":"操作成功",
-    "data":{
-        "datas":[
-            {
-                "dataKey":"z",
-                "dataName":"黄海水位",
-                "unit":"(m)",
-                "datas":['0','0','1','0','2','0.5','0','0','0','0.2'],
-                "cordonLineList":[
-                    {
-                        "id":"1856620587907244131",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"正常蓄水位",
-                        "lineValue":"1.3",
-                        "lineType":"2",
-                        "lineColor":"rgba(0, 255, 68, 1)",
-                        "systemDefault":"0",
-                        "code":"normal_water_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587932409132",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"设计洪水位",
-                        "lineValue":"1.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(221, 255, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"design_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604135",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"校核洪水位",
-                        "lineValue":"1.98",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 191, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"verify_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604134",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"坝顶高程",
-                        "lineValue":"2.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 81, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"dam_hight",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    }
-                ]
-            },
-            {
-                "dataKey":"pn05",
-                "dataName":"降雨量",
-                "unit":"mm",
-                "datas":['10','5','11','2','2','20','15','0','0','0.2'],
-                "cordonLineList":[
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-                ]
-            }
-        ],
-        "times":['1732291200000','1732291200000','1732291800000','1732292100000','1732292400000','1732292700000','1732293000000','1732293300000','1732293600000','1732293900000',]
-    }
-}
-    console.log('监测分析统计res',res);
-  loadingEchart.value=false
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-    if (res && res.code == 200) {
-      let data=res.data
-     let pn05Arr= data.datas.find(item => item.dataKey == 'pn05')||[]  //降雨
-     let zArr= data.datas.find(item => item.dataKey == 'z')||[]       //水深
-      if(pn05Arr){
-        chartInfo2.value.YAxis=pn05Arr.datas
-        chartInfo2.value.marklineJYL=pn05Arr.cordonLineList
-      }
-      if(zArr){
-        chartInfo2.value.YAxis2=zArr.datas
-        chartInfo2.value.marklineSS=zArr.cordonLineList
-      }
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
 
-      chartInfo2.value.XAxis=data.times
-      // console.log('chartInfo2123',chartInfo2.value);
     chartInfo2.value.refresh = Math.random();
-    }
-   },(error)=>{
+  },(error)=>{
     loadingEchart.value=false
-  })
+  });
+
 }
 onMounted(() => {
 

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 45e2825..4adccc8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -192,7 +192,7 @@
       top: nowSize(50, 1920),
       bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小
       left: nowSize(40, 1920),
-      right: nowSize(10, 1920),
+      right: nowSize(20, 1920),
       containLabel: true,
     },
     xAxis: [
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
index 124fbb9..58327c8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
@@ -53,9 +53,9 @@
         />
       </div>
       </div> -->
-      <div class="ChartHeight" v-loading="loadingEchart" element-loading-background="rgba(11, 18, 52, 0.3)">
-        <MonitoringAnalysisChart
-          v-if="isEchart"
+       <div class="ChartHeight"  v-loading="loadingEchart"
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
           :refresh="chartInfo2.refresh"
           :DataName="chartInfo2.DataName"
           :XAxis="chartInfo2.XAxis"
@@ -63,11 +63,11 @@
           :typeName="chartInfo2.typeName"
           :typeName2="chartInfo2.typeName2"
           :YAxis2="chartInfo2.YAxis2"
-          :marklineJYL="chartInfo2.marklineJYL"
-          :marklineSS="chartInfo2.marklineSS"
-          XnameTop="-480"
-        />
-      </div>
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
+    </div>
     </div>
   </div>
 </template>
@@ -77,7 +77,7 @@
 
 import { siteHistoryMonitorDataAnalysis } from '@/api/FloodControlAndDrainage';
 import { getRELAList, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
+import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
 
@@ -173,20 +173,23 @@
 };
 const chartInfo2 = ref({
   refresh: 1,
-  // DataName: "",
-  XAxis: [],
-  typeName: '5分钟降雨量(mm)',
-  typeName2: '黄海水位(m)',
-  YAxis: [],
-  YAxis2: [],
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
   loading: false,
-  marklineJYL: [],
-  marklineSS: [],
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
 });
-let isEchart = ref(false);
-let loadingEchart = ref(false);
+ let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart() {
-  loadingEchart.value = true;
+ showecharts.value = false;
+ loadingEchart.value=true
   let params = {
     stType: props.Getproperties.stType,
     stCode: Search_form.stCode,
@@ -194,122 +197,24 @@
     end: Search_form.Timers[1],
   };
   console.log('params', params);
-  getEchart(params).then(
-    res => {
-      isEchart.value = true;
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-      let res1 = {
-        code: 200,
-        msg: '操作成功',
-        data: {
-          datas: [
-            {
-              dataKey: 'z',
-              dataName: '黄海水位',
-              unit: '(m)',
-              datas: ['0', '0', '1', '0', '2', '0.5', '0', '0', '0', '0.2'],
-              cordonLineList: [
-                {
-                  id: '1856620587907244131',
-                  cordonId: '1856647503229968394',
-                  lineName: '正常蓄水位',
-                  lineValue: '1.3',
-                  lineType: '2',
-                  lineColor: 'rgba(0, 255, 68, 1)',
-                  systemDefault: '0',
-                  code: 'normal_water_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587932409132',
-                  cordonId: '1856647503229968394',
-                  lineName: '设计洪水位',
-                  lineValue: '1.8',
-                  lineType: '1',
-                  lineColor: 'rgba(221, 255, 0, 1)',
-                  systemDefault: '0',
-                  code: 'design_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604135',
-                  cordonId: '1856647503229968394',
-                  lineName: '校核洪水位',
-                  lineValue: '1.98',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 191, 0, 1)',
-                  systemDefault: '0',
-                  code: 'verify_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604134',
-                  cordonId: '1856647503229968394',
-                  lineName: '坝顶高程',
-                  lineValue: '2.8',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 81, 0, 1)',
-                  systemDefault: '0',
-                  code: 'dam_hight',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-              ],
-            },
-            {
-              dataKey: 'pn05',
-              dataName: '降雨量',
-              unit: 'mm',
-              datas: ['10', '5', '11', '2', '2', '20', '15', '0', '0', '0.2'],
-              cordonLineList: [],
-            },
-          ],
-          times: [
-            '1732291200000',
-            '1732291200000',
-            '1732291800000',
-            '1732292100000',
-            '1732292400000',
-            '1732292700000',
-            '1732293000000',
-            '1732293300000',
-            '1732293600000',
-            '1732293900000',
-          ],
-        },
-      };
-      console.log('监测分析统计res', res);
-      loadingEchart.value = false;
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-      if (res && res.code == 200) {
-        let data = res.data;
-        let pn05Arr = data.datas.find(item => item.dataKey == 'pn05') || []; //降雨
-        let zArr = data.datas.find(item => item.dataKey == 'z') || []; //水深
-        if (pn05Arr) {
-          chartInfo2.value.YAxis = pn05Arr.datas;
-          chartInfo2.value.marklineJYL = pn05Arr.cordonLineList;
-        }
-        if (zArr) {
-          chartInfo2.value.YAxis2 = zArr.datas;
-          chartInfo2.value.marklineSS = zArr.cordonLineList;
-        }
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-        chartInfo2.value.XAxis = data.times;
-        // console.log('chartInfo2123',chartInfo2.value);
-        chartInfo2.value.refresh = Math.random();
-      }
-    },
-    error => {
-      loadingEchart.value = false;
-    }
-  );
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
+
+    chartInfo2.value.refresh = Math.random();
+  },(error)=>{
+    loadingEchart.value=false
+  });
 }
 onMounted(() => {
   console.log('props.Getproperties.id', props.Getproperties);
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index bfae944..366f1c6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -26,7 +26,7 @@
       let params = {
         wellcode,
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
-        id: props.Getproperties.id,
+        id: props.Getproperties.gwMonitorId,
       };
       getSectionByWellCodeDetail(params).then(res => {
         if (res && res.code == 200) {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
index b7b35a2..2dc702a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
@@ -2,32 +2,7 @@
   <!-- 泵站分析 -->
   <div class="jiancefenxiBZ">
     <!-- 泵站目前没有接入  没有监测数据20241126 -->
-    <!-- <div class="dateDatetimerange">
-    <el-date-picker
-      v-model="Timers"
-      type="datetimerange"
-      range-separator="至"
-      :clearable="false"
-      value-format="YYYY-MM-DD HH:mm:ss"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      @change="datetimerangeChange"
-    />
-    </div>
-    <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
-    </div> -->
+
     <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
         <div class="name">所属雨水分区:</div>
@@ -78,7 +53,6 @@
 
 <script setup name="jiancefenxiBZ">
 import { drainageDispatchRainAnalysisByBz, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
index 2cc36f6..4f62703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
@@ -14,18 +14,19 @@
     />
     </div>
     <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
+          :refresh="chartInfo2.refresh"
+          :DataName="chartInfo2.DataName"
+          :XAxis="chartInfo2.XAxis"
+          :YAxis="chartInfo2.YAxis"
+          :typeName="chartInfo2.typeName"
+          :typeName2="chartInfo2.typeName2"
+          :YAxis2="chartInfo2.YAxis2"
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
     </div>
     <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
@@ -80,7 +81,6 @@
 import { drainageDispatchRainAnalysisByGwjcd,getEchart } from '@/api/MonitorAssetsOnMap';
 import { Back } from '@element-plus/icons-vue';
 
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
@@ -165,24 +165,27 @@
         }
           return text
 }
-const  chartInfo2=ref({
-        refresh: 1,
-        // DataName: "",
-        XAxis: [
 
-        ],
-        typeName: '5分钟降雨量(mm)',
-        typeName2: '水深(m)',
-        YAxis: [],
-        YAxis2: [],
-        loading: false,
-        marklineJYL:[],
-        marklineSS:[],
-})
-      let isEchart=ref(false)
+const chartInfo2 = ref({
+  refresh: 1,
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
+  loading: false,
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
+});
+  
       let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart(){
-  loadingEchart.value=true
+ showecharts.value = false;
+ loadingEchart.value=true
     let params={
 
       stType:props.Getproperties.stType,
@@ -197,110 +200,26 @@
       end:Timers.value[1],
     }
     console.log('params',params);
-   getEchart(params).then(res => {
-    isEchart.value=true
+    
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-    let res1={
-    "code":200,
-    "msg":"操作成功",
-    "data":{
-        "datas":[
-            {
-                "dataKey":"z",
-                "dataName":"黄海水位",
-                "unit":"(m)",
-                "datas":['0','0','1','0','2','0.5','0','0','0','0.2'],
-                "cordonLineList":[
-                    {
-                        "id":"1856620587907244131",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"正常蓄水位",
-                        "lineValue":"1.3",
-                        "lineType":"2",
-                        "lineColor":"rgba(0, 255, 68, 1)",
-                        "systemDefault":"0",
-                        "code":"normal_water_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587932409132",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"设计洪水位",
-                        "lineValue":"1.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(221, 255, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"design_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604135",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"校核洪水位",
-                        "lineValue":"1.98",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 191, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"verify_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604134",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"坝顶高程",
-                        "lineValue":"2.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 81, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"dam_hight",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    }
-                ]
-            },
-            {
-                "dataKey":"pn05",
-                "dataName":"降雨量",
-                "unit":"mm",
-                "datas":['10','5','11','2','2','20','15','0','0','0.2'],
-                "cordonLineList":[
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-                ]
-            }
-        ],
-        "times":['1732291200000','1732291200000','1732291800000','1732292100000','1732292400000','1732292700000','1732293000000','1732293300000','1732293600000','1732293900000',]
-    }
-}
-    console.log('监测分析统计res',res);
-  loadingEchart.value=false
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-    if (res && res.code == 200) {
-      let data=res.data
-     let pn05Arr= data.datas.find(item => item.dataKey == 'pn05')||[]  //降雨
-     let zArr= data.datas.find(item => item.dataKey == 'z')||[]       //水深
-      if(pn05Arr){
-        chartInfo2.value.YAxis=pn05Arr.datas
-        chartInfo2.value.marklineJYL=pn05Arr.cordonLineList
-      }
-      if(zArr){
-        chartInfo2.value.YAxis2=zArr.datas
-        chartInfo2.value.marklineSS=zArr.cordonLineList
-      }
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
 
-      chartInfo2.value.XAxis=data.times
-      // console.log('chartInfo2123',chartInfo2.value);
     chartInfo2.value.refresh = Math.random();
-    }
-   },(error)=>{
+  },(error)=>{
     loadingEchart.value=false
-  })
+  });
+
 }
 onMounted(() => {
 
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
index ff25389..9887c89 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
@@ -14,18 +14,19 @@
     />
     </div>
     <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
+          :refresh="chartInfo2.refresh"
+          :DataName="chartInfo2.DataName"
+          :XAxis="chartInfo2.XAxis"
+          :YAxis="chartInfo2.YAxis"
+          :typeName="chartInfo2.typeName"
+          :typeName2="chartInfo2.typeName2"
+          :YAxis2="chartInfo2.YAxis2"
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
     </div>
         <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
@@ -80,7 +81,6 @@
 import { drainageDispatchRainAnalysisByZsjcd,getEchart } from '@/api/MonitorAssetsOnMap';
 import { Back } from '@element-plus/icons-vue';
 
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
@@ -167,24 +167,26 @@
         }
           return text
 }
-const  chartInfo2=ref({
-        refresh: 1,
-        // DataName: "",
-        XAxis: [
+const chartInfo2 = ref({
+  refresh: 1,
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
+  loading: false,
+  yAxisarr: [
 
-        ],
-        typeName: '5分钟降雨量(mm)',
-        typeName2: '水深(m)',
-        YAxis: [],
-        YAxis2: [],
-        loading: false,
-        marklineJYL:[],
-        marklineSS:[],
-})
-      let isEchart=ref(false)
+  ],
+  marklinearr: [
+
+  ],
+});
+  
       let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart(){
-  loadingEchart.value=true
+ showecharts.value = false;
+ loadingEchart.value=true
     let params={
 
       stType:props.Getproperties.stType,
@@ -198,110 +200,26 @@
       end:Timers.value[1],
     }
     console.log('params',params);
-   getEchart(params).then(res => {
-    isEchart.value=true
+    
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-    let res1={
-    "code":200,
-    "msg":"操作成功",
-    "data":{
-        "datas":[
-            {
-                "dataKey":"z",
-                "dataName":"黄海水位",
-                "unit":"(m)",
-                "datas":['0','0','1','0','2','0.5','0','0','0','0.2'],
-                "cordonLineList":[
-                    {
-                        "id":"1856620587907244131",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"正常蓄水位",
-                        "lineValue":"1.3",
-                        "lineType":"2",
-                        "lineColor":"rgba(0, 255, 68, 1)",
-                        "systemDefault":"0",
-                        "code":"normal_water_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587932409132",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"设计洪水位",
-                        "lineValue":"1.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(221, 255, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"design_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604135",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"校核洪水位",
-                        "lineValue":"1.98",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 191, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"verify_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604134",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"坝顶高程",
-                        "lineValue":"2.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 81, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"dam_hight",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    }
-                ]
-            },
-            {
-                "dataKey":"pn05",
-                "dataName":"降雨量",
-                "unit":"mm",
-                "datas":['10','5','11','2','2','20','15','0','0','0.2'],
-                "cordonLineList":[
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-                ]
-            }
-        ],
-        "times":['1732291200000','1732291200000','1732291800000','1732292100000','1732292400000','1732292700000','1732293000000','1732293300000','1732293600000','1732293900000',]
-    }
-}
-    console.log('监测分析统计res',res);
-  loadingEchart.value=false
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-    if (res && res.code == 200) {
-      let data=res.data
-     let pn05Arr= data.datas.find(item => item.dataKey == 'pn05')||[]  //降雨
-     let zArr= data.datas.find(item => item.dataKey == 'z')||[]       //水深
-      if(pn05Arr){
-        chartInfo2.value.YAxis=pn05Arr.datas
-        chartInfo2.value.marklineJYL=pn05Arr.cordonLineList
-      }
-      if(zArr){
-        chartInfo2.value.YAxis2=zArr.datas
-        chartInfo2.value.marklineSS=zArr.cordonLineList
-      }
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
 
-      chartInfo2.value.XAxis=data.times
-      // console.log('chartInfo2123',chartInfo2.value);
     chartInfo2.value.refresh = Math.random();
-    }
-   },(error)=>{
+  },(error)=>{
     loadingEchart.value=false
-  })
+  });
+
 }
 onMounted(() => {
 

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index b09c9df..52091a4 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -364,6 +364,14 @@
     method: 'get',
   });
 }
+// 查询基础数据-水系汇水分区详情
+export function lakeInfoGetWaterRegion(query) {
+  return request({
+    url: `/business/lakeInfo/getWaterRegion`,
+    method: 'get',
+    params: query,
+  });
+}
 // 查询河湖水情 有哪些泵站
 export function rainWaterPumpStationInfoList(query) {
   return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e2292f1..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -466,14 +466,15 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
   Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
   Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
index 2b9dcc6..8d74108 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue
@@ -219,6 +219,8 @@
   if(num==2){
     item.stType="rainwater_pipeline_quality"
     item.dataCode="pipePoint"
+    item.gwMonitorId=item.id
+
     item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`]
     _bus.emit("DynamicBus", item);
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 45e2825..4adccc8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -192,7 +192,7 @@
       top: nowSize(50, 1920),
       bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小
       left: nowSize(40, 1920),
-      right: nowSize(10, 1920),
+      right: nowSize(20, 1920),
       containLabel: true,
     },
     xAxis: [
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
index 124fbb9..58327c8 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue
@@ -53,9 +53,9 @@
         />
       </div>
       </div> -->
-      <div class="ChartHeight" v-loading="loadingEchart" element-loading-background="rgba(11, 18, 52, 0.3)">
-        <MonitoringAnalysisChart
-          v-if="isEchart"
+       <div class="ChartHeight"  v-loading="loadingEchart"
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
           :refresh="chartInfo2.refresh"
           :DataName="chartInfo2.DataName"
           :XAxis="chartInfo2.XAxis"
@@ -63,11 +63,11 @@
           :typeName="chartInfo2.typeName"
           :typeName2="chartInfo2.typeName2"
           :YAxis2="chartInfo2.YAxis2"
-          :marklineJYL="chartInfo2.marklineJYL"
-          :marklineSS="chartInfo2.marklineSS"
-          XnameTop="-480"
-        />
-      </div>
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
+    </div>
     </div>
   </div>
 </template>
@@ -77,7 +77,7 @@
 
 import { siteHistoryMonitorDataAnalysis } from '@/api/FloodControlAndDrainage';
 import { getRELAList, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
+import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
 
@@ -173,20 +173,23 @@
 };
 const chartInfo2 = ref({
   refresh: 1,
-  // DataName: "",
-  XAxis: [],
-  typeName: '5分钟降雨量(mm)',
-  typeName2: '黄海水位(m)',
-  YAxis: [],
-  YAxis2: [],
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
   loading: false,
-  marklineJYL: [],
-  marklineSS: [],
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
 });
-let isEchart = ref(false);
-let loadingEchart = ref(false);
+ let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart() {
-  loadingEchart.value = true;
+ showecharts.value = false;
+ loadingEchart.value=true
   let params = {
     stType: props.Getproperties.stType,
     stCode: Search_form.stCode,
@@ -194,122 +197,24 @@
     end: Search_form.Timers[1],
   };
   console.log('params', params);
-  getEchart(params).then(
-    res => {
-      isEchart.value = true;
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-      let res1 = {
-        code: 200,
-        msg: '操作成功',
-        data: {
-          datas: [
-            {
-              dataKey: 'z',
-              dataName: '黄海水位',
-              unit: '(m)',
-              datas: ['0', '0', '1', '0', '2', '0.5', '0', '0', '0', '0.2'],
-              cordonLineList: [
-                {
-                  id: '1856620587907244131',
-                  cordonId: '1856647503229968394',
-                  lineName: '正常蓄水位',
-                  lineValue: '1.3',
-                  lineType: '2',
-                  lineColor: 'rgba(0, 255, 68, 1)',
-                  systemDefault: '0',
-                  code: 'normal_water_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587932409132',
-                  cordonId: '1856647503229968394',
-                  lineName: '设计洪水位',
-                  lineValue: '1.8',
-                  lineType: '1',
-                  lineColor: 'rgba(221, 255, 0, 1)',
-                  systemDefault: '0',
-                  code: 'design_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604135',
-                  cordonId: '1856647503229968394',
-                  lineName: '校核洪水位',
-                  lineValue: '1.98',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 191, 0, 1)',
-                  systemDefault: '0',
-                  code: 'verify_flood_level',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-                {
-                  id: '1856620587936604134',
-                  cordonId: '1856647503229968394',
-                  lineName: '坝顶高程',
-                  lineValue: '2.8',
-                  lineType: '1',
-                  lineColor: 'rgba(255, 81, 0, 1)',
-                  systemDefault: '0',
-                  code: 'dam_hight',
-                  stConfig: 'z',
-                  calcType: '2',
-                  relateRainSiteSt: '4201110002',
-                },
-              ],
-            },
-            {
-              dataKey: 'pn05',
-              dataName: '降雨量',
-              unit: 'mm',
-              datas: ['10', '5', '11', '2', '2', '20', '15', '0', '0', '0.2'],
-              cordonLineList: [],
-            },
-          ],
-          times: [
-            '1732291200000',
-            '1732291200000',
-            '1732291800000',
-            '1732292100000',
-            '1732292400000',
-            '1732292700000',
-            '1732293000000',
-            '1732293300000',
-            '1732293600000',
-            '1732293900000',
-          ],
-        },
-      };
-      console.log('监测分析统计res', res);
-      loadingEchart.value = false;
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-      if (res && res.code == 200) {
-        let data = res.data;
-        let pn05Arr = data.datas.find(item => item.dataKey == 'pn05') || []; //降雨
-        let zArr = data.datas.find(item => item.dataKey == 'z') || []; //水深
-        if (pn05Arr) {
-          chartInfo2.value.YAxis = pn05Arr.datas;
-          chartInfo2.value.marklineJYL = pn05Arr.cordonLineList;
-        }
-        if (zArr) {
-          chartInfo2.value.YAxis2 = zArr.datas;
-          chartInfo2.value.marklineSS = zArr.cordonLineList;
-        }
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-        chartInfo2.value.XAxis = data.times;
-        // console.log('chartInfo2123',chartInfo2.value);
-        chartInfo2.value.refresh = Math.random();
-      }
-    },
-    error => {
-      loadingEchart.value = false;
-    }
-  );
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
+
+    chartInfo2.value.refresh = Math.random();
+  },(error)=>{
+    loadingEchart.value=false
+  });
 }
 onMounted(() => {
   console.log('props.Getproperties.id', props.Getproperties);
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index bfae944..366f1c6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -26,7 +26,7 @@
       let params = {
         wellcode,
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
-        id: props.Getproperties.id,
+        id: props.Getproperties.gwMonitorId,
       };
       getSectionByWellCodeDetail(params).then(res => {
         if (res && res.code == 200) {
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
index b7b35a2..2dc702a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiBZ.vue
@@ -2,32 +2,7 @@
   <!-- 泵站分析 -->
   <div class="jiancefenxiBZ">
     <!-- 泵站目前没有接入  没有监测数据20241126 -->
-    <!-- <div class="dateDatetimerange">
-    <el-date-picker
-      v-model="Timers"
-      type="datetimerange"
-      range-separator="至"
-      :clearable="false"
-      value-format="YYYY-MM-DD HH:mm:ss"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      @change="datetimerangeChange"
-    />
-    </div>
-    <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
-    </div> -->
+
     <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
         <div class="name">所属雨水分区:</div>
@@ -78,7 +53,6 @@
 
 <script setup name="jiancefenxiBZ">
 import { drainageDispatchRainAnalysisByBz, getEchart } from '@/api/MonitorAssetsOnMap';
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
index 2cc36f6..4f62703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
@@ -14,18 +14,19 @@
     />
     </div>
     <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
+          :refresh="chartInfo2.refresh"
+          :DataName="chartInfo2.DataName"
+          :XAxis="chartInfo2.XAxis"
+          :YAxis="chartInfo2.YAxis"
+          :typeName="chartInfo2.typeName"
+          :typeName2="chartInfo2.typeName2"
+          :YAxis2="chartInfo2.YAxis2"
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
     </div>
     <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
@@ -80,7 +81,6 @@
 import { drainageDispatchRainAnalysisByGwjcd,getEchart } from '@/api/MonitorAssetsOnMap';
 import { Back } from '@element-plus/icons-vue';
 
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
@@ -165,24 +165,27 @@
         }
           return text
 }
-const  chartInfo2=ref({
-        refresh: 1,
-        // DataName: "",
-        XAxis: [
 
-        ],
-        typeName: '5分钟降雨量(mm)',
-        typeName2: '水深(m)',
-        YAxis: [],
-        YAxis2: [],
-        loading: false,
-        marklineJYL:[],
-        marklineSS:[],
-})
-      let isEchart=ref(false)
+const chartInfo2 = ref({
+  refresh: 1,
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
+  loading: false,
+  yAxisarr: [
+
+  ],
+  marklinearr: [
+
+  ],
+});
+  
       let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart(){
-  loadingEchart.value=true
+ showecharts.value = false;
+ loadingEchart.value=true
     let params={
 
       stType:props.Getproperties.stType,
@@ -197,110 +200,26 @@
       end:Timers.value[1],
     }
     console.log('params',params);
-   getEchart(params).then(res => {
-    isEchart.value=true
+    
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-    let res1={
-    "code":200,
-    "msg":"操作成功",
-    "data":{
-        "datas":[
-            {
-                "dataKey":"z",
-                "dataName":"黄海水位",
-                "unit":"(m)",
-                "datas":['0','0','1','0','2','0.5','0','0','0','0.2'],
-                "cordonLineList":[
-                    {
-                        "id":"1856620587907244131",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"正常蓄水位",
-                        "lineValue":"1.3",
-                        "lineType":"2",
-                        "lineColor":"rgba(0, 255, 68, 1)",
-                        "systemDefault":"0",
-                        "code":"normal_water_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587932409132",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"设计洪水位",
-                        "lineValue":"1.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(221, 255, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"design_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604135",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"校核洪水位",
-                        "lineValue":"1.98",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 191, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"verify_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604134",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"坝顶高程",
-                        "lineValue":"2.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 81, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"dam_hight",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    }
-                ]
-            },
-            {
-                "dataKey":"pn05",
-                "dataName":"降雨量",
-                "unit":"mm",
-                "datas":['10','5','11','2','2','20','15','0','0','0.2'],
-                "cordonLineList":[
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-                ]
-            }
-        ],
-        "times":['1732291200000','1732291200000','1732291800000','1732292100000','1732292400000','1732292700000','1732293000000','1732293300000','1732293600000','1732293900000',]
-    }
-}
-    console.log('监测分析统计res',res);
-  loadingEchart.value=false
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-    if (res && res.code == 200) {
-      let data=res.data
-     let pn05Arr= data.datas.find(item => item.dataKey == 'pn05')||[]  //降雨
-     let zArr= data.datas.find(item => item.dataKey == 'z')||[]       //水深
-      if(pn05Arr){
-        chartInfo2.value.YAxis=pn05Arr.datas
-        chartInfo2.value.marklineJYL=pn05Arr.cordonLineList
-      }
-      if(zArr){
-        chartInfo2.value.YAxis2=zArr.datas
-        chartInfo2.value.marklineSS=zArr.cordonLineList
-      }
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
 
-      chartInfo2.value.XAxis=data.times
-      // console.log('chartInfo2123',chartInfo2.value);
     chartInfo2.value.refresh = Math.random();
-    }
-   },(error)=>{
+  },(error)=>{
     loadingEchart.value=false
-  })
+  });
+
 }
 onMounted(() => {
 
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
index ff25389..9887c89 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
@@ -14,18 +14,19 @@
     />
     </div>
     <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-      <MonitoringAnalysisChart  v-if="isEchart" :refresh="chartInfo2.refresh"
-                          :DataName="chartInfo2.DataName"
-                          :XAxis="chartInfo2.XAxis"
-                          :YAxis="chartInfo2.YAxis"
-                          :typeName="chartInfo2.typeName"
-                          :typeName2="chartInfo2.typeName2"
-                          :YAxis2="chartInfo2.YAxis2"
-                          :marklineJYL="chartInfo2.marklineJYL"
-                          :marklineSS="chartInfo2.marklineSS"
-                          
-                          />
+    element-loading-background="rgba(11, 18, 52, 0.3)" >
+                                  <shuikujianceEcharts v-if="showecharts"
+          :refresh="chartInfo2.refresh"
+          :DataName="chartInfo2.DataName"
+          :XAxis="chartInfo2.XAxis"
+          :YAxis="chartInfo2.YAxis"
+          :typeName="chartInfo2.typeName"
+          :typeName2="chartInfo2.typeName2"
+          :YAxis2="chartInfo2.YAxis2"
+          :YAxis3="chartInfo2.YAxis3"
+          :yAxisarr="chartInfo2.yAxisarr"
+        >
+        </shuikujianceEcharts>
     </div>
         <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
@@ -80,7 +81,6 @@
 import { drainageDispatchRainAnalysisByZsjcd,getEchart } from '@/api/MonitorAssetsOnMap';
 import { Back } from '@element-plus/icons-vue';
 
-import MonitoringAnalysisChart from './MonitoringAnalysisChart.vue';
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
 
 import moment from 'moment';
@@ -167,24 +167,26 @@
         }
           return text
 }
-const  chartInfo2=ref({
-        refresh: 1,
-        // DataName: "",
-        XAxis: [
+const chartInfo2 = ref({
+  refresh: 1,
+  DataName: '',
+  XAxis: ['1:00', '3:00', '5:00', '7:00', '9:00', '11:00', '13:00', '15:00', '17:00'],
+  typeName: '降雨量',
+  YAxis: [0, 1, 6, 3, 4],
+  loading: false,
+  yAxisarr: [
 
-        ],
-        typeName: '5分钟降雨量(mm)',
-        typeName2: '水深(m)',
-        YAxis: [],
-        YAxis2: [],
-        loading: false,
-        marklineJYL:[],
-        marklineSS:[],
-})
-      let isEchart=ref(false)
+  ],
+  marklinearr: [
+
+  ],
+});
+  
       let loadingEchart=ref(false)
+      const showecharts = ref(false);
 function getDataEchart(){
-  loadingEchart.value=true
+ showecharts.value = false;
+ loadingEchart.value=true
     let params={
 
       stType:props.Getproperties.stType,
@@ -198,110 +200,26 @@
       end:Timers.value[1],
     }
     console.log('params',params);
-   getEchart(params).then(res => {
-    isEchart.value=true
+    
+  getEchart(params).then(res => {
+    showecharts.value = true;
+ loadingEchart.value=false
 
-    let res1={
-    "code":200,
-    "msg":"操作成功",
-    "data":{
-        "datas":[
-            {
-                "dataKey":"z",
-                "dataName":"黄海水位",
-                "unit":"(m)",
-                "datas":['0','0','1','0','2','0.5','0','0','0','0.2'],
-                "cordonLineList":[
-                    {
-                        "id":"1856620587907244131",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"正常蓄水位",
-                        "lineValue":"1.3",
-                        "lineType":"2",
-                        "lineColor":"rgba(0, 255, 68, 1)",
-                        "systemDefault":"0",
-                        "code":"normal_water_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587932409132",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"设计洪水位",
-                        "lineValue":"1.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(221, 255, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"design_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604135",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"校核洪水位",
-                        "lineValue":"1.98",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 191, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"verify_flood_level",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    },
-                    {
-                        "id":"1856620587936604134",
-                        "cordonId":"1856647503229968394",
-                        "lineName":"坝顶高程",
-                        "lineValue":"2.8",
-                        "lineType":"1",
-                        "lineColor":"rgba(255, 81, 0, 1)",
-                        "systemDefault":"0",
-                        "code":"dam_hight",
-                        "stConfig":"z",
-                        "calcType":"2",
-                        "relateRainSiteSt":"4201110002"
-                    }
-                ]
-            },
-            {
-                "dataKey":"pn05",
-                "dataName":"降雨量",
-                "unit":"mm",
-                "datas":['10','5','11','2','2','20','15','0','0','0.2'],
-                "cordonLineList":[
+    console.log(res.data);
+    chartInfo2.value.XAxis = res.data.times;
+    chartInfo2.value.yAxisarr = res.data.datas;
 
-                ]
-            }
-        ],
-        "times":['1732291200000','1732291200000','1732291800000','1732292100000','1732292400000','1732292700000','1732293000000','1732293300000','1732293600000','1732293900000',]
-    }
-}
-    console.log('监测分析统计res',res);
-  loadingEchart.value=false
+    res.data.datas.map(item => {
+      chartInfo2.value.marklinearr.push(...item.cordonLineList);
+    });
 
-    if (res && res.code == 200) {
-      let data=res.data
-     let pn05Arr= data.datas.find(item => item.dataKey == 'pn05')||[]  //降雨
-     let zArr= data.datas.find(item => item.dataKey == 'z')||[]       //水深
-      if(pn05Arr){
-        chartInfo2.value.YAxis=pn05Arr.datas
-        chartInfo2.value.marklineJYL=pn05Arr.cordonLineList
-      }
-      if(zArr){
-        chartInfo2.value.YAxis2=zArr.datas
-        chartInfo2.value.marklineSS=zArr.cordonLineList
-      }
+    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
 
-      chartInfo2.value.XAxis=data.times
-      // console.log('chartInfo2123',chartInfo2.value);
     chartInfo2.value.refresh = Math.random();
-    }
-   },(error)=>{
+  },(error)=>{
     loadingEchart.value=false
-  })
+  });
+
 }
 onMounted(() => {
 
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue
index eb989bc..b480c61 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue
@@ -34,6 +34,7 @@
 const { proxy } = getCurrentInstance();
 import {
   waterRegionInfo,
+  lakeInfoGetWaterRegion
 } from '@/api/FloodControlAndDrainage.js';
 const props = defineProps({
   // 数据id