diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 7d974f4..8a23003 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -192,8 +192,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="lonLat">
-              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />

diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 7d974f4..8a23003 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -192,8 +192,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="lonLat">
-              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index a0ce88f..b34cc61 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);

diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 7d974f4..8a23003 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -192,8 +192,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="lonLat">
-              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index a0ce88f..b34cc61 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 9cc5b48..7c3f9b5 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -69,25 +69,36 @@
     let WSCLCDataList = resWSCLC.data;
     WSCLC = this.getGeojsonData(WSCLCDataList); //污水处理厂
     wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围
-    let waterLogingRes = await waterloggingPointList();
+
+    // 获取内涝点数据
+    // let waterLogingRes = await waterloggingPointList();
+    let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' });
     if (waterLogingRes && waterLogingRes.code == 200) {
       waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点
     }
+
+    // 管网监测点数据 测试用
+    let pipeRes = await getStationList({ monitorTargetType: 'pipeline' });
+    if (pipeRes && pipeRes.code == 200) {
+      pipeMonitorData = this.getGeojsonData(pipeRes.data); //内涝点
+    }
+    // pipeMonitorData = this.getGeojsonData([
+    //   {
+    //     projectNo: 'JZGW02',
+    //     projectName: '汴京路管网监测点',
+    //     stCode: '2109600028',
+    //     stName: '汴京路管网监测点',
+    //     lonlat: '114.3141225,34.79221',
+    //   },
+    // ]);
+
+    // 海绵设施
     let params = {};
     let projectStationRes = await queryProjectStation(params);
     if (projectStationRes && projectStationRes.code == 200) {
       projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施
     }
-    // 管网监测点 测试用
-    pipeMonitorData = this.getGeojsonData([
-      {
-        projectNo: 'JZGW02',
-        projectName: '汴京路管网监测点',
-        stCode: '2109600028',
-        stName: '汴京路管网监测点',
-        lonlat: '114.3141225,34.79221',
-      },
-    ]);
+
     //发送图例
     legendDataList = this.legendData();
     bus.emit('cesiumLegendDataList', legendDataList);

diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 7d974f4..8a23003 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -192,8 +192,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="lonLat">
-              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index a0ce88f..b34cc61 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 9cc5b48..7c3f9b5 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -69,25 +69,36 @@
     let WSCLCDataList = resWSCLC.data;
     WSCLC = this.getGeojsonData(WSCLCDataList); //污水处理厂
     wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围
-    let waterLogingRes = await waterloggingPointList();
+
+    // 获取内涝点数据
+    // let waterLogingRes = await waterloggingPointList();
+    let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' });
     if (waterLogingRes && waterLogingRes.code == 200) {
       waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点
     }
+
+    // 管网监测点数据 测试用
+    let pipeRes = await getStationList({ monitorTargetType: 'pipeline' });
+    if (pipeRes && pipeRes.code == 200) {
+      pipeMonitorData = this.getGeojsonData(pipeRes.data); //内涝点
+    }
+    // pipeMonitorData = this.getGeojsonData([
+    //   {
+    //     projectNo: 'JZGW02',
+    //     projectName: '汴京路管网监测点',
+    //     stCode: '2109600028',
+    //     stName: '汴京路管网监测点',
+    //     lonlat: '114.3141225,34.79221',
+    //   },
+    // ]);
+
+    // 海绵设施
     let params = {};
     let projectStationRes = await queryProjectStation(params);
     if (projectStationRes && projectStationRes.code == 200) {
       projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施
     }
-    // 管网监测点 测试用
-    pipeMonitorData = this.getGeojsonData([
-      {
-        projectNo: 'JZGW02',
-        projectName: '汴京路管网监测点',
-        stCode: '2109600028',
-        stName: '汴京路管网监测点',
-        lonlat: '114.3141225,34.79221',
-      },
-    ]);
+
     //发送图例
     legendDataList = this.legendData();
     bus.emit('cesiumLegendDataList', legendDataList);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 66f77a6..e775208 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -82,18 +82,19 @@
         <div class="flex flex-start">
           <div>
             <el-date-picker
-              v-model="allData.dateTime"
+              v-model="allData.dateTimeJSD"
               type="daterange"
               value-format="YYYY-MM-DD"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              :clearable="false"
               size="small"
               style="width: 240px; margin-right: 10px"
             />
           </div>
           <el-button type="primary" size="small" @click="changeDateJSD">搜索</el-button>
         </div>
-        <div id="chartHistoryJSD"></div>
+        <div id="chartHistoryJSD" v-loading="jsdLoading"></div>
       </div>
     </div>
 
@@ -114,7 +115,7 @@
     <div class="basicInfo" v-if="allData.dataList.siteType == 'rain'">
       <div class="mt-10">
         <el-date-picker
-          v-model="allData.dateTime"
+          v-model="allData.dateTimeRain"
           type="daterange"
           value-format="YYYY-MM-DD"
           start-placeholder="开始时间"
@@ -122,6 +123,7 @@
           size="small"
           style="width: 200px"
           @change="changeDate"
+          :clearable="false"
         />
         <el-select v-model="selectCode" style="margin: -7px 0px 0px 10px; width: 150px" size="small" @change="changeRainType">
           <el-option v-for="item in dataOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -158,7 +160,8 @@
 const allData = reactive({
   dataList: {},
   popupShow: false,
-  dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeJSD: [proxy.moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeRain: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
 });
 const dataOption = ref([]);
 const selectData = ref([]);
@@ -167,6 +170,7 @@
 const unitName = ref('');
 const propertyMonitorXList = ref([]);
 const realRiverVal = ref(0);
+const jsdLoading = ref(true);
 
 //
 function closePopupCES() {
@@ -184,26 +188,39 @@
 // 积水点
 let chartJSD = null;
 function changeDateJSD() {
-  setTimeout(() => {
-    if (!!chartJSD) chartJSD.dispose();
+  if (!!chartJSD) chartJSD.dispose();
+  setTimeout(async () => {
     chartJSD = echarts.init(document.getElementById('chartHistoryJSD'));
-    chartOption.popupRainTrend.legend.data = ['水深'];
-    chartOption.popupRainTrend.yAxis.name = 'm';
-    chartOption.popupRainTrend.xAxis.data = ['2024-07-12 12:30:20', '2024-07-12 13:30:20', '2024-07-12 14:30:20', '2024-07-12 15:30:20'];
-    chartOption.popupRainTrend.xAxis.boundaryGap = true;
-    chartOption.popupRainTrend.series.name = '水深';
-    chartOption.popupRainTrend.series.barWidth = 10;
-    chartOption.popupRainTrend.series.data = [0.23, 0.3, 0.25, 0.18];
-    // 设置鼠标滚轮放大缩小展示数据区间
-    // chartOption.popupRainTrend.dataZoom = [{ type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }];
-    // if (propertyMonitorXList.value.length > 0) {
-    //   chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    // } else {
-    //   chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
-    // }
-    chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    chartJSD.clear();
-    chartJSD.setOption(chartOption.popupRainTrend);
+    let params = {
+      startTime: allData.dateTimeJSD[0],
+      endTime: allData.dateTimeJSD[1],
+      stCode: allData.dataList['stCode'],
+    };
+    jsdLoading.value = true;
+    let res = await graphicReport(params);
+    if (res && res.code == 200) {
+      let datas = res.data;
+      chartOption.popupRainTrend.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+      chartOption.popupRainTrend.yAxis.name = datas.propertyMonitorList[0].propertyUnit; //单位
+      chartOption.popupRainTrend.xAxis.data = datas.propertyMonitorXList;
+      chartOption.popupRainTrend.xAxis.boundaryGap = true;
+      chartOption.popupRainTrend.series.name = datas.propertyMonitorList[0].monitorPropertyName;
+      chartOption.popupRainTrend.series.barWidth = 3;
+      chartOption.popupRainTrend.series.data = datas.propertyMonitorList[0].ylist;
+      // 设置鼠标滚轮放大缩小展示数据区间
+      chartOption.popupRainTrend.dataZoom = [
+        { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length - 48] },
+      ];
+      if (datas.propertyMonitorXList > 0) {
+        chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      } else {
+        chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
+      }
+      chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      chartJSD.clear();
+      chartJSD.setOption(chartOption.popupRainTrend);
+      jsdLoading.value = false;
+    }
   });
 }
 
@@ -285,11 +302,11 @@
   selectData.value = obj.ylist;
   initEchartsPopup();
 };
-//获取监测数据
+//获取雨量站监测数据
 const getSuperViseData = async () => {
   let params = {
-    startTime: allData.dateTime[0],
-    endTime: allData.dateTime[1],
+    startTime: allData.dateTimeRain[0],
+    endTime: allData.dateTimeRain[1],
     stCode: allData.dataList['stCode'],
   };
   dataOption.value = [];
@@ -373,7 +390,10 @@
     allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
     if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
-    if (allData.dataList.type == 'waterLoging') changeDateJSD(); //内涝积水点
+    //内涝积水点
+    if (allData.dataList.type == 'waterLoging') {
+      changeDateJSD();
+    }
   });
 });
 onBeforeUnmount(() => {

diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 7d974f4..8a23003 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -192,8 +192,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="lonLat">
-              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index a0ce88f..b34cc61 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 9cc5b48..7c3f9b5 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -69,25 +69,36 @@
     let WSCLCDataList = resWSCLC.data;
     WSCLC = this.getGeojsonData(WSCLCDataList); //污水处理厂
     wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围
-    let waterLogingRes = await waterloggingPointList();
+
+    // 获取内涝点数据
+    // let waterLogingRes = await waterloggingPointList();
+    let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' });
     if (waterLogingRes && waterLogingRes.code == 200) {
       waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点
     }
+
+    // 管网监测点数据 测试用
+    let pipeRes = await getStationList({ monitorTargetType: 'pipeline' });
+    if (pipeRes && pipeRes.code == 200) {
+      pipeMonitorData = this.getGeojsonData(pipeRes.data); //内涝点
+    }
+    // pipeMonitorData = this.getGeojsonData([
+    //   {
+    //     projectNo: 'JZGW02',
+    //     projectName: '汴京路管网监测点',
+    //     stCode: '2109600028',
+    //     stName: '汴京路管网监测点',
+    //     lonlat: '114.3141225,34.79221',
+    //   },
+    // ]);
+
+    // 海绵设施
     let params = {};
     let projectStationRes = await queryProjectStation(params);
     if (projectStationRes && projectStationRes.code == 200) {
       projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施
     }
-    // 管网监测点 测试用
-    pipeMonitorData = this.getGeojsonData([
-      {
-        projectNo: 'JZGW02',
-        projectName: '汴京路管网监测点',
-        stCode: '2109600028',
-        stName: '汴京路管网监测点',
-        lonlat: '114.3141225,34.79221',
-      },
-    ]);
+
     //发送图例
     legendDataList = this.legendData();
     bus.emit('cesiumLegendDataList', legendDataList);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 66f77a6..e775208 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -82,18 +82,19 @@
         <div class="flex flex-start">
           <div>
             <el-date-picker
-              v-model="allData.dateTime"
+              v-model="allData.dateTimeJSD"
               type="daterange"
               value-format="YYYY-MM-DD"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              :clearable="false"
               size="small"
               style="width: 240px; margin-right: 10px"
             />
           </div>
           <el-button type="primary" size="small" @click="changeDateJSD">搜索</el-button>
         </div>
-        <div id="chartHistoryJSD"></div>
+        <div id="chartHistoryJSD" v-loading="jsdLoading"></div>
       </div>
     </div>
 
@@ -114,7 +115,7 @@
     <div class="basicInfo" v-if="allData.dataList.siteType == 'rain'">
       <div class="mt-10">
         <el-date-picker
-          v-model="allData.dateTime"
+          v-model="allData.dateTimeRain"
           type="daterange"
           value-format="YYYY-MM-DD"
           start-placeholder="开始时间"
@@ -122,6 +123,7 @@
           size="small"
           style="width: 200px"
           @change="changeDate"
+          :clearable="false"
         />
         <el-select v-model="selectCode" style="margin: -7px 0px 0px 10px; width: 150px" size="small" @change="changeRainType">
           <el-option v-for="item in dataOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -158,7 +160,8 @@
 const allData = reactive({
   dataList: {},
   popupShow: false,
-  dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeJSD: [proxy.moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeRain: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
 });
 const dataOption = ref([]);
 const selectData = ref([]);
@@ -167,6 +170,7 @@
 const unitName = ref('');
 const propertyMonitorXList = ref([]);
 const realRiverVal = ref(0);
+const jsdLoading = ref(true);
 
 //
 function closePopupCES() {
@@ -184,26 +188,39 @@
 // 积水点
 let chartJSD = null;
 function changeDateJSD() {
-  setTimeout(() => {
-    if (!!chartJSD) chartJSD.dispose();
+  if (!!chartJSD) chartJSD.dispose();
+  setTimeout(async () => {
     chartJSD = echarts.init(document.getElementById('chartHistoryJSD'));
-    chartOption.popupRainTrend.legend.data = ['水深'];
-    chartOption.popupRainTrend.yAxis.name = 'm';
-    chartOption.popupRainTrend.xAxis.data = ['2024-07-12 12:30:20', '2024-07-12 13:30:20', '2024-07-12 14:30:20', '2024-07-12 15:30:20'];
-    chartOption.popupRainTrend.xAxis.boundaryGap = true;
-    chartOption.popupRainTrend.series.name = '水深';
-    chartOption.popupRainTrend.series.barWidth = 10;
-    chartOption.popupRainTrend.series.data = [0.23, 0.3, 0.25, 0.18];
-    // 设置鼠标滚轮放大缩小展示数据区间
-    // chartOption.popupRainTrend.dataZoom = [{ type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }];
-    // if (propertyMonitorXList.value.length > 0) {
-    //   chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    // } else {
-    //   chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
-    // }
-    chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    chartJSD.clear();
-    chartJSD.setOption(chartOption.popupRainTrend);
+    let params = {
+      startTime: allData.dateTimeJSD[0],
+      endTime: allData.dateTimeJSD[1],
+      stCode: allData.dataList['stCode'],
+    };
+    jsdLoading.value = true;
+    let res = await graphicReport(params);
+    if (res && res.code == 200) {
+      let datas = res.data;
+      chartOption.popupRainTrend.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+      chartOption.popupRainTrend.yAxis.name = datas.propertyMonitorList[0].propertyUnit; //单位
+      chartOption.popupRainTrend.xAxis.data = datas.propertyMonitorXList;
+      chartOption.popupRainTrend.xAxis.boundaryGap = true;
+      chartOption.popupRainTrend.series.name = datas.propertyMonitorList[0].monitorPropertyName;
+      chartOption.popupRainTrend.series.barWidth = 3;
+      chartOption.popupRainTrend.series.data = datas.propertyMonitorList[0].ylist;
+      // 设置鼠标滚轮放大缩小展示数据区间
+      chartOption.popupRainTrend.dataZoom = [
+        { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length - 48] },
+      ];
+      if (datas.propertyMonitorXList > 0) {
+        chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      } else {
+        chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
+      }
+      chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      chartJSD.clear();
+      chartJSD.setOption(chartOption.popupRainTrend);
+      jsdLoading.value = false;
+    }
   });
 }
 
@@ -285,11 +302,11 @@
   selectData.value = obj.ylist;
   initEchartsPopup();
 };
-//获取监测数据
+//获取雨量站监测数据
 const getSuperViseData = async () => {
   let params = {
-    startTime: allData.dateTime[0],
-    endTime: allData.dateTime[1],
+    startTime: allData.dateTimeRain[0],
+    endTime: allData.dateTimeRain[1],
     stCode: allData.dataList['stCode'],
   };
   dataOption.value = [];
@@ -373,7 +390,10 @@
     allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
     if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
-    if (allData.dataList.type == 'waterLoging') changeDateJSD(); //内涝积水点
+    //内涝积水点
+    if (allData.dataList.type == 'waterLoging') {
+      changeDateJSD();
+    }
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index b862cff..13e91cc 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -20,9 +20,6 @@
 
     <!-- 右侧 -->
     <div :class="['publicRightHM', 'animate__animated', showPanel ? 'animate__fadeOutRight' : 'animate__fadeInRight']">
-      <!-- 泵站运行监控 -->
-      <!-- <MonitorBZ></MonitorBZ> -->
-
       <!-- 监测设备 -->
       <MonitorEquip class="mt-10"></MonitorEquip>
     </div>
@@ -42,7 +39,7 @@
 
     <!-- 管网监测点详情 -->
     <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-      <PipeDetail v-if="showPipe"></PipeDetail>
+      <PipeDetail v-if="showPipe" :pipeParams="pipeParams"></PipeDetail>
     </el-dialog>
   </div>
 </template>
@@ -55,7 +52,6 @@
 import PsssCount from '@/views/sponeScreen/waterFlood/PsssCount.vue'; //排水设施统计
 import ReportRain from '@/views/sponeScreen/waterFlood/rainReport.vue'; //降雨报告
 import FloodWZ from '@/views/sponeScreen/waterFlood/floodWZ.vue'; //防汛物资
-import MonitorBZ from '@/views/sponeScreen/waterFlood/pumpMonitor.vue'; //泵站运行监控
 import MonitorEquip from '@/views/sponeScreen/waterFlood/equipMonitor.vue'; //监测设备
 import FutureRain from '@/views/sponeScreen/waterFlood/futureRain.vue'; //降雨预报
 import { nextTick, onBeforeUnmount } from 'vue';
@@ -71,6 +67,7 @@
 const showWSC = ref(false);
 const wscObj = ref({});
 const wscTitle = ref('污水处理厂');
+const pipeParams = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -100,6 +97,7 @@
   });
   // 管网监测点
   bus.on('pipeMonitorBus', params => {
+    pipeParams.value = params;
     showPipe.value = true;
   });
   setTimeout(() => {
@@ -140,36 +138,40 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      {
-        layername: 'YSBZ', //雨水泵站
-        show: false,
-      },
-      {
-        layername: 'combineBengZhan', //合流泵站
-        show: false,
-      },
-      {
-        layername: 'sewageFactory', //污水处理厂
-        show: false,
-      },
-      {
-        layername: 'ysLine1', //雨水管网
-        show: false,
-      },
-      {
-        layername: 'hsLine1', //合流管网
-        show: false,
-      },
-      {
-        layername: 'pipeline_info_flow', //管网流向
-        show: false,
-      },
+      // {
+      //   layername: 'YSBZ', //雨水泵站
+      //   show: false,
+      // },
+      // {
+      //   layername: 'combineBengZhan', //合流泵站
+      //   show: false,
+      // },
+      // {
+      //   layername: 'sewageFactory', //污水处理厂
+      //   show: false,
+      // },
+      // {
+      //   layername: 'ysLine1', //雨水管网
+      //   show: false,
+      // },
+      // {
+      //   layername: 'hsLine1', //合流管网
+      //   show: false,
+      // },
+      // {
+      //   layername: 'pipeline_info_flow', //管网流向
+      //   show: false,
+      // },
       {
         layername: 'pipeMonitor', //管网监测点，测试
         show: false,
       },
+      // {
+      //   layername: 'waterCourse', //河道水位计
+      //   show: false,
+      // },
       {
-        layername: 'waterCourse', //河道水位计
+        layername: 'waterLoging', //内涝积水点
         show: false,
       },
     ]);

diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 7d974f4..8a23003 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -192,8 +192,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="lonLat">
-              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index a0ce88f..b34cc61 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 9cc5b48..7c3f9b5 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -69,25 +69,36 @@
     let WSCLCDataList = resWSCLC.data;
     WSCLC = this.getGeojsonData(WSCLCDataList); //污水处理厂
     wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围
-    let waterLogingRes = await waterloggingPointList();
+
+    // 获取内涝点数据
+    // let waterLogingRes = await waterloggingPointList();
+    let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' });
     if (waterLogingRes && waterLogingRes.code == 200) {
       waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点
     }
+
+    // 管网监测点数据 测试用
+    let pipeRes = await getStationList({ monitorTargetType: 'pipeline' });
+    if (pipeRes && pipeRes.code == 200) {
+      pipeMonitorData = this.getGeojsonData(pipeRes.data); //内涝点
+    }
+    // pipeMonitorData = this.getGeojsonData([
+    //   {
+    //     projectNo: 'JZGW02',
+    //     projectName: '汴京路管网监测点',
+    //     stCode: '2109600028',
+    //     stName: '汴京路管网监测点',
+    //     lonlat: '114.3141225,34.79221',
+    //   },
+    // ]);
+
+    // 海绵设施
     let params = {};
     let projectStationRes = await queryProjectStation(params);
     if (projectStationRes && projectStationRes.code == 200) {
       projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施
     }
-    // 管网监测点 测试用
-    pipeMonitorData = this.getGeojsonData([
-      {
-        projectNo: 'JZGW02',
-        projectName: '汴京路管网监测点',
-        stCode: '2109600028',
-        stName: '汴京路管网监测点',
-        lonlat: '114.3141225,34.79221',
-      },
-    ]);
+
     //发送图例
     legendDataList = this.legendData();
     bus.emit('cesiumLegendDataList', legendDataList);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 66f77a6..e775208 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -82,18 +82,19 @@
         <div class="flex flex-start">
           <div>
             <el-date-picker
-              v-model="allData.dateTime"
+              v-model="allData.dateTimeJSD"
               type="daterange"
               value-format="YYYY-MM-DD"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              :clearable="false"
               size="small"
               style="width: 240px; margin-right: 10px"
             />
           </div>
           <el-button type="primary" size="small" @click="changeDateJSD">搜索</el-button>
         </div>
-        <div id="chartHistoryJSD"></div>
+        <div id="chartHistoryJSD" v-loading="jsdLoading"></div>
       </div>
     </div>
 
@@ -114,7 +115,7 @@
     <div class="basicInfo" v-if="allData.dataList.siteType == 'rain'">
       <div class="mt-10">
         <el-date-picker
-          v-model="allData.dateTime"
+          v-model="allData.dateTimeRain"
           type="daterange"
           value-format="YYYY-MM-DD"
           start-placeholder="开始时间"
@@ -122,6 +123,7 @@
           size="small"
           style="width: 200px"
           @change="changeDate"
+          :clearable="false"
         />
         <el-select v-model="selectCode" style="margin: -7px 0px 0px 10px; width: 150px" size="small" @change="changeRainType">
           <el-option v-for="item in dataOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -158,7 +160,8 @@
 const allData = reactive({
   dataList: {},
   popupShow: false,
-  dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeJSD: [proxy.moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeRain: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
 });
 const dataOption = ref([]);
 const selectData = ref([]);
@@ -167,6 +170,7 @@
 const unitName = ref('');
 const propertyMonitorXList = ref([]);
 const realRiverVal = ref(0);
+const jsdLoading = ref(true);
 
 //
 function closePopupCES() {
@@ -184,26 +188,39 @@
 // 积水点
 let chartJSD = null;
 function changeDateJSD() {
-  setTimeout(() => {
-    if (!!chartJSD) chartJSD.dispose();
+  if (!!chartJSD) chartJSD.dispose();
+  setTimeout(async () => {
     chartJSD = echarts.init(document.getElementById('chartHistoryJSD'));
-    chartOption.popupRainTrend.legend.data = ['水深'];
-    chartOption.popupRainTrend.yAxis.name = 'm';
-    chartOption.popupRainTrend.xAxis.data = ['2024-07-12 12:30:20', '2024-07-12 13:30:20', '2024-07-12 14:30:20', '2024-07-12 15:30:20'];
-    chartOption.popupRainTrend.xAxis.boundaryGap = true;
-    chartOption.popupRainTrend.series.name = '水深';
-    chartOption.popupRainTrend.series.barWidth = 10;
-    chartOption.popupRainTrend.series.data = [0.23, 0.3, 0.25, 0.18];
-    // 设置鼠标滚轮放大缩小展示数据区间
-    // chartOption.popupRainTrend.dataZoom = [{ type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }];
-    // if (propertyMonitorXList.value.length > 0) {
-    //   chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    // } else {
-    //   chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
-    // }
-    chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    chartJSD.clear();
-    chartJSD.setOption(chartOption.popupRainTrend);
+    let params = {
+      startTime: allData.dateTimeJSD[0],
+      endTime: allData.dateTimeJSD[1],
+      stCode: allData.dataList['stCode'],
+    };
+    jsdLoading.value = true;
+    let res = await graphicReport(params);
+    if (res && res.code == 200) {
+      let datas = res.data;
+      chartOption.popupRainTrend.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+      chartOption.popupRainTrend.yAxis.name = datas.propertyMonitorList[0].propertyUnit; //单位
+      chartOption.popupRainTrend.xAxis.data = datas.propertyMonitorXList;
+      chartOption.popupRainTrend.xAxis.boundaryGap = true;
+      chartOption.popupRainTrend.series.name = datas.propertyMonitorList[0].monitorPropertyName;
+      chartOption.popupRainTrend.series.barWidth = 3;
+      chartOption.popupRainTrend.series.data = datas.propertyMonitorList[0].ylist;
+      // 设置鼠标滚轮放大缩小展示数据区间
+      chartOption.popupRainTrend.dataZoom = [
+        { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length - 48] },
+      ];
+      if (datas.propertyMonitorXList > 0) {
+        chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      } else {
+        chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
+      }
+      chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      chartJSD.clear();
+      chartJSD.setOption(chartOption.popupRainTrend);
+      jsdLoading.value = false;
+    }
   });
 }
 
@@ -285,11 +302,11 @@
   selectData.value = obj.ylist;
   initEchartsPopup();
 };
-//获取监测数据
+//获取雨量站监测数据
 const getSuperViseData = async () => {
   let params = {
-    startTime: allData.dateTime[0],
-    endTime: allData.dateTime[1],
+    startTime: allData.dateTimeRain[0],
+    endTime: allData.dateTimeRain[1],
     stCode: allData.dataList['stCode'],
   };
   dataOption.value = [];
@@ -373,7 +390,10 @@
     allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
     if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
-    if (allData.dataList.type == 'waterLoging') changeDateJSD(); //内涝积水点
+    //内涝积水点
+    if (allData.dataList.type == 'waterLoging') {
+      changeDateJSD();
+    }
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index b862cff..13e91cc 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -20,9 +20,6 @@
 
     <!-- 右侧 -->
     <div :class="['publicRightHM', 'animate__animated', showPanel ? 'animate__fadeOutRight' : 'animate__fadeInRight']">
-      <!-- 泵站运行监控 -->
-      <!-- <MonitorBZ></MonitorBZ> -->
-
       <!-- 监测设备 -->
       <MonitorEquip class="mt-10"></MonitorEquip>
     </div>
@@ -42,7 +39,7 @@
 
     <!-- 管网监测点详情 -->
     <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-      <PipeDetail v-if="showPipe"></PipeDetail>
+      <PipeDetail v-if="showPipe" :pipeParams="pipeParams"></PipeDetail>
     </el-dialog>
   </div>
 </template>
@@ -55,7 +52,6 @@
 import PsssCount from '@/views/sponeScreen/waterFlood/PsssCount.vue'; //排水设施统计
 import ReportRain from '@/views/sponeScreen/waterFlood/rainReport.vue'; //降雨报告
 import FloodWZ from '@/views/sponeScreen/waterFlood/floodWZ.vue'; //防汛物资
-import MonitorBZ from '@/views/sponeScreen/waterFlood/pumpMonitor.vue'; //泵站运行监控
 import MonitorEquip from '@/views/sponeScreen/waterFlood/equipMonitor.vue'; //监测设备
 import FutureRain from '@/views/sponeScreen/waterFlood/futureRain.vue'; //降雨预报
 import { nextTick, onBeforeUnmount } from 'vue';
@@ -71,6 +67,7 @@
 const showWSC = ref(false);
 const wscObj = ref({});
 const wscTitle = ref('污水处理厂');
+const pipeParams = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -100,6 +97,7 @@
   });
   // 管网监测点
   bus.on('pipeMonitorBus', params => {
+    pipeParams.value = params;
     showPipe.value = true;
   });
   setTimeout(() => {
@@ -140,36 +138,40 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      {
-        layername: 'YSBZ', //雨水泵站
-        show: false,
-      },
-      {
-        layername: 'combineBengZhan', //合流泵站
-        show: false,
-      },
-      {
-        layername: 'sewageFactory', //污水处理厂
-        show: false,
-      },
-      {
-        layername: 'ysLine1', //雨水管网
-        show: false,
-      },
-      {
-        layername: 'hsLine1', //合流管网
-        show: false,
-      },
-      {
-        layername: 'pipeline_info_flow', //管网流向
-        show: false,
-      },
+      // {
+      //   layername: 'YSBZ', //雨水泵站
+      //   show: false,
+      // },
+      // {
+      //   layername: 'combineBengZhan', //合流泵站
+      //   show: false,
+      // },
+      // {
+      //   layername: 'sewageFactory', //污水处理厂
+      //   show: false,
+      // },
+      // {
+      //   layername: 'ysLine1', //雨水管网
+      //   show: false,
+      // },
+      // {
+      //   layername: 'hsLine1', //合流管网
+      //   show: false,
+      // },
+      // {
+      //   layername: 'pipeline_info_flow', //管网流向
+      //   show: false,
+      // },
       {
         layername: 'pipeMonitor', //管网监测点，测试
         show: false,
       },
+      // {
+      //   layername: 'waterCourse', //河道水位计
+      //   show: false,
+      // },
       {
-        layername: 'waterCourse', //河道水位计
+        layername: 'waterLoging', //内涝积水点
         show: false,
       },
     ]);
diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue
index bfc4481..ffde517 100644
--- a/src/views/sponeScreen/waterFlood/pipeDetail.vue
+++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue
@@ -14,10 +14,10 @@
 
           <!-- 水高度 -->
           <img src="@/assets/newImgs/HMScreen/pipeW.png" alt="" class="water" style="height: 80px" />
-          <div class="part partW">水深：3.5米</div>
+          <div class="part partW">水深：{{ realData.z }} 米</div>
 
           <!-- 瞬时流量 -->
-          <div class="part partL" style="width: 180px">瞬时流量：0.06m³/s</div>
+          <div class="part partL" style="width: 180px">小时流量：{{ realData.sbl1 }} m³/h</div>
 
           <!-- 设备 -->
           <img src="@/assets/newImgs/HMScreen/equip.png" alt="" class="equipA" />
@@ -25,16 +25,16 @@
         <div class="rightP">
           <div class="title">基本信息</div>
           <div class="part flex">
+            <div class="biaoti">站点名称：</div>
+            <div class="cont">{{ realData.stName }}</div>
+          </div>
+          <div class="part flex">
             <div class="biaoti">所在位置：</div>
-            <div class="cont">黄河大街</div>
+            <div class="cont">{{ pipeDetail.address }}</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">管网流向：</div>
-            <div class="cont">由南到北</div>
-          </div>
-          <div class="part flex">
-            <div class="biaoti">井盖材质：</div>
-            <div class="cont">铸铁</div>
+            <div class="biaoti">建设方式：</div>
+            <div class="cont">{{ pipeDetail.buildType == 'owner' ? '自建' : '共享' }}</div>
           </div>
           <div class="part flex">
             <div class="biaoti">管径：</div>
@@ -42,7 +42,7 @@
           </div>
           <div class="part flex">
             <div class="biaoti">安装高度：</div>
-            <div class="cont">4.80米</div>
+            <div class="cont">{{ realData.installHeight || '--' }}米</div>
           </div>
           <div class="part flex">
             <div class="biaoti">井深：</div>
@@ -52,19 +52,23 @@
           <div class="title" style="margin-top: 50px">实时数据</div>
           <div class="part flex">
             <div class="biaoti">水深：</div>
-            <div class="cont">5.50米</div>
+            <div class="cont">{{ realData.z }} 米</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">温度：</div>
-            <div class="cont">30.8℃</div>
+            <div class="biaoti">累计流量：</div>
+            <div class="cont">{{ realData.sbl1 }}m³</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">瞬时流量：</div>
-            <div class="cont">0.06m³/s</div>
+            <div class="biaoti">流速：</div>
+            <div class="cont">{{ realData.va }}m/s</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">SS：</div>
-            <div class="cont">38.6mg/L</div>
+            <div class="biaoti">浊度：</div>
+            <div class="cont">{{ realData.turb }} 度</div>
+          </div>
+          <div class="part flex">
+            <div class="biaoti">更新时间：</div>
+            <div class="cont">{{ realData.tt }}</div>
           </div>
         </div>
       </div>
@@ -74,13 +78,15 @@
           <el-date-picker
             v-model="pipeTime"
             type="daterange"
+            value-format="YYYY-MM-DD"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             style="width: 240px"
+            :clearable="false"
           />
           <el-button type="warning" @click="changePipeDate" style="margin: -4px 0px 0px 8px">搜索</el-button>
         </div>
-        <div id="monitorPipe"></div>
+        <div id="monitorPipe" v-loading="pipeLoading"></div>
       </div>
     </div>
   </div>
@@ -89,12 +95,20 @@
 <script setup>
 import chartOption from '@/components/Echarts/pieChart_1.js';
 import * as echarts from 'echarts';
-import { realtimeDataPipelineListByType } from '@/api/floodSys/oneMap.js';
-import { graphicReport } from '@/api/dataAnalysis/syntherticData';
+import { graphicReport, realtimeDataLatest, getStationDetail } from '@/api/dataAnalysis/syntherticData';
 
 const { proxy } = getCurrentInstance();
 const tabActive = ref('1');
-const pipeTime = ref([proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')]);
+const pipeTime = ref([proxy.moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')]);
+const realData = ref({});
+const pipeDetail = ref({});
+const pipeLoading = ref(true);
+
+const props = defineProps({
+  pipeParams: {
+    type: Object,
+  },
+});
 
 // tab切换
 function changeTab(val) {
@@ -109,73 +123,73 @@
   initPipeChart();
 }
 
-//获取管网实时监测
-const getRealtimePipeLine = async () => {
-  tableDataLoading2.value = true;
+//管网监测趋势图
+let pipeChart = null;
+const initPipeChart = async () => {
+  pipeChart && pipeChart.dispose();
+  pipeChart = echarts.init(document.getElementById('monitorPipe'));
   let params = {
-    monitorTargetType: 'pipeline',
-    orderBy: 'tt desc',
-    pipelineType: allData.pipelineType,
+    startTime: pipeTime.value[0],
+    endTime: pipeTime.value[1],
+    stCode: props.pipeParams.stCode,
   };
-  let res = await realtimeDataPipelineListByType(params);
-  if (res && res.code == 200) {
-    let data = res.data;
-    tableData2.value = data;
-    tableDataLoading2.value = false;
-  }
-};
-//获取管网监测统计分析
-const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
+  pipeLoading.value = true;
+  //管网监测值
   let res = await graphicReport(params);
   if (res && res.code == 200) {
     let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+    chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+    chartOption.floodOneMapPipeSupervise.yAxis[0].name = '水位(m)';
+    chartOption.floodOneMapPipeSupervise.yAxis[1].name = '雨量(mm)';
+    chartOption.floodOneMapPipeSupervise.legend.data = ['水位', '雨量'];
+    chartOption.floodOneMapPipeSupervise.series[0].name = '水位';
+    chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  }
+
+  // 雨量站数据
+  let params2 = {
+    startTime: pipeTime.value[0],
+    endTime: pipeTime.value[1],
+    stCode: pipeDetail.value.referRainStCode,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+    chartOption.floodOneMapPipeSupervise.series[1].name = '雨量';
+    chartOption.floodOneMapPipeSupervise.series[1].type = 'bar';
+    chartOption.floodOneMapPipeSupervise.series[1].barWidth = '10';
+    chartOption.floodOneMapPipeSupervise.yAxis[1].inverse = true; //翻转
+    if (datas.propertyMonitorXList.length > 0) {
+      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; //暂无数据
+    } else {
+      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; //暂无数据
     }
     // 设置鼠标滚轮放大缩小展示数据区间
     chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length - 48] },
     ];
-    initPipeChart();
   }
-};
-
-//管网监测趋势图
-let pipeChart = null;
-const initPipeChart = () => {
-  pipeChart && pipeChart.dispose();
-  pipeChart = echarts.init(document.getElementById('monitorPipe'));
-  chartOption.floodOneMapPipeSupervise.yAxis[0].name = '水位(m)';
-  chartOption.floodOneMapPipeSupervise.yAxis[1].name = '雨量(mm)';
-  chartOption.floodOneMapPipeSupervise.legend.data = ['水位', '雨量'];
-  chartOption.floodOneMapPipeSupervise.series[0].name = '水位';
-  chartOption.floodOneMapPipeSupervise.series[1].name = '雨量';
-  chartOption.floodOneMapPipeSupervise.series[1].type = 'bar';
-  chartOption.floodOneMapPipeSupervise.series[1].barWidth = '10';
-  chartOption.floodOneMapPipeSupervise.yAxis[1].inverse = true; //翻转
-  chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
   pipeChart.clear();
   pipeChart.setOption(chartOption.floodOneMapPipeSupervise);
+  pipeLoading.value = false;
 };
 
-onMounted(() => {});
+// 获取管网详情数据
+function getDetailData() {
+  // 实时数据
+  realtimeDataLatest(props.pipeParams.stCode).then(res => {
+    realData.value = res.data;
+  });
+  // 站点详情
+  getStationDetail(props.pipeParams.id).then(res => {
+    pipeDetail.value = res.data;
+  });
+}
+
+onMounted(() => {
+  getDetailData();
+});
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 7d974f4..8a23003 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -192,8 +192,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="lonLat">
-              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index a0ce88f..b34cc61 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 9cc5b48..7c3f9b5 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -69,25 +69,36 @@
     let WSCLCDataList = resWSCLC.data;
     WSCLC = this.getGeojsonData(WSCLCDataList); //污水处理厂
     wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围
-    let waterLogingRes = await waterloggingPointList();
+
+    // 获取内涝点数据
+    // let waterLogingRes = await waterloggingPointList();
+    let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' });
     if (waterLogingRes && waterLogingRes.code == 200) {
       waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点
     }
+
+    // 管网监测点数据 测试用
+    let pipeRes = await getStationList({ monitorTargetType: 'pipeline' });
+    if (pipeRes && pipeRes.code == 200) {
+      pipeMonitorData = this.getGeojsonData(pipeRes.data); //内涝点
+    }
+    // pipeMonitorData = this.getGeojsonData([
+    //   {
+    //     projectNo: 'JZGW02',
+    //     projectName: '汴京路管网监测点',
+    //     stCode: '2109600028',
+    //     stName: '汴京路管网监测点',
+    //     lonlat: '114.3141225,34.79221',
+    //   },
+    // ]);
+
+    // 海绵设施
     let params = {};
     let projectStationRes = await queryProjectStation(params);
     if (projectStationRes && projectStationRes.code == 200) {
       projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施
     }
-    // 管网监测点 测试用
-    pipeMonitorData = this.getGeojsonData([
-      {
-        projectNo: 'JZGW02',
-        projectName: '汴京路管网监测点',
-        stCode: '2109600028',
-        stName: '汴京路管网监测点',
-        lonlat: '114.3141225,34.79221',
-      },
-    ]);
+
     //发送图例
     legendDataList = this.legendData();
     bus.emit('cesiumLegendDataList', legendDataList);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 66f77a6..e775208 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -82,18 +82,19 @@
         <div class="flex flex-start">
           <div>
             <el-date-picker
-              v-model="allData.dateTime"
+              v-model="allData.dateTimeJSD"
               type="daterange"
               value-format="YYYY-MM-DD"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              :clearable="false"
               size="small"
               style="width: 240px; margin-right: 10px"
             />
           </div>
           <el-button type="primary" size="small" @click="changeDateJSD">搜索</el-button>
         </div>
-        <div id="chartHistoryJSD"></div>
+        <div id="chartHistoryJSD" v-loading="jsdLoading"></div>
       </div>
     </div>
 
@@ -114,7 +115,7 @@
     <div class="basicInfo" v-if="allData.dataList.siteType == 'rain'">
       <div class="mt-10">
         <el-date-picker
-          v-model="allData.dateTime"
+          v-model="allData.dateTimeRain"
           type="daterange"
           value-format="YYYY-MM-DD"
           start-placeholder="开始时间"
@@ -122,6 +123,7 @@
           size="small"
           style="width: 200px"
           @change="changeDate"
+          :clearable="false"
         />
         <el-select v-model="selectCode" style="margin: -7px 0px 0px 10px; width: 150px" size="small" @change="changeRainType">
           <el-option v-for="item in dataOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -158,7 +160,8 @@
 const allData = reactive({
   dataList: {},
   popupShow: false,
-  dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeJSD: [proxy.moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
+  dateTimeRain: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
 });
 const dataOption = ref([]);
 const selectData = ref([]);
@@ -167,6 +170,7 @@
 const unitName = ref('');
 const propertyMonitorXList = ref([]);
 const realRiverVal = ref(0);
+const jsdLoading = ref(true);
 
 //
 function closePopupCES() {
@@ -184,26 +188,39 @@
 // 积水点
 let chartJSD = null;
 function changeDateJSD() {
-  setTimeout(() => {
-    if (!!chartJSD) chartJSD.dispose();
+  if (!!chartJSD) chartJSD.dispose();
+  setTimeout(async () => {
     chartJSD = echarts.init(document.getElementById('chartHistoryJSD'));
-    chartOption.popupRainTrend.legend.data = ['水深'];
-    chartOption.popupRainTrend.yAxis.name = 'm';
-    chartOption.popupRainTrend.xAxis.data = ['2024-07-12 12:30:20', '2024-07-12 13:30:20', '2024-07-12 14:30:20', '2024-07-12 15:30:20'];
-    chartOption.popupRainTrend.xAxis.boundaryGap = true;
-    chartOption.popupRainTrend.series.name = '水深';
-    chartOption.popupRainTrend.series.barWidth = 10;
-    chartOption.popupRainTrend.series.data = [0.23, 0.3, 0.25, 0.18];
-    // 设置鼠标滚轮放大缩小展示数据区间
-    // chartOption.popupRainTrend.dataZoom = [{ type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }];
-    // if (propertyMonitorXList.value.length > 0) {
-    //   chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    // } else {
-    //   chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
-    // }
-    chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
-    chartJSD.clear();
-    chartJSD.setOption(chartOption.popupRainTrend);
+    let params = {
+      startTime: allData.dateTimeJSD[0],
+      endTime: allData.dateTimeJSD[1],
+      stCode: allData.dataList['stCode'],
+    };
+    jsdLoading.value = true;
+    let res = await graphicReport(params);
+    if (res && res.code == 200) {
+      let datas = res.data;
+      chartOption.popupRainTrend.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+      chartOption.popupRainTrend.yAxis.name = datas.propertyMonitorList[0].propertyUnit; //单位
+      chartOption.popupRainTrend.xAxis.data = datas.propertyMonitorXList;
+      chartOption.popupRainTrend.xAxis.boundaryGap = true;
+      chartOption.popupRainTrend.series.name = datas.propertyMonitorList[0].monitorPropertyName;
+      chartOption.popupRainTrend.series.barWidth = 3;
+      chartOption.popupRainTrend.series.data = datas.propertyMonitorList[0].ylist;
+      // 设置鼠标滚轮放大缩小展示数据区间
+      chartOption.popupRainTrend.dataZoom = [
+        { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length - 48] },
+      ];
+      if (datas.propertyMonitorXList > 0) {
+        chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      } else {
+        chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
+      }
+      chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+      chartJSD.clear();
+      chartJSD.setOption(chartOption.popupRainTrend);
+      jsdLoading.value = false;
+    }
   });
 }
 
@@ -285,11 +302,11 @@
   selectData.value = obj.ylist;
   initEchartsPopup();
 };
-//获取监测数据
+//获取雨量站监测数据
 const getSuperViseData = async () => {
   let params = {
-    startTime: allData.dateTime[0],
-    endTime: allData.dateTime[1],
+    startTime: allData.dateTimeRain[0],
+    endTime: allData.dateTimeRain[1],
     stCode: allData.dataList['stCode'],
   };
   dataOption.value = [];
@@ -373,7 +390,10 @@
     allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
     if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
-    if (allData.dataList.type == 'waterLoging') changeDateJSD(); //内涝积水点
+    //内涝积水点
+    if (allData.dataList.type == 'waterLoging') {
+      changeDateJSD();
+    }
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index b862cff..13e91cc 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -20,9 +20,6 @@
 
     <!-- 右侧 -->
     <div :class="['publicRightHM', 'animate__animated', showPanel ? 'animate__fadeOutRight' : 'animate__fadeInRight']">
-      <!-- 泵站运行监控 -->
-      <!-- <MonitorBZ></MonitorBZ> -->
-
       <!-- 监测设备 -->
       <MonitorEquip class="mt-10"></MonitorEquip>
     </div>
@@ -42,7 +39,7 @@
 
     <!-- 管网监测点详情 -->
     <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-      <PipeDetail v-if="showPipe"></PipeDetail>
+      <PipeDetail v-if="showPipe" :pipeParams="pipeParams"></PipeDetail>
     </el-dialog>
   </div>
 </template>
@@ -55,7 +52,6 @@
 import PsssCount from '@/views/sponeScreen/waterFlood/PsssCount.vue'; //排水设施统计
 import ReportRain from '@/views/sponeScreen/waterFlood/rainReport.vue'; //降雨报告
 import FloodWZ from '@/views/sponeScreen/waterFlood/floodWZ.vue'; //防汛物资
-import MonitorBZ from '@/views/sponeScreen/waterFlood/pumpMonitor.vue'; //泵站运行监控
 import MonitorEquip from '@/views/sponeScreen/waterFlood/equipMonitor.vue'; //监测设备
 import FutureRain from '@/views/sponeScreen/waterFlood/futureRain.vue'; //降雨预报
 import { nextTick, onBeforeUnmount } from 'vue';
@@ -71,6 +67,7 @@
 const showWSC = ref(false);
 const wscObj = ref({});
 const wscTitle = ref('污水处理厂');
+const pipeParams = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -100,6 +97,7 @@
   });
   // 管网监测点
   bus.on('pipeMonitorBus', params => {
+    pipeParams.value = params;
     showPipe.value = true;
   });
   setTimeout(() => {
@@ -140,36 +138,40 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      {
-        layername: 'YSBZ', //雨水泵站
-        show: false,
-      },
-      {
-        layername: 'combineBengZhan', //合流泵站
-        show: false,
-      },
-      {
-        layername: 'sewageFactory', //污水处理厂
-        show: false,
-      },
-      {
-        layername: 'ysLine1', //雨水管网
-        show: false,
-      },
-      {
-        layername: 'hsLine1', //合流管网
-        show: false,
-      },
-      {
-        layername: 'pipeline_info_flow', //管网流向
-        show: false,
-      },
+      // {
+      //   layername: 'YSBZ', //雨水泵站
+      //   show: false,
+      // },
+      // {
+      //   layername: 'combineBengZhan', //合流泵站
+      //   show: false,
+      // },
+      // {
+      //   layername: 'sewageFactory', //污水处理厂
+      //   show: false,
+      // },
+      // {
+      //   layername: 'ysLine1', //雨水管网
+      //   show: false,
+      // },
+      // {
+      //   layername: 'hsLine1', //合流管网
+      //   show: false,
+      // },
+      // {
+      //   layername: 'pipeline_info_flow', //管网流向
+      //   show: false,
+      // },
       {
         layername: 'pipeMonitor', //管网监测点，测试
         show: false,
       },
+      // {
+      //   layername: 'waterCourse', //河道水位计
+      //   show: false,
+      // },
       {
-        layername: 'waterCourse', //河道水位计
+        layername: 'waterLoging', //内涝积水点
         show: false,
       },
     ]);
diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue
index bfc4481..ffde517 100644
--- a/src/views/sponeScreen/waterFlood/pipeDetail.vue
+++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue
@@ -14,10 +14,10 @@
 
           <!-- 水高度 -->
           <img src="@/assets/newImgs/HMScreen/pipeW.png" alt="" class="water" style="height: 80px" />
-          <div class="part partW">水深：3.5米</div>
+          <div class="part partW">水深：{{ realData.z }} 米</div>
 
           <!-- 瞬时流量 -->
-          <div class="part partL" style="width: 180px">瞬时流量：0.06m³/s</div>
+          <div class="part partL" style="width: 180px">小时流量：{{ realData.sbl1 }} m³/h</div>
 
           <!-- 设备 -->
           <img src="@/assets/newImgs/HMScreen/equip.png" alt="" class="equipA" />
@@ -25,16 +25,16 @@
         <div class="rightP">
           <div class="title">基本信息</div>
           <div class="part flex">
+            <div class="biaoti">站点名称：</div>
+            <div class="cont">{{ realData.stName }}</div>
+          </div>
+          <div class="part flex">
             <div class="biaoti">所在位置：</div>
-            <div class="cont">黄河大街</div>
+            <div class="cont">{{ pipeDetail.address }}</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">管网流向：</div>
-            <div class="cont">由南到北</div>
-          </div>
-          <div class="part flex">
-            <div class="biaoti">井盖材质：</div>
-            <div class="cont">铸铁</div>
+            <div class="biaoti">建设方式：</div>
+            <div class="cont">{{ pipeDetail.buildType == 'owner' ? '自建' : '共享' }}</div>
           </div>
           <div class="part flex">
             <div class="biaoti">管径：</div>
@@ -42,7 +42,7 @@
           </div>
           <div class="part flex">
             <div class="biaoti">安装高度：</div>
-            <div class="cont">4.80米</div>
+            <div class="cont">{{ realData.installHeight || '--' }}米</div>
           </div>
           <div class="part flex">
             <div class="biaoti">井深：</div>
@@ -52,19 +52,23 @@
           <div class="title" style="margin-top: 50px">实时数据</div>
           <div class="part flex">
             <div class="biaoti">水深：</div>
-            <div class="cont">5.50米</div>
+            <div class="cont">{{ realData.z }} 米</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">温度：</div>
-            <div class="cont">30.8℃</div>
+            <div class="biaoti">累计流量：</div>
+            <div class="cont">{{ realData.sbl1 }}m³</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">瞬时流量：</div>
-            <div class="cont">0.06m³/s</div>
+            <div class="biaoti">流速：</div>
+            <div class="cont">{{ realData.va }}m/s</div>
           </div>
           <div class="part flex">
-            <div class="biaoti">SS：</div>
-            <div class="cont">38.6mg/L</div>
+            <div class="biaoti">浊度：</div>
+            <div class="cont">{{ realData.turb }} 度</div>
+          </div>
+          <div class="part flex">
+            <div class="biaoti">更新时间：</div>
+            <div class="cont">{{ realData.tt }}</div>
           </div>
         </div>
       </div>
@@ -74,13 +78,15 @@
           <el-date-picker
             v-model="pipeTime"
             type="daterange"
+            value-format="YYYY-MM-DD"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             style="width: 240px"
+            :clearable="false"
           />
           <el-button type="warning" @click="changePipeDate" style="margin: -4px 0px 0px 8px">搜索</el-button>
         </div>
-        <div id="monitorPipe"></div>
+        <div id="monitorPipe" v-loading="pipeLoading"></div>
       </div>
     </div>
   </div>
@@ -89,12 +95,20 @@
 <script setup>
 import chartOption from '@/components/Echarts/pieChart_1.js';
 import * as echarts from 'echarts';
-import { realtimeDataPipelineListByType } from '@/api/floodSys/oneMap.js';
-import { graphicReport } from '@/api/dataAnalysis/syntherticData';
+import { graphicReport, realtimeDataLatest, getStationDetail } from '@/api/dataAnalysis/syntherticData';
 
 const { proxy } = getCurrentInstance();
 const tabActive = ref('1');
-const pipeTime = ref([proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')]);
+const pipeTime = ref([proxy.moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')]);
+const realData = ref({});
+const pipeDetail = ref({});
+const pipeLoading = ref(true);
+
+const props = defineProps({
+  pipeParams: {
+    type: Object,
+  },
+});
 
 // tab切换
 function changeTab(val) {
@@ -109,73 +123,73 @@
   initPipeChart();
 }
 
-//获取管网实时监测
-const getRealtimePipeLine = async () => {
-  tableDataLoading2.value = true;
+//管网监测趋势图
+let pipeChart = null;
+const initPipeChart = async () => {
+  pipeChart && pipeChart.dispose();
+  pipeChart = echarts.init(document.getElementById('monitorPipe'));
   let params = {
-    monitorTargetType: 'pipeline',
-    orderBy: 'tt desc',
-    pipelineType: allData.pipelineType,
+    startTime: pipeTime.value[0],
+    endTime: pipeTime.value[1],
+    stCode: props.pipeParams.stCode,
   };
-  let res = await realtimeDataPipelineListByType(params);
-  if (res && res.code == 200) {
-    let data = res.data;
-    tableData2.value = data;
-    tableDataLoading2.value = false;
-  }
-};
-//获取管网监测统计分析
-const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
+  pipeLoading.value = true;
+  //管网监测值
   let res = await graphicReport(params);
   if (res && res.code == 200) {
     let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+    chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+    chartOption.floodOneMapPipeSupervise.yAxis[0].name = '水位(m)';
+    chartOption.floodOneMapPipeSupervise.yAxis[1].name = '雨量(mm)';
+    chartOption.floodOneMapPipeSupervise.legend.data = ['水位', '雨量'];
+    chartOption.floodOneMapPipeSupervise.series[0].name = '水位';
+    chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  }
+
+  // 雨量站数据
+  let params2 = {
+    startTime: pipeTime.value[0],
+    endTime: pipeTime.value[1],
+    stCode: pipeDetail.value.referRainStCode,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+    chartOption.floodOneMapPipeSupervise.series[1].name = '雨量';
+    chartOption.floodOneMapPipeSupervise.series[1].type = 'bar';
+    chartOption.floodOneMapPipeSupervise.series[1].barWidth = '10';
+    chartOption.floodOneMapPipeSupervise.yAxis[1].inverse = true; //翻转
+    if (datas.propertyMonitorXList.length > 0) {
+      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; //暂无数据
+    } else {
+      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; //暂无数据
     }
     // 设置鼠标滚轮放大缩小展示数据区间
     chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length - 48] },
     ];
-    initPipeChart();
   }
-};
-
-//管网监测趋势图
-let pipeChart = null;
-const initPipeChart = () => {
-  pipeChart && pipeChart.dispose();
-  pipeChart = echarts.init(document.getElementById('monitorPipe'));
-  chartOption.floodOneMapPipeSupervise.yAxis[0].name = '水位(m)';
-  chartOption.floodOneMapPipeSupervise.yAxis[1].name = '雨量(mm)';
-  chartOption.floodOneMapPipeSupervise.legend.data = ['水位', '雨量'];
-  chartOption.floodOneMapPipeSupervise.series[0].name = '水位';
-  chartOption.floodOneMapPipeSupervise.series[1].name = '雨量';
-  chartOption.floodOneMapPipeSupervise.series[1].type = 'bar';
-  chartOption.floodOneMapPipeSupervise.series[1].barWidth = '10';
-  chartOption.floodOneMapPipeSupervise.yAxis[1].inverse = true; //翻转
-  chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
   pipeChart.clear();
   pipeChart.setOption(chartOption.floodOneMapPipeSupervise);
+  pipeLoading.value = false;
 };
 
-onMounted(() => {});
+// 获取管网详情数据
+function getDetailData() {
+  // 实时数据
+  realtimeDataLatest(props.pipeParams.stCode).then(res => {
+    realData.value = res.data;
+  });
+  // 站点详情
+  getStationDetail(props.pipeParams.id).then(res => {
+    pipeDetail.value = res.data;
+  });
+}
+
+onMounted(() => {
+  getDetailData();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/pumpMonitor.vue b/src/views/sponeScreen/waterFlood/pumpMonitor.vue
deleted file mode 100644
index 8751fb0..0000000
--- a/src/views/sponeScreen/waterFlood/pumpMonitor.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <!-- 泵站运行监控 -->
-  <div class="pumpJKPage">
-    <div class="partTitleHM">
-      泵站运行监控
-      <el-select
-        clearable
-        filterable
-        v-model="rainCode"
-        placeholder="请选择雨量站"
-        style="float: right; width: 130px; margin: 10px 60px 0px 0px"
-        size="small"
-      >
-        <el-option v-for="dict in rainType" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-      </el-select>
-    </div>
-    <div class="partContHM">
-      <el-tabs v-model="activeName" class="pumptabs" @tab-click="handleClick">
-        <el-tab-pane :label="item.label" :name="item.value" v-for="item in tabList" :key="item.value"></el-tab-pane>
-      </el-tabs>
-      <div class="pumpCount flex">
-        <div class="part"><span class="yellow circle"></span>当日抽排量 <span style="color: #ffed52">10.8</span>m³</div>
-        <div class="part"><span class="blue circle"></span>累计抽排量 <span style="color: #3afff8">--</span>万m³</div>
-        <div class="part"><span class="green circle"></span>前池水位 <span style="color: #18e87a">--</span>m</div>
-      </div>
-      <div class="flex flex-justcontent-spacearound mt10">
-        <div class="pumpStatus">
-          <img src="@/assets/newImgs/HMScreen/pumpOff.png" alt="" />
-          <p>1#泵</p>
-        </div>
-        <div class="pumpStatus">
-          <img src="@/assets/newImgs/HMScreen/pumpOpen.png" alt="" />
-          <p>2#泵</p>
-        </div>
-        <div class="pumpStatus">
-          <img src="@/assets/newImgs/HMScreen/pumpOpen.png" alt="" />
-          <p>3#泵</p>
-        </div>
-        <div class="pumpStatus">
-          <img src="@/assets/newImgs/HMScreen/pumpOff.png" alt="" />
-          <p>4#泵</p>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-const { proxy } = getCurrentInstance();
-const rainCode = ref('1');
-const rainType = ref([
-  { value: '1', label: '雨水泵站' },
-  { value: '2', label: '污水泵站' },
-  { value: '3', label: '合流泵站' },
-]);
-const activeName = ref('2');
-const tabList = ref([
-  { value: '1', label: '一号泵站' },
-  { value: '2', label: '二号泵站' },
-  { value: '3', label: '三号泵站' },
-  { value: '4', label: '四号泵站' },
-  { value: '5', label: '五号泵站' },
-  { value: '6', label: '六号泵站' },
-]);
-
-// tab泵站切换点击
-function handleClick(params) {
-  console.log(params);
-}
-
-onMounted(() => {});
-</script>
-
-<style lang="scss">
-.pumpJKPage {
-  width: 100%;
-  .partContHM {
-    .pumptabs {
-      .el-tabs__item {
-        font-family: Source Han Sans CN;
-        font-weight: 500;
-        font-size: 16px;
-        color: #b8ecff !important;
-      }
-      .el-tabs__item.is-active {
-        color: #3afff8 !important;
-        background: linear-gradient(0deg, #2ddaff 0%, rgba(45, 218, 255, 0) 100%);
-      }
-      .el-tabs__active-bar {
-        background: #3afff8 !important;
-      }
-      svg path {
-        fill: #3afff8 !important;
-        font-weight: bold;
-      }
-    }
-    .pumpCount {
-      width: 100%;
-      height: 15px;
-      background: url('@/assets/newImgs/HMScreen/pumpBg.png') no-repeat;
-      background-size: 100% 100%;
-      justify-content: space-around;
-      padding-bottom: 15px;
-      margin-top: 10px;
-
-      .part {
-        width: 33%;
-        font-size: 13px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        span {
-          margin: 0 5px;
-        }
-        .circle {
-          display: inline-block;
-          width: 5px;
-          height: 5px;
-          border-radius: 50%;
-          margin-right: 5px;
-        }
-        .yellow {
-          background: #ffed52;
-        }
-        .blue {
-          background: #3afff8;
-        }
-        .green {
-          background: #18e87a;
-        }
-      }
-    }
-    .pumpStatus {
-      justify-content: center;
-      img {
-        width: 66px;
-        height: 66px;
-      }
-      p {
-        text-align: center;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        font-size: 16px;
-        color: #b8ecff;
-      }
-    }
-  }
-}
-</style>