diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue
index 664ddf4..2175bc6 100644
--- a/src/views/sponeScreen/waterFlood/pipeDetail.vue
+++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue
@@ -281,9 +281,9 @@
 
 onMounted(() => {
   if (localStorage.getItem('showHistoryMonitor') == '1') {
-    ifReal.value = true; //排水防涝实时数据
+    ifReal.value = false; //项目建设历史数据
   } else {
-    ifReal.value = false; //其他模块历史数据
+    ifReal.value = true; //其他模块最新数据
   }
   getStationData();
 });

diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue
index 664ddf4..2175bc6 100644
--- a/src/views/sponeScreen/waterFlood/pipeDetail.vue
+++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue
@@ -281,9 +281,9 @@
 
 onMounted(() => {
   if (localStorage.getItem('showHistoryMonitor') == '1') {
-    ifReal.value = true; //排水防涝实时数据
+    ifReal.value = false; //项目建设历史数据
   } else {
-    ifReal.value = false; //其他模块历史数据
+    ifReal.value = true; //其他模块最新数据
   }
   getStationData();
 });
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index a70a1eb..5c14a51 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -147,7 +147,7 @@
 </template>
 
 <script setup>
-import { realtimeDataList } from '@/api/scada/monitor';
+import { realtimeDataList, sitePropertyRelation } from '@/api/scada/monitor';
 
 const { proxy } = getCurrentInstance();
 const pumpObj = ref({});
@@ -172,40 +172,89 @@
 );
 
 // 获取数据
-function getData() {
-  let params = {
-    stationCode: pumpObj.value.pumpCode, //'BZKFDJG'
-  };
-  realtimeDataList(params).then(res => {
-    let datas = res.data || {};
-    pumpList.value = [];
-    detailObj.value = datas;
-    realYW.value = detailObj.value['BZKFDJG-YW'] || detailObj.value['BZKFHYG-YE'] || 0.2; //实时液位
-    for (let i in datas) {
-      // 添加泵机数据
-      if (i.includes('QSB-YX') || i.includes('YSB-YX') || i.includes('RUN')) {
-        if (datas[i] == '0') {
-          datas[i] = '停止';
-        } else if (datas[i] == '1') {
-          datas[i] = '运行';
-        }
-        pumpList.value.push({ status: datas[i], dl: '', hour: '' });
-      }
-      // 大水管动效判断
-      pumpList.value &&
-        pumpList.value.filter(item => {
-          if (item.status == '运行') {
-            mainWater.value = true;
-          } else {
-            mainWater.value = false;
-          }
+async function getData() {
+  let datas = {};
+  if (localStorage.getItem('showHistoryMonitor') == '1') {
+    //其他模块历史数据，取水位最高的那一条数据
+    let params = {
+      startTime: localStorage.getItem('setRainDateKF') + ' 00:00:00',
+      endTime: localStorage.getItem('setRainDateKF') + ' 23:59:59',
+      stationCode: pumpObj.value.pumpCode, //泵站code
+      pageSize: 99999,
+      pageNum: 1,
+    };
+    let res = await sitePropertyRelation(params);
+    let lists = res.data || [];
+    let index = 0;
+    let arrs = [];
+    if (lists.length == 0) {
+      // 无数据时把泵的数量渲染加上
+      let total = pumpObj.value.rainpump.deviceCount || pumpObj.value.sweagepump.deviceCount;
+      for (let i = 0; i < total; i++) {
+        pumpList.value.push({
+          status: '停止',
+          dl: '',
+          hour: '',
         });
-      // 添加格栅机数据
-      if (i.includes('QSB-GSJ')) {
-        gsjList.value.push({ status: datas[i] });
       }
+      return;
+    } else {
+      if (!!!lists[0]['BZKFDJG-YW'] || !!!lists[0]['BZKFHYG-YE']) {
+        // 无数据时把泵的数量渲染加上
+        let total = pumpObj.value.rainpump.deviceCount || pumpObj.value.sweagepump.deviceCount;
+        for (let i = 0; i < total; i++) {
+          pumpList.value.push({
+            status: '停止',
+            dl: '',
+            hour: '',
+          });
+        }
+        return;
+      }
+      lists.map(item => {
+        arrs.push(item['BZKFDJG-YW'] || item['BZKFHYG-YE']);
+        let max = Math.max(...arrs);
+        index = arrs.findIndex(item2 => {
+          return item2 == max;
+        });
+      });
+      datas = lists[index];
     }
-  });
+  } else {
+    //排水防涝实时数据
+    let params = {
+      stationCode: pumpObj.value.pumpCode, //泵站code
+    };
+    let res = await realtimeDataList(params);
+    datas = res.data || {};
+  }
+  pumpList.value = [];
+  detailObj.value = datas;
+  realYW.value = detailObj.value['BZKFDJG-YW'] || detailObj.value['BZKFHYG-YE'] || 0.2; //实时液位
+  for (let i in datas) {
+    // 添加泵机数据
+    if (i.includes('QSB-YX') || i.includes('YSB-YX') || i.includes('RUN')) {
+      if (datas[i] == '0') {
+        datas[i] = '停止';
+      } else if (datas[i] == '1') {
+        datas[i] = '运行';
+      }
+      pumpList.value.push({ status: datas[i], dl: '', hour: '' });
+    }
+    // 大水管动效判断
+    pumpList.value &&
+      pumpList.value.filter(item => {
+        if (item.status == '运行') {
+          mainWater.value = true;
+        } else {
+          mainWater.value = false;
+        }
+      });
+    // 添加格栅机数据
+    if (i.includes('QSB-GSJ')) {
+      gsjList.value.push({ status: datas[i] });
+    }
+  }
 }
 
 onMounted(() => {
@@ -248,7 +297,6 @@
       });
     }
     detailObj.value.tt = '2024-08-20 12:20:32';
-    console.log(pumpObj.value.rainpump.deviceCount);
   }
 });