diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index a172100..d6401b5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -1,12 +1,10 @@
 <template>
   <!-- 泵站信息管理 -->
-  <div class="water-analysis-page">
+  <div class="publicContainer">
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
-        <el-form-item label="站点:" prop="pumpCode">
-          <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 label="泵站名称:" prop="pumpName">
+          <el-input clearable v-model="queryParams.pumpName" style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
           <el-select clearable v-model="queryParams.pumpType" placeholder="请选择">
@@ -33,17 +31,17 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="设计规模" prop="designScale">
+      <el-table-column label="设计规模(m³/s)" prop="designScaleSecond">
         <template #default="{ row }">
-          {{ getUnitName(row) }}
+          {{ row.rainpump.designScaleSecond || row.sweagepump.designScaleSecond || '--' }}
         </template>
-      </el-table-column> -->
-
+      </el-table-column>
+      <el-table-column label="泵机台数" prop="deviceCount">
+        <template #default="{ row }">
+          {{ Number(row.rainpump.deviceCount) + Number(row.sweagepump.deviceCount) || '--' }}
+        </template>
+      </el-table-column>
       <el-table-column label="泵站地址" prop="address" />
-      <el-table-column label="格栅机" prop="grilleMachine" />
-      <el-table-column label="开启数量" prop="openNumber" />
-      <el-table-column label="总流量m³/s" prop="totalFlow" />
-      <el-table-column label="建设单位" prop="unitDep" />
       <el-table-column label="联系人" prop="dutyUserName" />
       <el-table-column label="联系人电话" prop="dutyUserPhone" />
       <el-table-column label="操作" show-overflow-tooltip width="250">
@@ -64,7 +62,7 @@
     />
     <div class="water-analysis-page">
       <!-- 添加 修改 查看彈框 -->
-      <el-dialog :title="dialogTitle" v-model="showDialog" width="70%" :close-on-click-modal="false">
+      <el-dialog :title="dialogTitle" v-model="showDialog" width="65%" :close-on-click-modal="false">
         <el-form ref="ruleForm" :model="formData" :rules="formRules" :disabled="isDisab" label-width="180px">
           <el-row>
             <el-form-item label="泵站名称:" prop="pumpName" style="width: 45%">
@@ -265,7 +263,7 @@
 ]);
 let AllData = reactive({
   formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
-  queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
+  queryParams: { pumpName: '', pumpType: '', pageNum: 1, pageSize: 10 },
   formRules: {
     pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
     pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
@@ -292,7 +290,7 @@
 };
 //重置按钮
 const resectClcik = () => {
-  queryParams.value.pumpCode = '';
+  queryParams.value.pumpName = '';
   queryParams.value.pumpType = '';
   getDataList();
 };
@@ -303,7 +301,6 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
-
   total.value = res.total;
 };
 
@@ -417,44 +414,11 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  console.log(formData.value, 'formData.value');
-
-  // formData.value.designHead = Number(row.designHead);
-  // formData.value.dayLarge = Number(row.dayLarge);
-  // formData.value.designPower = Number(row.designPower);
-  // formData.value.deviceCount = Number(row.deviceCount);
-  // formData.value.maxWaterlevel = Number(row.maxWaterlevel);
-  // formData.value.modelValue = Number(row.modelValue);
-  // formData.value.large = Number(row.large);
-  // console.log(formData.value.pumpType, 'formData.value.pumpType');
-}
-
-function getUnitName(row) {
-  let unitName = '';
-  switch (row.pumpType) {
-    case 'rain_water':
-      unitName = 'm³/s';
-      break;
-    case 'sewage_water':
-      unitName = 'm³/s';
-      break;
-    case 'drain_flooded':
-      unitName = 'm³/s';
-      break;
-  }
-
-  return `${row.designScale}${unitName}`;
 }
 
 onMounted(() => {
   getDataList();
-  stationInfolistM();
 });
 </script>
 
-<style lang="scss" scoped>
-.water-analysis-page {
-  padding: 20px;
-  overflow-y: hidden;
-}
-</style>
+<style lang="scss" scoped></style>

diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index a172100..d6401b5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -1,12 +1,10 @@
 <template>
   <!-- 泵站信息管理 -->
-  <div class="water-analysis-page">
+  <div class="publicContainer">
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
-        <el-form-item label="站点:" prop="pumpCode">
-          <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 label="泵站名称:" prop="pumpName">
+          <el-input clearable v-model="queryParams.pumpName" style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
           <el-select clearable v-model="queryParams.pumpType" placeholder="请选择">
@@ -33,17 +31,17 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="设计规模" prop="designScale">
+      <el-table-column label="设计规模(m³/s)" prop="designScaleSecond">
         <template #default="{ row }">
-          {{ getUnitName(row) }}
+          {{ row.rainpump.designScaleSecond || row.sweagepump.designScaleSecond || '--' }}
         </template>
-      </el-table-column> -->
-
+      </el-table-column>
+      <el-table-column label="泵机台数" prop="deviceCount">
+        <template #default="{ row }">
+          {{ Number(row.rainpump.deviceCount) + Number(row.sweagepump.deviceCount) || '--' }}
+        </template>
+      </el-table-column>
       <el-table-column label="泵站地址" prop="address" />
-      <el-table-column label="格栅机" prop="grilleMachine" />
-      <el-table-column label="开启数量" prop="openNumber" />
-      <el-table-column label="总流量m³/s" prop="totalFlow" />
-      <el-table-column label="建设单位" prop="unitDep" />
       <el-table-column label="联系人" prop="dutyUserName" />
       <el-table-column label="联系人电话" prop="dutyUserPhone" />
       <el-table-column label="操作" show-overflow-tooltip width="250">
@@ -64,7 +62,7 @@
     />
     <div class="water-analysis-page">
       <!-- 添加 修改 查看彈框 -->
-      <el-dialog :title="dialogTitle" v-model="showDialog" width="70%" :close-on-click-modal="false">
+      <el-dialog :title="dialogTitle" v-model="showDialog" width="65%" :close-on-click-modal="false">
         <el-form ref="ruleForm" :model="formData" :rules="formRules" :disabled="isDisab" label-width="180px">
           <el-row>
             <el-form-item label="泵站名称:" prop="pumpName" style="width: 45%">
@@ -265,7 +263,7 @@
 ]);
 let AllData = reactive({
   formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
-  queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
+  queryParams: { pumpName: '', pumpType: '', pageNum: 1, pageSize: 10 },
   formRules: {
     pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
     pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
@@ -292,7 +290,7 @@
 };
 //重置按钮
 const resectClcik = () => {
-  queryParams.value.pumpCode = '';
+  queryParams.value.pumpName = '';
   queryParams.value.pumpType = '';
   getDataList();
 };
@@ -303,7 +301,6 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
-
   total.value = res.total;
 };
 
@@ -417,44 +414,11 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  console.log(formData.value, 'formData.value');
-
-  // formData.value.designHead = Number(row.designHead);
-  // formData.value.dayLarge = Number(row.dayLarge);
-  // formData.value.designPower = Number(row.designPower);
-  // formData.value.deviceCount = Number(row.deviceCount);
-  // formData.value.maxWaterlevel = Number(row.maxWaterlevel);
-  // formData.value.modelValue = Number(row.modelValue);
-  // formData.value.large = Number(row.large);
-  // console.log(formData.value.pumpType, 'formData.value.pumpType');
-}
-
-function getUnitName(row) {
-  let unitName = '';
-  switch (row.pumpType) {
-    case 'rain_water':
-      unitName = 'm³/s';
-      break;
-    case 'sewage_water':
-      unitName = 'm³/s';
-      break;
-    case 'drain_flooded':
-      unitName = 'm³/s';
-      break;
-  }
-
-  return `${row.designScale}${unitName}`;
 }
 
 onMounted(() => {
   getDataList();
-  stationInfolistM();
 });
 </script>
 
-<style lang="scss" scoped>
-.water-analysis-page {
-  padding: 20px;
-  overflow-y: hidden;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 804f7ca..568ddec 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -169,7 +169,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);

diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index a172100..d6401b5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -1,12 +1,10 @@
 <template>
   <!-- 泵站信息管理 -->
-  <div class="water-analysis-page">
+  <div class="publicContainer">
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
-        <el-form-item label="站点:" prop="pumpCode">
-          <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 label="泵站名称:" prop="pumpName">
+          <el-input clearable v-model="queryParams.pumpName" style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
           <el-select clearable v-model="queryParams.pumpType" placeholder="请选择">
@@ -33,17 +31,17 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="设计规模" prop="designScale">
+      <el-table-column label="设计规模(m³/s)" prop="designScaleSecond">
         <template #default="{ row }">
-          {{ getUnitName(row) }}
+          {{ row.rainpump.designScaleSecond || row.sweagepump.designScaleSecond || '--' }}
         </template>
-      </el-table-column> -->
-
+      </el-table-column>
+      <el-table-column label="泵机台数" prop="deviceCount">
+        <template #default="{ row }">
+          {{ Number(row.rainpump.deviceCount) + Number(row.sweagepump.deviceCount) || '--' }}
+        </template>
+      </el-table-column>
       <el-table-column label="泵站地址" prop="address" />
-      <el-table-column label="格栅机" prop="grilleMachine" />
-      <el-table-column label="开启数量" prop="openNumber" />
-      <el-table-column label="总流量m³/s" prop="totalFlow" />
-      <el-table-column label="建设单位" prop="unitDep" />
       <el-table-column label="联系人" prop="dutyUserName" />
       <el-table-column label="联系人电话" prop="dutyUserPhone" />
       <el-table-column label="操作" show-overflow-tooltip width="250">
@@ -64,7 +62,7 @@
     />
     <div class="water-analysis-page">
       <!-- 添加 修改 查看彈框 -->
-      <el-dialog :title="dialogTitle" v-model="showDialog" width="70%" :close-on-click-modal="false">
+      <el-dialog :title="dialogTitle" v-model="showDialog" width="65%" :close-on-click-modal="false">
         <el-form ref="ruleForm" :model="formData" :rules="formRules" :disabled="isDisab" label-width="180px">
           <el-row>
             <el-form-item label="泵站名称:" prop="pumpName" style="width: 45%">
@@ -265,7 +263,7 @@
 ]);
 let AllData = reactive({
   formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
-  queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
+  queryParams: { pumpName: '', pumpType: '', pageNum: 1, pageSize: 10 },
   formRules: {
     pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
     pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
@@ -292,7 +290,7 @@
 };
 //重置按钮
 const resectClcik = () => {
-  queryParams.value.pumpCode = '';
+  queryParams.value.pumpName = '';
   queryParams.value.pumpType = '';
   getDataList();
 };
@@ -303,7 +301,6 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
-
   total.value = res.total;
 };
 
@@ -417,44 +414,11 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  console.log(formData.value, 'formData.value');
-
-  // formData.value.designHead = Number(row.designHead);
-  // formData.value.dayLarge = Number(row.dayLarge);
-  // formData.value.designPower = Number(row.designPower);
-  // formData.value.deviceCount = Number(row.deviceCount);
-  // formData.value.maxWaterlevel = Number(row.maxWaterlevel);
-  // formData.value.modelValue = Number(row.modelValue);
-  // formData.value.large = Number(row.large);
-  // console.log(formData.value.pumpType, 'formData.value.pumpType');
-}
-
-function getUnitName(row) {
-  let unitName = '';
-  switch (row.pumpType) {
-    case 'rain_water':
-      unitName = 'm³/s';
-      break;
-    case 'sewage_water':
-      unitName = 'm³/s';
-      break;
-    case 'drain_flooded':
-      unitName = 'm³/s';
-      break;
-  }
-
-  return `${row.designScale}${unitName}`;
 }
 
 onMounted(() => {
   getDataList();
-  stationInfolistM();
 });
 </script>
 
-<style lang="scss" scoped>
-.water-analysis-page {
-  padding: 20px;
-  overflow-y: hidden;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 804f7ca..568ddec 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -169,7 +169,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index a849deb..0b71382 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -29,11 +29,14 @@
           <div class="contentName">建筑面积：</div>
           <div class="contentValue">{{ allData.dataList.buildArea }} ㎡</div>
           <div class="contentName">设计规模：</div>
-          <div class="contentValue">{{ JSON.parse(allData.dataList.rainpump).designScaleSecond }} m³/s</div>
+          <div class="contentValue">
+            {{ allData.dataList.rainpump.designScaleSecond || allData.dataList.sweagepump.designScaleSecond || '--' }}
+            m³/s
+          </div>
         </div>
         <div class="contentInfo">
           <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ JSON.parse(allData.dataList.rainpump).deviceCount }}台</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.deviceCount || allData.dataList.sweagepump.deviceCount || '--' }}台</div>
           <div class="contentName">建设单位：</div>
           <div class="contentValue" :title="allData.dataList.unitDep">{{ allData.dataList.unitDep }}</div>
         </div>
@@ -323,6 +326,10 @@
       popupCenter = allData.dataList.lonLat.split(',').map(Number);
       center = [popupCenter[0] - 0.002, popupCenter[1] + 0.005];
     }
+    if (allData.dataList.pumpCode) {
+      allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
+      allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
+    }
 
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,

diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index a172100..d6401b5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -1,12 +1,10 @@
 <template>
   <!-- 泵站信息管理 -->
-  <div class="water-analysis-page">
+  <div class="publicContainer">
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
-        <el-form-item label="站点:" prop="pumpCode">
-          <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 label="泵站名称:" prop="pumpName">
+          <el-input clearable v-model="queryParams.pumpName" style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
           <el-select clearable v-model="queryParams.pumpType" placeholder="请选择">
@@ -33,17 +31,17 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="设计规模" prop="designScale">
+      <el-table-column label="设计规模(m³/s)" prop="designScaleSecond">
         <template #default="{ row }">
-          {{ getUnitName(row) }}
+          {{ row.rainpump.designScaleSecond || row.sweagepump.designScaleSecond || '--' }}
         </template>
-      </el-table-column> -->
-
+      </el-table-column>
+      <el-table-column label="泵机台数" prop="deviceCount">
+        <template #default="{ row }">
+          {{ Number(row.rainpump.deviceCount) + Number(row.sweagepump.deviceCount) || '--' }}
+        </template>
+      </el-table-column>
       <el-table-column label="泵站地址" prop="address" />
-      <el-table-column label="格栅机" prop="grilleMachine" />
-      <el-table-column label="开启数量" prop="openNumber" />
-      <el-table-column label="总流量m³/s" prop="totalFlow" />
-      <el-table-column label="建设单位" prop="unitDep" />
       <el-table-column label="联系人" prop="dutyUserName" />
       <el-table-column label="联系人电话" prop="dutyUserPhone" />
       <el-table-column label="操作" show-overflow-tooltip width="250">
@@ -64,7 +62,7 @@
     />
     <div class="water-analysis-page">
       <!-- 添加 修改 查看彈框 -->
-      <el-dialog :title="dialogTitle" v-model="showDialog" width="70%" :close-on-click-modal="false">
+      <el-dialog :title="dialogTitle" v-model="showDialog" width="65%" :close-on-click-modal="false">
         <el-form ref="ruleForm" :model="formData" :rules="formRules" :disabled="isDisab" label-width="180px">
           <el-row>
             <el-form-item label="泵站名称:" prop="pumpName" style="width: 45%">
@@ -265,7 +263,7 @@
 ]);
 let AllData = reactive({
   formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
-  queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
+  queryParams: { pumpName: '', pumpType: '', pageNum: 1, pageSize: 10 },
   formRules: {
     pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
     pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
@@ -292,7 +290,7 @@
 };
 //重置按钮
 const resectClcik = () => {
-  queryParams.value.pumpCode = '';
+  queryParams.value.pumpName = '';
   queryParams.value.pumpType = '';
   getDataList();
 };
@@ -303,7 +301,6 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
-
   total.value = res.total;
 };
 
@@ -417,44 +414,11 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  console.log(formData.value, 'formData.value');
-
-  // formData.value.designHead = Number(row.designHead);
-  // formData.value.dayLarge = Number(row.dayLarge);
-  // formData.value.designPower = Number(row.designPower);
-  // formData.value.deviceCount = Number(row.deviceCount);
-  // formData.value.maxWaterlevel = Number(row.maxWaterlevel);
-  // formData.value.modelValue = Number(row.modelValue);
-  // formData.value.large = Number(row.large);
-  // console.log(formData.value.pumpType, 'formData.value.pumpType');
-}
-
-function getUnitName(row) {
-  let unitName = '';
-  switch (row.pumpType) {
-    case 'rain_water':
-      unitName = 'm³/s';
-      break;
-    case 'sewage_water':
-      unitName = 'm³/s';
-      break;
-    case 'drain_flooded':
-      unitName = 'm³/s';
-      break;
-  }
-
-  return `${row.designScale}${unitName}`;
 }
 
 onMounted(() => {
   getDataList();
-  stationInfolistM();
 });
 </script>
 
-<style lang="scss" scoped>
-.water-analysis-page {
-  padding: 20px;
-  overflow-y: hidden;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 804f7ca..568ddec 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -169,7 +169,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index a849deb..0b71382 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -29,11 +29,14 @@
           <div class="contentName">建筑面积：</div>
           <div class="contentValue">{{ allData.dataList.buildArea }} ㎡</div>
           <div class="contentName">设计规模：</div>
-          <div class="contentValue">{{ JSON.parse(allData.dataList.rainpump).designScaleSecond }} m³/s</div>
+          <div class="contentValue">
+            {{ allData.dataList.rainpump.designScaleSecond || allData.dataList.sweagepump.designScaleSecond || '--' }}
+            m³/s
+          </div>
         </div>
         <div class="contentInfo">
           <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ JSON.parse(allData.dataList.rainpump).deviceCount }}台</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.deviceCount || allData.dataList.sweagepump.deviceCount || '--' }}台</div>
           <div class="contentName">建设单位：</div>
           <div class="contentValue" :title="allData.dataList.unitDep">{{ allData.dataList.unitDep }}</div>
         </div>
@@ -323,6 +326,10 @@
       popupCenter = allData.dataList.lonLat.split(',').map(Number);
       center = [popupCenter[0] - 0.002, popupCenter[1] + 0.005];
     }
+    if (allData.dataList.pumpCode) {
+      allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
+      allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
+    }
 
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue
index 20f8050..6a162ae 100644
--- a/src/views/sponeScreen/waterFlood/pipeDetail.vue
+++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue
@@ -14,7 +14,7 @@
 
           <!-- 水高度 -->
           <img src="@/assets/newImgs/HMScreen/pipeW.png" alt="" class="water" style="height: 80px" />
-          <div class="part partW">水深：5.5米</div>
+          <div class="part partW">水深：3.5米</div>
 
           <!-- 瞬时流量 -->
           <div class="part partL" style="width: 180px">瞬时流量：0.06m³/s</div>

diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index a172100..d6401b5 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -1,12 +1,10 @@
 <template>
   <!-- 泵站信息管理 -->
-  <div class="water-analysis-page">
+  <div class="publicContainer">
     <div class="top">
       <el-form ref="queryRef" inline :model="queryParams" v-show="showSearch">
-        <el-form-item label="站点:" prop="pumpCode">
-          <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 label="泵站名称:" prop="pumpName">
+          <el-input clearable v-model="queryParams.pumpName" style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="泵站类型:" prop="pumpType">
           <el-select clearable v-model="queryParams.pumpType" placeholder="请选择">
@@ -33,17 +31,17 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="设计规模" prop="designScale">
+      <el-table-column label="设计规模(m³/s)" prop="designScaleSecond">
         <template #default="{ row }">
-          {{ getUnitName(row) }}
+          {{ row.rainpump.designScaleSecond || row.sweagepump.designScaleSecond || '--' }}
         </template>
-      </el-table-column> -->
-
+      </el-table-column>
+      <el-table-column label="泵机台数" prop="deviceCount">
+        <template #default="{ row }">
+          {{ Number(row.rainpump.deviceCount) + Number(row.sweagepump.deviceCount) || '--' }}
+        </template>
+      </el-table-column>
       <el-table-column label="泵站地址" prop="address" />
-      <el-table-column label="格栅机" prop="grilleMachine" />
-      <el-table-column label="开启数量" prop="openNumber" />
-      <el-table-column label="总流量m³/s" prop="totalFlow" />
-      <el-table-column label="建设单位" prop="unitDep" />
       <el-table-column label="联系人" prop="dutyUserName" />
       <el-table-column label="联系人电话" prop="dutyUserPhone" />
       <el-table-column label="操作" show-overflow-tooltip width="250">
@@ -64,7 +62,7 @@
     />
     <div class="water-analysis-page">
       <!-- 添加 修改 查看彈框 -->
-      <el-dialog :title="dialogTitle" v-model="showDialog" width="70%" :close-on-click-modal="false">
+      <el-dialog :title="dialogTitle" v-model="showDialog" width="65%" :close-on-click-modal="false">
         <el-form ref="ruleForm" :model="formData" :rules="formRules" :disabled="isDisab" label-width="180px">
           <el-row>
             <el-form-item label="泵站名称:" prop="pumpName" style="width: 45%">
@@ -265,7 +263,7 @@
 ]);
 let AllData = reactive({
   formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
-  queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
+  queryParams: { pumpName: '', pumpType: '', pageNum: 1, pageSize: 10 },
   formRules: {
     pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
     pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
@@ -292,7 +290,7 @@
 };
 //重置按钮
 const resectClcik = () => {
-  queryParams.value.pumpCode = '';
+  queryParams.value.pumpName = '';
   queryParams.value.pumpType = '';
   getDataList();
 };
@@ -303,7 +301,6 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
-
   total.value = res.total;
 };
 
@@ -417,44 +414,11 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  console.log(formData.value, 'formData.value');
-
-  // formData.value.designHead = Number(row.designHead);
-  // formData.value.dayLarge = Number(row.dayLarge);
-  // formData.value.designPower = Number(row.designPower);
-  // formData.value.deviceCount = Number(row.deviceCount);
-  // formData.value.maxWaterlevel = Number(row.maxWaterlevel);
-  // formData.value.modelValue = Number(row.modelValue);
-  // formData.value.large = Number(row.large);
-  // console.log(formData.value.pumpType, 'formData.value.pumpType');
-}
-
-function getUnitName(row) {
-  let unitName = '';
-  switch (row.pumpType) {
-    case 'rain_water':
-      unitName = 'm³/s';
-      break;
-    case 'sewage_water':
-      unitName = 'm³/s';
-      break;
-    case 'drain_flooded':
-      unitName = 'm³/s';
-      break;
-  }
-
-  return `${row.designScale}${unitName}`;
 }
 
 onMounted(() => {
   getDataList();
-  stationInfolistM();
 });
 </script>
 
-<style lang="scss" scoped>
-.water-analysis-page {
-  padding: 20px;
-  overflow-y: hidden;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 804f7ca..568ddec 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -169,7 +169,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index a849deb..0b71382 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -29,11 +29,14 @@
           <div class="contentName">建筑面积：</div>
           <div class="contentValue">{{ allData.dataList.buildArea }} ㎡</div>
           <div class="contentName">设计规模：</div>
-          <div class="contentValue">{{ JSON.parse(allData.dataList.rainpump).designScaleSecond }} m³/s</div>
+          <div class="contentValue">
+            {{ allData.dataList.rainpump.designScaleSecond || allData.dataList.sweagepump.designScaleSecond || '--' }}
+            m³/s
+          </div>
         </div>
         <div class="contentInfo">
           <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ JSON.parse(allData.dataList.rainpump).deviceCount }}台</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.deviceCount || allData.dataList.sweagepump.deviceCount || '--' }}台</div>
           <div class="contentName">建设单位：</div>
           <div class="contentValue" :title="allData.dataList.unitDep">{{ allData.dataList.unitDep }}</div>
         </div>
@@ -323,6 +326,10 @@
       popupCenter = allData.dataList.lonLat.split(',').map(Number);
       center = [popupCenter[0] - 0.002, popupCenter[1] + 0.005];
     }
+    if (allData.dataList.pumpCode) {
+      allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
+      allData.dataList.sweagepump = JSON.parse(allData.dataList.sweagepump);
+    }
 
     window.window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue
index 20f8050..6a162ae 100644
--- a/src/views/sponeScreen/waterFlood/pipeDetail.vue
+++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue
@@ -14,7 +14,7 @@
 
           <!-- 水高度 -->
           <img src="@/assets/newImgs/HMScreen/pipeW.png" alt="" class="water" style="height: 80px" />
-          <div class="part partW">水深：5.5米</div>
+          <div class="part partW">水深：3.5米</div>
 
           <!-- 瞬时流量 -->
           <div class="part partL" style="width: 180px">瞬时流量：0.06m³/s</div>
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 04ade75..3576481 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -26,10 +26,12 @@
     <!-- 泵站图 -->
     <div class="pumpCont">
       <!-- 排入水体 -->
-      <div class="waterGo">{{ JSON.parse(pumpObj.rainpump).collectionOut }}</div>
+      <div class="waterGo" v-if="pumpObj.pumpType == 'rain_water'">{{ pumpObj.rainpump.collectionOut }}</div>
+      <div class="waterGo" v-if="pumpObj.pumpType == 'sewage_water'">{{ pumpObj.sweagepump.collectionOut }}</div>
 
       <!-- 雨水池、污水池 -->
-      <div class="waterType">雨水池</div>
+      <div class="waterType" v-if="pumpObj.pumpType == 'rain_water'">雨水池</div>
+      <div class="waterType" v-if="pumpObj.pumpType == 'sewage_water'">污水池</div>
 
       <!-- 大水管水流动效 -->
       <div class="path-run" v-if="mainWater">
@@ -76,8 +78,8 @@
             </div>
           </div>
         </div>
-        <!-- 泵 -->
-        <div class="flex bzCont">
+        <!-- 雨水泵 -->
+        <div class="flex bzCont" v-if="pumpObj.pumpType == 'rain_water'">
           <div class="partBJ" v-for="(item, index) in pumpList" :key="index">
             <img class="guan" src="@/assets/newImgs/pumpGY/guan.png" alt="水管" />
             <!-- 开启单个水管水流动效 -->
@@ -107,6 +109,38 @@
             <div class="yxstatus statusTZ" v-else>停止</div>
           </div>
         </div>
+
+        <!-- 污水泵 -->
+        <div class="flex bzCont" v-if="pumpObj.pumpType == 'sewage_water'">
+          <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" 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/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" v-if="item.status == '运行'">{{ item.status }}</div>
+            <div class="yxstatus statusTZ" v-else>停止</div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -176,7 +210,7 @@
 
 onMounted(() => {
   if (pumpObj.value.pumpCode == 'hdbz') {
-    // 假数据，演示用
+    // 假数据，演示用,河大泵站
     realYW.value = 5.19;
     pumpList.value = [
       { status: '运行', dl: '88.1A', hour: '33:32:20' },
@@ -188,12 +222,33 @@
     mainWater.value = true;
     pumpObj.value.rainpump = JSON.stringify({ collectionOut: '东护城河' });
     detailObj.value.tt = '2024-08-20 12:20:32';
-  } else {
+  } else if (
+    pumpObj.value.pumpCode == 'BZKFHYG' ||
+    pumpObj.value.pumpCode == 'BZKFDJG' ||
+    pumpObj.value.pumpCode == 'BZKFMXJ' ||
+    pumpObj.value.pumpCode == 'BZKFTBJ'
+  ) {
+    // 接入plc数据的泵站数据展示
     getData();
     // 定时刷新
     timer.value = setInterval(() => {
       getData();
     }, 5 * 60 * 1000);
+  } else {
+    pumpList.value = [];
+    // 其他普通泵站显示
+    realYW.value = 5.19;
+    console.log(pumpObj.value.rainpump);
+    let total = pumpObj.value.rainpump.deviceCount || pumpObj.value.sweagepump.deviceCount;
+    for (let i = 0; i < total; i++) {
+      pumpList.value.push({
+        status: '停止',
+        dl: '',
+        hour: '',
+      });
+    }
+    detailObj.value.tt = '2024-08-20 12:20:32';
+    console.log(pumpObj.value.rainpump.deviceCount);
   }
 });