diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index 4486006..57d9a6b 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -12,6 +12,7 @@
       </div>
     </div>
     <div class="dividerLine"></div>
+    <!-- 泵站 -->
     <div class="basicInfo" v-if="allData.dataList.pumpCode">
       <div class="basicContent">
         <div class="contentInfo">
@@ -44,6 +45,7 @@
       </div>
     </div>
 
+    <!-- 污水处理厂 -->
     <div class="basicInfo" v-if="allData.dataList.sewageCode">
       <div class="basicContent">
         <div class="contentInfo">
@@ -72,6 +74,7 @@
         </div>
       </div>
     </div>
+    <!-- 排口 -->
     <div class="basicInfo" v-if="allData.dataList.pointType">
       <div class="basicContent">
         <div class="contentInfo">
@@ -100,7 +103,7 @@
         </div>
       </div>
     </div>
-
+    <!-- 污水处理厂 -->
     <div class="basicInfo" v-if="allData.dataList.type == 'WSCLC'">
       <div class="basicContent">
         <div class="contentInfo">
@@ -115,6 +118,7 @@
         </div>
       </div>
     </div>
+    <!-- 积水点 -->
     <div class="basicInfo" v-if="allData.dataList.originType">
       <div class="basicContent">
         <div class="contentInfo">
@@ -143,6 +147,8 @@
         </div>
       </div>
     </div>
+
+    <!-- 河道水位监测 -->
     <div class="basicInfo" v-if="allData.dataList.type == 'YSBZ'">
       <div class="basicContent">
         <div class="contentInfo">
@@ -158,36 +164,46 @@
       </div>
     </div>
 
-    <div class="basicInfo" v-if="allData.dataList.type == 'WSBZ'">
-      <div class="basicContent">
-        <div class="contentInfo" v-if="allData.dataList.ysNumber != 0">
-          <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>
-        <div class="contentInfo">
-          <div class="contentName">污水泵机台数：</div>
-          <div class="contentValue">{{ allData.dataList.wsNumber }}台</div>
-          <div class="contentName">污水抽排量：</div>
-          <div class="contentValue">{{ allData.dataList.wswater }}m³/s</div>
-        </div>
-        <div class="contentInfo">
-          <div class="contentName">泵站类型：</div>
-          <div class="contentValue">{{ allData.dataList.Layer }}</div>
-        </div>
+    <!-- 雨量站 -->
+    <div class="basicInfo" v-if="allData.dataList.siteType == 'rain'">
+      <div class="mt-10">
+        <el-date-picker
+          v-model="allData.dateTime"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          size="small"
+          style="width: 240px"
+          @change="changeDate"
+        />
+        <el-select v-model="selectCode" style="margin: -7px 0px 0px 10px" size="small" @change="changeRainType">
+          <el-option v-for="item in dataOption" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+        <div id="chartPopupRainC"></div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup name="CesiumPopup">
-import { getImageUrl } from '@/utils/ruoyi';
 import bus from '@/bus';
+import chartOption from '@/components/Echarts/pieChart_1.js';
+import { graphicReport } from '@/api/dataAnalysis/syntherticData';
+import * as echarts from 'echarts';
+
+const { proxy } = getCurrentInstance();
 const allData = reactive({
   dataList: {},
   popupShow: false,
+  dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
 });
+const dataOption = ref([]);
+const selectData = ref([]);
+const selectCode = ref('');
+const seleceName = ref('');
+const unitName = ref('');
+const propertyMonitorXList = ref([]);
 
 //
 function closePopupCES() {
@@ -195,6 +211,74 @@
   bus.emit('closeCesiumPopup');
 }
 
+const changeDate = () => {
+  getSuperViseData();
+};
+// 降雨趋势折线图
+let chartPopupRain = null;
+const initEchartsPopup = () => {
+  if (!!chartPopupRain) chartPopupRain.dispose();
+  chartPopupRain = echarts.init(document.getElementById('chartPopupRainC'));
+  chartOption.popupRainTrend.legend.data = [seleceName.value];
+  chartOption.popupRainTrend.yAxis.name = unitName.value;
+  chartOption.popupRainTrend.xAxis.data = propertyMonitorXList.value;
+  chartOption.popupRainTrend.series.name = seleceName.value;
+  chartOption.popupRainTrend.series.data = selectData.value;
+  // 设置鼠标滚轮放大缩小展示数据区间
+  chartOption.popupRainTrend.dataZoom = [{ type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }];
+  if (propertyMonitorXList.value.length > 0) {
+    chartOption.popupRainTrend.graphic.invisible = true; //暂无数据
+  } else {
+    chartOption.popupRainTrend.graphic.invisible = false; //暂无数据
+  }
+  chartPopupRain.clear();
+  chartPopupRain.setOption(chartOption.popupRainTrend);
+};
+// 切换因子点击
+const changeRainType = val => {
+  selectCode.value = val;
+  let obj = dataOption.value.filter(item => item.value == val)[0];
+  selectCode.value = obj.value;
+  seleceName.value = obj.label;
+  unitName.value = obj.propertyUnit;
+  selectData.value = obj.ylist;
+  initEchartsPopup();
+};
+//获取监测数据
+const getSuperViseData = async () => {
+  let params = {
+    startTime: allData.dateTime[0],
+    endTime: allData.dateTime[1],
+    stCode: allData.dataList['stCode'],
+  };
+  dataOption.value = [];
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    if (datas.propertyMonitorXList.length == 0) return;
+    datas.propertyMonitorList.map(item => {
+      dataOption.value.push({
+        value: item.stCode + item.monitorPropertyName,
+        label: item.monitorPropertyName,
+        propertyUnit: item.propertyUnit,
+        ylist: item.ylist,
+      });
+    });
+    if (Boolean(datas.propertyMonitorXList.length)) {
+      propertyMonitorXList.value = [];
+      datas.propertyMonitorXList.forEach(i => {
+        propertyMonitorXList.value.push(i.substr(0, 16));
+      });
+    }
+    selectCode.value = dataOption.value[0].value;
+    seleceName.value = dataOption.value[0].label;
+    // propertyMonitorXList.value = datas.propertyMonitorXList;
+    unitName.value = datas.propertyMonitorList[0].propertyUnit;
+    selectData.value = datas.propertyMonitorList[0].ylist;
+    initEchartsPopup();
+  }
+};
+
 // 泵站工况图查看
 function checkGYT() {
   bus.emit('checkBZGYT', allData.dataList);
@@ -204,6 +288,7 @@
   bus.on('popupcontent', data => {
     allData.dataList = data.popupInfo;
     console.log(allData.dataList, 9999);
+    if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图
   });
 });
 onBeforeUnmount(() => {
@@ -219,6 +304,11 @@
   padding: 10px;
   background: #003b6d;
   border: 1px solid #6acefe;
+  #chartPopupRainC {
+    width: 100%;
+    height: 200px;
+    margin-top: 10px;
+  }
   .title {
     display: flex;
     align-items: center;