diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index e21052a..be2dec3 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -293,7 +293,6 @@
 
     const setLegendData = list => {
       list.forEach(i => {
-        console.log('iii---', i);
         i.data &&
           i.data.features &&
           i.data.features.forEach(a => {

diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index e21052a..be2dec3 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -293,7 +293,6 @@
 
     const setLegendData = list => {
       list.forEach(i => {
-        console.log('iii---', i);
         i.data &&
           i.data.features &&
           i.data.features.forEach(a => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..128d22e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -17,6 +17,9 @@
       :class="['animate__animated', showPanel ? 'animate__fadeInUp left30' : 'animate__fadeInUp left480']"
     ></Legend>
 
+    <!-- 地图标注点弹窗popup -->
+    <PopupInfo></PopupInfo>
+
     <!-- 控制面板按钮 -->
     <div :class="['controlHM', showPanel ? 'right30' : 'right480']" v-if="menuIndex != 3">
       <img src="@/assets/newImgs/HMScreen/iconLegend.png" alt="" title="图例控制" @click="controlLegend" />
@@ -97,6 +100,7 @@
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
 import Legend from '@/views/sponeScreen/gisMF/legendKF.vue';
+import PopupInfo from '@/views/sponeScreen/gisMF/cesiumPopup.vue'; //地图标注点弹窗
 import bus from '@/bus';
 import City from '@/views/sponeScreen/cityGK/index.vue'; //城市概况
 import ProjectHM from '@/views/sponeScreen/projectHM/index.vue'; //项目建设
@@ -120,7 +124,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -209,18 +213,22 @@
 };
 //地图点击
 const mapClick = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  console.log('地图点击---', properties);
+  bus.emit('popupcontent', {
+    popupShow: true,
+    point: point,
+    popupInfo: properties,
+  });
 };
 //鼠标移入
 const moveOn = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移入--', properties);
 };
 //鼠标移出
 const moveLeave = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移出--', properties);
 };
 onMounted(() => {
   getWeather();
@@ -228,7 +236,6 @@
 onBeforeUnmount(() => {
   if (!newfiberMap) return;
   if (newfiberMap) {
-    console.log('newfiberMap.getMap().destroy()');
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
     newfiberMap.getMap().imageryLayers.removeAll();
     newfiberMap.getMap().entities.removeAll();

diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index e21052a..be2dec3 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -293,7 +293,6 @@
 
     const setLegendData = list => {
       list.forEach(i => {
-        console.log('iii---', i);
         i.data &&
           i.data.features &&
           i.data.features.forEach(a => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..128d22e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -17,6 +17,9 @@
       :class="['animate__animated', showPanel ? 'animate__fadeInUp left30' : 'animate__fadeInUp left480']"
     ></Legend>
 
+    <!-- 地图标注点弹窗popup -->
+    <PopupInfo></PopupInfo>
+
     <!-- 控制面板按钮 -->
     <div :class="['controlHM', showPanel ? 'right30' : 'right480']" v-if="menuIndex != 3">
       <img src="@/assets/newImgs/HMScreen/iconLegend.png" alt="" title="图例控制" @click="controlLegend" />
@@ -97,6 +100,7 @@
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
 import Legend from '@/views/sponeScreen/gisMF/legendKF.vue';
+import PopupInfo from '@/views/sponeScreen/gisMF/cesiumPopup.vue'; //地图标注点弹窗
 import bus from '@/bus';
 import City from '@/views/sponeScreen/cityGK/index.vue'; //城市概况
 import ProjectHM from '@/views/sponeScreen/projectHM/index.vue'; //项目建设
@@ -120,7 +124,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -209,18 +213,22 @@
 };
 //地图点击
 const mapClick = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  console.log('地图点击---', properties);
+  bus.emit('popupcontent', {
+    popupShow: true,
+    point: point,
+    popupInfo: properties,
+  });
 };
 //鼠标移入
 const moveOn = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移入--', properties);
 };
 //鼠标移出
 const moveLeave = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移出--', properties);
 };
 onMounted(() => {
   getWeather();
@@ -228,7 +236,6 @@
 onBeforeUnmount(() => {
   if (!newfiberMap) return;
   if (newfiberMap) {
-    console.log('newfiberMap.getMap().destroy()');
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
     newfiberMap.getMap().imageryLayers.removeAll();
     newfiberMap.getMap().entities.removeAll();
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index 10e28da..eb408d4 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -99,6 +99,7 @@
 onBeforeUnmount(() => {
   clearInterval(window.currentWeatherTimer);
   window.currentWeatherTimer = null;
+  bus.off('closeCesiumPopup');
   if (!newfiberMap) return;
   newfiberMap.weatherRemove();
 });

diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index e21052a..be2dec3 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -293,7 +293,6 @@
 
     const setLegendData = list => {
       list.forEach(i => {
-        console.log('iii---', i);
         i.data &&
           i.data.features &&
           i.data.features.forEach(a => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..128d22e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -17,6 +17,9 @@
       :class="['animate__animated', showPanel ? 'animate__fadeInUp left30' : 'animate__fadeInUp left480']"
     ></Legend>
 
+    <!-- 地图标注点弹窗popup -->
+    <PopupInfo></PopupInfo>
+
     <!-- 控制面板按钮 -->
     <div :class="['controlHM', showPanel ? 'right30' : 'right480']" v-if="menuIndex != 3">
       <img src="@/assets/newImgs/HMScreen/iconLegend.png" alt="" title="图例控制" @click="controlLegend" />
@@ -97,6 +100,7 @@
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
 import Legend from '@/views/sponeScreen/gisMF/legendKF.vue';
+import PopupInfo from '@/views/sponeScreen/gisMF/cesiumPopup.vue'; //地图标注点弹窗
 import bus from '@/bus';
 import City from '@/views/sponeScreen/cityGK/index.vue'; //城市概况
 import ProjectHM from '@/views/sponeScreen/projectHM/index.vue'; //项目建设
@@ -120,7 +124,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -209,18 +213,22 @@
 };
 //地图点击
 const mapClick = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  console.log('地图点击---', properties);
+  bus.emit('popupcontent', {
+    popupShow: true,
+    point: point,
+    popupInfo: properties,
+  });
 };
 //鼠标移入
 const moveOn = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移入--', properties);
 };
 //鼠标移出
 const moveLeave = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移出--', properties);
 };
 onMounted(() => {
   getWeather();
@@ -228,7 +236,6 @@
 onBeforeUnmount(() => {
   if (!newfiberMap) return;
   if (newfiberMap) {
-    console.log('newfiberMap.getMap().destroy()');
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
     newfiberMap.getMap().imageryLayers.removeAll();
     newfiberMap.getMap().entities.removeAll();
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index 10e28da..eb408d4 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -99,6 +99,7 @@
 onBeforeUnmount(() => {
   clearInterval(window.currentWeatherTimer);
   window.currentWeatherTimer = null;
+  bus.off('closeCesiumPopup');
   if (!newfiberMap) return;
   newfiberMap.weatherRemove();
 });
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 16332d4..fae0f1e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -5,7 +5,6 @@
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
-      <div class="titleNamePP" v-if="allData.dataList.name">{{ allData.dataList.name }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
@@ -132,18 +131,24 @@
     </div>
 
     <!-- 河道水位监测 -->
-    <div class="basicInfo" v-if="allData.dataList.type == 'YSBZ'">
-      <div class="basicContentCP">
-        <div class="contentInfo">
-          <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.ysNumber }}台</div>
-          <div class="contentName">抽排量：</div>
-          <div class="contentValue">{{ allData.dataList.yswater }}m³/s</div>
+    <div class="basicInfo" v-if="allData.dataList.type == 'waterCourse'">
+      <div class="mt-10">
+        <div class="flex flex-start">
+          <div>
+            <el-date-picker
+              v-model="allData.dateTime"
+              type="daterange"
+              value-format="YYYY-MM-DD"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              size="small"
+              style="width: 240px; margin-right: 10px"
+            />
+          </div>
+          <el-button type="primary" size="small" @click="changeDateSW">搜索</el-button>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">泵站类型：</div>
-          <div class="contentValue">{{ allData.dataList.Layer }}</div>
-        </div>
+
+        <div id="chartPopupRainC"></div>
       </div>
     </div>
 
@@ -192,12 +197,24 @@
 function closePopupCES() {
   allData.popupShow = false;
   bus.emit('closeCesiumPopup');
+  // 关闭之后回到中心点
+  newfiberMapbox.map.easeTo({
+    center: [114.35, 34.802],
+    zoom: 12.9,
+    pitch: 55,
+  });
 }
 
 // 雨量站弹窗内容
 const changeDate = () => {
   getSuperViseData();
 };
+
+// 水位计弹窗内容
+function changeDateSW() {
+  getSuperViseData();
+}
+
 // 降雨趋势折线图
 let chartPopupRain = null;
 const initEchartsPopup = () => {
@@ -276,18 +293,45 @@
 }
 
 onMounted(() => {
-  bus.on('popupcontent', data => {
-    allData.dataList = data.popupInfo;
-    console.log(allData.dataList, 9999);
+  bus.on('popupcontent', params => {
+    console.log('popup接收地图标注点值---', params);
+    allData.dataList = params.popupInfo;
+    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    window.window.pipePopup = new mapboxL7.Popup({
+      html: pipePopupDiv,
+      lngLat: {
+        lng: params.point[0],
+        lat: params.point[1],
+      },
+      anchor: 'center',
+      offsets: [-30, 150],
+      autoClose: false,
+    });
+    newfiberMapbox.addPopup(pipePopup);
+    newfiberMapbox.map.easeTo({
+      center: [params.point[0], params.point[1]],
+      zoom: 17,
+    });
+    allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
+    if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
   });
 });
 onBeforeUnmount(() => {
   bus.off('popupcontent');
-  bus.off('closeCesiumPopup');
 });
 </script>
 <style lang="scss">
+.l7-popup-tip {
+  display: none;
+}
+.l7-popup .l7-popup-content {
+  padding: 0px;
+  background: none;
+}
+.l7-popup .l7-popup-content .l7-popup-close-button {
+  display: none;
+}
 .cesiumPopup {
   position: absolute;
   width: 500px;

diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index e21052a..be2dec3 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -293,7 +293,6 @@
 
     const setLegendData = list => {
       list.forEach(i => {
-        console.log('iii---', i);
         i.data &&
           i.data.features &&
           i.data.features.forEach(a => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..128d22e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -17,6 +17,9 @@
       :class="['animate__animated', showPanel ? 'animate__fadeInUp left30' : 'animate__fadeInUp left480']"
     ></Legend>
 
+    <!-- 地图标注点弹窗popup -->
+    <PopupInfo></PopupInfo>
+
     <!-- 控制面板按钮 -->
     <div :class="['controlHM', showPanel ? 'right30' : 'right480']" v-if="menuIndex != 3">
       <img src="@/assets/newImgs/HMScreen/iconLegend.png" alt="" title="图例控制" @click="controlLegend" />
@@ -97,6 +100,7 @@
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
 import Legend from '@/views/sponeScreen/gisMF/legendKF.vue';
+import PopupInfo from '@/views/sponeScreen/gisMF/cesiumPopup.vue'; //地图标注点弹窗
 import bus from '@/bus';
 import City from '@/views/sponeScreen/cityGK/index.vue'; //城市概况
 import ProjectHM from '@/views/sponeScreen/projectHM/index.vue'; //项目建设
@@ -120,7 +124,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -209,18 +213,22 @@
 };
 //地图点击
 const mapClick = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  console.log('地图点击---', properties);
+  bus.emit('popupcontent', {
+    popupShow: true,
+    point: point,
+    popupInfo: properties,
+  });
 };
 //鼠标移入
 const moveOn = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移入--', properties);
 };
 //鼠标移出
 const moveLeave = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移出--', properties);
 };
 onMounted(() => {
   getWeather();
@@ -228,7 +236,6 @@
 onBeforeUnmount(() => {
   if (!newfiberMap) return;
   if (newfiberMap) {
-    console.log('newfiberMap.getMap().destroy()');
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
     newfiberMap.getMap().imageryLayers.removeAll();
     newfiberMap.getMap().entities.removeAll();
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index 10e28da..eb408d4 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -99,6 +99,7 @@
 onBeforeUnmount(() => {
   clearInterval(window.currentWeatherTimer);
   window.currentWeatherTimer = null;
+  bus.off('closeCesiumPopup');
   if (!newfiberMap) return;
   newfiberMap.weatherRemove();
 });
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 16332d4..fae0f1e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -5,7 +5,6 @@
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
-      <div class="titleNamePP" v-if="allData.dataList.name">{{ allData.dataList.name }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
@@ -132,18 +131,24 @@
     </div>
 
     <!-- 河道水位监测 -->
-    <div class="basicInfo" v-if="allData.dataList.type == 'YSBZ'">
-      <div class="basicContentCP">
-        <div class="contentInfo">
-          <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.ysNumber }}台</div>
-          <div class="contentName">抽排量：</div>
-          <div class="contentValue">{{ allData.dataList.yswater }}m³/s</div>
+    <div class="basicInfo" v-if="allData.dataList.type == 'waterCourse'">
+      <div class="mt-10">
+        <div class="flex flex-start">
+          <div>
+            <el-date-picker
+              v-model="allData.dateTime"
+              type="daterange"
+              value-format="YYYY-MM-DD"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              size="small"
+              style="width: 240px; margin-right: 10px"
+            />
+          </div>
+          <el-button type="primary" size="small" @click="changeDateSW">搜索</el-button>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">泵站类型：</div>
-          <div class="contentValue">{{ allData.dataList.Layer }}</div>
-        </div>
+
+        <div id="chartPopupRainC"></div>
       </div>
     </div>
 
@@ -192,12 +197,24 @@
 function closePopupCES() {
   allData.popupShow = false;
   bus.emit('closeCesiumPopup');
+  // 关闭之后回到中心点
+  newfiberMapbox.map.easeTo({
+    center: [114.35, 34.802],
+    zoom: 12.9,
+    pitch: 55,
+  });
 }
 
 // 雨量站弹窗内容
 const changeDate = () => {
   getSuperViseData();
 };
+
+// 水位计弹窗内容
+function changeDateSW() {
+  getSuperViseData();
+}
+
 // 降雨趋势折线图
 let chartPopupRain = null;
 const initEchartsPopup = () => {
@@ -276,18 +293,45 @@
 }
 
 onMounted(() => {
-  bus.on('popupcontent', data => {
-    allData.dataList = data.popupInfo;
-    console.log(allData.dataList, 9999);
+  bus.on('popupcontent', params => {
+    console.log('popup接收地图标注点值---', params);
+    allData.dataList = params.popupInfo;
+    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    window.window.pipePopup = new mapboxL7.Popup({
+      html: pipePopupDiv,
+      lngLat: {
+        lng: params.point[0],
+        lat: params.point[1],
+      },
+      anchor: 'center',
+      offsets: [-30, 150],
+      autoClose: false,
+    });
+    newfiberMapbox.addPopup(pipePopup);
+    newfiberMapbox.map.easeTo({
+      center: [params.point[0], params.point[1]],
+      zoom: 17,
+    });
+    allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
+    if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
   });
 });
 onBeforeUnmount(() => {
   bus.off('popupcontent');
-  bus.off('closeCesiumPopup');
 });
 </script>
 <style lang="scss">
+.l7-popup-tip {
+  display: none;
+}
+.l7-popup .l7-popup-content {
+  padding: 0px;
+  background: none;
+}
+.l7-popup .l7-popup-content .l7-popup-close-button {
+  display: none;
+}
 .cesiumPopup {
   position: absolute;
   width: 500px;
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 4f339c1..6331afa 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -62,7 +62,7 @@
 watch(
   () => props.showLegend,
   () => {
-    console.log('showLegend---', props.showLegend);
+    // console.log('showLegend---', props.showLegend);
     showLegend.value = props.showLegend;
   },
   { immediate: true }
@@ -70,13 +70,13 @@
 
 //图例一级标题点击
 const changeAllLegend = item => {
-  console.log('item---', item);
+  // console.log('item---', item);
   // item.isCheck = !item.isCheck;
 };
 //图例点击
 const changeLegend = async item => {
   item.isCheck = !item.isCheck;
-  console.log('item--', item);
+  // console.log('item--', item);
   bus.emit('setLayerVisible', item);
   // if (item.layername == 'weather_cloud') {
   //   return newfiberMap.setLayersVisible([item.layername], item.isCheck);
@@ -361,7 +361,7 @@
   });
   nextTick(() => {
     bus.on('setIniteLayer', data => {
-      console.log('data---', data);
+      // console.log('data---', data);
       if (!data.length) {
         let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat();
         legendList_1.forEach(layer => {
@@ -376,10 +376,9 @@
           .flat();
         data.forEach(layer => {
           let selectedLayer = legendList_1.filter(item => item.layername == layer.layername);
-          console.log('selectedLayer--', selectedLayer);
+          // console.log('selectedLayer--', selectedLayer);
           selectedLayer.forEach(i => {
             i.isCheck = layer.show;
-            console.log('iiiiiiii---', i, layer);
             changeLegend(i);
           });
         });

diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index e21052a..be2dec3 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -293,7 +293,6 @@
 
     const setLegendData = list => {
       list.forEach(i => {
-        console.log('iii---', i);
         i.data &&
           i.data.features &&
           i.data.features.forEach(a => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..128d22e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -17,6 +17,9 @@
       :class="['animate__animated', showPanel ? 'animate__fadeInUp left30' : 'animate__fadeInUp left480']"
     ></Legend>
 
+    <!-- 地图标注点弹窗popup -->
+    <PopupInfo></PopupInfo>
+
     <!-- 控制面板按钮 -->
     <div :class="['controlHM', showPanel ? 'right30' : 'right480']" v-if="menuIndex != 3">
       <img src="@/assets/newImgs/HMScreen/iconLegend.png" alt="" title="图例控制" @click="controlLegend" />
@@ -97,6 +100,7 @@
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
 import Legend from '@/views/sponeScreen/gisMF/legendKF.vue';
+import PopupInfo from '@/views/sponeScreen/gisMF/cesiumPopup.vue'; //地图标注点弹窗
 import bus from '@/bus';
 import City from '@/views/sponeScreen/cityGK/index.vue'; //城市概况
 import ProjectHM from '@/views/sponeScreen/projectHM/index.vue'; //项目建设
@@ -120,7 +124,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -209,18 +213,22 @@
 };
 //地图点击
 const mapClick = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  console.log('地图点击---', properties);
+  bus.emit('popupcontent', {
+    popupShow: true,
+    point: point,
+    popupInfo: properties,
+  });
 };
 //鼠标移入
 const moveOn = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移入--', properties);
 };
 //鼠标移出
 const moveLeave = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移出--', properties);
 };
 onMounted(() => {
   getWeather();
@@ -228,7 +236,6 @@
 onBeforeUnmount(() => {
   if (!newfiberMap) return;
   if (newfiberMap) {
-    console.log('newfiberMap.getMap().destroy()');
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
     newfiberMap.getMap().imageryLayers.removeAll();
     newfiberMap.getMap().entities.removeAll();
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index 10e28da..eb408d4 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -99,6 +99,7 @@
 onBeforeUnmount(() => {
   clearInterval(window.currentWeatherTimer);
   window.currentWeatherTimer = null;
+  bus.off('closeCesiumPopup');
   if (!newfiberMap) return;
   newfiberMap.weatherRemove();
 });
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 16332d4..fae0f1e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -5,7 +5,6 @@
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
-      <div class="titleNamePP" v-if="allData.dataList.name">{{ allData.dataList.name }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
@@ -132,18 +131,24 @@
     </div>
 
     <!-- 河道水位监测 -->
-    <div class="basicInfo" v-if="allData.dataList.type == 'YSBZ'">
-      <div class="basicContentCP">
-        <div class="contentInfo">
-          <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.ysNumber }}台</div>
-          <div class="contentName">抽排量：</div>
-          <div class="contentValue">{{ allData.dataList.yswater }}m³/s</div>
+    <div class="basicInfo" v-if="allData.dataList.type == 'waterCourse'">
+      <div class="mt-10">
+        <div class="flex flex-start">
+          <div>
+            <el-date-picker
+              v-model="allData.dateTime"
+              type="daterange"
+              value-format="YYYY-MM-DD"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              size="small"
+              style="width: 240px; margin-right: 10px"
+            />
+          </div>
+          <el-button type="primary" size="small" @click="changeDateSW">搜索</el-button>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">泵站类型：</div>
-          <div class="contentValue">{{ allData.dataList.Layer }}</div>
-        </div>
+
+        <div id="chartPopupRainC"></div>
       </div>
     </div>
 
@@ -192,12 +197,24 @@
 function closePopupCES() {
   allData.popupShow = false;
   bus.emit('closeCesiumPopup');
+  // 关闭之后回到中心点
+  newfiberMapbox.map.easeTo({
+    center: [114.35, 34.802],
+    zoom: 12.9,
+    pitch: 55,
+  });
 }
 
 // 雨量站弹窗内容
 const changeDate = () => {
   getSuperViseData();
 };
+
+// 水位计弹窗内容
+function changeDateSW() {
+  getSuperViseData();
+}
+
 // 降雨趋势折线图
 let chartPopupRain = null;
 const initEchartsPopup = () => {
@@ -276,18 +293,45 @@
 }
 
 onMounted(() => {
-  bus.on('popupcontent', data => {
-    allData.dataList = data.popupInfo;
-    console.log(allData.dataList, 9999);
+  bus.on('popupcontent', params => {
+    console.log('popup接收地图标注点值---', params);
+    allData.dataList = params.popupInfo;
+    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    window.window.pipePopup = new mapboxL7.Popup({
+      html: pipePopupDiv,
+      lngLat: {
+        lng: params.point[0],
+        lat: params.point[1],
+      },
+      anchor: 'center',
+      offsets: [-30, 150],
+      autoClose: false,
+    });
+    newfiberMapbox.addPopup(pipePopup);
+    newfiberMapbox.map.easeTo({
+      center: [params.point[0], params.point[1]],
+      zoom: 17,
+    });
+    allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
+    if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
   });
 });
 onBeforeUnmount(() => {
   bus.off('popupcontent');
-  bus.off('closeCesiumPopup');
 });
 </script>
 <style lang="scss">
+.l7-popup-tip {
+  display: none;
+}
+.l7-popup .l7-popup-content {
+  padding: 0px;
+  background: none;
+}
+.l7-popup .l7-popup-content .l7-popup-close-button {
+  display: none;
+}
 .cesiumPopup {
   position: absolute;
   width: 500px;
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 4f339c1..6331afa 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -62,7 +62,7 @@
 watch(
   () => props.showLegend,
   () => {
-    console.log('showLegend---', props.showLegend);
+    // console.log('showLegend---', props.showLegend);
     showLegend.value = props.showLegend;
   },
   { immediate: true }
@@ -70,13 +70,13 @@
 
 //图例一级标题点击
 const changeAllLegend = item => {
-  console.log('item---', item);
+  // console.log('item---', item);
   // item.isCheck = !item.isCheck;
 };
 //图例点击
 const changeLegend = async item => {
   item.isCheck = !item.isCheck;
-  console.log('item--', item);
+  // console.log('item--', item);
   bus.emit('setLayerVisible', item);
   // if (item.layername == 'weather_cloud') {
   //   return newfiberMap.setLayersVisible([item.layername], item.isCheck);
@@ -361,7 +361,7 @@
   });
   nextTick(() => {
     bus.on('setIniteLayer', data => {
-      console.log('data---', data);
+      // console.log('data---', data);
       if (!data.length) {
         let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat();
         legendList_1.forEach(layer => {
@@ -376,10 +376,9 @@
           .flat();
         data.forEach(layer => {
           let selectedLayer = legendList_1.filter(item => item.layername == layer.layername);
-          console.log('selectedLayer--', selectedLayer);
+          // console.log('selectedLayer--', selectedLayer);
           selectedLayer.forEach(i => {
             i.isCheck = layer.show;
-            console.log('iiiiiiii---', i, layer);
             changeLegend(i);
           });
         });
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index fd6f0f7..ed69e6b 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -101,11 +101,13 @@
     //   pitch: -25.2508969308367,
     //   roll: 0.005453465256790101,
     // });
+    // 默认缩放比、中心点
     newfiberMapbox.map.easeTo({
-      center: [114.312, 34.802],
+      center: [114.35, 34.802],
       zoom: 12.9,
       pitch: 55,
     });
+
     bus.emit('setIniteLayer', [
       {
         layername: 'YSBZ', //雨水泵站
@@ -135,6 +137,10 @@
         layername: 'pipeMonitor', //管网监测点，测试
         show: false,
       },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
     ]);
   }, 1000);
 });

diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index e21052a..be2dec3 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -293,7 +293,6 @@
 
     const setLegendData = list => {
       list.forEach(i => {
-        console.log('iii---', i);
         i.data &&
           i.data.features &&
           i.data.features.forEach(a => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..128d22e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -17,6 +17,9 @@
       :class="['animate__animated', showPanel ? 'animate__fadeInUp left30' : 'animate__fadeInUp left480']"
     ></Legend>
 
+    <!-- 地图标注点弹窗popup -->
+    <PopupInfo></PopupInfo>
+
     <!-- 控制面板按钮 -->
     <div :class="['controlHM', showPanel ? 'right30' : 'right480']" v-if="menuIndex != 3">
       <img src="@/assets/newImgs/HMScreen/iconLegend.png" alt="" title="图例控制" @click="controlLegend" />
@@ -97,6 +100,7 @@
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
 import Legend from '@/views/sponeScreen/gisMF/legendKF.vue';
+import PopupInfo from '@/views/sponeScreen/gisMF/cesiumPopup.vue'; //地图标注点弹窗
 import bus from '@/bus';
 import City from '@/views/sponeScreen/cityGK/index.vue'; //城市概况
 import ProjectHM from '@/views/sponeScreen/projectHM/index.vue'; //项目建设
@@ -120,7 +124,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -209,18 +213,22 @@
 };
 //地图点击
 const mapClick = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  console.log('地图点击---', properties);
+  bus.emit('popupcontent', {
+    popupShow: true,
+    point: point,
+    popupInfo: properties,
+  });
 };
 //鼠标移入
 const moveOn = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移入--', properties);
 };
 //鼠标移出
 const moveLeave = (point, properties) => {
-  console.log('point', point);
-  console.log('properties', properties);
+  // console.log('point', point);
+  // console.log('鼠标移出--', properties);
 };
 onMounted(() => {
   getWeather();
@@ -228,7 +236,6 @@
 onBeforeUnmount(() => {
   if (!newfiberMap) return;
   if (newfiberMap) {
-    console.log('newfiberMap.getMap().destroy()');
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
     newfiberMap.getMap().imageryLayers.removeAll();
     newfiberMap.getMap().entities.removeAll();
diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue
index 10e28da..eb408d4 100644
--- a/src/views/sponeScreen/gisMF/cesiumMap.vue
+++ b/src/views/sponeScreen/gisMF/cesiumMap.vue
@@ -99,6 +99,7 @@
 onBeforeUnmount(() => {
   clearInterval(window.currentWeatherTimer);
   window.currentWeatherTimer = null;
+  bus.off('closeCesiumPopup');
   if (!newfiberMap) return;
   newfiberMap.weatherRemove();
 });
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 16332d4..fae0f1e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -5,7 +5,6 @@
       <div class="titleNamePP" v-if="allData.dataList.pumpName">{{ allData.dataList.pumpName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.sewageName">{{ allData.dataList.sewageName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
-      <div class="titleNamePP" v-if="allData.dataList.name">{{ allData.dataList.name }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
@@ -132,18 +131,24 @@
     </div>
 
     <!-- 河道水位监测 -->
-    <div class="basicInfo" v-if="allData.dataList.type == 'YSBZ'">
-      <div class="basicContentCP">
-        <div class="contentInfo">
-          <div class="contentName">泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.ysNumber }}台</div>
-          <div class="contentName">抽排量：</div>
-          <div class="contentValue">{{ allData.dataList.yswater }}m³/s</div>
+    <div class="basicInfo" v-if="allData.dataList.type == 'waterCourse'">
+      <div class="mt-10">
+        <div class="flex flex-start">
+          <div>
+            <el-date-picker
+              v-model="allData.dateTime"
+              type="daterange"
+              value-format="YYYY-MM-DD"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              size="small"
+              style="width: 240px; margin-right: 10px"
+            />
+          </div>
+          <el-button type="primary" size="small" @click="changeDateSW">搜索</el-button>
         </div>
-        <div class="contentInfo">
-          <div class="contentName">泵站类型：</div>
-          <div class="contentValue">{{ allData.dataList.Layer }}</div>
-        </div>
+
+        <div id="chartPopupRainC"></div>
       </div>
     </div>
 
@@ -192,12 +197,24 @@
 function closePopupCES() {
   allData.popupShow = false;
   bus.emit('closeCesiumPopup');
+  // 关闭之后回到中心点
+  newfiberMapbox.map.easeTo({
+    center: [114.35, 34.802],
+    zoom: 12.9,
+    pitch: 55,
+  });
 }
 
 // 雨量站弹窗内容
 const changeDate = () => {
   getSuperViseData();
 };
+
+// 水位计弹窗内容
+function changeDateSW() {
+  getSuperViseData();
+}
+
 // 降雨趋势折线图
 let chartPopupRain = null;
 const initEchartsPopup = () => {
@@ -276,18 +293,45 @@
 }
 
 onMounted(() => {
-  bus.on('popupcontent', data => {
-    allData.dataList = data.popupInfo;
-    console.log(allData.dataList, 9999);
+  bus.on('popupcontent', params => {
+    console.log('popup接收地图标注点值---', params);
+    allData.dataList = params.popupInfo;
+    let pipePopupDiv = document.getElementById('cesiumPopupID');
+    window.window.pipePopup = new mapboxL7.Popup({
+      html: pipePopupDiv,
+      lngLat: {
+        lng: params.point[0],
+        lat: params.point[1],
+      },
+      anchor: 'center',
+      offsets: [-30, 150],
+      autoClose: false,
+    });
+    newfiberMapbox.addPopup(pipePopup);
+    newfiberMapbox.map.easeTo({
+      center: [params.point[0], params.point[1]],
+      zoom: 17,
+    });
+    allData.popupShow = true;
     if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
+    if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计
   });
 });
 onBeforeUnmount(() => {
   bus.off('popupcontent');
-  bus.off('closeCesiumPopup');
 });
 </script>
 <style lang="scss">
+.l7-popup-tip {
+  display: none;
+}
+.l7-popup .l7-popup-content {
+  padding: 0px;
+  background: none;
+}
+.l7-popup .l7-popup-content .l7-popup-close-button {
+  display: none;
+}
 .cesiumPopup {
   position: absolute;
   width: 500px;
diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue
index 4f339c1..6331afa 100644
--- a/src/views/sponeScreen/gisMF/legendKF.vue
+++ b/src/views/sponeScreen/gisMF/legendKF.vue
@@ -62,7 +62,7 @@
 watch(
   () => props.showLegend,
   () => {
-    console.log('showLegend---', props.showLegend);
+    // console.log('showLegend---', props.showLegend);
     showLegend.value = props.showLegend;
   },
   { immediate: true }
@@ -70,13 +70,13 @@
 
 //图例一级标题点击
 const changeAllLegend = item => {
-  console.log('item---', item);
+  // console.log('item---', item);
   // item.isCheck = !item.isCheck;
 };
 //图例点击
 const changeLegend = async item => {
   item.isCheck = !item.isCheck;
-  console.log('item--', item);
+  // console.log('item--', item);
   bus.emit('setLayerVisible', item);
   // if (item.layername == 'weather_cloud') {
   //   return newfiberMap.setLayersVisible([item.layername], item.isCheck);
@@ -361,7 +361,7 @@
   });
   nextTick(() => {
     bus.on('setIniteLayer', data => {
-      console.log('data---', data);
+      // console.log('data---', data);
       if (!data.length) {
         let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat();
         legendList_1.forEach(layer => {
@@ -376,10 +376,9 @@
           .flat();
         data.forEach(layer => {
           let selectedLayer = legendList_1.filter(item => item.layername == layer.layername);
-          console.log('selectedLayer--', selectedLayer);
+          // console.log('selectedLayer--', selectedLayer);
           selectedLayer.forEach(i => {
             i.isCheck = layer.show;
-            console.log('iiiiiiii---', i, layer);
             changeLegend(i);
           });
         });
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index fd6f0f7..ed69e6b 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -101,11 +101,13 @@
     //   pitch: -25.2508969308367,
     //   roll: 0.005453465256790101,
     // });
+    // 默认缩放比、中心点
     newfiberMapbox.map.easeTo({
-      center: [114.312, 34.802],
+      center: [114.35, 34.802],
       zoom: 12.9,
       pitch: 55,
     });
+
     bus.emit('setIniteLayer', [
       {
         layername: 'YSBZ', //雨水泵站
@@ -135,6 +137,10 @@
         layername: 'pipeMonitor', //管网监测点，测试
         show: false,
       },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
     ]);
   }, 1000);
 });
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 0241b65..047a5d6 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -57,7 +57,7 @@
     <!-- 泵站图 -->
     <div class="pumpCont">
       <!-- 排入水体 -->
-      <div class="waterGo">{{ pumpObj.rainpump.collectionOut }}</div>
+      <div class="waterGo">{{ JSON.parse(pumpObj.rainpump).collectionOut }}</div>
 
       <!-- 雨水池、污水池 -->
       <div class="waterType">雨水池</div>
@@ -177,10 +177,15 @@
     let datas = res.data || {};
     console.log(datas);
     detailObj.value = datas;
-    realYW.value = detailObj.value['BZKFDJG-YW']; //实时液位
+    realYW.value = detailObj.value['BZKFDJG-YW'] || detailObj.value['BZKFHYG-YE'] || 0.2; //实时液位
     for (let i in datas) {
       // 添加泵机数据
-      if (i.includes('QSB-YX')) {
+      if (i.includes('QSB-YX') || i.includes('YSB-YX') || i.includes('RUN')) {
+        if (datas[i] == '0') {
+          datas[i] = '停止';
+        } else if (datas[i] == '1') {
+          datas[i] = '运行';
+        }
         pumpList.value.push({ status: datas[i], dl: '', hour: '' });
       }
       // 大水管动效判断