diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file

diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 5f8b704..1216148 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -33,17 +33,19 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设计规模" prop="designScale">
+      <!-- <el-table-column label="设计规模" prop="designScale">
         <template #default="{ row }">
           {{ getUnitName(row) }}
         </template>
-      </el-table-column>
-      <el-table-column label="日抽排量" prop="dayLarge" />
-      <el-table-column label="起抽水位(m)" prop="qbWaterlevel" />
-      <el-table-column label="停抽水位(m)" prop="tbWaterlevel" />
-      <el-table-column label="建设时间" prop="createTime" width="160" />
-      <el-table-column label="主管单位" prop="unitDep" />
-      <el-table-column label="泵机数量" prop="deviceCount" />
+      </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">
         <template #default="{ row }">
           <el-button link icon="View" type="primary" @click="checkDetail(row)">详情</el-button>
@@ -72,118 +74,168 @@
               <el-input v-model="formData.pumpCode" placeholder="请输入" clearable :disabled="hiddentext" />
             </el-form-item>
             <el-form-item label="泵站类型:" prop="pumpType" style="width: 45%">
-              <el-select clearable v-model="formData.pumpType" class="m-2" placeholder="请选择" style="width: 100%">
+              <el-select
+                clearable
+                v-model="formData.pumpType"
+                class="m-2"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="pumpTypechange"
+              >
                 <el-option v-for="item in pump_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属:" prop="belongTo" style="width: 45%">
-              <el-select clearable v-model="formData.belongTo" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Affiliation" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">雨水泵站信息</el-divider>
+            <!-- 下拉框雨污水合建泵站-->
+            <el-form-item label="雨水设计规模(m³/s):" prop="a" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入雨水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="建筑面积:" prop="buildArea" style="width: 45%">
-              <el-input v-model="formData.buildArea" placeholder="请输入" clearable />
+            <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="catchmentArea" style="width: 45%">
-              <el-input v-model="formData.catchmentArea" 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="company" style="width: 45%">
-              <el-input v-model="formData.company" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="出水管管径(csg管径):" prop="csgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.csgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水范围:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入雨水收水范围" clearable />
             </el-form-item>
-            <el-form-item label="设计来源:" prop="dataSource" style="width: 45%">
-              <el-select clearable v-model="formData.dataSource" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Datasources" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="日抽排量:" prop="dayLarge" style="width: 45%">
-              <el-input-number v-model="formData.dayLarge" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">污水泵站信息</el-divider>
+            <el-form-item label="污水设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入污水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="设计扬程:" prop="designHead" style="width: 45%">
-              <el-input-number v-model="formData.designHead" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <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="designPower" style="width: 45%">
-              <el-input-number
-                v-model="formData.designPower"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                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="changelabel()" prop="designScale" style="width: 45%">
-              <el-input-number v-model="formData.designScale" placeholder="请输入" controls-position="right" style="width: 100%" clearable>
-              </el-input-number>
+            <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="设计时间(sj时间):" prop="designTime" style="width: 45%">
-              <el-input v-model="formData.designTime" placeholder="请输入" clearable />
+            <el-form-item label="污水收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入污水收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="泵机数量:" prop="deviceCount" style="width: 45%">
-              <el-input-number
-                v-model="formData.deviceCount"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <!--雨水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'rain_water'">雨水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="领导:" prop="dutyLeaderName" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderName" placeholder="请输入" clearable />
+            <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="dutyLeaderPhone" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderPhone" 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="dutyUserName" style="width: 45%">
-              <el-input v-model="formData.dutyUserName" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="负责人手机号:" prop="dutyUserPhone" style="width: 45%">
-              <el-input v-model="formData.dutyUserPhone" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="空间数据:" prop="geometrys" style="width: 45%">
-              <el-input v-model="formData.geometrys" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="地面高程(地面gc):" prop="groundAltitude" style="width: 45%">
-              <el-input v-model="formData.groundAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="所属污水处理系统:" prop="hhsxWaterCode" style="width: 45%">
-              <el-input v-model="formData.hhsxWaterCode" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="jsc高程 (jsc高程):" prop="jscAltitude" style="width: 45%">
-              <el-input v-model="formData.jscAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="进水管管径(jsg管径):" prop="jsgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.jsgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="抽排量(m³/h):" prop="large" style="width: 45%">
-              <el-input-number v-model="formData.large" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <!--污水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_water'">污水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="最高水位 (zg水位):" prop="maxWaterlevel" style="width: 45%">
-              <el-input-number
-                v-model="formData.maxWaterlevel"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <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="model" style="width: 45%">
-              <el-input v-model="formData.model" 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="qbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.qbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="停排水位（停抽水位）:" prop="tbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.tbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="行政区（行政区):" prop="region" style="width: 45%">
-              <el-input v-model="formData.region" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="主管单位:" prop="unitDep" style="width: 45%">
-              <el-input v-model="formData.unitDep" placeholder="请输入" clearable />
+
+            <!--污水处理  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_handle'">污水处理信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
+            </el-form-item>
+
+            <!--临时泵    -->
+            <el-divider content-position="left">临时泵站信息</el-divider>
+            <el-form-item label="是否有临时泵:" prop="haveTemporary" style="width: 45%">
+              <el-select clearable v-model="formData.haveTemporary" class="m-2" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in pumpingData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+
+            <!--  -->
+            <el-divider content-position="left"></el-divider>
+            <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="grilleMachine" style="width: 45%">
+              <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
+            </el-form-item>
+            <el-form-item label="开启数量:" prop="openNumber" style="width: 45%">
+              <el-input v-model="formData.openNumber" placeholder="请输入开启数量" clearable />
+            </el-form-item>
+            <el-form-item label="总流量m³/s:" prop="totalFlow" style="width: 45%">
+              <el-input v-model="formData.totalFlow" placeholder="请输入总流量m³/s" clearable />
+            </el-form-item>
+            <el-form-item label="建设单位:" prop="unitDep" style="width: 45%">
+              <el-input v-model="formData.unitDep" placeholder="请输入建设单位" clearable />
+            </el-form-item>
+            <el-form-item label="占地面积(㎡):" prop="buildArea" style="width: 45%">
+              <el-input v-model="formData.buildArea" placeholder="请输入占地面积(㎡)" clearable />
+            </el-form-item>
+            <el-form-item label="联系人:" prop="dutyUserName" style="width: 45%">
+              <el-input v-model="formData.dutyUserName" placeholder="请输入联系人" clearable />
+            </el-form-item>
+            <el-form-item label="联系人电话:" prop="dutyUserPhone" style="width: 45%">
+              <el-input v-model="formData.dutyUserPhone" placeholder="请输入联系人电话" clearable />
             </el-form-item>
           </el-row>
         </el-form>
@@ -201,7 +253,6 @@
 <script setup>
 import { stationInfolist } from '@/api/scada/areaInfo';
 import { facilityPumpPage, facilityPumpAdd, facilityPumpEdit, facilityPumpDelete } from '@/api/scada/pumpStationInformation';
-import { getInfo } from '@/api/scada/plcPointInfo';
 const { proxy } = getCurrentInstance();
 const hiddentext = ref(false);
 const isDisab = ref(false);
@@ -213,32 +264,31 @@
 let typeList = ref([]);
 const dialogTitle = ref('');
 const { pump_type } = proxy.useDict('pump_type');
-
-const Affiliation = ref([
-  { label: '市', value: '1' },
-  { label: '区', value: '2' },
+console.log(pump_type, 'pump_type');
+const pumpingData = ref([
+  { label: '是', value: '1' },
+  { label: '否', value: '0' },
 ]);
-const Datasources = ref([
-  { label: '设计院', value: '1' },
-  { label: '待定', value: '2' },
-]);
-
 let AllData = reactive({
-  formData: {},
+  formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
   queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
-  formRules: {},
+  formRules: {
+    pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
+    pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
+    pumpType: [{ required: true, message: '请选择泵站类型', trigger: 'blur' }],
+    dutyUserPhone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 let { queryParams, formData, formRules } = toRefs(AllData);
 /** 表单重置 */
 function resetForm() {
-  formData.value = {
-    stCode: undefined,
-    belongTo: undefined,
-    dataSource: undefined,
-    buildArea: undefined,
-    dayLarge: undefined,
-    designHead: undefined,
-  };
+  formData.value = {};
   proxy.resetForm('ruleForm');
 }
 //搜索
@@ -263,8 +313,38 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
+
   total.value = res.total;
 };
+
+// 下拉框
+function pumpTypechange(val) {
+  if (formData.value.pumpType == 'rain_water') {
+    // formData.value.rainpump = {};
+    formData.value.temporarypump = {};
+    formData.value.sweagepump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_water') {
+    // formData.value.sweagepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_handle') {
+    // formData.value.handlepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.sweagepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else {
+    formData.value.temporarypump = {};
+    formData.value.handlepump = {};
+    formData.value.rainpump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  }
+}
+
 //新增按钮
 const addData = () => {
   resetForm();
@@ -272,6 +352,12 @@
   showDialog.value = true;
   hiddentext.value = false;
   dialogTitle.value = '新增泵站信息';
+  formData.value.temporarypump = {};
+  formData.value.rainpump = {};
+  formData.value.sweagepump = {};
+  formData.value.handlepump = {};
+  formData.value.haveTemporary = pumpingData.value[1].value;
+  formData.value.pumpType = pump_type._object.pump_type[0].value;
 };
 /** 取消按钮 */
 function cancel() {
@@ -289,6 +375,22 @@
           getDataList();
         });
       } else {
+        formData.value.pumpType = formData.value.pumpType;
+        if (formData.value.pumpType == 'rain_water') {
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_water') {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_handle') {
+          formData.value.handlepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        }
+        console.log(formData.value, 'formData.value');
         facilityPumpAdd(formData.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           showDialog.value = false;
@@ -299,21 +401,6 @@
   });
 }
 
-function changelabel() {
-  let label = '设计规模';
-  switch (formData.value.pumpType) {
-    case 'rain_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'sewage_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'drain_flooded':
-      label = '设计规模(m³/s)';
-      break;
-  }
-  return label;
-}
 //表格修改
 function editData(row) {
   dialogTitle.value = '修改泵站信息';
@@ -321,13 +408,6 @@
   showDialog.value = true;
   hiddentext.value = true;
   formData.value = { ...row };
-  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);
 }
 // 表格删除
 function deleteData(row) {
@@ -347,13 +427,15 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  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, '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');
 }
 

diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 5f8b704..1216148 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -33,17 +33,19 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设计规模" prop="designScale">
+      <!-- <el-table-column label="设计规模" prop="designScale">
         <template #default="{ row }">
           {{ getUnitName(row) }}
         </template>
-      </el-table-column>
-      <el-table-column label="日抽排量" prop="dayLarge" />
-      <el-table-column label="起抽水位(m)" prop="qbWaterlevel" />
-      <el-table-column label="停抽水位(m)" prop="tbWaterlevel" />
-      <el-table-column label="建设时间" prop="createTime" width="160" />
-      <el-table-column label="主管单位" prop="unitDep" />
-      <el-table-column label="泵机数量" prop="deviceCount" />
+      </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">
         <template #default="{ row }">
           <el-button link icon="View" type="primary" @click="checkDetail(row)">详情</el-button>
@@ -72,118 +74,168 @@
               <el-input v-model="formData.pumpCode" placeholder="请输入" clearable :disabled="hiddentext" />
             </el-form-item>
             <el-form-item label="泵站类型:" prop="pumpType" style="width: 45%">
-              <el-select clearable v-model="formData.pumpType" class="m-2" placeholder="请选择" style="width: 100%">
+              <el-select
+                clearable
+                v-model="formData.pumpType"
+                class="m-2"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="pumpTypechange"
+              >
                 <el-option v-for="item in pump_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属:" prop="belongTo" style="width: 45%">
-              <el-select clearable v-model="formData.belongTo" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Affiliation" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">雨水泵站信息</el-divider>
+            <!-- 下拉框雨污水合建泵站-->
+            <el-form-item label="雨水设计规模(m³/s):" prop="a" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入雨水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="建筑面积:" prop="buildArea" style="width: 45%">
-              <el-input v-model="formData.buildArea" placeholder="请输入" clearable />
+            <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="catchmentArea" style="width: 45%">
-              <el-input v-model="formData.catchmentArea" 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="company" style="width: 45%">
-              <el-input v-model="formData.company" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="出水管管径(csg管径):" prop="csgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.csgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水范围:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入雨水收水范围" clearable />
             </el-form-item>
-            <el-form-item label="设计来源:" prop="dataSource" style="width: 45%">
-              <el-select clearable v-model="formData.dataSource" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Datasources" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="日抽排量:" prop="dayLarge" style="width: 45%">
-              <el-input-number v-model="formData.dayLarge" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">污水泵站信息</el-divider>
+            <el-form-item label="污水设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入污水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="设计扬程:" prop="designHead" style="width: 45%">
-              <el-input-number v-model="formData.designHead" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <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="designPower" style="width: 45%">
-              <el-input-number
-                v-model="formData.designPower"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                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="changelabel()" prop="designScale" style="width: 45%">
-              <el-input-number v-model="formData.designScale" placeholder="请输入" controls-position="right" style="width: 100%" clearable>
-              </el-input-number>
+            <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="设计时间(sj时间):" prop="designTime" style="width: 45%">
-              <el-input v-model="formData.designTime" placeholder="请输入" clearable />
+            <el-form-item label="污水收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入污水收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="泵机数量:" prop="deviceCount" style="width: 45%">
-              <el-input-number
-                v-model="formData.deviceCount"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <!--雨水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'rain_water'">雨水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="领导:" prop="dutyLeaderName" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderName" placeholder="请输入" clearable />
+            <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="dutyLeaderPhone" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderPhone" 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="dutyUserName" style="width: 45%">
-              <el-input v-model="formData.dutyUserName" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="负责人手机号:" prop="dutyUserPhone" style="width: 45%">
-              <el-input v-model="formData.dutyUserPhone" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="空间数据:" prop="geometrys" style="width: 45%">
-              <el-input v-model="formData.geometrys" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="地面高程(地面gc):" prop="groundAltitude" style="width: 45%">
-              <el-input v-model="formData.groundAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="所属污水处理系统:" prop="hhsxWaterCode" style="width: 45%">
-              <el-input v-model="formData.hhsxWaterCode" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="jsc高程 (jsc高程):" prop="jscAltitude" style="width: 45%">
-              <el-input v-model="formData.jscAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="进水管管径(jsg管径):" prop="jsgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.jsgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="抽排量(m³/h):" prop="large" style="width: 45%">
-              <el-input-number v-model="formData.large" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <!--污水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_water'">污水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="最高水位 (zg水位):" prop="maxWaterlevel" style="width: 45%">
-              <el-input-number
-                v-model="formData.maxWaterlevel"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <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="model" style="width: 45%">
-              <el-input v-model="formData.model" 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="qbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.qbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="停排水位（停抽水位）:" prop="tbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.tbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="行政区（行政区):" prop="region" style="width: 45%">
-              <el-input v-model="formData.region" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="主管单位:" prop="unitDep" style="width: 45%">
-              <el-input v-model="formData.unitDep" placeholder="请输入" clearable />
+
+            <!--污水处理  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_handle'">污水处理信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
+            </el-form-item>
+
+            <!--临时泵    -->
+            <el-divider content-position="left">临时泵站信息</el-divider>
+            <el-form-item label="是否有临时泵:" prop="haveTemporary" style="width: 45%">
+              <el-select clearable v-model="formData.haveTemporary" class="m-2" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in pumpingData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+
+            <!--  -->
+            <el-divider content-position="left"></el-divider>
+            <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="grilleMachine" style="width: 45%">
+              <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
+            </el-form-item>
+            <el-form-item label="开启数量:" prop="openNumber" style="width: 45%">
+              <el-input v-model="formData.openNumber" placeholder="请输入开启数量" clearable />
+            </el-form-item>
+            <el-form-item label="总流量m³/s:" prop="totalFlow" style="width: 45%">
+              <el-input v-model="formData.totalFlow" placeholder="请输入总流量m³/s" clearable />
+            </el-form-item>
+            <el-form-item label="建设单位:" prop="unitDep" style="width: 45%">
+              <el-input v-model="formData.unitDep" placeholder="请输入建设单位" clearable />
+            </el-form-item>
+            <el-form-item label="占地面积(㎡):" prop="buildArea" style="width: 45%">
+              <el-input v-model="formData.buildArea" placeholder="请输入占地面积(㎡)" clearable />
+            </el-form-item>
+            <el-form-item label="联系人:" prop="dutyUserName" style="width: 45%">
+              <el-input v-model="formData.dutyUserName" placeholder="请输入联系人" clearable />
+            </el-form-item>
+            <el-form-item label="联系人电话:" prop="dutyUserPhone" style="width: 45%">
+              <el-input v-model="formData.dutyUserPhone" placeholder="请输入联系人电话" clearable />
             </el-form-item>
           </el-row>
         </el-form>
@@ -201,7 +253,6 @@
 <script setup>
 import { stationInfolist } from '@/api/scada/areaInfo';
 import { facilityPumpPage, facilityPumpAdd, facilityPumpEdit, facilityPumpDelete } from '@/api/scada/pumpStationInformation';
-import { getInfo } from '@/api/scada/plcPointInfo';
 const { proxy } = getCurrentInstance();
 const hiddentext = ref(false);
 const isDisab = ref(false);
@@ -213,32 +264,31 @@
 let typeList = ref([]);
 const dialogTitle = ref('');
 const { pump_type } = proxy.useDict('pump_type');
-
-const Affiliation = ref([
-  { label: '市', value: '1' },
-  { label: '区', value: '2' },
+console.log(pump_type, 'pump_type');
+const pumpingData = ref([
+  { label: '是', value: '1' },
+  { label: '否', value: '0' },
 ]);
-const Datasources = ref([
-  { label: '设计院', value: '1' },
-  { label: '待定', value: '2' },
-]);
-
 let AllData = reactive({
-  formData: {},
+  formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
   queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
-  formRules: {},
+  formRules: {
+    pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
+    pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
+    pumpType: [{ required: true, message: '请选择泵站类型', trigger: 'blur' }],
+    dutyUserPhone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 let { queryParams, formData, formRules } = toRefs(AllData);
 /** 表单重置 */
 function resetForm() {
-  formData.value = {
-    stCode: undefined,
-    belongTo: undefined,
-    dataSource: undefined,
-    buildArea: undefined,
-    dayLarge: undefined,
-    designHead: undefined,
-  };
+  formData.value = {};
   proxy.resetForm('ruleForm');
 }
 //搜索
@@ -263,8 +313,38 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
+
   total.value = res.total;
 };
+
+// 下拉框
+function pumpTypechange(val) {
+  if (formData.value.pumpType == 'rain_water') {
+    // formData.value.rainpump = {};
+    formData.value.temporarypump = {};
+    formData.value.sweagepump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_water') {
+    // formData.value.sweagepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_handle') {
+    // formData.value.handlepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.sweagepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else {
+    formData.value.temporarypump = {};
+    formData.value.handlepump = {};
+    formData.value.rainpump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  }
+}
+
 //新增按钮
 const addData = () => {
   resetForm();
@@ -272,6 +352,12 @@
   showDialog.value = true;
   hiddentext.value = false;
   dialogTitle.value = '新增泵站信息';
+  formData.value.temporarypump = {};
+  formData.value.rainpump = {};
+  formData.value.sweagepump = {};
+  formData.value.handlepump = {};
+  formData.value.haveTemporary = pumpingData.value[1].value;
+  formData.value.pumpType = pump_type._object.pump_type[0].value;
 };
 /** 取消按钮 */
 function cancel() {
@@ -289,6 +375,22 @@
           getDataList();
         });
       } else {
+        formData.value.pumpType = formData.value.pumpType;
+        if (formData.value.pumpType == 'rain_water') {
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_water') {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_handle') {
+          formData.value.handlepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        }
+        console.log(formData.value, 'formData.value');
         facilityPumpAdd(formData.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           showDialog.value = false;
@@ -299,21 +401,6 @@
   });
 }
 
-function changelabel() {
-  let label = '设计规模';
-  switch (formData.value.pumpType) {
-    case 'rain_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'sewage_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'drain_flooded':
-      label = '设计规模(m³/s)';
-      break;
-  }
-  return label;
-}
 //表格修改
 function editData(row) {
   dialogTitle.value = '修改泵站信息';
@@ -321,13 +408,6 @@
   showDialog.value = true;
   hiddentext.value = true;
   formData.value = { ...row };
-  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);
 }
 // 表格删除
 function deleteData(row) {
@@ -347,13 +427,15 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  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, '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');
 }
 
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 17be5f4..cd667cb 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -188,10 +188,10 @@
   newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter');
   newfiberMap.setCenter({
     lng: 114.312,
-    lat: 34.262,
+    lat: 34.742,
     heading: 2.281299097855777,
-    zoom: 42358.12942752382,
-    pitch: -35.2508969308367,
+    zoom: 75358.12942752382,
+    pitch: -80.2508969308367,
     roll: 0.005453465256790101,
   });
 };

diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 5f8b704..1216148 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -33,17 +33,19 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设计规模" prop="designScale">
+      <!-- <el-table-column label="设计规模" prop="designScale">
         <template #default="{ row }">
           {{ getUnitName(row) }}
         </template>
-      </el-table-column>
-      <el-table-column label="日抽排量" prop="dayLarge" />
-      <el-table-column label="起抽水位(m)" prop="qbWaterlevel" />
-      <el-table-column label="停抽水位(m)" prop="tbWaterlevel" />
-      <el-table-column label="建设时间" prop="createTime" width="160" />
-      <el-table-column label="主管单位" prop="unitDep" />
-      <el-table-column label="泵机数量" prop="deviceCount" />
+      </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">
         <template #default="{ row }">
           <el-button link icon="View" type="primary" @click="checkDetail(row)">详情</el-button>
@@ -72,118 +74,168 @@
               <el-input v-model="formData.pumpCode" placeholder="请输入" clearable :disabled="hiddentext" />
             </el-form-item>
             <el-form-item label="泵站类型:" prop="pumpType" style="width: 45%">
-              <el-select clearable v-model="formData.pumpType" class="m-2" placeholder="请选择" style="width: 100%">
+              <el-select
+                clearable
+                v-model="formData.pumpType"
+                class="m-2"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="pumpTypechange"
+              >
                 <el-option v-for="item in pump_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属:" prop="belongTo" style="width: 45%">
-              <el-select clearable v-model="formData.belongTo" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Affiliation" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">雨水泵站信息</el-divider>
+            <!-- 下拉框雨污水合建泵站-->
+            <el-form-item label="雨水设计规模(m³/s):" prop="a" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入雨水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="建筑面积:" prop="buildArea" style="width: 45%">
-              <el-input v-model="formData.buildArea" placeholder="请输入" clearable />
+            <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="catchmentArea" style="width: 45%">
-              <el-input v-model="formData.catchmentArea" 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="company" style="width: 45%">
-              <el-input v-model="formData.company" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="出水管管径(csg管径):" prop="csgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.csgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水范围:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入雨水收水范围" clearable />
             </el-form-item>
-            <el-form-item label="设计来源:" prop="dataSource" style="width: 45%">
-              <el-select clearable v-model="formData.dataSource" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Datasources" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="日抽排量:" prop="dayLarge" style="width: 45%">
-              <el-input-number v-model="formData.dayLarge" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">污水泵站信息</el-divider>
+            <el-form-item label="污水设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入污水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="设计扬程:" prop="designHead" style="width: 45%">
-              <el-input-number v-model="formData.designHead" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <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="designPower" style="width: 45%">
-              <el-input-number
-                v-model="formData.designPower"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                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="changelabel()" prop="designScale" style="width: 45%">
-              <el-input-number v-model="formData.designScale" placeholder="请输入" controls-position="right" style="width: 100%" clearable>
-              </el-input-number>
+            <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="设计时间(sj时间):" prop="designTime" style="width: 45%">
-              <el-input v-model="formData.designTime" placeholder="请输入" clearable />
+            <el-form-item label="污水收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入污水收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="泵机数量:" prop="deviceCount" style="width: 45%">
-              <el-input-number
-                v-model="formData.deviceCount"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <!--雨水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'rain_water'">雨水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="领导:" prop="dutyLeaderName" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderName" placeholder="请输入" clearable />
+            <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="dutyLeaderPhone" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderPhone" 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="dutyUserName" style="width: 45%">
-              <el-input v-model="formData.dutyUserName" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="负责人手机号:" prop="dutyUserPhone" style="width: 45%">
-              <el-input v-model="formData.dutyUserPhone" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="空间数据:" prop="geometrys" style="width: 45%">
-              <el-input v-model="formData.geometrys" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="地面高程(地面gc):" prop="groundAltitude" style="width: 45%">
-              <el-input v-model="formData.groundAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="所属污水处理系统:" prop="hhsxWaterCode" style="width: 45%">
-              <el-input v-model="formData.hhsxWaterCode" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="jsc高程 (jsc高程):" prop="jscAltitude" style="width: 45%">
-              <el-input v-model="formData.jscAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="进水管管径(jsg管径):" prop="jsgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.jsgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="抽排量(m³/h):" prop="large" style="width: 45%">
-              <el-input-number v-model="formData.large" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <!--污水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_water'">污水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="最高水位 (zg水位):" prop="maxWaterlevel" style="width: 45%">
-              <el-input-number
-                v-model="formData.maxWaterlevel"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <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="model" style="width: 45%">
-              <el-input v-model="formData.model" 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="qbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.qbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="停排水位（停抽水位）:" prop="tbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.tbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="行政区（行政区):" prop="region" style="width: 45%">
-              <el-input v-model="formData.region" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="主管单位:" prop="unitDep" style="width: 45%">
-              <el-input v-model="formData.unitDep" placeholder="请输入" clearable />
+
+            <!--污水处理  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_handle'">污水处理信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
+            </el-form-item>
+
+            <!--临时泵    -->
+            <el-divider content-position="left">临时泵站信息</el-divider>
+            <el-form-item label="是否有临时泵:" prop="haveTemporary" style="width: 45%">
+              <el-select clearable v-model="formData.haveTemporary" class="m-2" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in pumpingData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+
+            <!--  -->
+            <el-divider content-position="left"></el-divider>
+            <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="grilleMachine" style="width: 45%">
+              <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
+            </el-form-item>
+            <el-form-item label="开启数量:" prop="openNumber" style="width: 45%">
+              <el-input v-model="formData.openNumber" placeholder="请输入开启数量" clearable />
+            </el-form-item>
+            <el-form-item label="总流量m³/s:" prop="totalFlow" style="width: 45%">
+              <el-input v-model="formData.totalFlow" placeholder="请输入总流量m³/s" clearable />
+            </el-form-item>
+            <el-form-item label="建设单位:" prop="unitDep" style="width: 45%">
+              <el-input v-model="formData.unitDep" placeholder="请输入建设单位" clearable />
+            </el-form-item>
+            <el-form-item label="占地面积(㎡):" prop="buildArea" style="width: 45%">
+              <el-input v-model="formData.buildArea" placeholder="请输入占地面积(㎡)" clearable />
+            </el-form-item>
+            <el-form-item label="联系人:" prop="dutyUserName" style="width: 45%">
+              <el-input v-model="formData.dutyUserName" placeholder="请输入联系人" clearable />
+            </el-form-item>
+            <el-form-item label="联系人电话:" prop="dutyUserPhone" style="width: 45%">
+              <el-input v-model="formData.dutyUserPhone" placeholder="请输入联系人电话" clearable />
             </el-form-item>
           </el-row>
         </el-form>
@@ -201,7 +253,6 @@
 <script setup>
 import { stationInfolist } from '@/api/scada/areaInfo';
 import { facilityPumpPage, facilityPumpAdd, facilityPumpEdit, facilityPumpDelete } from '@/api/scada/pumpStationInformation';
-import { getInfo } from '@/api/scada/plcPointInfo';
 const { proxy } = getCurrentInstance();
 const hiddentext = ref(false);
 const isDisab = ref(false);
@@ -213,32 +264,31 @@
 let typeList = ref([]);
 const dialogTitle = ref('');
 const { pump_type } = proxy.useDict('pump_type');
-
-const Affiliation = ref([
-  { label: '市', value: '1' },
-  { label: '区', value: '2' },
+console.log(pump_type, 'pump_type');
+const pumpingData = ref([
+  { label: '是', value: '1' },
+  { label: '否', value: '0' },
 ]);
-const Datasources = ref([
-  { label: '设计院', value: '1' },
-  { label: '待定', value: '2' },
-]);
-
 let AllData = reactive({
-  formData: {},
+  formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
   queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
-  formRules: {},
+  formRules: {
+    pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
+    pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
+    pumpType: [{ required: true, message: '请选择泵站类型', trigger: 'blur' }],
+    dutyUserPhone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 let { queryParams, formData, formRules } = toRefs(AllData);
 /** 表单重置 */
 function resetForm() {
-  formData.value = {
-    stCode: undefined,
-    belongTo: undefined,
-    dataSource: undefined,
-    buildArea: undefined,
-    dayLarge: undefined,
-    designHead: undefined,
-  };
+  formData.value = {};
   proxy.resetForm('ruleForm');
 }
 //搜索
@@ -263,8 +313,38 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
+
   total.value = res.total;
 };
+
+// 下拉框
+function pumpTypechange(val) {
+  if (formData.value.pumpType == 'rain_water') {
+    // formData.value.rainpump = {};
+    formData.value.temporarypump = {};
+    formData.value.sweagepump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_water') {
+    // formData.value.sweagepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_handle') {
+    // formData.value.handlepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.sweagepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else {
+    formData.value.temporarypump = {};
+    formData.value.handlepump = {};
+    formData.value.rainpump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  }
+}
+
 //新增按钮
 const addData = () => {
   resetForm();
@@ -272,6 +352,12 @@
   showDialog.value = true;
   hiddentext.value = false;
   dialogTitle.value = '新增泵站信息';
+  formData.value.temporarypump = {};
+  formData.value.rainpump = {};
+  formData.value.sweagepump = {};
+  formData.value.handlepump = {};
+  formData.value.haveTemporary = pumpingData.value[1].value;
+  formData.value.pumpType = pump_type._object.pump_type[0].value;
 };
 /** 取消按钮 */
 function cancel() {
@@ -289,6 +375,22 @@
           getDataList();
         });
       } else {
+        formData.value.pumpType = formData.value.pumpType;
+        if (formData.value.pumpType == 'rain_water') {
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_water') {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_handle') {
+          formData.value.handlepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        }
+        console.log(formData.value, 'formData.value');
         facilityPumpAdd(formData.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           showDialog.value = false;
@@ -299,21 +401,6 @@
   });
 }
 
-function changelabel() {
-  let label = '设计规模';
-  switch (formData.value.pumpType) {
-    case 'rain_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'sewage_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'drain_flooded':
-      label = '设计规模(m³/s)';
-      break;
-  }
-  return label;
-}
 //表格修改
 function editData(row) {
   dialogTitle.value = '修改泵站信息';
@@ -321,13 +408,6 @@
   showDialog.value = true;
   hiddentext.value = true;
   formData.value = { ...row };
-  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);
 }
 // 表格删除
 function deleteData(row) {
@@ -347,13 +427,15 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  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, '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');
 }
 
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 17be5f4..cd667cb 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -188,10 +188,10 @@
   newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter');
   newfiberMap.setCenter({
     lng: 114.312,
-    lat: 34.262,
+    lat: 34.742,
     heading: 2.281299097855777,
-    zoom: 42358.12942752382,
-    pitch: -35.2508969308367,
+    zoom: 75358.12942752382,
+    pitch: -80.2508969308367,
     roll: 0.005453465256790101,
   });
 };
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ebb14b3..2159fbc 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -272,13 +272,17 @@
           [
             {
               isCheck: false,
-              name: '雨水管网',
+              name: '排水管网',
               layername: 'rainLine',
               url: 'rainLine_icon.png', //图层+json √
               type: '3dModel',
               data: [
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
               ],
             },
             {
@@ -295,17 +299,6 @@
           [
             {
               isCheck: false,
-              name: '污水管网',
-              layername: 'sewageLine',
-              url: 'sewageLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
-              ],
-            },
-            {
-              isCheck: false,
               name: '污水泵站', //图层+json   √
               layername: 'WSBZ',
               url: 'sewageBenZhan_icon.png',
@@ -314,19 +307,6 @@
               data: WSBZ,
               dataArea: wsArea,
             },
-          ],
-          [
-            {
-              isCheck: false,
-              name: '合流管网',
-              layername: 'combineLine',
-              url: 'combineLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
-              ],
-            },
             {
               isCheck: false,
               name: '合流泵站', //图层+json   √

diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 5f8b704..1216148 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -33,17 +33,19 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设计规模" prop="designScale">
+      <!-- <el-table-column label="设计规模" prop="designScale">
         <template #default="{ row }">
           {{ getUnitName(row) }}
         </template>
-      </el-table-column>
-      <el-table-column label="日抽排量" prop="dayLarge" />
-      <el-table-column label="起抽水位(m)" prop="qbWaterlevel" />
-      <el-table-column label="停抽水位(m)" prop="tbWaterlevel" />
-      <el-table-column label="建设时间" prop="createTime" width="160" />
-      <el-table-column label="主管单位" prop="unitDep" />
-      <el-table-column label="泵机数量" prop="deviceCount" />
+      </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">
         <template #default="{ row }">
           <el-button link icon="View" type="primary" @click="checkDetail(row)">详情</el-button>
@@ -72,118 +74,168 @@
               <el-input v-model="formData.pumpCode" placeholder="请输入" clearable :disabled="hiddentext" />
             </el-form-item>
             <el-form-item label="泵站类型:" prop="pumpType" style="width: 45%">
-              <el-select clearable v-model="formData.pumpType" class="m-2" placeholder="请选择" style="width: 100%">
+              <el-select
+                clearable
+                v-model="formData.pumpType"
+                class="m-2"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="pumpTypechange"
+              >
                 <el-option v-for="item in pump_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属:" prop="belongTo" style="width: 45%">
-              <el-select clearable v-model="formData.belongTo" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Affiliation" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">雨水泵站信息</el-divider>
+            <!-- 下拉框雨污水合建泵站-->
+            <el-form-item label="雨水设计规模(m³/s):" prop="a" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入雨水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="建筑面积:" prop="buildArea" style="width: 45%">
-              <el-input v-model="formData.buildArea" placeholder="请输入" clearable />
+            <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="catchmentArea" style="width: 45%">
-              <el-input v-model="formData.catchmentArea" 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="company" style="width: 45%">
-              <el-input v-model="formData.company" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="出水管管径(csg管径):" prop="csgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.csgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水范围:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入雨水收水范围" clearable />
             </el-form-item>
-            <el-form-item label="设计来源:" prop="dataSource" style="width: 45%">
-              <el-select clearable v-model="formData.dataSource" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Datasources" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="日抽排量:" prop="dayLarge" style="width: 45%">
-              <el-input-number v-model="formData.dayLarge" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">污水泵站信息</el-divider>
+            <el-form-item label="污水设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入污水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="设计扬程:" prop="designHead" style="width: 45%">
-              <el-input-number v-model="formData.designHead" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <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="designPower" style="width: 45%">
-              <el-input-number
-                v-model="formData.designPower"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                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="changelabel()" prop="designScale" style="width: 45%">
-              <el-input-number v-model="formData.designScale" placeholder="请输入" controls-position="right" style="width: 100%" clearable>
-              </el-input-number>
+            <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="设计时间(sj时间):" prop="designTime" style="width: 45%">
-              <el-input v-model="formData.designTime" placeholder="请输入" clearable />
+            <el-form-item label="污水收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入污水收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="泵机数量:" prop="deviceCount" style="width: 45%">
-              <el-input-number
-                v-model="formData.deviceCount"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <!--雨水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'rain_water'">雨水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="领导:" prop="dutyLeaderName" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderName" placeholder="请输入" clearable />
+            <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="dutyLeaderPhone" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderPhone" 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="dutyUserName" style="width: 45%">
-              <el-input v-model="formData.dutyUserName" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="负责人手机号:" prop="dutyUserPhone" style="width: 45%">
-              <el-input v-model="formData.dutyUserPhone" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="空间数据:" prop="geometrys" style="width: 45%">
-              <el-input v-model="formData.geometrys" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="地面高程(地面gc):" prop="groundAltitude" style="width: 45%">
-              <el-input v-model="formData.groundAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="所属污水处理系统:" prop="hhsxWaterCode" style="width: 45%">
-              <el-input v-model="formData.hhsxWaterCode" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="jsc高程 (jsc高程):" prop="jscAltitude" style="width: 45%">
-              <el-input v-model="formData.jscAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="进水管管径(jsg管径):" prop="jsgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.jsgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="抽排量(m³/h):" prop="large" style="width: 45%">
-              <el-input-number v-model="formData.large" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <!--污水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_water'">污水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="最高水位 (zg水位):" prop="maxWaterlevel" style="width: 45%">
-              <el-input-number
-                v-model="formData.maxWaterlevel"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <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="model" style="width: 45%">
-              <el-input v-model="formData.model" 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="qbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.qbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="停排水位（停抽水位）:" prop="tbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.tbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="行政区（行政区):" prop="region" style="width: 45%">
-              <el-input v-model="formData.region" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="主管单位:" prop="unitDep" style="width: 45%">
-              <el-input v-model="formData.unitDep" placeholder="请输入" clearable />
+
+            <!--污水处理  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_handle'">污水处理信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
+            </el-form-item>
+
+            <!--临时泵    -->
+            <el-divider content-position="left">临时泵站信息</el-divider>
+            <el-form-item label="是否有临时泵:" prop="haveTemporary" style="width: 45%">
+              <el-select clearable v-model="formData.haveTemporary" class="m-2" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in pumpingData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+
+            <!--  -->
+            <el-divider content-position="left"></el-divider>
+            <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="grilleMachine" style="width: 45%">
+              <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
+            </el-form-item>
+            <el-form-item label="开启数量:" prop="openNumber" style="width: 45%">
+              <el-input v-model="formData.openNumber" placeholder="请输入开启数量" clearable />
+            </el-form-item>
+            <el-form-item label="总流量m³/s:" prop="totalFlow" style="width: 45%">
+              <el-input v-model="formData.totalFlow" placeholder="请输入总流量m³/s" clearable />
+            </el-form-item>
+            <el-form-item label="建设单位:" prop="unitDep" style="width: 45%">
+              <el-input v-model="formData.unitDep" placeholder="请输入建设单位" clearable />
+            </el-form-item>
+            <el-form-item label="占地面积(㎡):" prop="buildArea" style="width: 45%">
+              <el-input v-model="formData.buildArea" placeholder="请输入占地面积(㎡)" clearable />
+            </el-form-item>
+            <el-form-item label="联系人:" prop="dutyUserName" style="width: 45%">
+              <el-input v-model="formData.dutyUserName" placeholder="请输入联系人" clearable />
+            </el-form-item>
+            <el-form-item label="联系人电话:" prop="dutyUserPhone" style="width: 45%">
+              <el-input v-model="formData.dutyUserPhone" placeholder="请输入联系人电话" clearable />
             </el-form-item>
           </el-row>
         </el-form>
@@ -201,7 +253,6 @@
 <script setup>
 import { stationInfolist } from '@/api/scada/areaInfo';
 import { facilityPumpPage, facilityPumpAdd, facilityPumpEdit, facilityPumpDelete } from '@/api/scada/pumpStationInformation';
-import { getInfo } from '@/api/scada/plcPointInfo';
 const { proxy } = getCurrentInstance();
 const hiddentext = ref(false);
 const isDisab = ref(false);
@@ -213,32 +264,31 @@
 let typeList = ref([]);
 const dialogTitle = ref('');
 const { pump_type } = proxy.useDict('pump_type');
-
-const Affiliation = ref([
-  { label: '市', value: '1' },
-  { label: '区', value: '2' },
+console.log(pump_type, 'pump_type');
+const pumpingData = ref([
+  { label: '是', value: '1' },
+  { label: '否', value: '0' },
 ]);
-const Datasources = ref([
-  { label: '设计院', value: '1' },
-  { label: '待定', value: '2' },
-]);
-
 let AllData = reactive({
-  formData: {},
+  formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
   queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
-  formRules: {},
+  formRules: {
+    pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
+    pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
+    pumpType: [{ required: true, message: '请选择泵站类型', trigger: 'blur' }],
+    dutyUserPhone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 let { queryParams, formData, formRules } = toRefs(AllData);
 /** 表单重置 */
 function resetForm() {
-  formData.value = {
-    stCode: undefined,
-    belongTo: undefined,
-    dataSource: undefined,
-    buildArea: undefined,
-    dayLarge: undefined,
-    designHead: undefined,
-  };
+  formData.value = {};
   proxy.resetForm('ruleForm');
 }
 //搜索
@@ -263,8 +313,38 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
+
   total.value = res.total;
 };
+
+// 下拉框
+function pumpTypechange(val) {
+  if (formData.value.pumpType == 'rain_water') {
+    // formData.value.rainpump = {};
+    formData.value.temporarypump = {};
+    formData.value.sweagepump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_water') {
+    // formData.value.sweagepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_handle') {
+    // formData.value.handlepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.sweagepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else {
+    formData.value.temporarypump = {};
+    formData.value.handlepump = {};
+    formData.value.rainpump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  }
+}
+
 //新增按钮
 const addData = () => {
   resetForm();
@@ -272,6 +352,12 @@
   showDialog.value = true;
   hiddentext.value = false;
   dialogTitle.value = '新增泵站信息';
+  formData.value.temporarypump = {};
+  formData.value.rainpump = {};
+  formData.value.sweagepump = {};
+  formData.value.handlepump = {};
+  formData.value.haveTemporary = pumpingData.value[1].value;
+  formData.value.pumpType = pump_type._object.pump_type[0].value;
 };
 /** 取消按钮 */
 function cancel() {
@@ -289,6 +375,22 @@
           getDataList();
         });
       } else {
+        formData.value.pumpType = formData.value.pumpType;
+        if (formData.value.pumpType == 'rain_water') {
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_water') {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_handle') {
+          formData.value.handlepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        }
+        console.log(formData.value, 'formData.value');
         facilityPumpAdd(formData.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           showDialog.value = false;
@@ -299,21 +401,6 @@
   });
 }
 
-function changelabel() {
-  let label = '设计规模';
-  switch (formData.value.pumpType) {
-    case 'rain_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'sewage_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'drain_flooded':
-      label = '设计规模(m³/s)';
-      break;
-  }
-  return label;
-}
 //表格修改
 function editData(row) {
   dialogTitle.value = '修改泵站信息';
@@ -321,13 +408,6 @@
   showDialog.value = true;
   hiddentext.value = true;
   formData.value = { ...row };
-  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);
 }
 // 表格删除
 function deleteData(row) {
@@ -347,13 +427,15 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  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, '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');
 }
 
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 17be5f4..cd667cb 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -188,10 +188,10 @@
   newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter');
   newfiberMap.setCenter({
     lng: 114.312,
-    lat: 34.262,
+    lat: 34.742,
     heading: 2.281299097855777,
-    zoom: 42358.12942752382,
-    pitch: -35.2508969308367,
+    zoom: 75358.12942752382,
+    pitch: -80.2508969308367,
     roll: 0.005453465256790101,
   });
 };
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ebb14b3..2159fbc 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -272,13 +272,17 @@
           [
             {
               isCheck: false,
-              name: '雨水管网',
+              name: '排水管网',
               layername: 'rainLine',
               url: 'rainLine_icon.png', //图层+json √
               type: '3dModel',
               data: [
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
               ],
             },
             {
@@ -295,17 +299,6 @@
           [
             {
               isCheck: false,
-              name: '污水管网',
-              layername: 'sewageLine',
-              url: 'sewageLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
-              ],
-            },
-            {
-              isCheck: false,
               name: '污水泵站', //图层+json   √
               layername: 'WSBZ',
               url: 'sewageBenZhan_icon.png',
@@ -314,19 +307,6 @@
               data: WSBZ,
               dataArea: wsArea,
             },
-          ],
-          [
-            {
-              isCheck: false,
-              name: '合流管网',
-              layername: 'combineLine',
-              url: 'combineLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
-              ],
-            },
             {
               isCheck: false,
               name: '合流泵站', //图层+json   √
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 8786b09..f5cbdef 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -224,8 +224,8 @@
   width: 500px;
   height: 300px;
   padding: 10px;
-  background: rgba(0, 49, 78, 0.5);
-  border: 1px solid #094065;
+  background: #003b6d;
+  border: 1px solid #6acefe;
   .title {
     display: flex;
     align-items: center;
@@ -237,7 +237,7 @@
       font-size: 16px;
       font-family: PingFang SC;
       font-weight: 400;
-      color: #ccf1ff;
+      color: #b8ecff;
       line-height: 22px;
       margin: 5px;
       width: 330px;
@@ -273,7 +273,7 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentName1 {
         margin: 3px;
@@ -281,14 +281,14 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentValue {
         margin: 3px;
         width: 100px;
         font-size: 14px;
         font-weight: 400;
-        color: #00d1ff;
+        color: #b8ecff;
         word-wrap: break-word;
       }
     }

diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 5f8b704..1216148 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -33,17 +33,19 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设计规模" prop="designScale">
+      <!-- <el-table-column label="设计规模" prop="designScale">
         <template #default="{ row }">
           {{ getUnitName(row) }}
         </template>
-      </el-table-column>
-      <el-table-column label="日抽排量" prop="dayLarge" />
-      <el-table-column label="起抽水位(m)" prop="qbWaterlevel" />
-      <el-table-column label="停抽水位(m)" prop="tbWaterlevel" />
-      <el-table-column label="建设时间" prop="createTime" width="160" />
-      <el-table-column label="主管单位" prop="unitDep" />
-      <el-table-column label="泵机数量" prop="deviceCount" />
+      </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">
         <template #default="{ row }">
           <el-button link icon="View" type="primary" @click="checkDetail(row)">详情</el-button>
@@ -72,118 +74,168 @@
               <el-input v-model="formData.pumpCode" placeholder="请输入" clearable :disabled="hiddentext" />
             </el-form-item>
             <el-form-item label="泵站类型:" prop="pumpType" style="width: 45%">
-              <el-select clearable v-model="formData.pumpType" class="m-2" placeholder="请选择" style="width: 100%">
+              <el-select
+                clearable
+                v-model="formData.pumpType"
+                class="m-2"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="pumpTypechange"
+              >
                 <el-option v-for="item in pump_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属:" prop="belongTo" style="width: 45%">
-              <el-select clearable v-model="formData.belongTo" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Affiliation" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">雨水泵站信息</el-divider>
+            <!-- 下拉框雨污水合建泵站-->
+            <el-form-item label="雨水设计规模(m³/s):" prop="a" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入雨水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="建筑面积:" prop="buildArea" style="width: 45%">
-              <el-input v-model="formData.buildArea" placeholder="请输入" clearable />
+            <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="catchmentArea" style="width: 45%">
-              <el-input v-model="formData.catchmentArea" 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="company" style="width: 45%">
-              <el-input v-model="formData.company" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="出水管管径(csg管径):" prop="csgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.csgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水范围:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入雨水收水范围" clearable />
             </el-form-item>
-            <el-form-item label="设计来源:" prop="dataSource" style="width: 45%">
-              <el-select clearable v-model="formData.dataSource" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Datasources" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="日抽排量:" prop="dayLarge" style="width: 45%">
-              <el-input-number v-model="formData.dayLarge" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">污水泵站信息</el-divider>
+            <el-form-item label="污水设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入污水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="设计扬程:" prop="designHead" style="width: 45%">
-              <el-input-number v-model="formData.designHead" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <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="designPower" style="width: 45%">
-              <el-input-number
-                v-model="formData.designPower"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                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="changelabel()" prop="designScale" style="width: 45%">
-              <el-input-number v-model="formData.designScale" placeholder="请输入" controls-position="right" style="width: 100%" clearable>
-              </el-input-number>
+            <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="设计时间(sj时间):" prop="designTime" style="width: 45%">
-              <el-input v-model="formData.designTime" placeholder="请输入" clearable />
+            <el-form-item label="污水收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入污水收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="泵机数量:" prop="deviceCount" style="width: 45%">
-              <el-input-number
-                v-model="formData.deviceCount"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <!--雨水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'rain_water'">雨水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="领导:" prop="dutyLeaderName" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderName" placeholder="请输入" clearable />
+            <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="dutyLeaderPhone" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderPhone" 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="dutyUserName" style="width: 45%">
-              <el-input v-model="formData.dutyUserName" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="负责人手机号:" prop="dutyUserPhone" style="width: 45%">
-              <el-input v-model="formData.dutyUserPhone" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="空间数据:" prop="geometrys" style="width: 45%">
-              <el-input v-model="formData.geometrys" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="地面高程(地面gc):" prop="groundAltitude" style="width: 45%">
-              <el-input v-model="formData.groundAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="所属污水处理系统:" prop="hhsxWaterCode" style="width: 45%">
-              <el-input v-model="formData.hhsxWaterCode" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="jsc高程 (jsc高程):" prop="jscAltitude" style="width: 45%">
-              <el-input v-model="formData.jscAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="进水管管径(jsg管径):" prop="jsgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.jsgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="抽排量(m³/h):" prop="large" style="width: 45%">
-              <el-input-number v-model="formData.large" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <!--污水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_water'">污水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="最高水位 (zg水位):" prop="maxWaterlevel" style="width: 45%">
-              <el-input-number
-                v-model="formData.maxWaterlevel"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <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="model" style="width: 45%">
-              <el-input v-model="formData.model" 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="qbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.qbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="停排水位（停抽水位）:" prop="tbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.tbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="行政区（行政区):" prop="region" style="width: 45%">
-              <el-input v-model="formData.region" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="主管单位:" prop="unitDep" style="width: 45%">
-              <el-input v-model="formData.unitDep" placeholder="请输入" clearable />
+
+            <!--污水处理  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_handle'">污水处理信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
+            </el-form-item>
+
+            <!--临时泵    -->
+            <el-divider content-position="left">临时泵站信息</el-divider>
+            <el-form-item label="是否有临时泵:" prop="haveTemporary" style="width: 45%">
+              <el-select clearable v-model="formData.haveTemporary" class="m-2" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in pumpingData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+
+            <!--  -->
+            <el-divider content-position="left"></el-divider>
+            <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="grilleMachine" style="width: 45%">
+              <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
+            </el-form-item>
+            <el-form-item label="开启数量:" prop="openNumber" style="width: 45%">
+              <el-input v-model="formData.openNumber" placeholder="请输入开启数量" clearable />
+            </el-form-item>
+            <el-form-item label="总流量m³/s:" prop="totalFlow" style="width: 45%">
+              <el-input v-model="formData.totalFlow" placeholder="请输入总流量m³/s" clearable />
+            </el-form-item>
+            <el-form-item label="建设单位:" prop="unitDep" style="width: 45%">
+              <el-input v-model="formData.unitDep" placeholder="请输入建设单位" clearable />
+            </el-form-item>
+            <el-form-item label="占地面积(㎡):" prop="buildArea" style="width: 45%">
+              <el-input v-model="formData.buildArea" placeholder="请输入占地面积(㎡)" clearable />
+            </el-form-item>
+            <el-form-item label="联系人:" prop="dutyUserName" style="width: 45%">
+              <el-input v-model="formData.dutyUserName" placeholder="请输入联系人" clearable />
+            </el-form-item>
+            <el-form-item label="联系人电话:" prop="dutyUserPhone" style="width: 45%">
+              <el-input v-model="formData.dutyUserPhone" placeholder="请输入联系人电话" clearable />
             </el-form-item>
           </el-row>
         </el-form>
@@ -201,7 +253,6 @@
 <script setup>
 import { stationInfolist } from '@/api/scada/areaInfo';
 import { facilityPumpPage, facilityPumpAdd, facilityPumpEdit, facilityPumpDelete } from '@/api/scada/pumpStationInformation';
-import { getInfo } from '@/api/scada/plcPointInfo';
 const { proxy } = getCurrentInstance();
 const hiddentext = ref(false);
 const isDisab = ref(false);
@@ -213,32 +264,31 @@
 let typeList = ref([]);
 const dialogTitle = ref('');
 const { pump_type } = proxy.useDict('pump_type');
-
-const Affiliation = ref([
-  { label: '市', value: '1' },
-  { label: '区', value: '2' },
+console.log(pump_type, 'pump_type');
+const pumpingData = ref([
+  { label: '是', value: '1' },
+  { label: '否', value: '0' },
 ]);
-const Datasources = ref([
-  { label: '设计院', value: '1' },
-  { label: '待定', value: '2' },
-]);
-
 let AllData = reactive({
-  formData: {},
+  formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
   queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
-  formRules: {},
+  formRules: {
+    pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
+    pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
+    pumpType: [{ required: true, message: '请选择泵站类型', trigger: 'blur' }],
+    dutyUserPhone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 let { queryParams, formData, formRules } = toRefs(AllData);
 /** 表单重置 */
 function resetForm() {
-  formData.value = {
-    stCode: undefined,
-    belongTo: undefined,
-    dataSource: undefined,
-    buildArea: undefined,
-    dayLarge: undefined,
-    designHead: undefined,
-  };
+  formData.value = {};
   proxy.resetForm('ruleForm');
 }
 //搜索
@@ -263,8 +313,38 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
+
   total.value = res.total;
 };
+
+// 下拉框
+function pumpTypechange(val) {
+  if (formData.value.pumpType == 'rain_water') {
+    // formData.value.rainpump = {};
+    formData.value.temporarypump = {};
+    formData.value.sweagepump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_water') {
+    // formData.value.sweagepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_handle') {
+    // formData.value.handlepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.sweagepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else {
+    formData.value.temporarypump = {};
+    formData.value.handlepump = {};
+    formData.value.rainpump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  }
+}
+
 //新增按钮
 const addData = () => {
   resetForm();
@@ -272,6 +352,12 @@
   showDialog.value = true;
   hiddentext.value = false;
   dialogTitle.value = '新增泵站信息';
+  formData.value.temporarypump = {};
+  formData.value.rainpump = {};
+  formData.value.sweagepump = {};
+  formData.value.handlepump = {};
+  formData.value.haveTemporary = pumpingData.value[1].value;
+  formData.value.pumpType = pump_type._object.pump_type[0].value;
 };
 /** 取消按钮 */
 function cancel() {
@@ -289,6 +375,22 @@
           getDataList();
         });
       } else {
+        formData.value.pumpType = formData.value.pumpType;
+        if (formData.value.pumpType == 'rain_water') {
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_water') {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_handle') {
+          formData.value.handlepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        }
+        console.log(formData.value, 'formData.value');
         facilityPumpAdd(formData.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           showDialog.value = false;
@@ -299,21 +401,6 @@
   });
 }
 
-function changelabel() {
-  let label = '设计规模';
-  switch (formData.value.pumpType) {
-    case 'rain_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'sewage_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'drain_flooded':
-      label = '设计规模(m³/s)';
-      break;
-  }
-  return label;
-}
 //表格修改
 function editData(row) {
   dialogTitle.value = '修改泵站信息';
@@ -321,13 +408,6 @@
   showDialog.value = true;
   hiddentext.value = true;
   formData.value = { ...row };
-  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);
 }
 // 表格删除
 function deleteData(row) {
@@ -347,13 +427,15 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  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, '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');
 }
 
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 17be5f4..cd667cb 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -188,10 +188,10 @@
   newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter');
   newfiberMap.setCenter({
     lng: 114.312,
-    lat: 34.262,
+    lat: 34.742,
     heading: 2.281299097855777,
-    zoom: 42358.12942752382,
-    pitch: -35.2508969308367,
+    zoom: 75358.12942752382,
+    pitch: -80.2508969308367,
     roll: 0.005453465256790101,
   });
 };
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ebb14b3..2159fbc 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -272,13 +272,17 @@
           [
             {
               isCheck: false,
-              name: '雨水管网',
+              name: '排水管网',
               layername: 'rainLine',
               url: 'rainLine_icon.png', //图层+json √
               type: '3dModel',
               data: [
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
               ],
             },
             {
@@ -295,17 +299,6 @@
           [
             {
               isCheck: false,
-              name: '污水管网',
-              layername: 'sewageLine',
-              url: 'sewageLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
-              ],
-            },
-            {
-              isCheck: false,
               name: '污水泵站', //图层+json   √
               layername: 'WSBZ',
               url: 'sewageBenZhan_icon.png',
@@ -314,19 +307,6 @@
               data: WSBZ,
               dataArea: wsArea,
             },
-          ],
-          [
-            {
-              isCheck: false,
-              name: '合流管网',
-              layername: 'combineLine',
-              url: 'combineLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
-              ],
-            },
             {
               isCheck: false,
               name: '合流泵站', //图层+json   √
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 8786b09..f5cbdef 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -224,8 +224,8 @@
   width: 500px;
   height: 300px;
   padding: 10px;
-  background: rgba(0, 49, 78, 0.5);
-  border: 1px solid #094065;
+  background: #003b6d;
+  border: 1px solid #6acefe;
   .title {
     display: flex;
     align-items: center;
@@ -237,7 +237,7 @@
       font-size: 16px;
       font-family: PingFang SC;
       font-weight: 400;
-      color: #ccf1ff;
+      color: #b8ecff;
       line-height: 22px;
       margin: 5px;
       width: 330px;
@@ -273,7 +273,7 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentName1 {
         margin: 3px;
@@ -281,14 +281,14 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentValue {
         margin: 3px;
         width: 100px;
         font-size: 14px;
         font-weight: 400;
-        color: #00d1ff;
+        color: #b8ecff;
         word-wrap: break-word;
       }
     }
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 00c3118..9f2b8e0 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -126,9 +126,9 @@
     if (item.type == 'polygon') {
       newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.data, item.layername);
     }
-    if (item.type == 'point') {
-      newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername);
-    }
+    // if (item.type == 'point') {
+    //   newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername);
+    // }
     if (item.type == 'areaWall') {
       newfiberVectorLayer.addGeojsonWall(newfiberMap, item.data, item.layername);
     }
@@ -140,11 +140,11 @@
         newfiberVectorLayer.setDynamicWaterVisible(item.isCheck);
       }
     }
-    // if (item.type == '3dModel') {
-    //   item.data.forEach((url, index) => {
-    //     newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
-    //   });
-    // }
+    if (item.type == '3dModel') {
+      item.data.forEach((url, index) => {
+        newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
+      });
+    }
     if (item.type == 'point') {
       newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername);
       if (item.dataArea) {
@@ -180,11 +180,11 @@
     if (item.layername == 'dynamicWater') {
       newfiberVectorLayer.setDynamicWaterVisible(item.isCheck);
     }
-    // if (item.type == '3dModel') {
-    //   item.data.forEach((url, index) => {
-    //     newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck);
-    //   });
-    // }
+    if (item.type == '3dModel') {
+      item.data.forEach((url, index) => {
+        newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck);
+      });
+    }
     newfiberMap.removeByIds([item.layername]);
     if (rainDataTimer.value) {
       clearInterval(rainDataTimer.value);

diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 5f8b704..1216148 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -33,17 +33,19 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设计规模" prop="designScale">
+      <!-- <el-table-column label="设计规模" prop="designScale">
         <template #default="{ row }">
           {{ getUnitName(row) }}
         </template>
-      </el-table-column>
-      <el-table-column label="日抽排量" prop="dayLarge" />
-      <el-table-column label="起抽水位(m)" prop="qbWaterlevel" />
-      <el-table-column label="停抽水位(m)" prop="tbWaterlevel" />
-      <el-table-column label="建设时间" prop="createTime" width="160" />
-      <el-table-column label="主管单位" prop="unitDep" />
-      <el-table-column label="泵机数量" prop="deviceCount" />
+      </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">
         <template #default="{ row }">
           <el-button link icon="View" type="primary" @click="checkDetail(row)">详情</el-button>
@@ -72,118 +74,168 @@
               <el-input v-model="formData.pumpCode" placeholder="请输入" clearable :disabled="hiddentext" />
             </el-form-item>
             <el-form-item label="泵站类型:" prop="pumpType" style="width: 45%">
-              <el-select clearable v-model="formData.pumpType" class="m-2" placeholder="请选择" style="width: 100%">
+              <el-select
+                clearable
+                v-model="formData.pumpType"
+                class="m-2"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="pumpTypechange"
+              >
                 <el-option v-for="item in pump_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属:" prop="belongTo" style="width: 45%">
-              <el-select clearable v-model="formData.belongTo" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Affiliation" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">雨水泵站信息</el-divider>
+            <!-- 下拉框雨污水合建泵站-->
+            <el-form-item label="雨水设计规模(m³/s):" prop="a" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入雨水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="建筑面积:" prop="buildArea" style="width: 45%">
-              <el-input v-model="formData.buildArea" placeholder="请输入" clearable />
+            <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="catchmentArea" style="width: 45%">
-              <el-input v-model="formData.catchmentArea" 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="company" style="width: 45%">
-              <el-input v-model="formData.company" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="出水管管径(csg管径):" prop="csgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.csgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水范围:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入雨水收水范围" clearable />
             </el-form-item>
-            <el-form-item label="设计来源:" prop="dataSource" style="width: 45%">
-              <el-select clearable v-model="formData.dataSource" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Datasources" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="日抽排量:" prop="dayLarge" style="width: 45%">
-              <el-input-number v-model="formData.dayLarge" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">污水泵站信息</el-divider>
+            <el-form-item label="污水设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入污水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="设计扬程:" prop="designHead" style="width: 45%">
-              <el-input-number v-model="formData.designHead" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <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="designPower" style="width: 45%">
-              <el-input-number
-                v-model="formData.designPower"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                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="changelabel()" prop="designScale" style="width: 45%">
-              <el-input-number v-model="formData.designScale" placeholder="请输入" controls-position="right" style="width: 100%" clearable>
-              </el-input-number>
+            <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="设计时间(sj时间):" prop="designTime" style="width: 45%">
-              <el-input v-model="formData.designTime" placeholder="请输入" clearable />
+            <el-form-item label="污水收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入污水收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="泵机数量:" prop="deviceCount" style="width: 45%">
-              <el-input-number
-                v-model="formData.deviceCount"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <!--雨水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'rain_water'">雨水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="领导:" prop="dutyLeaderName" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderName" placeholder="请输入" clearable />
+            <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="dutyLeaderPhone" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderPhone" 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="dutyUserName" style="width: 45%">
-              <el-input v-model="formData.dutyUserName" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="负责人手机号:" prop="dutyUserPhone" style="width: 45%">
-              <el-input v-model="formData.dutyUserPhone" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="空间数据:" prop="geometrys" style="width: 45%">
-              <el-input v-model="formData.geometrys" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="地面高程(地面gc):" prop="groundAltitude" style="width: 45%">
-              <el-input v-model="formData.groundAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="所属污水处理系统:" prop="hhsxWaterCode" style="width: 45%">
-              <el-input v-model="formData.hhsxWaterCode" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="jsc高程 (jsc高程):" prop="jscAltitude" style="width: 45%">
-              <el-input v-model="formData.jscAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="进水管管径(jsg管径):" prop="jsgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.jsgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="抽排量(m³/h):" prop="large" style="width: 45%">
-              <el-input-number v-model="formData.large" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <!--污水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_water'">污水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="最高水位 (zg水位):" prop="maxWaterlevel" style="width: 45%">
-              <el-input-number
-                v-model="formData.maxWaterlevel"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <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="model" style="width: 45%">
-              <el-input v-model="formData.model" 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="qbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.qbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="停排水位（停抽水位）:" prop="tbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.tbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="行政区（行政区):" prop="region" style="width: 45%">
-              <el-input v-model="formData.region" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="主管单位:" prop="unitDep" style="width: 45%">
-              <el-input v-model="formData.unitDep" placeholder="请输入" clearable />
+
+            <!--污水处理  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_handle'">污水处理信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
+            </el-form-item>
+
+            <!--临时泵    -->
+            <el-divider content-position="left">临时泵站信息</el-divider>
+            <el-form-item label="是否有临时泵:" prop="haveTemporary" style="width: 45%">
+              <el-select clearable v-model="formData.haveTemporary" class="m-2" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in pumpingData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+
+            <!--  -->
+            <el-divider content-position="left"></el-divider>
+            <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="grilleMachine" style="width: 45%">
+              <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
+            </el-form-item>
+            <el-form-item label="开启数量:" prop="openNumber" style="width: 45%">
+              <el-input v-model="formData.openNumber" placeholder="请输入开启数量" clearable />
+            </el-form-item>
+            <el-form-item label="总流量m³/s:" prop="totalFlow" style="width: 45%">
+              <el-input v-model="formData.totalFlow" placeholder="请输入总流量m³/s" clearable />
+            </el-form-item>
+            <el-form-item label="建设单位:" prop="unitDep" style="width: 45%">
+              <el-input v-model="formData.unitDep" placeholder="请输入建设单位" clearable />
+            </el-form-item>
+            <el-form-item label="占地面积(㎡):" prop="buildArea" style="width: 45%">
+              <el-input v-model="formData.buildArea" placeholder="请输入占地面积(㎡)" clearable />
+            </el-form-item>
+            <el-form-item label="联系人:" prop="dutyUserName" style="width: 45%">
+              <el-input v-model="formData.dutyUserName" placeholder="请输入联系人" clearable />
+            </el-form-item>
+            <el-form-item label="联系人电话:" prop="dutyUserPhone" style="width: 45%">
+              <el-input v-model="formData.dutyUserPhone" placeholder="请输入联系人电话" clearable />
             </el-form-item>
           </el-row>
         </el-form>
@@ -201,7 +253,6 @@
 <script setup>
 import { stationInfolist } from '@/api/scada/areaInfo';
 import { facilityPumpPage, facilityPumpAdd, facilityPumpEdit, facilityPumpDelete } from '@/api/scada/pumpStationInformation';
-import { getInfo } from '@/api/scada/plcPointInfo';
 const { proxy } = getCurrentInstance();
 const hiddentext = ref(false);
 const isDisab = ref(false);
@@ -213,32 +264,31 @@
 let typeList = ref([]);
 const dialogTitle = ref('');
 const { pump_type } = proxy.useDict('pump_type');
-
-const Affiliation = ref([
-  { label: '市', value: '1' },
-  { label: '区', value: '2' },
+console.log(pump_type, 'pump_type');
+const pumpingData = ref([
+  { label: '是', value: '1' },
+  { label: '否', value: '0' },
 ]);
-const Datasources = ref([
-  { label: '设计院', value: '1' },
-  { label: '待定', value: '2' },
-]);
-
 let AllData = reactive({
-  formData: {},
+  formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
   queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
-  formRules: {},
+  formRules: {
+    pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
+    pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
+    pumpType: [{ required: true, message: '请选择泵站类型', trigger: 'blur' }],
+    dutyUserPhone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 let { queryParams, formData, formRules } = toRefs(AllData);
 /** 表单重置 */
 function resetForm() {
-  formData.value = {
-    stCode: undefined,
-    belongTo: undefined,
-    dataSource: undefined,
-    buildArea: undefined,
-    dayLarge: undefined,
-    designHead: undefined,
-  };
+  formData.value = {};
   proxy.resetForm('ruleForm');
 }
 //搜索
@@ -263,8 +313,38 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
+
   total.value = res.total;
 };
+
+// 下拉框
+function pumpTypechange(val) {
+  if (formData.value.pumpType == 'rain_water') {
+    // formData.value.rainpump = {};
+    formData.value.temporarypump = {};
+    formData.value.sweagepump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_water') {
+    // formData.value.sweagepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_handle') {
+    // formData.value.handlepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.sweagepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else {
+    formData.value.temporarypump = {};
+    formData.value.handlepump = {};
+    formData.value.rainpump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  }
+}
+
 //新增按钮
 const addData = () => {
   resetForm();
@@ -272,6 +352,12 @@
   showDialog.value = true;
   hiddentext.value = false;
   dialogTitle.value = '新增泵站信息';
+  formData.value.temporarypump = {};
+  formData.value.rainpump = {};
+  formData.value.sweagepump = {};
+  formData.value.handlepump = {};
+  formData.value.haveTemporary = pumpingData.value[1].value;
+  formData.value.pumpType = pump_type._object.pump_type[0].value;
 };
 /** 取消按钮 */
 function cancel() {
@@ -289,6 +375,22 @@
           getDataList();
         });
       } else {
+        formData.value.pumpType = formData.value.pumpType;
+        if (formData.value.pumpType == 'rain_water') {
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_water') {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_handle') {
+          formData.value.handlepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        }
+        console.log(formData.value, 'formData.value');
         facilityPumpAdd(formData.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           showDialog.value = false;
@@ -299,21 +401,6 @@
   });
 }
 
-function changelabel() {
-  let label = '设计规模';
-  switch (formData.value.pumpType) {
-    case 'rain_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'sewage_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'drain_flooded':
-      label = '设计规模(m³/s)';
-      break;
-  }
-  return label;
-}
 //表格修改
 function editData(row) {
   dialogTitle.value = '修改泵站信息';
@@ -321,13 +408,6 @@
   showDialog.value = true;
   hiddentext.value = true;
   formData.value = { ...row };
-  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);
 }
 // 表格删除
 function deleteData(row) {
@@ -347,13 +427,15 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  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, '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');
 }
 
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 17be5f4..cd667cb 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -188,10 +188,10 @@
   newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter');
   newfiberMap.setCenter({
     lng: 114.312,
-    lat: 34.262,
+    lat: 34.742,
     heading: 2.281299097855777,
-    zoom: 42358.12942752382,
-    pitch: -35.2508969308367,
+    zoom: 75358.12942752382,
+    pitch: -80.2508969308367,
     roll: 0.005453465256790101,
   });
 };
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ebb14b3..2159fbc 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -272,13 +272,17 @@
           [
             {
               isCheck: false,
-              name: '雨水管网',
+              name: '排水管网',
               layername: 'rainLine',
               url: 'rainLine_icon.png', //图层+json √
               type: '3dModel',
               data: [
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
               ],
             },
             {
@@ -295,17 +299,6 @@
           [
             {
               isCheck: false,
-              name: '污水管网',
-              layername: 'sewageLine',
-              url: 'sewageLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
-              ],
-            },
-            {
-              isCheck: false,
               name: '污水泵站', //图层+json   √
               layername: 'WSBZ',
               url: 'sewageBenZhan_icon.png',
@@ -314,19 +307,6 @@
               data: WSBZ,
               dataArea: wsArea,
             },
-          ],
-          [
-            {
-              isCheck: false,
-              name: '合流管网',
-              layername: 'combineLine',
-              url: 'combineLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
-              ],
-            },
             {
               isCheck: false,
               name: '合流泵站', //图层+json   √
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 8786b09..f5cbdef 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -224,8 +224,8 @@
   width: 500px;
   height: 300px;
   padding: 10px;
-  background: rgba(0, 49, 78, 0.5);
-  border: 1px solid #094065;
+  background: #003b6d;
+  border: 1px solid #6acefe;
   .title {
     display: flex;
     align-items: center;
@@ -237,7 +237,7 @@
       font-size: 16px;
       font-family: PingFang SC;
       font-weight: 400;
-      color: #ccf1ff;
+      color: #b8ecff;
       line-height: 22px;
       margin: 5px;
       width: 330px;
@@ -273,7 +273,7 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentName1 {
         margin: 3px;
@@ -281,14 +281,14 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentValue {
         margin: 3px;
         width: 100px;
         font-size: 14px;
         font-weight: 400;
-        color: #00d1ff;
+        color: #b8ecff;
         word-wrap: break-word;
       }
     }
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 00c3118..9f2b8e0 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -126,9 +126,9 @@
     if (item.type == 'polygon') {
       newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.data, item.layername);
     }
-    if (item.type == 'point') {
-      newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername);
-    }
+    // if (item.type == 'point') {
+    //   newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername);
+    // }
     if (item.type == 'areaWall') {
       newfiberVectorLayer.addGeojsonWall(newfiberMap, item.data, item.layername);
     }
@@ -140,11 +140,11 @@
         newfiberVectorLayer.setDynamicWaterVisible(item.isCheck);
       }
     }
-    // if (item.type == '3dModel') {
-    //   item.data.forEach((url, index) => {
-    //     newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
-    //   });
-    // }
+    if (item.type == '3dModel') {
+      item.data.forEach((url, index) => {
+        newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
+      });
+    }
     if (item.type == 'point') {
       newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername);
       if (item.dataArea) {
@@ -180,11 +180,11 @@
     if (item.layername == 'dynamicWater') {
       newfiberVectorLayer.setDynamicWaterVisible(item.isCheck);
     }
-    // if (item.type == '3dModel') {
-    //   item.data.forEach((url, index) => {
-    //     newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck);
-    //   });
-    // }
+    if (item.type == '3dModel') {
+      item.data.forEach((url, index) => {
+        newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck);
+      });
+    }
     newfiberMap.removeByIds([item.layername]);
     if (rainDataTimer.value) {
       clearInterval(rainDataTimer.value);
diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
index 2a5f6a2..0115a63 100644
--- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
+++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
@@ -13,7 +13,6 @@
               width: 30,
               height: 30,
               pixelOffset: [0, 0],
-              distanceDisplayCondition: [Number.MIN_VALUE, 7000000],
             },
             name:
               feature.properties.name ||
@@ -24,7 +23,7 @@
             id: newfiberId,
             labelOptions: {
               font: '16px PingFang SC',
-              color: 'rgba(197, 234, 255, 1)',
+              color: 'rgba(16, 117, 224, 1)',
               pixelOffset: [0, 0],
               backgroundColor: 'rgba(0,0,0,1)',
               showBackground: false,
@@ -56,6 +55,7 @@
               // outlineColorBottom: !!feature.properties.outcolor ? feature.properties.outcolor : 'rgba(189,127,171,0.75)',
               // outlineWidthBottom: 2,
             },
+
             name: feature.properties.name != ' ' ? feature.properties.name : null,
             id: newfiberId,
             labelOptions: {
@@ -78,6 +78,7 @@
       newfiberMap.geojsonToMap(geojson);
     }
   }
+
   //添加发光线
   static addLightenLine(geojson, newfiberId) {
     let width = 10;

diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json
index 20b5820..3ad6fe0 100644
--- a/src/assets/geojson/kaifeng/oneCenter.json
+++ b/src/assets/geojson/kaifeng/oneCenter.json
@@ -3,6 +3,7 @@
   "features": [
     {
       "type": "Feature",
+      "id": 0,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -439,6 +440,7 @@
     },
     {
       "type": "Feature",
+      "id": 1,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -863,6 +865,7 @@
     },
     {
       "type": "Feature",
+      "id": 2,
       "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -1304,6 +1307,183 @@
         "name": "南部卫生防护区",
         "fillcolor": "rgba(243,233,99,0.4)"
       }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              114.12401658160695,
+              34.9072047436145
+            ],
+            [
+              114.1300434232104,
+              34.911878909225152
+            ],
+            [
+              114.13018619087063,
+              34.911878909225152
+            ],
+            [
+              114.12718807000329,
+              34.914448727111278
+            ],
+            [
+              114.11119809204399,
+              34.902170708321364
+            ],
+            [
+              114.12718807000329,
+              34.890320992512272
+            ],
+            [
+              114.12990065554993,
+              34.893033578058805
+            ],
+            [
+              114.1251893227585,
+              34.896888304888307
+            ],
+            [
+              114.143035280302,
+              34.897459375529763
+            ],
+            [
+              114.15488499611115,
+              34.87932788266528
+            ],
+            [
+              114.17501523622047,
+              34.879756185646443
+            ],
+            [
+              114.18972030523662,
+              34.897031072548771
+            ],
+            [
+              114.27823625465339,
+              34.896745537228014
+            ],
+            [
+              114.27937839593619,
+              34.89760214319017
+            ],
+            [
+              114.33893154599025,
+              34.89627916287094
+            ],
+            [
+              114.35387456110675,
+              34.905416293133271
+            ],
+            [
+              114.39759715708908,
+              34.904744095398996
+            ],
+            [
+              114.42942244804203,
+              34.88407252791086
+            ],
+            [
+              114.49470890938949,
+              34.88407252791086
+            ],
+            [
+              114.51820608682203,
+              34.89894415919747
+            ],
+            [
+              114.53976995218738,
+              34.89879544288442
+            ],
+            [
+              114.53426744861144,
+              34.894482669811396
+            ],
+            [
+              114.5370930585558,
+              34.89165705986693
+            ],
+            [
+              114.55270827140657,
+              34.90370308120913
+            ],
+            [
+              114.53679562593015,
+              34.916195251489739
+            ],
+            [
+              114.53411873229857,
+              34.91336964154516
+            ],
+            [
+              114.53858022168447,
+              34.909503017410657
+            ],
+            [
+              114.52088298045362,
+              34.909354301097835
+            ],
+            [
+              114.50378060447417,
+              34.920061875624071
+            ],
+            [
+              114.45871956167616,
+              34.9209541735014
+            ],
+            [
+              114.42525839128166,
+              34.941923173615294
+            ],
+            [
+              114.37335639809214,
+              34.942220606240824
+            ],
+            [
+              114.33974651138465,
+              34.920359308249942
+            ],
+            [
+              114.2930495891452,
+              34.920805457188351
+            ],
+            [
+              114.28249073093184,
+              34.914708088360953
+            ],
+            [
+              114.25810125562202,
+              34.915451669925233
+            ],
+            [
+              114.23754085655207,
+              34.928462277169785
+            ],
+            [
+              114.17512511972973,
+              34.928763802468552
+            ],
+            [
+              114.16095343069264,
+              34.906752455666435
+            ],
+            [
+              114.12401658160695,
+              34.9072047436145
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "FID": 3,
+        "Id": 34,
+        "name": "黄河生态文化带",
+        "fillcolor": "rgba(134, 140, 255,0.6)"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/views/floodSys/scada/pumpStationInformation/index.vue b/src/views/floodSys/scada/pumpStationInformation/index.vue
index 5f8b704..1216148 100644
--- a/src/views/floodSys/scada/pumpStationInformation/index.vue
+++ b/src/views/floodSys/scada/pumpStationInformation/index.vue
@@ -33,17 +33,19 @@
           <dict-tag :options="pump_type" :value="row.pumpType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设计规模" prop="designScale">
+      <!-- <el-table-column label="设计规模" prop="designScale">
         <template #default="{ row }">
           {{ getUnitName(row) }}
         </template>
-      </el-table-column>
-      <el-table-column label="日抽排量" prop="dayLarge" />
-      <el-table-column label="起抽水位(m)" prop="qbWaterlevel" />
-      <el-table-column label="停抽水位(m)" prop="tbWaterlevel" />
-      <el-table-column label="建设时间" prop="createTime" width="160" />
-      <el-table-column label="主管单位" prop="unitDep" />
-      <el-table-column label="泵机数量" prop="deviceCount" />
+      </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">
         <template #default="{ row }">
           <el-button link icon="View" type="primary" @click="checkDetail(row)">详情</el-button>
@@ -72,118 +74,168 @@
               <el-input v-model="formData.pumpCode" placeholder="请输入" clearable :disabled="hiddentext" />
             </el-form-item>
             <el-form-item label="泵站类型:" prop="pumpType" style="width: 45%">
-              <el-select clearable v-model="formData.pumpType" class="m-2" placeholder="请选择" style="width: 100%">
+              <el-select
+                clearable
+                v-model="formData.pumpType"
+                class="m-2"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="pumpTypechange"
+              >
                 <el-option v-for="item in pump_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属:" prop="belongTo" style="width: 45%">
-              <el-select clearable v-model="formData.belongTo" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Affiliation" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">雨水泵站信息</el-divider>
+            <!-- 下拉框雨污水合建泵站-->
+            <el-form-item label="雨水设计规模(m³/s):" prop="a" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入雨水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="建筑面积:" prop="buildArea" style="width: 45%">
-              <el-input v-model="formData.buildArea" placeholder="请输入" clearable />
+            <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="catchmentArea" style="width: 45%">
-              <el-input v-model="formData.catchmentArea" 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="company" style="width: 45%">
-              <el-input v-model="formData.company" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水出路:" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入雨水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="出水管管径(csg管径):" prop="csgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.csgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="雨水收水范围:" prop="c" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入雨水收水范围" clearable />
             </el-form-item>
-            <el-form-item label="设计来源:" prop="dataSource" style="width: 45%">
-              <el-select clearable v-model="formData.dataSource" class="m-2" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in Datasources" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="日抽排量:" prop="dayLarge" style="width: 45%">
-              <el-input-number v-model="formData.dayLarge" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <el-divider content-position="left" v-if="formData.pumpType == 'confluence'">污水泵站信息</el-divider>
+            <el-form-item label="污水设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入污水设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="设计扬程:" prop="designHead" style="width: 45%">
-              <el-input-number v-model="formData.designHead" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <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="designPower" style="width: 45%">
-              <el-input-number
-                v-model="formData.designPower"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                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="changelabel()" prop="designScale" style="width: 45%">
-              <el-input-number v-model="formData.designScale" placeholder="请输入" controls-position="right" style="width: 100%" clearable>
-              </el-input-number>
+            <el-form-item label="污水收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入污水收水出路" clearable />
             </el-form-item>
-            <el-form-item label="设计时间(sj时间):" prop="designTime" style="width: 45%">
-              <el-input v-model="formData.designTime" placeholder="请输入" clearable />
+            <el-form-item label="污水收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入污水收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'confluence'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="泵机数量:" prop="deviceCount" style="width: 45%">
-              <el-input-number
-                v-model="formData.deviceCount"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <!--雨水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'rain_water'">雨水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="领导:" prop="dutyLeaderName" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderName" placeholder="请输入" clearable />
+            <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="dutyLeaderPhone" style="width: 45%">
-              <el-input v-model="formData.dutyLeaderPhone" 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="dutyUserName" style="width: 45%">
-              <el-input v-model="formData.dutyUserName" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="负责人手机号:" prop="dutyUserPhone" style="width: 45%">
-              <el-input v-model="formData.dutyUserPhone" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="空间数据:" prop="geometrys" style="width: 45%">
-              <el-input v-model="formData.geometrys" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="地面高程(地面gc):" prop="groundAltitude" style="width: 45%">
-              <el-input v-model="formData.groundAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="所属污水处理系统:" prop="hhsxWaterCode" style="width: 45%">
-              <el-input v-model="formData.hhsxWaterCode" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="jsc高程 (jsc高程):" prop="jscAltitude" style="width: 45%">
-              <el-input v-model="formData.jscAltitude" placeholder="请输入" clearable />
-            </el-form-item>
-            <el-form-item label="进水管管径(jsg管径):" prop="jsgPipeDiameter" style="width: 45%">
-              <el-input v-model="formData.jsgPipeDiameter" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'rain_water'">
+              <el-input v-model="formData.rainpump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
 
-            <el-form-item label="抽排量(m³/h):" prop="large" style="width: 45%">
-              <el-input-number v-model="formData.large" placeholder="请输入" controls-position="right" style="width: 100%" clearable />
+            <!--污水泵站数据  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_water'">污水泵站信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
             </el-form-item>
-            <el-form-item label="最高水位 (zg水位):" prop="maxWaterlevel" style="width: 45%">
-              <el-input-number
-                v-model="formData.maxWaterlevel"
-                placeholder="请输入"
-                controls-position="right"
-                style="width: 100%"
-                clearable
-              />
+            <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="model" style="width: 45%">
-              <el-input v-model="formData.model" 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="qbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.qbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionOut" placeholder="请输入收水出路" clearable />
             </el-form-item>
-            <el-form-item label="停排水位（停抽水位）:" prop="tbWaterlevel" style="width: 45%">
-              <el-input v-model="formData.tbWaterlevel" placeholder="请输入" clearable />
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.collectionRange" placeholder="请输入收水范围" clearable />
             </el-form-item>
-            <el-form-item label="行政区（行政区):" prop="region" style="width: 45%">
-              <el-input v-model="formData.region" placeholder="请输入" clearable />
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_water'">
+              <el-input v-model="formData.sweagepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
             </el-form-item>
-            <el-form-item label="主管单位:" prop="unitDep" style="width: 45%">
-              <el-input v-model="formData.unitDep" placeholder="请输入" clearable />
+
+            <!--污水处理  -->
+            <el-divider content-position="left" v-if="formData.pumpType == 'sewage_handle'">污水处理信息</el-divider>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围(gis):" prop="geometrys" style="width: 45%" v-if="formData.pumpType == 'sewage_handle'">
+              <el-input v-model="formData.handlepump.geometrys" placeholder="请输入收水范围(gis)" clearable />
+            </el-form-item>
+
+            <!--临时泵    -->
+            <el-divider content-position="left">临时泵站信息</el-divider>
+            <el-form-item label="是否有临时泵:" prop="haveTemporary" style="width: 45%">
+              <el-select clearable v-model="formData.haveTemporary" class="m-2" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in pumpingData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计规模(m³/s):" prop="designScaleSecond" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.designScaleSecond" placeholder="请输入设计规模(m³/s)" clearable />
+            </el-form-item>
+            <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>
+            <el-form-item label="收水出路:" prop="collectionOut" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionOut" placeholder="请输入收水出路" clearable />
+            </el-form-item>
+            <el-form-item label="收水范围:" prop="collectionRange" style="width: 45%" v-if="formData.haveTemporary == '1'">
+              <el-input v-model="formData.temporarypump.collectionRange" placeholder="请输入收水范围" clearable />
+            </el-form-item>
+
+            <!--  -->
+            <el-divider content-position="left"></el-divider>
+            <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="grilleMachine" style="width: 45%">
+              <el-input v-model="formData.grilleMachine" placeholder="请输入格栅机" clearable />
+            </el-form-item>
+            <el-form-item label="开启数量:" prop="openNumber" style="width: 45%">
+              <el-input v-model="formData.openNumber" placeholder="请输入开启数量" clearable />
+            </el-form-item>
+            <el-form-item label="总流量m³/s:" prop="totalFlow" style="width: 45%">
+              <el-input v-model="formData.totalFlow" placeholder="请输入总流量m³/s" clearable />
+            </el-form-item>
+            <el-form-item label="建设单位:" prop="unitDep" style="width: 45%">
+              <el-input v-model="formData.unitDep" placeholder="请输入建设单位" clearable />
+            </el-form-item>
+            <el-form-item label="占地面积(㎡):" prop="buildArea" style="width: 45%">
+              <el-input v-model="formData.buildArea" placeholder="请输入占地面积(㎡)" clearable />
+            </el-form-item>
+            <el-form-item label="联系人:" prop="dutyUserName" style="width: 45%">
+              <el-input v-model="formData.dutyUserName" placeholder="请输入联系人" clearable />
+            </el-form-item>
+            <el-form-item label="联系人电话:" prop="dutyUserPhone" style="width: 45%">
+              <el-input v-model="formData.dutyUserPhone" placeholder="请输入联系人电话" clearable />
             </el-form-item>
           </el-row>
         </el-form>
@@ -201,7 +253,6 @@
 <script setup>
 import { stationInfolist } from '@/api/scada/areaInfo';
 import { facilityPumpPage, facilityPumpAdd, facilityPumpEdit, facilityPumpDelete } from '@/api/scada/pumpStationInformation';
-import { getInfo } from '@/api/scada/plcPointInfo';
 const { proxy } = getCurrentInstance();
 const hiddentext = ref(false);
 const isDisab = ref(false);
@@ -213,32 +264,31 @@
 let typeList = ref([]);
 const dialogTitle = ref('');
 const { pump_type } = proxy.useDict('pump_type');
-
-const Affiliation = ref([
-  { label: '市', value: '1' },
-  { label: '区', value: '2' },
+console.log(pump_type, 'pump_type');
+const pumpingData = ref([
+  { label: '是', value: '1' },
+  { label: '否', value: '0' },
 ]);
-const Datasources = ref([
-  { label: '设计院', value: '1' },
-  { label: '待定', value: '2' },
-]);
-
 let AllData = reactive({
-  formData: {},
+  formData: { rainpump: {}, temporarypump: {}, sweagepump: {}, handlepump: {} },
   queryParams: { pumpCode: '', pumpType: '', pageNum: 1, pageSize: 10 },
-  formRules: {},
+  formRules: {
+    pumpName: [{ required: true, message: '请输入泵站名称', trigger: 'blur' }],
+    pumpCode: [{ required: true, message: '请输入泵站编码', trigger: 'blur' }],
+    pumpType: [{ required: true, message: '请选择泵站类型', trigger: 'blur' }],
+    dutyUserPhone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 let { queryParams, formData, formRules } = toRefs(AllData);
 /** 表单重置 */
 function resetForm() {
-  formData.value = {
-    stCode: undefined,
-    belongTo: undefined,
-    dataSource: undefined,
-    buildArea: undefined,
-    dayLarge: undefined,
-    designHead: undefined,
-  };
+  formData.value = {};
   proxy.resetForm('ruleForm');
 }
 //搜索
@@ -263,8 +313,38 @@
   const res = await facilityPumpPage(queryParams.value);
   tableLoading.value = false;
   tableData.value = res.data;
+
   total.value = res.total;
 };
+
+// 下拉框
+function pumpTypechange(val) {
+  if (formData.value.pumpType == 'rain_water') {
+    // formData.value.rainpump = {};
+    formData.value.temporarypump = {};
+    formData.value.sweagepump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_water') {
+    // formData.value.sweagepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.handlepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else if (formData.value.pumpType == 'sewage_handle') {
+    // formData.value.handlepump = {};
+    formData.value.temporarypump = {};
+    formData.value.rainpump = {};
+    formData.value.sweagepump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  } else {
+    formData.value.temporarypump = {};
+    formData.value.handlepump = {};
+    formData.value.rainpump = {};
+    formData.value.haveTemporary = pumpingData.value[1].value;
+  }
+}
+
 //新增按钮
 const addData = () => {
   resetForm();
@@ -272,6 +352,12 @@
   showDialog.value = true;
   hiddentext.value = false;
   dialogTitle.value = '新增泵站信息';
+  formData.value.temporarypump = {};
+  formData.value.rainpump = {};
+  formData.value.sweagepump = {};
+  formData.value.handlepump = {};
+  formData.value.haveTemporary = pumpingData.value[1].value;
+  formData.value.pumpType = pump_type._object.pump_type[0].value;
 };
 /** 取消按钮 */
 function cancel() {
@@ -289,6 +375,22 @@
           getDataList();
         });
       } else {
+        formData.value.pumpType = formData.value.pumpType;
+        if (formData.value.pumpType == 'rain_water') {
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_water') {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else if (formData.value.pumpType == 'sewage_handle') {
+          formData.value.handlepump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        } else {
+          formData.value.sweagepump.pumpType = formData.value.pumpType;
+          formData.value.rainpump.pumpType = formData.value.pumpType;
+          formData.value.temporarypump.pumpType = 'temporary';
+        }
+        console.log(formData.value, 'formData.value');
         facilityPumpAdd(formData.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           showDialog.value = false;
@@ -299,21 +401,6 @@
   });
 }
 
-function changelabel() {
-  let label = '设计规模';
-  switch (formData.value.pumpType) {
-    case 'rain_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'sewage_water':
-      label = '设计规模(m³/s)';
-      break;
-    case 'drain_flooded':
-      label = '设计规模(m³/s)';
-      break;
-  }
-  return label;
-}
 //表格修改
 function editData(row) {
   dialogTitle.value = '修改泵站信息';
@@ -321,13 +408,6 @@
   showDialog.value = true;
   hiddentext.value = true;
   formData.value = { ...row };
-  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);
 }
 // 表格删除
 function deleteData(row) {
@@ -347,13 +427,15 @@
   isDisab.value = true;
   showDialog.value = true;
   formData.value = { ...row };
-  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, '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');
 }
 
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 17be5f4..cd667cb 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -188,10 +188,10 @@
   newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter');
   newfiberMap.setCenter({
     lng: 114.312,
-    lat: 34.262,
+    lat: 34.742,
     heading: 2.281299097855777,
-    zoom: 42358.12942752382,
-    pitch: -35.2508969308367,
+    zoom: 75358.12942752382,
+    pitch: -80.2508969308367,
     roll: 0.005453465256790101,
   });
 };
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ebb14b3..2159fbc 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -272,13 +272,17 @@
           [
             {
               isCheck: false,
-              name: '雨水管网',
+              name: '排水管网',
               layername: 'rainLine',
               url: 'rainLine_icon.png', //图层+json √
               type: '3dModel',
               data: [
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp',
                 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
               ],
             },
             {
@@ -295,17 +299,6 @@
           [
             {
               isCheck: false,
-              name: '污水管网',
-              layername: 'sewageLine',
-              url: 'sewageLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp',
-              ],
-            },
-            {
-              isCheck: false,
               name: '污水泵站', //图层+json   √
               layername: 'WSBZ',
               url: 'sewageBenZhan_icon.png',
@@ -314,19 +307,6 @@
               data: WSBZ,
               dataArea: wsArea,
             },
-          ],
-          [
-            {
-              isCheck: false,
-              name: '合流管网',
-              layername: 'combineLine',
-              url: 'combineLine_icon.png', //服务  √
-              type: '3dModel',
-              data: [
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp',
-                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp',
-              ],
-            },
             {
               isCheck: false,
               name: '合流泵站', //图层+json   √
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 8786b09..f5cbdef 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -224,8 +224,8 @@
   width: 500px;
   height: 300px;
   padding: 10px;
-  background: rgba(0, 49, 78, 0.5);
-  border: 1px solid #094065;
+  background: #003b6d;
+  border: 1px solid #6acefe;
   .title {
     display: flex;
     align-items: center;
@@ -237,7 +237,7 @@
       font-size: 16px;
       font-family: PingFang SC;
       font-weight: 400;
-      color: #ccf1ff;
+      color: #b8ecff;
       line-height: 22px;
       margin: 5px;
       width: 330px;
@@ -273,7 +273,7 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentName1 {
         margin: 3px;
@@ -281,14 +281,14 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 20px;
-        color: #00d1ff;
+        color: #b8ecff;
       }
       .contentValue {
         margin: 3px;
         width: 100px;
         font-size: 14px;
         font-weight: 400;
-        color: #00d1ff;
+        color: #b8ecff;
         word-wrap: break-word;
       }
     }
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 00c3118..9f2b8e0 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -126,9 +126,9 @@
     if (item.type == 'polygon') {
       newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.data, item.layername);
     }
-    if (item.type == 'point') {
-      newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername);
-    }
+    // if (item.type == 'point') {
+    //   newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername);
+    // }
     if (item.type == 'areaWall') {
       newfiberVectorLayer.addGeojsonWall(newfiberMap, item.data, item.layername);
     }
@@ -140,11 +140,11 @@
         newfiberVectorLayer.setDynamicWaterVisible(item.isCheck);
       }
     }
-    // if (item.type == '3dModel') {
-    //   item.data.forEach((url, index) => {
-    //     newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
-    //   });
-    // }
+    if (item.type == '3dModel') {
+      item.data.forEach((url, index) => {
+        newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index);
+      });
+    }
     if (item.type == 'point') {
       newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername);
       if (item.dataArea) {
@@ -180,11 +180,11 @@
     if (item.layername == 'dynamicWater') {
       newfiberVectorLayer.setDynamicWaterVisible(item.isCheck);
     }
-    // if (item.type == '3dModel') {
-    //   item.data.forEach((url, index) => {
-    //     newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck);
-    //   });
-    // }
+    if (item.type == '3dModel') {
+      item.data.forEach((url, index) => {
+        newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck);
+      });
+    }
     newfiberMap.removeByIds([item.layername]);
     if (rainDataTimer.value) {
       clearInterval(rainDataTimer.value);
diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
index 2a5f6a2..0115a63 100644
--- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
+++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js
@@ -13,7 +13,6 @@
               width: 30,
               height: 30,
               pixelOffset: [0, 0],
-              distanceDisplayCondition: [Number.MIN_VALUE, 7000000],
             },
             name:
               feature.properties.name ||
@@ -24,7 +23,7 @@
             id: newfiberId,
             labelOptions: {
               font: '16px PingFang SC',
-              color: 'rgba(197, 234, 255, 1)',
+              color: 'rgba(16, 117, 224, 1)',
               pixelOffset: [0, 0],
               backgroundColor: 'rgba(0,0,0,1)',
               showBackground: false,
@@ -56,6 +55,7 @@
               // outlineColorBottom: !!feature.properties.outcolor ? feature.properties.outcolor : 'rgba(189,127,171,0.75)',
               // outlineWidthBottom: 2,
             },
+
             name: feature.properties.name != ' ' ? feature.properties.name : null,
             id: newfiberId,
             labelOptions: {
@@ -78,6 +78,7 @@
       newfiberMap.geojsonToMap(geojson);
     }
   }
+
   //添加发光线
   static addLightenLine(geojson, newfiberId) {
     let width = 10;
diff --git a/vite.config.js b/vite.config.js
index ea36ec6..24dcf41 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,8 +7,8 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 
 // const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
-// const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+const targetUrl = 'http://192.168.20.52:7300'; //杨辉
+// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {