diff --git a/src/assets/newImgs/pumpGY/gauge.png b/src/assets/newImgs/pumpGY/gauge.png
index 533b1b3..0294f5b 100644
--- a/src/assets/newImgs/pumpGY/gauge.png
+++ b/src/assets/newImgs/pumpGY/gauge.png
Binary files differ

diff --git a/src/assets/newImgs/pumpGY/gauge.png b/src/assets/newImgs/pumpGY/gauge.png
index 533b1b3..0294f5b 100644
--- a/src/assets/newImgs/pumpGY/gauge.png
+++ b/src/assets/newImgs/pumpGY/gauge.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/water.png b/src/assets/newImgs/pumpGY/water.png
index 9a3c324..968b5e3 100644
--- a/src/assets/newImgs/pumpGY/water.png
+++ b/src/assets/newImgs/pumpGY/water.png
Binary files differ

diff --git a/src/assets/newImgs/pumpGY/gauge.png b/src/assets/newImgs/pumpGY/gauge.png
index 533b1b3..0294f5b 100644
--- a/src/assets/newImgs/pumpGY/gauge.png
+++ b/src/assets/newImgs/pumpGY/gauge.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/water.png b/src/assets/newImgs/pumpGY/water.png
index 9a3c324..968b5e3 100644
--- a/src/assets/newImgs/pumpGY/water.png
+++ b/src/assets/newImgs/pumpGY/water.png
Binary files differ
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 1216148..b79bba5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -4,8 +4,8 @@
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
         <el-form-item label="站点:" prop="pumpCode">
-          <el-select clearable v-model="queryParams.pumpCode" placeholder="请选择">
-            <el-option v-for="item in typeList" :key="item.stationCode" :label="item.stationName" :value="item.stationCode" />
+          <el-select clearable filterable v-model="queryParams.pumpCode" placeholder="请选择">
+            <el-option v-for="item in tableData" :key="item.pumpCode" :label="item.pumpName" :value="item.pumpCode" />
           </el-select>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
@@ -93,8 +93,8 @@
             <el-form-item label="雨水单台流量(m³/s):" prop="b" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入雨水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="雨水泵站台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵站台数" clearable />
+            <el-form-item label="雨水泵机台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
@@ -112,8 +112,8 @@
             <el-form-item label="污水单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入污水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="污水泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵站台数" clearable />
+            <el-form-item label="污水泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
@@ -133,8 +133,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -154,8 +154,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -175,8 +175,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
-              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -201,8 +201,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
-              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -216,6 +216,12 @@
             <el-form-item label="泵站地址:" prop="address" style="width: 45%">
               <el-input v-model="formData.address" placeholder="请输入泵站地址" clearable />
             </el-form-item>
+            <el-form-item label="经度:" prop="lon" style="width: 45%">
+              <el-input v-model="formData.lon" placeholder="请输入经度" clearable />
+            </el-form-item>
+            <el-form-item label="纬度:" prop="lat" style="width: 45%">
+              <el-input v-model="formData.lat" placeholder="请输入纬度" clearable />
+            </el-form-item>
             <el-form-item label="格栅机:" prop="grilleMachine" style="width: 45%">
               <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
             </el-form-item>
@@ -302,11 +308,7 @@
   queryParams.value.pumpType = '';
   getDataList();
 };
-//站点下拉框
-const stationInfolistM = async p => {
-  const res = await stationInfolist();
-  typeList.value = res.data;
-};
+
 //获取列表数据
 const getDataList = async () => {
   tableLoading.value = true;

diff --git a/src/assets/newImgs/pumpGY/gauge.png b/src/assets/newImgs/pumpGY/gauge.png
index 533b1b3..0294f5b 100644
--- a/src/assets/newImgs/pumpGY/gauge.png
+++ b/src/assets/newImgs/pumpGY/gauge.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/water.png b/src/assets/newImgs/pumpGY/water.png
index 9a3c324..968b5e3 100644
--- a/src/assets/newImgs/pumpGY/water.png
+++ b/src/assets/newImgs/pumpGY/water.png
Binary files differ
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 1216148..b79bba5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -4,8 +4,8 @@
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
         <el-form-item label="站点:" prop="pumpCode">
-          <el-select clearable v-model="queryParams.pumpCode" placeholder="请选择">
-            <el-option v-for="item in typeList" :key="item.stationCode" :label="item.stationName" :value="item.stationCode" />
+          <el-select clearable filterable v-model="queryParams.pumpCode" placeholder="请选择">
+            <el-option v-for="item in tableData" :key="item.pumpCode" :label="item.pumpName" :value="item.pumpCode" />
           </el-select>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
@@ -93,8 +93,8 @@
             <el-form-item label="雨水单台流量(m³/s):" prop="b" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入雨水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="雨水泵站台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵站台数" clearable />
+            <el-form-item label="雨水泵机台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
@@ -112,8 +112,8 @@
             <el-form-item label="污水单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入污水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="污水泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵站台数" clearable />
+            <el-form-item label="污水泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
@@ -133,8 +133,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -154,8 +154,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -175,8 +175,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
-              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -201,8 +201,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
-              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -216,6 +216,12 @@
             <el-form-item label="泵站地址:" prop="address" style="width: 45%">
               <el-input v-model="formData.address" placeholder="请输入泵站地址" clearable />
             </el-form-item>
+            <el-form-item label="经度:" prop="lon" style="width: 45%">
+              <el-input v-model="formData.lon" placeholder="请输入经度" clearable />
+            </el-form-item>
+            <el-form-item label="纬度:" prop="lat" style="width: 45%">
+              <el-input v-model="formData.lat" placeholder="请输入纬度" clearable />
+            </el-form-item>
             <el-form-item label="格栅机:" prop="grilleMachine" style="width: 45%">
               <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
             </el-form-item>
@@ -302,11 +308,7 @@
   queryParams.value.pumpType = '';
   getDataList();
 };
-//站点下拉框
-const stationInfolistM = async p => {
-  const res = await stationInfolist();
-  typeList.value = res.data;
-};
+
 //获取列表数据
 const getDataList = async () => {
   tableLoading.value = true;
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 65c3b05..edfc04a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -46,7 +46,7 @@
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
-const dialogShow = ref(true);
+const dialogShow = ref(false);
 
 // 面板内容展开收起控制
 const props = defineProps({

diff --git a/src/assets/newImgs/pumpGY/gauge.png b/src/assets/newImgs/pumpGY/gauge.png
index 533b1b3..0294f5b 100644
--- a/src/assets/newImgs/pumpGY/gauge.png
+++ b/src/assets/newImgs/pumpGY/gauge.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/water.png b/src/assets/newImgs/pumpGY/water.png
index 9a3c324..968b5e3 100644
--- a/src/assets/newImgs/pumpGY/water.png
+++ b/src/assets/newImgs/pumpGY/water.png
Binary files differ
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 1216148..b79bba5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -4,8 +4,8 @@
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
         <el-form-item label="站点:" prop="pumpCode">
-          <el-select clearable v-model="queryParams.pumpCode" placeholder="请选择">
-            <el-option v-for="item in typeList" :key="item.stationCode" :label="item.stationName" :value="item.stationCode" />
+          <el-select clearable filterable v-model="queryParams.pumpCode" placeholder="请选择">
+            <el-option v-for="item in tableData" :key="item.pumpCode" :label="item.pumpName" :value="item.pumpCode" />
           </el-select>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
@@ -93,8 +93,8 @@
             <el-form-item label="雨水单台流量(m³/s):" prop="b" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入雨水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="雨水泵站台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵站台数" clearable />
+            <el-form-item label="雨水泵机台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
@@ -112,8 +112,8 @@
             <el-form-item label="污水单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入污水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="污水泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵站台数" clearable />
+            <el-form-item label="污水泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
@@ -133,8 +133,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -154,8 +154,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -175,8 +175,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
-              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -201,8 +201,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
-              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -216,6 +216,12 @@
             <el-form-item label="泵站地址:" prop="address" style="width: 45%">
               <el-input v-model="formData.address" placeholder="请输入泵站地址" clearable />
             </el-form-item>
+            <el-form-item label="经度:" prop="lon" style="width: 45%">
+              <el-input v-model="formData.lon" placeholder="请输入经度" clearable />
+            </el-form-item>
+            <el-form-item label="纬度:" prop="lat" style="width: 45%">
+              <el-input v-model="formData.lat" placeholder="请输入纬度" clearable />
+            </el-form-item>
             <el-form-item label="格栅机:" prop="grilleMachine" style="width: 45%">
               <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
             </el-form-item>
@@ -302,11 +308,7 @@
   queryParams.value.pumpType = '';
   getDataList();
 };
-//站点下拉框
-const stationInfolistM = async p => {
-  const res = await stationInfolist();
-  typeList.value = res.data;
-};
+
 //获取列表数据
 const getDataList = async () => {
   tableLoading.value = true;
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 65c3b05..edfc04a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -46,7 +46,7 @@
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
-const dialogShow = ref(true);
+const dialogShow = ref(false);
 
 // 面板内容展开收起控制
 const props = defineProps({
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 434c256..2c46784 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -11,6 +11,7 @@
             <!-- <p class="fail"><span></span>离线</p> -->
             <!-- <p class="fault"><span></span>故障</p> -->
           </div>
+          <div>更新时间：{{ detailObj.tt }}</div>
         </div>
         <div class="infoRight">
           <div class="name"><img src="@/assets/newImgs/pumpGY/dianya.png" alt="电压" />电压</div>
@@ -59,15 +60,36 @@
       <!-- 雨水池、污水池 -->
       <div class="waterType">雨水池</div>
 
+      <!-- 大水管水流动效 -->
+      <div class="path-run" v-if="mainWater">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="1056"
+          height="350"
+          viewBox="0 0 1256 400"
+          fill="transparent"
+          stroke-width="15"
+          stroke-dasharray="60"
+        >
+          <path
+            transform="translate(7.5 7.5)  rotate(0 619.5 131.5)"
+            d="M0,393L0,10C0,4.48 4.48,0 10,0L1229,0C1234.52,0 1239,4.48 1239,10L1239,393 "
+            class="pathRun"
+            stroke="#ff8500"
+            fill="transparent"
+          ></path>
+        </svg>
+      </div>
+
       <!-- 格栅机 -->
       <div class="gsjCont flex">
-        <div class="partGsj" v-for="i in 2" :key="i">
-          <div class="contTips">{{ i }}#格栅机</div>
-          <img src="@/assets/newImgs/pumpGY/gsjDefault.png" alt="格栅机停止状态" />
-          <!-- <img src="@/assets/newImgs/pumpGY/gsjMove.png" alt="格栅机运行状态" /> -->
+        <div class="partGsj" v-for="(item, index) in gsjList" :key="index">
+          <div class="contTips">{{ index + 1 }}#格栅机</div>
+          <img src="@/assets/newImgs/pumpGY/gsjDefault.png" alt="格栅机停止状态" v-if="item.status == '运行'" />
+          <img src="@/assets/newImgs/pumpGY/gsjMove.png" alt="格栅机运行状态" v-else />
           <div class="status">就地</div>
-          <div class="yxstatus statusYX">运行</div>
-          <!-- <div class="yxstatus statusTZ">停止</div> -->
+          <div class="yxstatus statusYX" v-if="item.status == '运行'">{{ item.status }}</div>
+          <div class="yxstatus statusTZ" v-else>停止</div>
         </div>
       </div>
 
@@ -75,30 +97,43 @@
       <div class="pumpBZ">
         <!-- 水流和液位值 -->
         <div class="waterVal">
-          <img class="water" src="@/assets/newImgs/pumpGY/water.png" alt="水位" />
+          <img class="water" src="@/assets/newImgs/pumpGY/water.png" :style="{ height: (realYW / 10.5) * 384 + 'px' }" alt="水位" />
           <div class="value">
             <img src="@/assets/newImgs/pumpGY/gauge.png" alt="水尺" />
-            <div class="number" :style="{ bottom: (1.45 / 12) * 384 + 'px' }">
-              <div class="val">1.45</div>
+            <div class="number" :style="{ bottom: (realYW / 10.5) * 384 + 'px' }">
+              <div class="val">{{ realYW }}</div>
             </div>
           </div>
         </div>
         <!-- 泵 -->
         <div class="flex bzCont">
-          <div class="partBJ" v-for="i in 6" :key="i">
+          <div class="partBJ" v-for="(item, index) in pumpList" :key="index">
             <img class="guan" src="@/assets/newImgs/pumpGY/guan.png" alt="水管" />
+            <!-- 开启单个水管水流动效 -->
+            <div class="line-div" v-if="item.status == '运行'">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                version="1.0"
+                viewBox="0 0 40 400"
+                stroke-width="40"
+                stroke-dasharray="30"
+                style="height: 290px; width: 24px"
+              >
+                <path d="M5 -50 Q1 -5 2 -2 V425" stroke="#ff8500" fill="transparent" class="line-div-run"></path>
+              </svg>
+            </div>
             <div class="tipsBZ">
               <div class="contTips">{{ i }}雨水泵</div>
-              <div class="light">
-                <div class="flex"><img src="@/assets/newImgs/pumpGY/dlIcon.png" alt="电流" />77.6A</div>
-                <div class="flex"><img src="@/assets/newImgs/pumpGY/timeIcon.png" alt="时长" />01:23:10</div>
+              <div class="light" v-if="item.dl">
+                <div class="flex"><img src="@/assets/newImgs/pumpGY/dlIcon.png" alt="电流" />{{ item.dl }}</div>
+                <div class="flex"><img src="@/assets/newImgs/pumpGY/timeIcon.png" alt="时长" />{{ item.hour }}</div>
               </div>
             </div>
-            <img class="pump" src="@/assets/newImgs/pumpGY/pump.png" alt="泵机停止状态" />
-            <!-- <img class="pump" src="@/assets/newImgs/pumpGY/pumpOpen.png" alt="泵机开启状态" /> -->
+            <img class="pump" src="@/assets/newImgs/pumpGY/pumpOpen.png" alt="泵机开启状态" v-if="item.status == '运行'" />
+            <img class="pump" src="@/assets/newImgs/pumpGY/pump.png" alt="泵机停止状态" v-else />
             <div class="status">就地</div>
-            <div class="yxstatus statusYX">运行</div>
-            <!-- <div class="yxstatus statusTZ">停止</div> -->
+            <div class="yxstatus statusYX" v-if="item.status == '运行'">{{ item.status }}</div>
+            <div class="yxstatus statusTZ" v-else>停止</div>
           </div>
         </div>
       </div>
@@ -107,9 +142,50 @@
 </template>
 
 <script setup>
-const { proxy } = getCurrentInstance();
+import { realtimeDataList } from '@/api/scada/monitor';
 
-onMounted(() => {});
+const { proxy } = getCurrentInstance();
+const detailObj = ref({});
+const pumpList = ref([]); //泵机
+const gsjList = ref([]); //格栅机
+const realYW = ref(''); //实时液位
+const mainWater = ref(false); //大水管动效
+
+// 获取数据
+function getData() {
+  let params = {
+    stationCode: 'BZKFDJG',
+  };
+  realtimeDataList(params).then(res => {
+    let datas = res.data || {};
+    console.log(datas);
+    detailObj.value = datas;
+    realYW.value = detailObj.value['BZKFDJG-YW']; //实时液位
+    for (let i in datas) {
+      // 添加泵机数据
+      if (i.includes('QSB-YX')) {
+        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(() => {
+  getData();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -166,6 +242,23 @@
           .guan{
             margin:25PX 0px 0px 0PX;
           }
+          .line-div{
+            position:absolute;
+            left:5PX;
+            top:25PX;
+            .line-div-run{
+              fill:transparent !important;
+              animation: moveLines 1s linear infinite;;
+            }
+            @keyframes moveLines {
+              0%{
+                stroke-dashoffset: -30;
+              }
+              100%{
+                stroke-dashoffset: 30;
+              }
+            }
+          }
           .pump{
             margin:-3PX 0px 0px -20PX;
           }
@@ -188,6 +281,7 @@
           position:absolute;
           bottom:0PX;
           left:0PX;
+          width:100%;
         }
         .value{
           position:absolute;
@@ -199,16 +293,17 @@
             bottom:0PX;
             left:0PX;
             z-index: 99;
-            width:65PX;
+            width:67PX;
             border-bottom:3px solid #2ABB3E;
             .val{
               text-align: center;
-              padding:3PX 0;
-              width:40PX;
+              padding:3PX 2PX;
+              width:42PX;
               margin-left:25PX;
+              margin-bottom:-1PX;
               background: #2ABB3E;
               font-weight: bold;
-              font-size: 18PX;
+              font-size: 17PX;
             }
           }
         }
@@ -265,6 +360,24 @@
       font-weight: bold;
       z-index: 90;
     }
+    .path-run{
+      position:absolute;
+      left:285PX;
+      top:0PX;
+      height: 350PX;
+      .pathRun{
+        animation: pathRun 2s linear infinite;
+        fill:transparent !important;
+      }
+      @keyframes pathRun {
+        0%{
+          stroke-dashoffset: 0;
+        }
+        100%{
+          stroke-dashoffset: -120;
+        }
+      }
+    }
   }
   .statusYX{
     width: 68PX;
@@ -283,14 +396,14 @@
     border-radius: 14PX;
   }
   .pumpInfo{
-    width:740PX;
+    width:340PX;
     height: 140PX;
     background: rgba(7,45,67,0.6);
     border: 2PX solid #2C81C7;
     box-shadow: 0PX 0PX 8PX #67BDFA inset;
     padding:15PX;
     .infoLeft{
-      width:40%;
+      width:100%;
       .name{
         font-size: 18PX;
         font-weight: 800;
@@ -318,6 +431,7 @@
     }
     .infoRight{
       flex:1;
+      display: none;
       .name{
         display: flex;
         align-items: center;

diff --git a/src/assets/newImgs/pumpGY/gauge.png b/src/assets/newImgs/pumpGY/gauge.png
index 533b1b3..0294f5b 100644
--- a/src/assets/newImgs/pumpGY/gauge.png
+++ b/src/assets/newImgs/pumpGY/gauge.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/water.png b/src/assets/newImgs/pumpGY/water.png
index 9a3c324..968b5e3 100644
--- a/src/assets/newImgs/pumpGY/water.png
+++ b/src/assets/newImgs/pumpGY/water.png
Binary files differ
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 1216148..b79bba5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -4,8 +4,8 @@
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
         <el-form-item label="站点:" prop="pumpCode">
-          <el-select clearable v-model="queryParams.pumpCode" placeholder="请选择">
-            <el-option v-for="item in typeList" :key="item.stationCode" :label="item.stationName" :value="item.stationCode" />
+          <el-select clearable filterable v-model="queryParams.pumpCode" placeholder="请选择">
+            <el-option v-for="item in tableData" :key="item.pumpCode" :label="item.pumpName" :value="item.pumpCode" />
           </el-select>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
@@ -93,8 +93,8 @@
             <el-form-item label="雨水单台流量(m³/s):" prop="b" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入雨水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="雨水泵站台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵站台数" clearable />
+            <el-form-item label="雨水泵机台数:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入雨水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
@@ -112,8 +112,8 @@
             <el-form-item label="污水单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入污水单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="污水泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵站台数" clearable />
+            <el-form-item label="污水泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入污水泵机台数" clearable />
             </el-form-item>
             <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
@@ -133,8 +133,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
-              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
               <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -154,8 +154,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
-              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
               <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -175,8 +175,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
-              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
               <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -201,8 +201,8 @@
             <el-form-item label="单台流量(m³/s):" prop="singleFlowSccond" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.singleFlowSccond" placeholder="请输入单台流量(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="泵站台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
-              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵站台数" clearable />
+            <el-form-item label="泵机台数:" prop="deviceCount" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.deviceCount" placeholder="请输入泵机台数" clearable />
             </el-form-item>
             <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
               <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
@@ -216,6 +216,12 @@
             <el-form-item label="泵站地址:" prop="address" style="width: 45%">
               <el-input v-model="formData.address" placeholder="请输入泵站地址" clearable />
             </el-form-item>
+            <el-form-item label="经度:" prop="lon" style="width: 45%">
+              <el-input v-model="formData.lon" placeholder="请输入经度" clearable />
+            </el-form-item>
+            <el-form-item label="纬度:" prop="lat" style="width: 45%">
+              <el-input v-model="formData.lat" placeholder="请输入纬度" clearable />
+            </el-form-item>
             <el-form-item label="格栅机:" prop="grilleMachine" style="width: 45%">
               <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
             </el-form-item>
@@ -302,11 +308,7 @@
   queryParams.value.pumpType = '';
   getDataList();
 };
-//站点下拉框
-const stationInfolistM = async p => {
-  const res = await stationInfolist();
-  typeList.value = res.data;
-};
+
 //获取列表数据
 const getDataList = async () => {
   tableLoading.value = true;
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 65c3b05..edfc04a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -46,7 +46,7 @@
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
-const dialogShow = ref(true);
+const dialogShow = ref(false);
 
 // 面板内容展开收起控制
 const props = defineProps({
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 434c256..2c46784 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -11,6 +11,7 @@
             <!-- <p class="fail"><span></span>离线</p> -->
             <!-- <p class="fault"><span></span>故障</p> -->
           </div>
+          <div>更新时间：{{ detailObj.tt }}</div>
         </div>
         <div class="infoRight">
           <div class="name"><img src="@/assets/newImgs/pumpGY/dianya.png" alt="电压" />电压</div>
@@ -59,15 +60,36 @@
       <!-- 雨水池、污水池 -->
       <div class="waterType">雨水池</div>
 
+      <!-- 大水管水流动效 -->
+      <div class="path-run" v-if="mainWater">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="1056"
+          height="350"
+          viewBox="0 0 1256 400"
+          fill="transparent"
+          stroke-width="15"
+          stroke-dasharray="60"
+        >
+          <path
+            transform="translate(7.5 7.5)  rotate(0 619.5 131.5)"
+            d="M0,393L0,10C0,4.48 4.48,0 10,0L1229,0C1234.52,0 1239,4.48 1239,10L1239,393 "
+            class="pathRun"
+            stroke="#ff8500"
+            fill="transparent"
+          ></path>
+        </svg>
+      </div>
+
       <!-- 格栅机 -->
       <div class="gsjCont flex">
-        <div class="partGsj" v-for="i in 2" :key="i">
-          <div class="contTips">{{ i }}#格栅机</div>
-          <img src="@/assets/newImgs/pumpGY/gsjDefault.png" alt="格栅机停止状态" />
-          <!-- <img src="@/assets/newImgs/pumpGY/gsjMove.png" alt="格栅机运行状态" /> -->
+        <div class="partGsj" v-for="(item, index) in gsjList" :key="index">
+          <div class="contTips">{{ index + 1 }}#格栅机</div>
+          <img src="@/assets/newImgs/pumpGY/gsjDefault.png" alt="格栅机停止状态" v-if="item.status == '运行'" />
+          <img src="@/assets/newImgs/pumpGY/gsjMove.png" alt="格栅机运行状态" v-else />
           <div class="status">就地</div>
-          <div class="yxstatus statusYX">运行</div>
-          <!-- <div class="yxstatus statusTZ">停止</div> -->
+          <div class="yxstatus statusYX" v-if="item.status == '运行'">{{ item.status }}</div>
+          <div class="yxstatus statusTZ" v-else>停止</div>
         </div>
       </div>
 
@@ -75,30 +97,43 @@
       <div class="pumpBZ">
         <!-- 水流和液位值 -->
         <div class="waterVal">
-          <img class="water" src="@/assets/newImgs/pumpGY/water.png" alt="水位" />
+          <img class="water" src="@/assets/newImgs/pumpGY/water.png" :style="{ height: (realYW / 10.5) * 384 + 'px' }" alt="水位" />
           <div class="value">
             <img src="@/assets/newImgs/pumpGY/gauge.png" alt="水尺" />
-            <div class="number" :style="{ bottom: (1.45 / 12) * 384 + 'px' }">
-              <div class="val">1.45</div>
+            <div class="number" :style="{ bottom: (realYW / 10.5) * 384 + 'px' }">
+              <div class="val">{{ realYW }}</div>
             </div>
           </div>
         </div>
         <!-- 泵 -->
         <div class="flex bzCont">
-          <div class="partBJ" v-for="i in 6" :key="i">
+          <div class="partBJ" v-for="(item, index) in pumpList" :key="index">
             <img class="guan" src="@/assets/newImgs/pumpGY/guan.png" alt="水管" />
+            <!-- 开启单个水管水流动效 -->
+            <div class="line-div" v-if="item.status == '运行'">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                version="1.0"
+                viewBox="0 0 40 400"
+                stroke-width="40"
+                stroke-dasharray="30"
+                style="height: 290px; width: 24px"
+              >
+                <path d="M5 -50 Q1 -5 2 -2 V425" stroke="#ff8500" fill="transparent" class="line-div-run"></path>
+              </svg>
+            </div>
             <div class="tipsBZ">
               <div class="contTips">{{ i }}雨水泵</div>
-              <div class="light">
-                <div class="flex"><img src="@/assets/newImgs/pumpGY/dlIcon.png" alt="电流" />77.6A</div>
-                <div class="flex"><img src="@/assets/newImgs/pumpGY/timeIcon.png" alt="时长" />01:23:10</div>
+              <div class="light" v-if="item.dl">
+                <div class="flex"><img src="@/assets/newImgs/pumpGY/dlIcon.png" alt="电流" />{{ item.dl }}</div>
+                <div class="flex"><img src="@/assets/newImgs/pumpGY/timeIcon.png" alt="时长" />{{ item.hour }}</div>
               </div>
             </div>
-            <img class="pump" src="@/assets/newImgs/pumpGY/pump.png" alt="泵机停止状态" />
-            <!-- <img class="pump" src="@/assets/newImgs/pumpGY/pumpOpen.png" alt="泵机开启状态" /> -->
+            <img class="pump" src="@/assets/newImgs/pumpGY/pumpOpen.png" alt="泵机开启状态" v-if="item.status == '运行'" />
+            <img class="pump" src="@/assets/newImgs/pumpGY/pump.png" alt="泵机停止状态" v-else />
             <div class="status">就地</div>
-            <div class="yxstatus statusYX">运行</div>
-            <!-- <div class="yxstatus statusTZ">停止</div> -->
+            <div class="yxstatus statusYX" v-if="item.status == '运行'">{{ item.status }}</div>
+            <div class="yxstatus statusTZ" v-else>停止</div>
           </div>
         </div>
       </div>
@@ -107,9 +142,50 @@
 </template>
 
 <script setup>
-const { proxy } = getCurrentInstance();
+import { realtimeDataList } from '@/api/scada/monitor';
 
-onMounted(() => {});
+const { proxy } = getCurrentInstance();
+const detailObj = ref({});
+const pumpList = ref([]); //泵机
+const gsjList = ref([]); //格栅机
+const realYW = ref(''); //实时液位
+const mainWater = ref(false); //大水管动效
+
+// 获取数据
+function getData() {
+  let params = {
+    stationCode: 'BZKFDJG',
+  };
+  realtimeDataList(params).then(res => {
+    let datas = res.data || {};
+    console.log(datas);
+    detailObj.value = datas;
+    realYW.value = detailObj.value['BZKFDJG-YW']; //实时液位
+    for (let i in datas) {
+      // 添加泵机数据
+      if (i.includes('QSB-YX')) {
+        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(() => {
+  getData();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -166,6 +242,23 @@
           .guan{
             margin:25PX 0px 0px 0PX;
           }
+          .line-div{
+            position:absolute;
+            left:5PX;
+            top:25PX;
+            .line-div-run{
+              fill:transparent !important;
+              animation: moveLines 1s linear infinite;;
+            }
+            @keyframes moveLines {
+              0%{
+                stroke-dashoffset: -30;
+              }
+              100%{
+                stroke-dashoffset: 30;
+              }
+            }
+          }
           .pump{
             margin:-3PX 0px 0px -20PX;
           }
@@ -188,6 +281,7 @@
           position:absolute;
           bottom:0PX;
           left:0PX;
+          width:100%;
         }
         .value{
           position:absolute;
@@ -199,16 +293,17 @@
             bottom:0PX;
             left:0PX;
             z-index: 99;
-            width:65PX;
+            width:67PX;
             border-bottom:3px solid #2ABB3E;
             .val{
               text-align: center;
-              padding:3PX 0;
-              width:40PX;
+              padding:3PX 2PX;
+              width:42PX;
               margin-left:25PX;
+              margin-bottom:-1PX;
               background: #2ABB3E;
               font-weight: bold;
-              font-size: 18PX;
+              font-size: 17PX;
             }
           }
         }
@@ -265,6 +360,24 @@
       font-weight: bold;
       z-index: 90;
     }
+    .path-run{
+      position:absolute;
+      left:285PX;
+      top:0PX;
+      height: 350PX;
+      .pathRun{
+        animation: pathRun 2s linear infinite;
+        fill:transparent !important;
+      }
+      @keyframes pathRun {
+        0%{
+          stroke-dashoffset: 0;
+        }
+        100%{
+          stroke-dashoffset: -120;
+        }
+      }
+    }
   }
   .statusYX{
     width: 68PX;
@@ -283,14 +396,14 @@
     border-radius: 14PX;
   }
   .pumpInfo{
-    width:740PX;
+    width:340PX;
     height: 140PX;
     background: rgba(7,45,67,0.6);
     border: 2PX solid #2C81C7;
     box-shadow: 0PX 0PX 8PX #67BDFA inset;
     padding:15PX;
     .infoLeft{
-      width:40%;
+      width:100%;
       .name{
         font-size: 18PX;
         font-weight: 800;
@@ -318,6 +431,7 @@
     }
     .infoRight{
       flex:1;
+      display: none;
       .name{
         display: flex;
         align-items: center;
diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue
index a24b199..c9a76ab 100644
--- a/src/views/sponeScreen/waterFlood/rainReport.vue
+++ b/src/views/sponeScreen/waterFlood/rainReport.vue
@@ -60,7 +60,6 @@
   let res = await rainfallSessionInfoList();
   if (res && res.code == 200) {
     dataList.value = res.data;
-    console.log(dataList.value, '123213');
   }
 }