diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8f80272..203904c 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -355,3 +355,21 @@
     params: query,
   });
 }
+
+// 雨水Echarts
+export function rainEcharts(query) {
+  return request({
+    url: '/business/rainWaterPumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 污水echarts
+export function sewageEcharts(query) {
+  return request({
+    url: '/business/sewagePumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8f80272..203904c 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -355,3 +355,21 @@
     params: query,
   });
 }
+
+// 雨水Echarts
+export function rainEcharts(query) {
+  return request({
+    url: '/business/rainWaterPumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 污水echarts
+export function sewageEcharts(query) {
+  return request({
+    url: '/business/sewagePumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/assets/images/pictureOnMap/bengzhan-chang.png b/src/assets/images/pictureOnMap/bengzhan-chang.png
new file mode 100644
index 0000000..f315643
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-chang.png
Binary files differ

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8f80272..203904c 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -355,3 +355,21 @@
     params: query,
   });
 }
+
+// 雨水Echarts
+export function rainEcharts(query) {
+  return request({
+    url: '/business/rainWaterPumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 污水echarts
+export function sewageEcharts(query) {
+  return request({
+    url: '/business/sewagePumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/assets/images/pictureOnMap/bengzhan-chang.png b/src/assets/images/pictureOnMap/bengzhan-chang.png
new file mode 100644
index 0000000..f315643
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-chang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-kai.png b/src/assets/images/pictureOnMap/bengzhan-kai.png
new file mode 100644
index 0000000..07d0d42
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-kai.png
Binary files differ

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8f80272..203904c 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -355,3 +355,21 @@
     params: query,
   });
 }
+
+// 雨水Echarts
+export function rainEcharts(query) {
+  return request({
+    url: '/business/rainWaterPumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 污水echarts
+export function sewageEcharts(query) {
+  return request({
+    url: '/business/sewagePumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/assets/images/pictureOnMap/bengzhan-chang.png b/src/assets/images/pictureOnMap/bengzhan-chang.png
new file mode 100644
index 0000000..f315643
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-chang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-kai.png b/src/assets/images/pictureOnMap/bengzhan-kai.png
new file mode 100644
index 0000000..07d0d42
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-kai.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-yichang.png b/src/assets/images/pictureOnMap/bengzhan-yichang.png
new file mode 100644
index 0000000..7c90452
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-yichang.png
Binary files differ

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8f80272..203904c 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -355,3 +355,21 @@
     params: query,
   });
 }
+
+// 雨水Echarts
+export function rainEcharts(query) {
+  return request({
+    url: '/business/rainWaterPumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 污水echarts
+export function sewageEcharts(query) {
+  return request({
+    url: '/business/sewagePumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/assets/images/pictureOnMap/bengzhan-chang.png b/src/assets/images/pictureOnMap/bengzhan-chang.png
new file mode 100644
index 0000000..f315643
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-chang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-kai.png b/src/assets/images/pictureOnMap/bengzhan-kai.png
new file mode 100644
index 0000000..07d0d42
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-kai.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-yichang.png b/src/assets/images/pictureOnMap/bengzhan-yichang.png
new file mode 100644
index 0000000..7c90452
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-yichang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/mianban.png b/src/assets/images/pictureOnMap/mianban.png
new file mode 100644
index 0000000..f991f47
--- /dev/null
+++ b/src/assets/images/pictureOnMap/mianban.png
Binary files differ

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8f80272..203904c 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -355,3 +355,21 @@
     params: query,
   });
 }
+
+// 雨水Echarts
+export function rainEcharts(query) {
+  return request({
+    url: '/business/rainWaterPumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 污水echarts
+export function sewageEcharts(query) {
+  return request({
+    url: '/business/sewagePumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/assets/images/pictureOnMap/bengzhan-chang.png b/src/assets/images/pictureOnMap/bengzhan-chang.png
new file mode 100644
index 0000000..f315643
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-chang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-kai.png b/src/assets/images/pictureOnMap/bengzhan-kai.png
new file mode 100644
index 0000000..07d0d42
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-kai.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-yichang.png b/src/assets/images/pictureOnMap/bengzhan-yichang.png
new file mode 100644
index 0000000..7c90452
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-yichang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/mianban.png b/src/assets/images/pictureOnMap/mianban.png
new file mode 100644
index 0000000..f991f47
--- /dev/null
+++ b/src/assets/images/pictureOnMap/mianban.png
Binary files differ
diff --git a/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue
index 5de9a0d..f532728 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue
@@ -10,8 +10,8 @@
       <div class="ListInfo100">
         <div class="ListInfo_label">泵站类型:</div>
         <div class="ListInfo_value">
-          <!-- {{ AllData.bengZhanInfo.pointNumber ? AllData.bengZhanInfo.pointNumber : "--" }} -->
-          <dict-tag :options="pump_station_type" :value="AllData.bengZhanInfo.type" />
+          {{ Datatype == 'sewage_pump_station_info' ? '污水泵站' : '雨水泵站' }}
+          <!-- <dict-tag :options="pump_station_type" :value="AllData.bengZhanInfo.type" /> -->
         </div>
       </div>
       <div class="ListInfo100">
@@ -75,8 +75,8 @@
       <div class="modularBody">
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.jinZhan.jinZhanA + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.jinZhan.jinZhanA }}</span>
+            <el-tooltip :content="AllData.jinZhan.nowDay + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.jinZhan.nowDay }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -84,8 +84,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.jinZhan.jinZhanB + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.jinZhan.jinZhanB }}</span>
+            <el-tooltip :content="AllData.jinZhan.yesterday + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.jinZhan.yesterday }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -93,8 +93,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.jinZhan.jinZhanC + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.jinZhan.jinZhanC }}</span>
+            <el-tooltip :content="AllData.jinZhan.average + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.jinZhan.average }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -108,8 +108,8 @@
       <div class="modularBody">
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.ChuZhan.ChuZhanA + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.ChuZhan.ChuZhanA }}</span>
+            <el-tooltip :content="AllData.ChuZhan.nowDay + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.ChuZhan.nowDay }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -117,8 +117,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.ChuZhan.ChuZhanB + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.ChuZhan.ChuZhanB }}</span>
+            <el-tooltip :content="AllData.ChuZhan.yesterday + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.ChuZhan.yesterday }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -126,8 +126,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.ChuZhan.ChuZhanC + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.ChuZhan.ChuZhanC }}</span>
+            <el-tooltip :content="AllData.ChuZhan.average + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.ChuZhan.average }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -138,17 +138,31 @@
     <!-- 二级泵站 展示泵机状态 -->
     <div class="modular3_right" v-if="!AllData.ChuShuiShow">
       <div class="leve2Title">泵机状态</div>
-      <div class="modularBody"></div>
+      <div class="modularBody">
+        <div class="bengjibox">
+          <div class="bengji" v-for="item in AllData.BengjiObj.pumpStates" :key="item">
+            <div class="icon" :class="item.pumpSate == 1 ? 'kai' : item.pumpSate == -1 ? 'yichang' : ''"></div>
+            <div class="name">{{ item.pumpNum }}泵</div>
+          </div>
+        </div>
+        <div class="mianban">
+          <div class="mianban1">实时液位</div>
+          <div class="mianban2">
+            {{ AllData.BengjiObj.waterlevel || '-' }}
+            <span class="unit">米</span>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="modular4_right">
       <div class="leve2Title">实时水量</div>
       <div class="modularBody" v-loading="chartInfo3.loading" element-loading-background="rgba(122, 122, 122, 0.2)">
-        <!-- <shuiliang
+        <shuiliang
           :refresh="chartInfo3.refresh"
           :XAxis="chartInfo3.XAxis"
           :YAxis="chartInfo3.YAxis"
           :typeName="chartInfo3.typeName"
-        ></shuiliang> -->
+        ></shuiliang>
       </div>
     </div>
   </div>
@@ -156,7 +170,14 @@
 
 <script setup name="BengZhanRight">
 import { ref, reactive, toRefs, onMounted } from 'vue';
-import { listwaterRegionInfo, getBaseDetail, SWgetPumpDetail, RaingetPumpDetail } from '@/api/MonitorAssetsOnMap';
+import {
+  listwaterRegionInfo,
+  getBaseDetail,
+  SWgetPumpDetail,
+  RaingetPumpDetail,
+  rainEcharts,
+  sewageEcharts,
+} from '@/api/MonitorAssetsOnMap';
 import shuiliang from './components/shuiliang.vue';
 
 const { proxy } = getCurrentInstance();
@@ -165,17 +186,21 @@
   bengZhanInfo: {},
   // 是否展示出水量
   ChuShuiShow: true,
-  // 进站水量 :::::: 与后台对接口后替换jinZhanA,B,C的字段即可
+  // 进站水量
   jinZhan: {
-    jinZhanA: '10',
-    jinZhanB: '20',
-    jinZhanC: '30',
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
   },
-  // 出站水量:::::: 与后台对接口后替换ChuZhanA,B,C的字段即可
+  // 出站水量
   ChuZhan: {
-    ChuZhanA: '11',
-    ChuZhanB: '21',
-    ChuZhanC: '31',
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
+  },
+  BengjiObj: {
+    pumpStates: [],
+    waterlevel: '',
   },
 });
 const props = defineProps({
@@ -196,31 +221,46 @@
 
 const chartInfo3 = ref({
   refresh: 1,
-  XAxis: ['1', '2', '3', '4', '5'],
-  YAxis: [4, 5, 4, 6, 5, 1, 3],
-  // XAxis: [],
-  // YAxis: [],
+  // XAxis: ['1', '2', '3', '4', '5'],
+  // YAxis: [4, 5, 4, 6, 5, 1, 3],
+  XAxis: [],
+  YAxis: [],
   typeName: '水量(万吨)',
-  loading: false,
+  loading: true,
 });
 
 const { pump_station_type } = proxy.useDict('pump_station_type');
 // 获取基础数据信息 下面的进行变化
 const getBengZhanInfo = () => {
-  // 雨水
+  AllData.bengZhanInfo = {};
   getBaseDetail({
     dataId: props.DataId,
     dataCode: props.Datatype,
   }).then(res => {
     if (res && res.code == 200) {
       AllData.bengZhanInfo = res.data;
+      Getbottominfo();
+      GetEcharts();
     }
   });
-  // Getbottominfo();
 };
 
-//
+//获取进站水量/出战水量/泵机状态等数据
 const Getbottominfo = () => {
+  AllData.BengjiObj = {
+    pumpStates: [],
+    waterlevel: '',
+  };
+  AllData.jinZhan = {
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
+  };
+  AllData.ChuZhan = {
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
+  };
   if (props.TypeID == 'rain') {
     AllData.ChuShuiShow = false;
     // 雨水
@@ -228,7 +268,8 @@
       id: props.DataId,
     }).then(res => {
       if (res && res.code == 200) {
-        // AllData.bengZhanInfo = res.data;
+        AllData.BengjiObj = res.data.pumpStateDto;
+        AllData.jinZhan = res.data.inFlow;
       }
     });
   } else {
@@ -236,17 +277,55 @@
       id: props.DataId,
     }).then(res => {
       if (res && res.code == 200) {
-        // AllData.bengZhanInfo = res.data;
+        if (AllData.bengZhanInfo.grade == 1) {
+          // 污水一级泵站
+          AllData.ChuShuiShow = true;
+          AllData.jinZhan = res.data.inFlow;
+          AllData.ChuZhan = res.data.outFlow;
+        } else {
+          // 污水二级
+          AllData.BengjiObj = res.data.pumpStateDto;
+          AllData.jinZhan = res.data.inFlow;
+          AllData.ChuShuiShow = false;
+        }
       }
     });
-
     // 污水
     // 一级泵站 ChuShuiShow：true，二级泵站 ChuShuiShow：false
-    if (AllData.bengZhanInfo.grade == 1) {
-      AllData.ChuShuiShow = true;
-    } else {
-      AllData.ChuShuiShow = false;
-    }
+  }
+};
+
+// 获取雨水/污水Echarts
+const GetEcharts = () => {
+  chartInfo3.value.loading = true;
+  chartInfo3.value.XAxis = [];
+  chartInfo3.value.YAxis = [];
+  chartInfo3.value.refresh = Math.random();
+
+  let params = {
+    id: props.DataId,
+    start: proxy.moment(new Date().getTime()).format('YYYY-MM-DD 00:00:00'),
+    end: proxy.moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss'),
+  };
+  if (props.TypeID == 'rain') {
+    // 雨水
+    rainEcharts(params).then(res => {
+      if (res && res.code == 200) {
+        chartInfo3.value.XAxis = res.data.times;
+        chartInfo3.value.YAxis = res.data.datas;
+        chartInfo3.value.loading = false;
+        chartInfo3.value.refresh = Math.random();
+      }
+    });
+  } else {
+    sewageEcharts(params).then(res => {
+      if (res && res.code == 200) {
+        chartInfo3.value.XAxis = res.data.times;
+        chartInfo3.value.YAxis = res.data.datas;
+        chartInfo3.value.loading = false;
+        chartInfo3.value.refresh = Math.random();
+      }
+    });
   }
 };
 
@@ -374,15 +453,89 @@
 
   .modular3_right {
     width: 100%;
-    height: 120px;
+    height: 160px;
     .modularBody {
       width: 100%;
       height: calc(100% - 50px);
+
+      .bengjibox {
+        height: 90px;
+        display: flex;
+        margin-left: 2.5%;
+        .bengji {
+          margin-right: 5px;
+          .icon {
+            width: 63px;
+            height: 60px;
+            background-image: url('@/assets/images/pictureOnMap/bengzhan-chang.png');
+            background-size: 100% 100%;
+
+            &.kai {
+              background-image: url('@/assets/images/pictureOnMap/bengzhan-kai.png');
+              background-size: 100% 100%;
+            }
+            &.yichang {
+              background-image: url('@/assets/images/pictureOnMap/bengzhan-yichang.png');
+              background-size: 100% 100%;
+            }
+          }
+
+          .name {
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 16px;
+            color: #ccdfff;
+            text-align: center;
+          }
+        }
+      }
+
+      .mianban {
+        position: relative;
+        background-image: url('@/assets/images/pictureOnMap/mianban.png');
+        background-size: 100% 100%;
+        height: 32px;
+        margin-left: 2.5%;
+        width: 95%;
+
+        .mianban1 {
+          position: absolute;
+          left: 40px;
+          top: 44%;
+          transform: translateY(-50%);
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          font-size: 14px;
+          color: #ffffff;
+          line-height: 23px;
+        }
+
+        .mianban2 {
+          position: absolute;
+          font-family: DINPro;
+          top: 44%;
+          transform: translateY(-50%);
+          right: 20px;
+          font-weight: 500;
+          font-size: 16px;
+          color: #00fcff;
+          line-height: 23px;
+
+          .unit {
+            margin-left: 5px;
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 14px;
+            color: #ffffff;
+            line-height: 23px;
+          }
+        }
+      }
     }
   }
   .modular4_right {
     width: 100%;
-    height: 280px;
+    height: 240px;
     .modularBody {
       width: 100%;
       height: calc(100% - 50px);

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8f80272..203904c 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -355,3 +355,21 @@
     params: query,
   });
 }
+
+// 雨水Echarts
+export function rainEcharts(query) {
+  return request({
+    url: '/business/rainWaterPumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 污水echarts
+export function sewageEcharts(query) {
+  return request({
+    url: '/business/sewagePumpStationInfo/getPumpEchart',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/assets/images/pictureOnMap/bengzhan-chang.png b/src/assets/images/pictureOnMap/bengzhan-chang.png
new file mode 100644
index 0000000..f315643
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-chang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-kai.png b/src/assets/images/pictureOnMap/bengzhan-kai.png
new file mode 100644
index 0000000..07d0d42
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-kai.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/bengzhan-yichang.png b/src/assets/images/pictureOnMap/bengzhan-yichang.png
new file mode 100644
index 0000000..7c90452
--- /dev/null
+++ b/src/assets/images/pictureOnMap/bengzhan-yichang.png
Binary files differ
diff --git a/src/assets/images/pictureOnMap/mianban.png b/src/assets/images/pictureOnMap/mianban.png
new file mode 100644
index 0000000..f991f47
--- /dev/null
+++ b/src/assets/images/pictureOnMap/mianban.png
Binary files differ
diff --git a/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue
index 5de9a0d..f532728 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue
@@ -10,8 +10,8 @@
       <div class="ListInfo100">
         <div class="ListInfo_label">泵站类型:</div>
         <div class="ListInfo_value">
-          <!-- {{ AllData.bengZhanInfo.pointNumber ? AllData.bengZhanInfo.pointNumber : "--" }} -->
-          <dict-tag :options="pump_station_type" :value="AllData.bengZhanInfo.type" />
+          {{ Datatype == 'sewage_pump_station_info' ? '污水泵站' : '雨水泵站' }}
+          <!-- <dict-tag :options="pump_station_type" :value="AllData.bengZhanInfo.type" /> -->
         </div>
       </div>
       <div class="ListInfo100">
@@ -75,8 +75,8 @@
       <div class="modularBody">
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.jinZhan.jinZhanA + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.jinZhan.jinZhanA }}</span>
+            <el-tooltip :content="AllData.jinZhan.nowDay + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.jinZhan.nowDay }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -84,8 +84,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.jinZhan.jinZhanB + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.jinZhan.jinZhanB }}</span>
+            <el-tooltip :content="AllData.jinZhan.yesterday + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.jinZhan.yesterday }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -93,8 +93,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.jinZhan.jinZhanC + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.jinZhan.jinZhanC }}</span>
+            <el-tooltip :content="AllData.jinZhan.average + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.jinZhan.average }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -108,8 +108,8 @@
       <div class="modularBody">
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.ChuZhan.ChuZhanA + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.ChuZhan.ChuZhanA }}</span>
+            <el-tooltip :content="AllData.ChuZhan.nowDay + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.ChuZhan.nowDay }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -117,8 +117,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.ChuZhan.ChuZhanB + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.ChuZhan.ChuZhanB }}</span>
+            <el-tooltip :content="AllData.ChuZhan.yesterday + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.ChuZhan.yesterday }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -126,8 +126,8 @@
         </div>
         <div class="SLList">
           <div class="SlList1P">
-            <el-tooltip :content="AllData.ChuZhan.ChuZhanC + '万吨'" placement="top">
-              <span class="SlListNum">{{ AllData.ChuZhan.ChuZhanC }}</span>
+            <el-tooltip :content="AllData.ChuZhan.average + '万吨'" placement="top">
+              <span class="SlListNum">{{ AllData.ChuZhan.average }}</span>
             </el-tooltip>
             <span class="SlListUnit">万吨</span>
           </div>
@@ -138,17 +138,31 @@
     <!-- 二级泵站 展示泵机状态 -->
     <div class="modular3_right" v-if="!AllData.ChuShuiShow">
       <div class="leve2Title">泵机状态</div>
-      <div class="modularBody"></div>
+      <div class="modularBody">
+        <div class="bengjibox">
+          <div class="bengji" v-for="item in AllData.BengjiObj.pumpStates" :key="item">
+            <div class="icon" :class="item.pumpSate == 1 ? 'kai' : item.pumpSate == -1 ? 'yichang' : ''"></div>
+            <div class="name">{{ item.pumpNum }}泵</div>
+          </div>
+        </div>
+        <div class="mianban">
+          <div class="mianban1">实时液位</div>
+          <div class="mianban2">
+            {{ AllData.BengjiObj.waterlevel || '-' }}
+            <span class="unit">米</span>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="modular4_right">
       <div class="leve2Title">实时水量</div>
       <div class="modularBody" v-loading="chartInfo3.loading" element-loading-background="rgba(122, 122, 122, 0.2)">
-        <!-- <shuiliang
+        <shuiliang
           :refresh="chartInfo3.refresh"
           :XAxis="chartInfo3.XAxis"
           :YAxis="chartInfo3.YAxis"
           :typeName="chartInfo3.typeName"
-        ></shuiliang> -->
+        ></shuiliang>
       </div>
     </div>
   </div>
@@ -156,7 +170,14 @@
 
 <script setup name="BengZhanRight">
 import { ref, reactive, toRefs, onMounted } from 'vue';
-import { listwaterRegionInfo, getBaseDetail, SWgetPumpDetail, RaingetPumpDetail } from '@/api/MonitorAssetsOnMap';
+import {
+  listwaterRegionInfo,
+  getBaseDetail,
+  SWgetPumpDetail,
+  RaingetPumpDetail,
+  rainEcharts,
+  sewageEcharts,
+} from '@/api/MonitorAssetsOnMap';
 import shuiliang from './components/shuiliang.vue';
 
 const { proxy } = getCurrentInstance();
@@ -165,17 +186,21 @@
   bengZhanInfo: {},
   // 是否展示出水量
   ChuShuiShow: true,
-  // 进站水量 :::::: 与后台对接口后替换jinZhanA,B,C的字段即可
+  // 进站水量
   jinZhan: {
-    jinZhanA: '10',
-    jinZhanB: '20',
-    jinZhanC: '30',
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
   },
-  // 出站水量:::::: 与后台对接口后替换ChuZhanA,B,C的字段即可
+  // 出站水量
   ChuZhan: {
-    ChuZhanA: '11',
-    ChuZhanB: '21',
-    ChuZhanC: '31',
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
+  },
+  BengjiObj: {
+    pumpStates: [],
+    waterlevel: '',
   },
 });
 const props = defineProps({
@@ -196,31 +221,46 @@
 
 const chartInfo3 = ref({
   refresh: 1,
-  XAxis: ['1', '2', '3', '4', '5'],
-  YAxis: [4, 5, 4, 6, 5, 1, 3],
-  // XAxis: [],
-  // YAxis: [],
+  // XAxis: ['1', '2', '3', '4', '5'],
+  // YAxis: [4, 5, 4, 6, 5, 1, 3],
+  XAxis: [],
+  YAxis: [],
   typeName: '水量(万吨)',
-  loading: false,
+  loading: true,
 });
 
 const { pump_station_type } = proxy.useDict('pump_station_type');
 // 获取基础数据信息 下面的进行变化
 const getBengZhanInfo = () => {
-  // 雨水
+  AllData.bengZhanInfo = {};
   getBaseDetail({
     dataId: props.DataId,
     dataCode: props.Datatype,
   }).then(res => {
     if (res && res.code == 200) {
       AllData.bengZhanInfo = res.data;
+      Getbottominfo();
+      GetEcharts();
     }
   });
-  // Getbottominfo();
 };
 
-//
+//获取进站水量/出战水量/泵机状态等数据
 const Getbottominfo = () => {
+  AllData.BengjiObj = {
+    pumpStates: [],
+    waterlevel: '',
+  };
+  AllData.jinZhan = {
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
+  };
+  AllData.ChuZhan = {
+    nowDay: '0',
+    yesterday: '0',
+    average: '0',
+  };
   if (props.TypeID == 'rain') {
     AllData.ChuShuiShow = false;
     // 雨水
@@ -228,7 +268,8 @@
       id: props.DataId,
     }).then(res => {
       if (res && res.code == 200) {
-        // AllData.bengZhanInfo = res.data;
+        AllData.BengjiObj = res.data.pumpStateDto;
+        AllData.jinZhan = res.data.inFlow;
       }
     });
   } else {
@@ -236,17 +277,55 @@
       id: props.DataId,
     }).then(res => {
       if (res && res.code == 200) {
-        // AllData.bengZhanInfo = res.data;
+        if (AllData.bengZhanInfo.grade == 1) {
+          // 污水一级泵站
+          AllData.ChuShuiShow = true;
+          AllData.jinZhan = res.data.inFlow;
+          AllData.ChuZhan = res.data.outFlow;
+        } else {
+          // 污水二级
+          AllData.BengjiObj = res.data.pumpStateDto;
+          AllData.jinZhan = res.data.inFlow;
+          AllData.ChuShuiShow = false;
+        }
       }
     });
-
     // 污水
     // 一级泵站 ChuShuiShow：true，二级泵站 ChuShuiShow：false
-    if (AllData.bengZhanInfo.grade == 1) {
-      AllData.ChuShuiShow = true;
-    } else {
-      AllData.ChuShuiShow = false;
-    }
+  }
+};
+
+// 获取雨水/污水Echarts
+const GetEcharts = () => {
+  chartInfo3.value.loading = true;
+  chartInfo3.value.XAxis = [];
+  chartInfo3.value.YAxis = [];
+  chartInfo3.value.refresh = Math.random();
+
+  let params = {
+    id: props.DataId,
+    start: proxy.moment(new Date().getTime()).format('YYYY-MM-DD 00:00:00'),
+    end: proxy.moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss'),
+  };
+  if (props.TypeID == 'rain') {
+    // 雨水
+    rainEcharts(params).then(res => {
+      if (res && res.code == 200) {
+        chartInfo3.value.XAxis = res.data.times;
+        chartInfo3.value.YAxis = res.data.datas;
+        chartInfo3.value.loading = false;
+        chartInfo3.value.refresh = Math.random();
+      }
+    });
+  } else {
+    sewageEcharts(params).then(res => {
+      if (res && res.code == 200) {
+        chartInfo3.value.XAxis = res.data.times;
+        chartInfo3.value.YAxis = res.data.datas;
+        chartInfo3.value.loading = false;
+        chartInfo3.value.refresh = Math.random();
+      }
+    });
   }
 };
 
@@ -374,15 +453,89 @@
 
   .modular3_right {
     width: 100%;
-    height: 120px;
+    height: 160px;
     .modularBody {
       width: 100%;
       height: calc(100% - 50px);
+
+      .bengjibox {
+        height: 90px;
+        display: flex;
+        margin-left: 2.5%;
+        .bengji {
+          margin-right: 5px;
+          .icon {
+            width: 63px;
+            height: 60px;
+            background-image: url('@/assets/images/pictureOnMap/bengzhan-chang.png');
+            background-size: 100% 100%;
+
+            &.kai {
+              background-image: url('@/assets/images/pictureOnMap/bengzhan-kai.png');
+              background-size: 100% 100%;
+            }
+            &.yichang {
+              background-image: url('@/assets/images/pictureOnMap/bengzhan-yichang.png');
+              background-size: 100% 100%;
+            }
+          }
+
+          .name {
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 16px;
+            color: #ccdfff;
+            text-align: center;
+          }
+        }
+      }
+
+      .mianban {
+        position: relative;
+        background-image: url('@/assets/images/pictureOnMap/mianban.png');
+        background-size: 100% 100%;
+        height: 32px;
+        margin-left: 2.5%;
+        width: 95%;
+
+        .mianban1 {
+          position: absolute;
+          left: 40px;
+          top: 44%;
+          transform: translateY(-50%);
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          font-size: 14px;
+          color: #ffffff;
+          line-height: 23px;
+        }
+
+        .mianban2 {
+          position: absolute;
+          font-family: DINPro;
+          top: 44%;
+          transform: translateY(-50%);
+          right: 20px;
+          font-weight: 500;
+          font-size: 16px;
+          color: #00fcff;
+          line-height: 23px;
+
+          .unit {
+            margin-left: 5px;
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 14px;
+            color: #ffffff;
+            line-height: 23px;
+          }
+        }
+      }
     }
   }
   .modular4_right {
     width: 100%;
-    height: 280px;
+    height: 240px;
     .modularBody {
       width: 100%;
       height: calc(100% - 50px);
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/shuiliang.vue b/src/views/pictureOnMap/page/DrainageSystem/components/shuiliang.vue
index 07414a3..bb76d3d 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/shuiliang.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/shuiliang.vue
@@ -74,7 +74,7 @@
     grid: {
       left: '10%',
       right: '4%',
-      bottom: '6%',
+      bottom: '10%',
       top: '8%',
       containLabel: true,
     },
@@ -85,15 +85,10 @@
       axisLabel: {
         show: true,
         color: '#fff',
-        // formatter: function (params) {
-        //   let one = params.substring(0, 3);
-        //   let two = params.substring(3, 6);
-        //   let three = params.substring(6, 8);
-        //   let four = params.substring(8) ? '...' : '';
-
-        //   let newParamsName = one + '\n' + two + '\n' + three + four;
-        //   return newParamsName;
-        // },
+        formatter: function (params) {
+          let newParamsName = params.substring(10, 16);
+          return newParamsName;
+        },
       },
       axisLine: {
         show: true,
@@ -113,7 +108,7 @@
       nameLocation: 'start',
       nameTextStyle: {
         color: '#AED2E0',
-        padding: [-3, 0, 0, -60], // 四个数字分别为上右下左与原位置距离
+        padding: [-6, 0, 0, -80], // 四个数字分别为上右下左与原位置距离
       },
       axisLabel: {
         show: true,