diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
index 338fe82..576222a 100644
--- a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
Binary files differ

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
index 338fe82..576222a 100644
--- a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
Binary files differ
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index cf67dcc..ebe370e 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -197,8 +197,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="lonLat">
+              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
index 338fe82..576222a 100644
--- a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
Binary files differ
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index cf67dcc..ebe370e 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -197,8 +197,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="lonLat">
+              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index d371678..327f5a3 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -52,7 +52,6 @@
       let properties = feature.properties.getValue();
       console.log('properties--', properties);
       dataList.value = properties;
-      console.log('初始化弹窗--', window.PopupInfo);
       if (!!!window.PopupInfo) {
         window.PopupInfo = newfiberMap.createPopup({
           id: 'cesiumPopupID',

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
index 338fe82..576222a 100644
--- a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
Binary files differ
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index cf67dcc..ebe370e 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -197,8 +197,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="lonLat">
+              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index d371678..327f5a3 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -52,7 +52,6 @@
       let properties = feature.properties.getValue();
       console.log('properties--', properties);
       dataList.value = properties;
-      console.log('初始化弹窗--', window.PopupInfo);
       if (!!!window.PopupInfo) {
         window.PopupInfo = newfiberMap.createPopup({
           id: 'cesiumPopupID',
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index f5cbdef..4486006 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -20,38 +20,27 @@
           <div class="contentName">厂站类型：</div>
           <div class="contentValue">
             {{
-              allData.dataList.pumpType == 'rain_water'
-                ? '雨水'
-                : allData.dataList.pumpType == 'sewage_water'
-                ? '污水'
-                : allData.dataList.pumpType == 'drain_flooded'
-                ? '排涝'
-                : allData.dataList.pumpType
+              allData.dataList.pumpType == 'rain_water' ? '雨水泵站' : allData.dataList.pumpType == 'sewage_water' ? '污水泵站' : '雨污合建'
             }}
           </div>
         </div>
         <div class="contentInfo">
           <div class="contentName">建筑面积：</div>
-          <div class="contentValue">{{ allData.dataList.buildArea }}</div>
+          <div class="contentValue">{{ allData.dataList.buildArea }} ㎡</div>
           <div class="contentName">设计规模：</div>
-          <div class="contentValue">{{ allData.dataList.designScale }}</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.designScaleSecond }} m³/s</div>
         </div>
         <div class="contentInfo">
           <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.deviceCount }}台</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.deviceCount }}台</div>
           <div class="contentName">建设单位：</div>
           <div class="contentValue" :title="allData.dataList.unitDep">{{ allData.dataList.unitDep }}</div>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">当前水位：</div>
-          <div class="contentValue">{{ allData.dataList.qbWaterlevel || '--' }}</div>
-          <div class="contentName">起抽水位：</div>
-          <div class="contentValue">{{ allData.dataList.tbWaterlevel || '--' }}</div>
-        </div>
-        <div class="contentInfo">
+        <div class="contentInfo" style="width: 100%">
           <div class="contentName">地址：</div>
-          <div class="contentValue">{{ allData.dataList.address }}</div>
+          <div class="contentValue" style="width: 100%">{{ allData.dataList.address }}</div>
         </div>
+        <el-button type="warning" @click="checkGYT" style="margin: 20px 0px 0px 12%">查看工况图</el-button>
       </div>
     </div>
 
@@ -206,11 +195,15 @@
   bus.emit('closeCesiumPopup');
 }
 
+// 泵站工况图查看
+function checkGYT() {
+  bus.emit('checkBZGYT', allData.dataList);
+}
+
 onMounted(() => {
   bus.on('popupcontent', data => {
     allData.dataList = data.popupInfo;
     console.log(allData.dataList, 9999);
-    !!allData.dataList.pumpType && allData.dataList.pumpType == 'rain_water' ? (allData.dataList.pumpType = '雨水泵站') : '污水泵站';
   });
 });
 onBeforeUnmount(() => {

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
index 338fe82..576222a 100644
--- a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
Binary files differ
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index cf67dcc..ebe370e 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -197,8 +197,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="lonLat">
+              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index d371678..327f5a3 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -52,7 +52,6 @@
       let properties = feature.properties.getValue();
       console.log('properties--', properties);
       dataList.value = properties;
-      console.log('初始化弹窗--', window.PopupInfo);
       if (!!!window.PopupInfo) {
         window.PopupInfo = newfiberMap.createPopup({
           id: 'cesiumPopupID',
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index f5cbdef..4486006 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -20,38 +20,27 @@
           <div class="contentName">厂站类型：</div>
           <div class="contentValue">
             {{
-              allData.dataList.pumpType == 'rain_water'
-                ? '雨水'
-                : allData.dataList.pumpType == 'sewage_water'
-                ? '污水'
-                : allData.dataList.pumpType == 'drain_flooded'
-                ? '排涝'
-                : allData.dataList.pumpType
+              allData.dataList.pumpType == 'rain_water' ? '雨水泵站' : allData.dataList.pumpType == 'sewage_water' ? '污水泵站' : '雨污合建'
             }}
           </div>
         </div>
         <div class="contentInfo">
           <div class="contentName">建筑面积：</div>
-          <div class="contentValue">{{ allData.dataList.buildArea }}</div>
+          <div class="contentValue">{{ allData.dataList.buildArea }} ㎡</div>
           <div class="contentName">设计规模：</div>
-          <div class="contentValue">{{ allData.dataList.designScale }}</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.designScaleSecond }} m³/s</div>
         </div>
         <div class="contentInfo">
           <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.deviceCount }}台</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.deviceCount }}台</div>
           <div class="contentName">建设单位：</div>
           <div class="contentValue" :title="allData.dataList.unitDep">{{ allData.dataList.unitDep }}</div>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">当前水位：</div>
-          <div class="contentValue">{{ allData.dataList.qbWaterlevel || '--' }}</div>
-          <div class="contentName">起抽水位：</div>
-          <div class="contentValue">{{ allData.dataList.tbWaterlevel || '--' }}</div>
-        </div>
-        <div class="contentInfo">
+        <div class="contentInfo" style="width: 100%">
           <div class="contentName">地址：</div>
-          <div class="contentValue">{{ allData.dataList.address }}</div>
+          <div class="contentValue" style="width: 100%">{{ allData.dataList.address }}</div>
         </div>
+        <el-button type="warning" @click="checkGYT" style="margin: 20px 0px 0px 12%">查看工况图</el-button>
       </div>
     </div>
 
@@ -206,11 +195,15 @@
   bus.emit('closeCesiumPopup');
 }
 
+// 泵站工况图查看
+function checkGYT() {
+  bus.emit('checkBZGYT', allData.dataList);
+}
+
 onMounted(() => {
   bus.on('popupcontent', data => {
     allData.dataList = data.popupInfo;
     console.log(allData.dataList, 9999);
-    !!allData.dataList.pumpType && allData.dataList.pumpType == 'rain_water' ? (allData.dataList.pumpType = '雨水泵站') : '污水泵站';
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index edfc04a..d2ae6e7 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -29,7 +29,7 @@
 
     <!-- 泵站运行工况图 -->
     <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
-      <PumpProcess v-if="dialogShow"></PumpProcess>
+      <PumpProcess v-if="dialogShow" :pumpObj="pumpObj"></PumpProcess>
     </el-dialog>
   </div>
 </template>
@@ -43,10 +43,12 @@
 import MonitorEquip from '@/views/sponeScreen/waterFlood/equipMonitor.vue'; //监测设备
 import HeadRain from '@/views/sponeScreen/waterFlood/futureRain.vue'; //降雨预报
 import { onBeforeUnmount } from 'vue';
+import bus from '@/bus/index';
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 const dialogShow = ref(false);
+const pumpObj = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -62,8 +64,17 @@
   { immediate: true }
 );
 
-onMounted(() => {});
-onBeforeUnmount(() => {});
+onMounted(() => {
+  // 泵站工况图
+  bus.on('checkBZGYT', params => {
+    console.log('checkBZGYT--', params);
+    pumpObj.value = params;
+    dialogShow.value = true;
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('checkBZGYT');
+});
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
index 338fe82..576222a 100644
--- a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
Binary files differ
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index cf67dcc..ebe370e 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -197,8 +197,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="lonLat">
+              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index d371678..327f5a3 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -52,7 +52,6 @@
       let properties = feature.properties.getValue();
       console.log('properties--', properties);
       dataList.value = properties;
-      console.log('初始化弹窗--', window.PopupInfo);
       if (!!!window.PopupInfo) {
         window.PopupInfo = newfiberMap.createPopup({
           id: 'cesiumPopupID',
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index f5cbdef..4486006 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -20,38 +20,27 @@
           <div class="contentName">厂站类型：</div>
           <div class="contentValue">
             {{
-              allData.dataList.pumpType == 'rain_water'
-                ? '雨水'
-                : allData.dataList.pumpType == 'sewage_water'
-                ? '污水'
-                : allData.dataList.pumpType == 'drain_flooded'
-                ? '排涝'
-                : allData.dataList.pumpType
+              allData.dataList.pumpType == 'rain_water' ? '雨水泵站' : allData.dataList.pumpType == 'sewage_water' ? '污水泵站' : '雨污合建'
             }}
           </div>
         </div>
         <div class="contentInfo">
           <div class="contentName">建筑面积：</div>
-          <div class="contentValue">{{ allData.dataList.buildArea }}</div>
+          <div class="contentValue">{{ allData.dataList.buildArea }} ㎡</div>
           <div class="contentName">设计规模：</div>
-          <div class="contentValue">{{ allData.dataList.designScale }}</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.designScaleSecond }} m³/s</div>
         </div>
         <div class="contentInfo">
           <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.deviceCount }}台</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.deviceCount }}台</div>
           <div class="contentName">建设单位：</div>
           <div class="contentValue" :title="allData.dataList.unitDep">{{ allData.dataList.unitDep }}</div>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">当前水位：</div>
-          <div class="contentValue">{{ allData.dataList.qbWaterlevel || '--' }}</div>
-          <div class="contentName">起抽水位：</div>
-          <div class="contentValue">{{ allData.dataList.tbWaterlevel || '--' }}</div>
-        </div>
-        <div class="contentInfo">
+        <div class="contentInfo" style="width: 100%">
           <div class="contentName">地址：</div>
-          <div class="contentValue">{{ allData.dataList.address }}</div>
+          <div class="contentValue" style="width: 100%">{{ allData.dataList.address }}</div>
         </div>
+        <el-button type="warning" @click="checkGYT" style="margin: 20px 0px 0px 12%">查看工况图</el-button>
       </div>
     </div>
 
@@ -206,11 +195,15 @@
   bus.emit('closeCesiumPopup');
 }
 
+// 泵站工况图查看
+function checkGYT() {
+  bus.emit('checkBZGYT', allData.dataList);
+}
+
 onMounted(() => {
   bus.on('popupcontent', data => {
     allData.dataList = data.popupInfo;
     console.log(allData.dataList, 9999);
-    !!allData.dataList.pumpType && allData.dataList.pumpType == 'rain_water' ? (allData.dataList.pumpType = '雨水泵站') : '污水泵站';
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index edfc04a..d2ae6e7 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -29,7 +29,7 @@
 
     <!-- 泵站运行工况图 -->
     <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
-      <PumpProcess v-if="dialogShow"></PumpProcess>
+      <PumpProcess v-if="dialogShow" :pumpObj="pumpObj"></PumpProcess>
     </el-dialog>
   </div>
 </template>
@@ -43,10 +43,12 @@
 import MonitorEquip from '@/views/sponeScreen/waterFlood/equipMonitor.vue'; //监测设备
 import HeadRain from '@/views/sponeScreen/waterFlood/futureRain.vue'; //降雨预报
 import { onBeforeUnmount } from 'vue';
+import bus from '@/bus/index';
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 const dialogShow = ref(false);
+const pumpObj = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -62,8 +64,17 @@
   { immediate: true }
 );
 
-onMounted(() => {});
-onBeforeUnmount(() => {});
+onMounted(() => {
+  // 泵站工况图
+  bus.on('checkBZGYT', params => {
+    console.log('checkBZGYT--', params);
+    pumpObj.value = params;
+    dialogShow.value = true;
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('checkBZGYT');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 2c46784..0241b65 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -5,11 +5,13 @@
     <div class="pumpInfo">
       <div class="flex">
         <div class="infoLeft">
-          <div class="name">海洋馆泵站(雨水泵站)</div>
+          <div class="name">
+            {{ pumpObj.pumpName }}
+            {{ pumpObj.pumpType == 'rain_water' ? '雨水泵站' : pumpObj.pumpType == 'sewage_water' ? '污水泵站' : '雨污合建' }}
+          </div>
           <div class="type">
-            <p class="success"><span></span>在线</p>
-            <!-- <p class="fail"><span></span>离线</p> -->
-            <!-- <p class="fault"><span></span>故障</p> -->
+            <p class="fail" v-if="Object.keys(detailObj).length == 0"><span></span>离线</p>
+            <p class="success" v-else><span></span>在线</p>
           </div>
           <div>更新时间：{{ detailObj.tt }}</div>
         </div>
@@ -55,7 +57,7 @@
     <!-- 泵站图 -->
     <div class="pumpCont">
       <!-- 排入水体 -->
-      <div class="waterGo">惠济河</div>
+      <div class="waterGo">{{ pumpObj.rainpump.collectionOut }}</div>
 
       <!-- 雨水池、污水池 -->
       <div class="waterType">雨水池</div>
@@ -145,16 +147,31 @@
 import { realtimeDataList } from '@/api/scada/monitor';
 
 const { proxy } = getCurrentInstance();
+const pumpObj = ref({});
 const detailObj = ref({});
 const pumpList = ref([]); //泵机
 const gsjList = ref([]); //格栅机
 const realYW = ref(''); //实时液位
 const mainWater = ref(false); //大水管动效
+const timer = ref(null);
+
+const props = defineProps({
+  pumpObj: {
+    type: Object,
+  },
+});
+watch(
+  () => props.pumpObj,
+  () => {
+    pumpObj.value = props.pumpObj;
+  },
+  { immediate: true }
+);
 
 // 获取数据
 function getData() {
   let params = {
-    stationCode: 'BZKFDJG',
+    stationCode: props.pumpObj.pumpCode, //'BZKFDJG'
   };
   realtimeDataList(params).then(res => {
     let datas = res.data || {};
@@ -185,6 +202,14 @@
 
 onMounted(() => {
   getData();
+  // 定时刷新
+  timer.value = setInterval(() => {
+    getData();
+  }, 5 * 60 * 1000);
+});
+
+onBeforeUnmount(() => {
+  if (timer.value) clearInterval(timer.value);
 });
 </script>
 

diff --git a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
index 2a17734..064c034 100644
--- a/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/combineBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
index 8031828..c295a35 100644
--- a/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/rainBengZhan_icon.png
Binary files differ
diff --git a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
index 338fe82..576222a 100644
--- a/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
+++ b/src/assets/cesiumMap/legendIcon/sewageBenZhan_icon.png
Binary files differ
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index cf67dcc..ebe370e 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -197,8 +197,8 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="安装地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入安装地址">
+            <el-form-item label="安装地址" prop="lonLat">
+              <el-input v-model="form.lonLat" placeholder="请输入安装地址">
                 <template #append>
                   <el-icon color="#81888e" size="23" @click="openMapDialog">
                     <LocationInformation />
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index d371678..327f5a3 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -52,7 +52,6 @@
       let properties = feature.properties.getValue();
       console.log('properties--', properties);
       dataList.value = properties;
-      console.log('初始化弹窗--', window.PopupInfo);
       if (!!!window.PopupInfo) {
         window.PopupInfo = newfiberMap.createPopup({
           id: 'cesiumPopupID',
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index f5cbdef..4486006 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -20,38 +20,27 @@
           <div class="contentName">厂站类型：</div>
           <div class="contentValue">
             {{
-              allData.dataList.pumpType == 'rain_water'
-                ? '雨水'
-                : allData.dataList.pumpType == 'sewage_water'
-                ? '污水'
-                : allData.dataList.pumpType == 'drain_flooded'
-                ? '排涝'
-                : allData.dataList.pumpType
+              allData.dataList.pumpType == 'rain_water' ? '雨水泵站' : allData.dataList.pumpType == 'sewage_water' ? '污水泵站' : '雨污合建'
             }}
           </div>
         </div>
         <div class="contentInfo">
           <div class="contentName">建筑面积：</div>
-          <div class="contentValue">{{ allData.dataList.buildArea }}</div>
+          <div class="contentValue">{{ allData.dataList.buildArea }} ㎡</div>
           <div class="contentName">设计规模：</div>
-          <div class="contentValue">{{ allData.dataList.designScale }}</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.designScaleSecond }} m³/s</div>
         </div>
         <div class="contentInfo">
           <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.deviceCount }}台</div>
+          <div class="contentValue">{{ allData.dataList.rainpump.deviceCount }}台</div>
           <div class="contentName">建设单位：</div>
           <div class="contentValue" :title="allData.dataList.unitDep">{{ allData.dataList.unitDep }}</div>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">当前水位：</div>
-          <div class="contentValue">{{ allData.dataList.qbWaterlevel || '--' }}</div>
-          <div class="contentName">起抽水位：</div>
-          <div class="contentValue">{{ allData.dataList.tbWaterlevel || '--' }}</div>
-        </div>
-        <div class="contentInfo">
+        <div class="contentInfo" style="width: 100%">
           <div class="contentName">地址：</div>
-          <div class="contentValue">{{ allData.dataList.address }}</div>
+          <div class="contentValue" style="width: 100%">{{ allData.dataList.address }}</div>
         </div>
+        <el-button type="warning" @click="checkGYT" style="margin: 20px 0px 0px 12%">查看工况图</el-button>
       </div>
     </div>
 
@@ -206,11 +195,15 @@
   bus.emit('closeCesiumPopup');
 }
 
+// 泵站工况图查看
+function checkGYT() {
+  bus.emit('checkBZGYT', allData.dataList);
+}
+
 onMounted(() => {
   bus.on('popupcontent', data => {
     allData.dataList = data.popupInfo;
     console.log(allData.dataList, 9999);
-    !!allData.dataList.pumpType && allData.dataList.pumpType == 'rain_water' ? (allData.dataList.pumpType = '雨水泵站') : '污水泵站';
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index edfc04a..d2ae6e7 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -29,7 +29,7 @@
 
     <!-- 泵站运行工况图 -->
     <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
-      <PumpProcess v-if="dialogShow"></PumpProcess>
+      <PumpProcess v-if="dialogShow" :pumpObj="pumpObj"></PumpProcess>
     </el-dialog>
   </div>
 </template>
@@ -43,10 +43,12 @@
 import MonitorEquip from '@/views/sponeScreen/waterFlood/equipMonitor.vue'; //监测设备
 import HeadRain from '@/views/sponeScreen/waterFlood/futureRain.vue'; //降雨预报
 import { onBeforeUnmount } from 'vue';
+import bus from '@/bus/index';
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 const dialogShow = ref(false);
+const pumpObj = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -62,8 +64,17 @@
   { immediate: true }
 );
 
-onMounted(() => {});
-onBeforeUnmount(() => {});
+onMounted(() => {
+  // 泵站工况图
+  bus.on('checkBZGYT', params => {
+    console.log('checkBZGYT--', params);
+    pumpObj.value = params;
+    dialogShow.value = true;
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('checkBZGYT');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 2c46784..0241b65 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -5,11 +5,13 @@
     <div class="pumpInfo">
       <div class="flex">
         <div class="infoLeft">
-          <div class="name">海洋馆泵站(雨水泵站)</div>
+          <div class="name">
+            {{ pumpObj.pumpName }}
+            {{ pumpObj.pumpType == 'rain_water' ? '雨水泵站' : pumpObj.pumpType == 'sewage_water' ? '污水泵站' : '雨污合建' }}
+          </div>
           <div class="type">
-            <p class="success"><span></span>在线</p>
-            <!-- <p class="fail"><span></span>离线</p> -->
-            <!-- <p class="fault"><span></span>故障</p> -->
+            <p class="fail" v-if="Object.keys(detailObj).length == 0"><span></span>离线</p>
+            <p class="success" v-else><span></span>在线</p>
           </div>
           <div>更新时间：{{ detailObj.tt }}</div>
         </div>
@@ -55,7 +57,7 @@
     <!-- 泵站图 -->
     <div class="pumpCont">
       <!-- 排入水体 -->
-      <div class="waterGo">惠济河</div>
+      <div class="waterGo">{{ pumpObj.rainpump.collectionOut }}</div>
 
       <!-- 雨水池、污水池 -->
       <div class="waterType">雨水池</div>
@@ -145,16 +147,31 @@
 import { realtimeDataList } from '@/api/scada/monitor';
 
 const { proxy } = getCurrentInstance();
+const pumpObj = ref({});
 const detailObj = ref({});
 const pumpList = ref([]); //泵机
 const gsjList = ref([]); //格栅机
 const realYW = ref(''); //实时液位
 const mainWater = ref(false); //大水管动效
+const timer = ref(null);
+
+const props = defineProps({
+  pumpObj: {
+    type: Object,
+  },
+});
+watch(
+  () => props.pumpObj,
+  () => {
+    pumpObj.value = props.pumpObj;
+  },
+  { immediate: true }
+);
 
 // 获取数据
 function getData() {
   let params = {
-    stationCode: 'BZKFDJG',
+    stationCode: props.pumpObj.pumpCode, //'BZKFDJG'
   };
   realtimeDataList(params).then(res => {
     let datas = res.data || {};
@@ -185,6 +202,14 @@
 
 onMounted(() => {
   getData();
+  // 定时刷新
+  timer.value = setInterval(() => {
+    getData();
+  }, 5 * 60 * 1000);
+});
+
+onBeforeUnmount(() => {
+  if (timer.value) clearInterval(timer.value);
 });
 </script>
 
diff --git a/vite.config.js b/vite.config.js
index 24dcf41..ea36ec6 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 }) => {