diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 6777663..87e37fe 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -111,7 +111,7 @@
     <img src="@/assets/newImgs/HMScreen/headLight.png" alt="" class="bottomLightDXR" />
 
     <!-- 三维管网弹窗 -->
-    <el-dialog v-model="showPipe" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
+    <el-dialog v-model="showPipe3D" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
       <GisMapMF style="position: relative"></GisMapMF>
     </el-dialog>
 
@@ -137,10 +137,32 @@
     <el-dialog v-model="showJSD" :title="titleJSD" style="width: 900px" append-to-body>
       <WaterLogging18 :detailJSD="detailJSD" v-if="showJSD"></WaterLogging18>
     </el-dialog>
+
+    <!-- 泵站运行工况图 -->
+    <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
+      <!-- 雨水、污水泵站 -->
+      <PumpProcess v-if="dialogShow && (pumpObj.type == 'YSBZ' || pumpObj.type == 'WSBZ')" :pumpObj="pumpObj"></PumpProcess>
+      <!-- 合流泵站 -->
+      <PumpProcessHL v-if="dialogShow && pumpObj.type == 'combineBengZhan'" :pumpObj="pumpObj"></PumpProcessHL>
+    </el-dialog>
+
+    <!-- 污水处理厂工艺图 -->
+    <el-dialog v-model="showWSC" :title="wscTitle + '实时数据'" width="1050px" append-to-body>
+      <WscMonitor v-if="showWSC" :wscObj="wscObj"></WscMonitor>
+    </el-dialog>
+
+    <!-- 管网监测点详情 -->
+    <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
+      <PipeDetail v-if="showPipe" :pipeParams="pipeParams"></PipeDetail>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import WscMonitor from '@/views/sponeScreen/waterFlood/wscMonitor.vue'; //污水处理厂工艺图
+import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
+import PumpProcess from '@/views/sponeScreen/waterFlood/pumpProcess.vue'; //雨污水泵站运行工况图
+import PumpProcessHL from '@/views/sponeScreen/waterFlood/pumpProcessHL.vue'; //合流泵站运行工况图
 import WaterLogging18 from '@/views/sponeScreen/waterFlood/waterLogging18.vue'; //18个内涝积水点弹窗
 import ProjectFX from '@/views/sponeScreen/projectHM/projectFX.vue'; //典型项目分析
 import ProjectSSDX from '@/views/sponeScreen/projectHM/projectSSDX.vue'; //典型项目设施分析
@@ -173,6 +195,13 @@
 
 const permissionStore = usePermissionStore();
 const { proxy } = getCurrentInstance();
+const dialogShow = ref(false);
+const pumpObj = ref({});
+const showPipe = ref(false);
+const showWSC = ref(false);
+const wscObj = ref({});
+const wscTitle = ref('污水处理厂');
+const pipeParams = ref({});
 const projectParams = ref({});
 const projectParamsSS = ref({});
 const router = useRouter();
@@ -192,7 +221,7 @@
 const menuIndex = ref(1);
 const showPanel = ref(false);
 const showLegend = ref(false);
-const showPipe = ref(false);
+const showPipe3D = ref(false);
 const showLandXDM = ref(false); //下垫面控制
 const showProjectSSDX = ref(false);
 const showProjectDX = ref(false);
@@ -231,7 +260,7 @@
 
 // 三维管网点击
 function controlPipe3D() {
-  showPipe.value = true;
+  showPipe3D.value = true;
 }
 
 // 菜单跳转
@@ -280,7 +309,8 @@
   newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']);
   // 管网监测点
   if (properties.type == 'pipeMonitor' || properties.type == 'origine') {
-    bus.emit('pipeMonitorBus', properties);
+    pipeParams.value = properties;
+    showPipe.value = true;
   }
   // 海绵设施
   if (properties.type == 'spongeFacility') {
@@ -426,6 +456,17 @@
     titleJSD.value = (params.name || '') + ' 水位监测';
     showJSD.value = true;
   });
+  // 泵站工况图
+  bus.on('checkBZGYT', params => {
+    pumpObj.value = params;
+    dialogShow.value = true;
+  });
+  // 污水厂工况图
+  bus.on('checkWSCGYT', params => {
+    wscTitle.value = params.sewageName || '污水处理厂';
+    wscObj.value = params;
+    showWSC.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
@@ -433,6 +474,8 @@
   bus.off('checkRainL');
   bus.off('checkLandXDM');
   bus.off('checkSSFX');
+  bus.off('checkBZGYT');
+  bus.off('checkWSCGYT');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;

diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 6777663..87e37fe 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -111,7 +111,7 @@
     <img src="@/assets/newImgs/HMScreen/headLight.png" alt="" class="bottomLightDXR" />
 
     <!-- 三维管网弹窗 -->
-    <el-dialog v-model="showPipe" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
+    <el-dialog v-model="showPipe3D" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
       <GisMapMF style="position: relative"></GisMapMF>
     </el-dialog>
 
@@ -137,10 +137,32 @@
     <el-dialog v-model="showJSD" :title="titleJSD" style="width: 900px" append-to-body>
       <WaterLogging18 :detailJSD="detailJSD" v-if="showJSD"></WaterLogging18>
     </el-dialog>
+
+    <!-- 泵站运行工况图 -->
+    <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
+      <!-- 雨水、污水泵站 -->
+      <PumpProcess v-if="dialogShow && (pumpObj.type == 'YSBZ' || pumpObj.type == 'WSBZ')" :pumpObj="pumpObj"></PumpProcess>
+      <!-- 合流泵站 -->
+      <PumpProcessHL v-if="dialogShow && pumpObj.type == 'combineBengZhan'" :pumpObj="pumpObj"></PumpProcessHL>
+    </el-dialog>
+
+    <!-- 污水处理厂工艺图 -->
+    <el-dialog v-model="showWSC" :title="wscTitle + '实时数据'" width="1050px" append-to-body>
+      <WscMonitor v-if="showWSC" :wscObj="wscObj"></WscMonitor>
+    </el-dialog>
+
+    <!-- 管网监测点详情 -->
+    <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
+      <PipeDetail v-if="showPipe" :pipeParams="pipeParams"></PipeDetail>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import WscMonitor from '@/views/sponeScreen/waterFlood/wscMonitor.vue'; //污水处理厂工艺图
+import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
+import PumpProcess from '@/views/sponeScreen/waterFlood/pumpProcess.vue'; //雨污水泵站运行工况图
+import PumpProcessHL from '@/views/sponeScreen/waterFlood/pumpProcessHL.vue'; //合流泵站运行工况图
 import WaterLogging18 from '@/views/sponeScreen/waterFlood/waterLogging18.vue'; //18个内涝积水点弹窗
 import ProjectFX from '@/views/sponeScreen/projectHM/projectFX.vue'; //典型项目分析
 import ProjectSSDX from '@/views/sponeScreen/projectHM/projectSSDX.vue'; //典型项目设施分析
@@ -173,6 +195,13 @@
 
 const permissionStore = usePermissionStore();
 const { proxy } = getCurrentInstance();
+const dialogShow = ref(false);
+const pumpObj = ref({});
+const showPipe = ref(false);
+const showWSC = ref(false);
+const wscObj = ref({});
+const wscTitle = ref('污水处理厂');
+const pipeParams = ref({});
 const projectParams = ref({});
 const projectParamsSS = ref({});
 const router = useRouter();
@@ -192,7 +221,7 @@
 const menuIndex = ref(1);
 const showPanel = ref(false);
 const showLegend = ref(false);
-const showPipe = ref(false);
+const showPipe3D = ref(false);
 const showLandXDM = ref(false); //下垫面控制
 const showProjectSSDX = ref(false);
 const showProjectDX = ref(false);
@@ -231,7 +260,7 @@
 
 // 三维管网点击
 function controlPipe3D() {
-  showPipe.value = true;
+  showPipe3D.value = true;
 }
 
 // 菜单跳转
@@ -280,7 +309,8 @@
   newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']);
   // 管网监测点
   if (properties.type == 'pipeMonitor' || properties.type == 'origine') {
-    bus.emit('pipeMonitorBus', properties);
+    pipeParams.value = properties;
+    showPipe.value = true;
   }
   // 海绵设施
   if (properties.type == 'spongeFacility') {
@@ -426,6 +456,17 @@
     titleJSD.value = (params.name || '') + ' 水位监测';
     showJSD.value = true;
   });
+  // 泵站工况图
+  bus.on('checkBZGYT', params => {
+    pumpObj.value = params;
+    dialogShow.value = true;
+  });
+  // 污水厂工况图
+  bus.on('checkWSCGYT', params => {
+    wscTitle.value = params.sewageName || '污水处理厂';
+    wscObj.value = params;
+    showWSC.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
@@ -433,6 +474,8 @@
   bus.off('checkRainL');
   bus.off('checkLandXDM');
   bus.off('checkSSFX');
+  bus.off('checkBZGYT');
+  bus.off('checkWSCGYT');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/projectHM/index.vue b/src/views/sponeScreen/projectHM/index.vue
index 9adb1fe..70ebe40 100644
--- a/src/views/sponeScreen/projectHM/index.vue
+++ b/src/views/sponeScreen/projectHM/index.vue
@@ -17,11 +17,6 @@
 
   <!-- 项目详情 -->
   <qipao v-if="visibleqipao" @closed="closed" :allDateList="allDate"></qipao>
-
-  <!-- 管网监测点详情 -->
-  <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-    <PipeDetail v-if="showPipe" :pipeParams="pipeParams" :ifReal="false"></PipeDetail>
-  </el-dialog>
 </template>
 <script setup>
 import CaldarRain from '@/views/sponeScreen/waterFlood/rainCaldar.vue'; //降雨日历
@@ -31,15 +26,11 @@
 import ProjectEvaluation from '@/views/sponeScreen/projectHM/ProjectEvaluation.vue'; //项目评估
 import qipao from '@/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue';
 import bus from '@/bus/index';
-import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
-
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 const visibleqipao = ref(false);
 const allDate = ref({});
-const showPipe = ref(false);
-const pipeParams = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -72,15 +63,8 @@
   });
 }
 
-onMounted(() => {
-  // 管网监测点
-  bus.on('pipeMonitorBus', params => {
-    pipeParams.value = params;
-    showPipe.value = true;
-  });
-});
+onMounted(() => {});
 onBeforeUnmount(() => {
-  bus.off('pipeMonitorBus');
   bus.emit('removeMapDatas', ['warning_monitor']);
   bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: false });
 });

diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 6777663..87e37fe 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -111,7 +111,7 @@
     <img src="@/assets/newImgs/HMScreen/headLight.png" alt="" class="bottomLightDXR" />
 
     <!-- 三维管网弹窗 -->
-    <el-dialog v-model="showPipe" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
+    <el-dialog v-model="showPipe3D" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
       <GisMapMF style="position: relative"></GisMapMF>
     </el-dialog>
 
@@ -137,10 +137,32 @@
     <el-dialog v-model="showJSD" :title="titleJSD" style="width: 900px" append-to-body>
       <WaterLogging18 :detailJSD="detailJSD" v-if="showJSD"></WaterLogging18>
     </el-dialog>
+
+    <!-- 泵站运行工况图 -->
+    <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
+      <!-- 雨水、污水泵站 -->
+      <PumpProcess v-if="dialogShow && (pumpObj.type == 'YSBZ' || pumpObj.type == 'WSBZ')" :pumpObj="pumpObj"></PumpProcess>
+      <!-- 合流泵站 -->
+      <PumpProcessHL v-if="dialogShow && pumpObj.type == 'combineBengZhan'" :pumpObj="pumpObj"></PumpProcessHL>
+    </el-dialog>
+
+    <!-- 污水处理厂工艺图 -->
+    <el-dialog v-model="showWSC" :title="wscTitle + '实时数据'" width="1050px" append-to-body>
+      <WscMonitor v-if="showWSC" :wscObj="wscObj"></WscMonitor>
+    </el-dialog>
+
+    <!-- 管网监测点详情 -->
+    <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
+      <PipeDetail v-if="showPipe" :pipeParams="pipeParams"></PipeDetail>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import WscMonitor from '@/views/sponeScreen/waterFlood/wscMonitor.vue'; //污水处理厂工艺图
+import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
+import PumpProcess from '@/views/sponeScreen/waterFlood/pumpProcess.vue'; //雨污水泵站运行工况图
+import PumpProcessHL from '@/views/sponeScreen/waterFlood/pumpProcessHL.vue'; //合流泵站运行工况图
 import WaterLogging18 from '@/views/sponeScreen/waterFlood/waterLogging18.vue'; //18个内涝积水点弹窗
 import ProjectFX from '@/views/sponeScreen/projectHM/projectFX.vue'; //典型项目分析
 import ProjectSSDX from '@/views/sponeScreen/projectHM/projectSSDX.vue'; //典型项目设施分析
@@ -173,6 +195,13 @@
 
 const permissionStore = usePermissionStore();
 const { proxy } = getCurrentInstance();
+const dialogShow = ref(false);
+const pumpObj = ref({});
+const showPipe = ref(false);
+const showWSC = ref(false);
+const wscObj = ref({});
+const wscTitle = ref('污水处理厂');
+const pipeParams = ref({});
 const projectParams = ref({});
 const projectParamsSS = ref({});
 const router = useRouter();
@@ -192,7 +221,7 @@
 const menuIndex = ref(1);
 const showPanel = ref(false);
 const showLegend = ref(false);
-const showPipe = ref(false);
+const showPipe3D = ref(false);
 const showLandXDM = ref(false); //下垫面控制
 const showProjectSSDX = ref(false);
 const showProjectDX = ref(false);
@@ -231,7 +260,7 @@
 
 // 三维管网点击
 function controlPipe3D() {
-  showPipe.value = true;
+  showPipe3D.value = true;
 }
 
 // 菜单跳转
@@ -280,7 +309,8 @@
   newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']);
   // 管网监测点
   if (properties.type == 'pipeMonitor' || properties.type == 'origine') {
-    bus.emit('pipeMonitorBus', properties);
+    pipeParams.value = properties;
+    showPipe.value = true;
   }
   // 海绵设施
   if (properties.type == 'spongeFacility') {
@@ -426,6 +456,17 @@
     titleJSD.value = (params.name || '') + ' 水位监测';
     showJSD.value = true;
   });
+  // 泵站工况图
+  bus.on('checkBZGYT', params => {
+    pumpObj.value = params;
+    dialogShow.value = true;
+  });
+  // 污水厂工况图
+  bus.on('checkWSCGYT', params => {
+    wscTitle.value = params.sewageName || '污水处理厂';
+    wscObj.value = params;
+    showWSC.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
@@ -433,6 +474,8 @@
   bus.off('checkRainL');
   bus.off('checkLandXDM');
   bus.off('checkSSFX');
+  bus.off('checkBZGYT');
+  bus.off('checkWSCGYT');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/projectHM/index.vue b/src/views/sponeScreen/projectHM/index.vue
index 9adb1fe..70ebe40 100644
--- a/src/views/sponeScreen/projectHM/index.vue
+++ b/src/views/sponeScreen/projectHM/index.vue
@@ -17,11 +17,6 @@
 
   <!-- 项目详情 -->
   <qipao v-if="visibleqipao" @closed="closed" :allDateList="allDate"></qipao>
-
-  <!-- 管网监测点详情 -->
-  <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-    <PipeDetail v-if="showPipe" :pipeParams="pipeParams" :ifReal="false"></PipeDetail>
-  </el-dialog>
 </template>
 <script setup>
 import CaldarRain from '@/views/sponeScreen/waterFlood/rainCaldar.vue'; //降雨日历
@@ -31,15 +26,11 @@
 import ProjectEvaluation from '@/views/sponeScreen/projectHM/ProjectEvaluation.vue'; //项目评估
 import qipao from '@/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue';
 import bus from '@/bus/index';
-import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
-
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 const visibleqipao = ref(false);
 const allDate = ref({});
-const showPipe = ref(false);
-const pipeParams = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -72,15 +63,8 @@
   });
 }
 
-onMounted(() => {
-  // 管网监测点
-  bus.on('pipeMonitorBus', params => {
-    pipeParams.value = params;
-    showPipe.value = true;
-  });
-});
+onMounted(() => {});
 onBeforeUnmount(() => {
-  bus.off('pipeMonitorBus');
   bus.emit('removeMapDatas', ['warning_monitor']);
   bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: false });
 });
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index d1d45bf..69bd426 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -26,32 +26,10 @@
       <!-- 监测设备 -->
       <MonitorEquip class="mt-10"></MonitorEquip>
     </div>
-
-    <!-- 泵站运行工况图 -->
-    <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
-      <!-- 雨水、污水泵站 -->
-      <PumpProcess v-if="dialogShow && (pumpObj.type == 'YSBZ' || pumpObj.type == 'WSBZ')" :pumpObj="pumpObj"></PumpProcess>
-      <!-- 合流泵站 -->
-      <PumpProcessHL v-if="dialogShow && pumpObj.type == 'combineBengZhan'" :pumpObj="pumpObj"></PumpProcessHL>
-    </el-dialog>
-
-    <!-- 污水处理厂工艺图 -->
-    <el-dialog v-model="showWSC" :title="wscTitle + '实时数据'" width="1050px" append-to-body>
-      <WscMonitor v-if="showWSC" :wscObj="wscObj"></WscMonitor>
-    </el-dialog>
-
-    <!-- 管网监测点详情 -->
-    <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-      <PipeDetail v-if="showPipe" :pipeParams="pipeParams" :ifReal="true"></PipeDetail>
-    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import WscMonitor from '@/views/sponeScreen/waterFlood/wscMonitor.vue'; //污水处理厂工艺图
-import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
-import PumpProcess from '@/views/sponeScreen/waterFlood/pumpProcess.vue'; //雨污水泵站运行工况图
-import PumpProcessHL from '@/views/sponeScreen/waterFlood/pumpProcessHL.vue'; //合流泵站运行工况图
 import PsssCount from '@/views/sponeScreen/waterFlood/PsssCount.vue'; //排水设施统计
 import ReportRain from '@/views/sponeScreen/waterFlood/rainReport.vue'; //降雨报告
 import FloodWZ from '@/views/sponeScreen/waterFlood/floodWZ.vue'; //防汛物资
@@ -66,13 +44,7 @@
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
-const dialogShow = ref(false);
-const pumpObj = ref({});
-const showPipe = ref(false);
-const showWSC = ref(false);
-const wscObj = ref({});
-const wscTitle = ref('污水处理厂');
-const pipeParams = ref({});
+
 const warnTimer = ref(null);
 // 面板内容展开收起控制
 const props = defineProps({
@@ -119,22 +91,6 @@
 }
 
 onMounted(() => {
-  // 泵站工况图
-  bus.on('checkBZGYT', params => {
-    pumpObj.value = params;
-    dialogShow.value = true;
-  });
-  // 污水厂工况图
-  bus.on('checkWSCGYT', params => {
-    wscTitle.value = params.sewageName || '污水处理厂';
-    wscObj.value = params;
-    showWSC.value = true;
-  });
-  // 管网监测点
-  bus.on('pipeMonitorBus', params => {
-    pipeParams.value = params;
-    showPipe.value = true;
-  });
   setTimeout(() => {
     //河流流向
     let layer = new mapboxL7.LineLayer({
@@ -197,9 +153,6 @@
     { layername: 'spongeFacility', show: true }, //海绵设施图层
     { layername: 'origine', show: true }, //典型项目图层
   ]);
-  bus.off('checkBZGYT');
-  bus.off('checkWSCGYT');
-  bus.off('pipeMonitorBus');
   bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: false });
   bus.emit('removeMapDatas', ['warning_monitor']);
   if (!newfiberMapbox) return;

diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 6777663..87e37fe 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -111,7 +111,7 @@
     <img src="@/assets/newImgs/HMScreen/headLight.png" alt="" class="bottomLightDXR" />
 
     <!-- 三维管网弹窗 -->
-    <el-dialog v-model="showPipe" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
+    <el-dialog v-model="showPipe3D" title="三维管网" style="width: 1850px; height: 900px" append-to-body>
       <GisMapMF style="position: relative"></GisMapMF>
     </el-dialog>
 
@@ -137,10 +137,32 @@
     <el-dialog v-model="showJSD" :title="titleJSD" style="width: 900px" append-to-body>
       <WaterLogging18 :detailJSD="detailJSD" v-if="showJSD"></WaterLogging18>
     </el-dialog>
+
+    <!-- 泵站运行工况图 -->
+    <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
+      <!-- 雨水、污水泵站 -->
+      <PumpProcess v-if="dialogShow && (pumpObj.type == 'YSBZ' || pumpObj.type == 'WSBZ')" :pumpObj="pumpObj"></PumpProcess>
+      <!-- 合流泵站 -->
+      <PumpProcessHL v-if="dialogShow && pumpObj.type == 'combineBengZhan'" :pumpObj="pumpObj"></PumpProcessHL>
+    </el-dialog>
+
+    <!-- 污水处理厂工艺图 -->
+    <el-dialog v-model="showWSC" :title="wscTitle + '实时数据'" width="1050px" append-to-body>
+      <WscMonitor v-if="showWSC" :wscObj="wscObj"></WscMonitor>
+    </el-dialog>
+
+    <!-- 管网监测点详情 -->
+    <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
+      <PipeDetail v-if="showPipe" :pipeParams="pipeParams"></PipeDetail>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import WscMonitor from '@/views/sponeScreen/waterFlood/wscMonitor.vue'; //污水处理厂工艺图
+import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
+import PumpProcess from '@/views/sponeScreen/waterFlood/pumpProcess.vue'; //雨污水泵站运行工况图
+import PumpProcessHL from '@/views/sponeScreen/waterFlood/pumpProcessHL.vue'; //合流泵站运行工况图
 import WaterLogging18 from '@/views/sponeScreen/waterFlood/waterLogging18.vue'; //18个内涝积水点弹窗
 import ProjectFX from '@/views/sponeScreen/projectHM/projectFX.vue'; //典型项目分析
 import ProjectSSDX from '@/views/sponeScreen/projectHM/projectSSDX.vue'; //典型项目设施分析
@@ -173,6 +195,13 @@
 
 const permissionStore = usePermissionStore();
 const { proxy } = getCurrentInstance();
+const dialogShow = ref(false);
+const pumpObj = ref({});
+const showPipe = ref(false);
+const showWSC = ref(false);
+const wscObj = ref({});
+const wscTitle = ref('污水处理厂');
+const pipeParams = ref({});
 const projectParams = ref({});
 const projectParamsSS = ref({});
 const router = useRouter();
@@ -192,7 +221,7 @@
 const menuIndex = ref(1);
 const showPanel = ref(false);
 const showLegend = ref(false);
-const showPipe = ref(false);
+const showPipe3D = ref(false);
 const showLandXDM = ref(false); //下垫面控制
 const showProjectSSDX = ref(false);
 const showProjectDX = ref(false);
@@ -231,7 +260,7 @@
 
 // 三维管网点击
 function controlPipe3D() {
-  showPipe.value = true;
+  showPipe3D.value = true;
 }
 
 // 菜单跳转
@@ -280,7 +309,8 @@
   newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']);
   // 管网监测点
   if (properties.type == 'pipeMonitor' || properties.type == 'origine') {
-    bus.emit('pipeMonitorBus', properties);
+    pipeParams.value = properties;
+    showPipe.value = true;
   }
   // 海绵设施
   if (properties.type == 'spongeFacility') {
@@ -426,6 +456,17 @@
     titleJSD.value = (params.name || '') + ' 水位监测';
     showJSD.value = true;
   });
+  // 泵站工况图
+  bus.on('checkBZGYT', params => {
+    pumpObj.value = params;
+    dialogShow.value = true;
+  });
+  // 污水厂工况图
+  bus.on('checkWSCGYT', params => {
+    wscTitle.value = params.sewageName || '污水处理厂';
+    wscObj.value = params;
+    showWSC.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
@@ -433,6 +474,8 @@
   bus.off('checkRainL');
   bus.off('checkLandXDM');
   bus.off('checkSSFX');
+  bus.off('checkBZGYT');
+  bus.off('checkWSCGYT');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/projectHM/index.vue b/src/views/sponeScreen/projectHM/index.vue
index 9adb1fe..70ebe40 100644
--- a/src/views/sponeScreen/projectHM/index.vue
+++ b/src/views/sponeScreen/projectHM/index.vue
@@ -17,11 +17,6 @@
 
   <!-- 项目详情 -->
   <qipao v-if="visibleqipao" @closed="closed" :allDateList="allDate"></qipao>
-
-  <!-- 管网监测点详情 -->
-  <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-    <PipeDetail v-if="showPipe" :pipeParams="pipeParams" :ifReal="false"></PipeDetail>
-  </el-dialog>
 </template>
 <script setup>
 import CaldarRain from '@/views/sponeScreen/waterFlood/rainCaldar.vue'; //降雨日历
@@ -31,15 +26,11 @@
 import ProjectEvaluation from '@/views/sponeScreen/projectHM/ProjectEvaluation.vue'; //项目评估
 import qipao from '@/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue';
 import bus from '@/bus/index';
-import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
-
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
 const visibleqipao = ref(false);
 const allDate = ref({});
-const showPipe = ref(false);
-const pipeParams = ref({});
 
 // 面板内容展开收起控制
 const props = defineProps({
@@ -72,15 +63,8 @@
   });
 }
 
-onMounted(() => {
-  // 管网监测点
-  bus.on('pipeMonitorBus', params => {
-    pipeParams.value = params;
-    showPipe.value = true;
-  });
-});
+onMounted(() => {});
 onBeforeUnmount(() => {
-  bus.off('pipeMonitorBus');
   bus.emit('removeMapDatas', ['warning_monitor']);
   bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: false });
 });
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index d1d45bf..69bd426 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -26,32 +26,10 @@
       <!-- 监测设备 -->
       <MonitorEquip class="mt-10"></MonitorEquip>
     </div>
-
-    <!-- 泵站运行工况图 -->
-    <el-dialog v-model="dialogShow" title="泵站工况图" width="1500px" append-to-body>
-      <!-- 雨水、污水泵站 -->
-      <PumpProcess v-if="dialogShow && (pumpObj.type == 'YSBZ' || pumpObj.type == 'WSBZ')" :pumpObj="pumpObj"></PumpProcess>
-      <!-- 合流泵站 -->
-      <PumpProcessHL v-if="dialogShow && pumpObj.type == 'combineBengZhan'" :pumpObj="pumpObj"></PumpProcessHL>
-    </el-dialog>
-
-    <!-- 污水处理厂工艺图 -->
-    <el-dialog v-model="showWSC" :title="wscTitle + '实时数据'" width="1050px" append-to-body>
-      <WscMonitor v-if="showWSC" :wscObj="wscObj"></WscMonitor>
-    </el-dialog>
-
-    <!-- 管网监测点详情 -->
-    <el-dialog v-model="showPipe" title="管网监测详情" width="1000px" append-to-body>
-      <PipeDetail v-if="showPipe" :pipeParams="pipeParams" :ifReal="true"></PipeDetail>
-    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import WscMonitor from '@/views/sponeScreen/waterFlood/wscMonitor.vue'; //污水处理厂工艺图
-import PipeDetail from '@/views/sponeScreen/waterFlood/pipeDetail.vue'; //管网监测点详情
-import PumpProcess from '@/views/sponeScreen/waterFlood/pumpProcess.vue'; //雨污水泵站运行工况图
-import PumpProcessHL from '@/views/sponeScreen/waterFlood/pumpProcessHL.vue'; //合流泵站运行工况图
 import PsssCount from '@/views/sponeScreen/waterFlood/PsssCount.vue'; //排水设施统计
 import ReportRain from '@/views/sponeScreen/waterFlood/rainReport.vue'; //降雨报告
 import FloodWZ from '@/views/sponeScreen/waterFlood/floodWZ.vue'; //防汛物资
@@ -66,13 +44,7 @@
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
-const dialogShow = ref(false);
-const pumpObj = ref({});
-const showPipe = ref(false);
-const showWSC = ref(false);
-const wscObj = ref({});
-const wscTitle = ref('污水处理厂');
-const pipeParams = ref({});
+
 const warnTimer = ref(null);
 // 面板内容展开收起控制
 const props = defineProps({
@@ -119,22 +91,6 @@
 }
 
 onMounted(() => {
-  // 泵站工况图
-  bus.on('checkBZGYT', params => {
-    pumpObj.value = params;
-    dialogShow.value = true;
-  });
-  // 污水厂工况图
-  bus.on('checkWSCGYT', params => {
-    wscTitle.value = params.sewageName || '污水处理厂';
-    wscObj.value = params;
-    showWSC.value = true;
-  });
-  // 管网监测点
-  bus.on('pipeMonitorBus', params => {
-    pipeParams.value = params;
-    showPipe.value = true;
-  });
   setTimeout(() => {
     //河流流向
     let layer = new mapboxL7.LineLayer({
@@ -197,9 +153,6 @@
     { layername: 'spongeFacility', show: true }, //海绵设施图层
     { layername: 'origine', show: true }, //典型项目图层
   ]);
-  bus.off('checkBZGYT');
-  bus.off('checkWSCGYT');
-  bus.off('pipeMonitorBus');
   bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: false });
   bus.emit('removeMapDatas', ['warning_monitor']);
   if (!newfiberMapbox) return;
diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue
index 214568c..664ddf4 100644
--- a/src/views/sponeScreen/waterFlood/pipeDetail.vue
+++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue
@@ -5,7 +5,7 @@
       <el-tab-pane label="管网剖面" name="1"></el-tab-pane>
       <el-tab-pane label="监测数据" name="2"></el-tab-pane>
     </el-tabs>
-    <div class="content">
+    <div class="content" v-loading="dataLoading">
       <!-- 管网剖面 -->
       <div class="pipePou flex" v-if="tabActive == 1">
         <div class="leftP">
@@ -70,7 +70,7 @@
           </div>
 
           <!-- 实时数据 -->
-          <div v-if="props.ifReal">
+          <div v-if="ifReal">
             <!-- 有满管、管网冒溢风险时推送消息 -->
             <div class="part flex" v-if="realData.z >= (pipeDetail.pipelineDiameterTemp || '2')">
               <div class="biaoti">
@@ -85,7 +85,7 @@
           </div>
 
           <!-- 历史数据 -->
-          <div v-if="!props.ifReal">
+          <div v-if="!ifReal">
             <div class="part flex" v-if="realData.z >= (pipeDetail.pipelineDiameterTemp || '2')">
               <div class="biaoti" @click="dialogShow = true"><el-button type="warning">已短信通知相关责任人进行处理</el-button></div>
             </div>
@@ -132,14 +132,13 @@
 const valIndex = ref(0);
 const dialogShow = ref(false);
 const waterHeight = ref(0);
+const dataLoading = ref(true);
+const ifReal = ref(true);
 
 const props = defineProps({
   pipeParams: {
     type: Object,
   },
-  ifReal: {
-    type: Boolean,
-  },
 });
 
 // tab切换
@@ -192,7 +191,7 @@
     chartOption.floodOneMapPipeSupervise.yAxis[1].max = Math.max(...datas.propertyMonitorList[0].ylist) + 0.5;
     chartOption.floodOneMapPipeSupervise.series[1].name = '雨量';
     chartOption.floodOneMapPipeSupervise.series[1].type = 'bar';
-    chartOption.floodOneMapPipeSupervise.series[1].barWidth = '10';
+    chartOption.floodOneMapPipeSupervise.series[1].barWidth = 'auto';
     chartOption.floodOneMapPipeSupervise.yAxis[1].inverse = true; //翻转
     chartOption.floodOneMapPipeSupervise.yAxis[1].nameLocation = 'start'; //坐标轴名称显示位置
     if (datas.propertyMonitorXList.length > 0) {
@@ -200,10 +199,6 @@
     } else {
       chartOption.floodOneMapPipeSupervise.graphic.invisible = false; //暂无数据
     }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length - 48] },
-    ];
   }
   pipeChart.clear();
   pipeChart.setOption(chartOption.floodOneMapPipeSupervise);
@@ -252,39 +247,45 @@
 }
 
 // 获取站点详情
-function getStationData() {
-  getStationDetail(props.pipeParams.id).then(res => {
+async function getStationData() {
+  dataLoading.value = true;
+  let res = await getStationDetail(props.pipeParams.id);
+  if (res && res.code == 200) {
     pipeDetail.value = res.data;
-  });
+    // 项目建设中需要获取某一天的监测数据，排水防涝里面获取实时数据
+    if (ifReal.value) {
+      getDataReal();
+    } else {
+      pipeTime.value = [localStorage.getItem('setRainDateKF'), localStorage.getItem('setRainDateKF')];
+      getHistoryData();
+    }
+  }
 }
 
 // 水深高度
 function getWaterHeight() {
-  setTimeout(() => {
-    // 水深高度判断 非满管  满管溢流
-    if (realData.value.z > pipeDetail.value.bottomBuriedDepthTemp) {
-      waterHeight.value = 390;
-    } else if (realData.value.z <= pipeDetail.value.pipelineDiameterTemp) {
-      waterHeight.value = (140 * realData.value.z) / pipeDetail.value.pipelineDiameterTemp;
-    } else if (realData.value.z > pipeDetail.value.pipelineDiameterTemp) {
-      // 满管溢流
-      waterHeight.value =
-        140 +
-        (250 * (realData.value.z - pipeDetail.value.pipelineDiameterTemp)) /
-          (pipeDetail.value.bottomBuriedDepthTemp - pipeDetail.value.pipelineDiameterTemp);
-    }
-  });
+  // 水深高度判断 非满管  满管溢流
+  if (realData.value.z > pipeDetail.value.bottomBuriedDepthTemp) {
+    waterHeight.value = 390;
+  } else if (realData.value.z <= pipeDetail.value.pipelineDiameterTemp) {
+    waterHeight.value = (140 * realData.value.z) / pipeDetail.value.pipelineDiameterTemp;
+  } else if (realData.value.z > pipeDetail.value.pipelineDiameterTemp) {
+    // 满管溢流
+    waterHeight.value =
+      140 +
+      (250 * (realData.value.z - pipeDetail.value.pipelineDiameterTemp)) /
+        (pipeDetail.value.bottomBuriedDepthTemp - pipeDetail.value.pipelineDiameterTemp);
+  }
+  dataLoading.value = false;
 }
 
 onMounted(() => {
-  getStationData();
-  // 项目建设中需要获取某一天的监测数据，排水防涝里面获取实时数据
-  if (props.ifReal) {
-    getDataReal();
+  if (localStorage.getItem('showHistoryMonitor') == '1') {
+    ifReal.value = true; //排水防涝实时数据
   } else {
-    pipeTime.value = [localStorage.getItem('setRainDateKF'), localStorage.getItem('setRainDateKF')];
-    getHistoryData();
+    ifReal.value = false; //其他模块历史数据
   }
+  getStationData();
 });
 </script>