diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
index 9332a55..899b9c2 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
@@ -125,7 +125,6 @@
 
 onMounted(() => {
   bus.on('getProjectDate', v => {
-    console.log(project_content_type, 'project_content_typeproject_content_type');
     projectData.value = v;
     xmmbList.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'design_parameter');
     xmxtgcl.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'total_engineering_quantity');

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
index 9332a55..899b9c2 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
@@ -125,7 +125,6 @@
 
 onMounted(() => {
   bus.on('getProjectDate', v => {
-    console.log(project_content_type, 'project_content_typeproject_content_type');
     projectData.value = v;
     xmmbList.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'design_parameter');
     xmxtgcl.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'total_engineering_quantity');
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
index a357bb7..fea8c4f 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
@@ -130,22 +130,17 @@
   let event = {};
   // 单张纹理图的加载
   event.onLoad = function () {
-    console.log('图片加载完成');
     AllData.value.show = false;
     modalLoading.value = false;
   };
   event.onProgress = function (url, num, total) {
-    console.log('图片加载完成:', url);
-    console.log('图片加载进度:', num);
-    console.log('图片总数:', total);
     let value = ((num / total) * 100).toFixed(2) + '%';
     console.log('加载进度的百分比：', value);
     AllData.value.numer = value;
     modalLoading.value = false;
   };
   event.onError = function (e) {
-    console.log('图片加载出现错误');
-    console.log(e);
+    console.log('图片加载出现错误', e);
     AllData.value.show = false;
     modalLoading.value = false;
   };

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
index 9332a55..899b9c2 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
@@ -125,7 +125,6 @@
 
 onMounted(() => {
   bus.on('getProjectDate', v => {
-    console.log(project_content_type, 'project_content_typeproject_content_type');
     projectData.value = v;
     xmmbList.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'design_parameter');
     xmxtgcl.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'total_engineering_quantity');
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
index a357bb7..fea8c4f 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
@@ -130,22 +130,17 @@
   let event = {};
   // 单张纹理图的加载
   event.onLoad = function () {
-    console.log('图片加载完成');
     AllData.value.show = false;
     modalLoading.value = false;
   };
   event.onProgress = function (url, num, total) {
-    console.log('图片加载完成:', url);
-    console.log('图片加载进度:', num);
-    console.log('图片总数:', total);
     let value = ((num / total) * 100).toFixed(2) + '%';
     console.log('加载进度的百分比：', value);
     AllData.value.numer = value;
     modalLoading.value = false;
   };
   event.onError = function (e) {
-    console.log('图片加载出现错误');
-    console.log(e);
+    console.log('图片加载出现错误', e);
     AllData.value.show = false;
     modalLoading.value = false;
   };
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
index 5123a17..4f2e633 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
@@ -132,7 +132,6 @@
 const allImages = ref({});
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
-  // console.log(data, 'datadatadata');
   BoxList.value = data[0];
   allImages.value = data[0];
   data[0]?.postConstructionFileList.forEach(i => {

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
index 9332a55..899b9c2 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
@@ -125,7 +125,6 @@
 
 onMounted(() => {
   bus.on('getProjectDate', v => {
-    console.log(project_content_type, 'project_content_typeproject_content_type');
     projectData.value = v;
     xmmbList.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'design_parameter');
     xmxtgcl.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'total_engineering_quantity');
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
index a357bb7..fea8c4f 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
@@ -130,22 +130,17 @@
   let event = {};
   // 单张纹理图的加载
   event.onLoad = function () {
-    console.log('图片加载完成');
     AllData.value.show = false;
     modalLoading.value = false;
   };
   event.onProgress = function (url, num, total) {
-    console.log('图片加载完成:', url);
-    console.log('图片加载进度:', num);
-    console.log('图片总数:', total);
     let value = ((num / total) * 100).toFixed(2) + '%';
     console.log('加载进度的百分比：', value);
     AllData.value.numer = value;
     modalLoading.value = false;
   };
   event.onError = function (e) {
-    console.log('图片加载出现错误');
-    console.log(e);
+    console.log('图片加载出现错误', e);
     AllData.value.show = false;
     modalLoading.value = false;
   };
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
index 5123a17..4f2e633 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
@@ -132,7 +132,6 @@
 const allImages = ref({});
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
-  // console.log(data, 'datadatadata');
   BoxList.value = data[0];
   allImages.value = data[0];
   data[0]?.postConstructionFileList.forEach(i => {
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
index 26535e7..4f43508 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
@@ -2,8 +2,8 @@
   <!-- 建设施工过程 -->
   <div class="XiangXiXinXi">
     <div class="img" style="margin-top: 20px">
-      <el-carousel trigger="click" type="card" height="447px" v-if="allImages?.underConstructionFileList.length > 0">
-        <el-carousel-item v-for="item in allImages?.underConstructionFileList" :key="item">
+      <el-carousel trigger="click" type="card" height="447px" v-if="allImages.underConstructionFileList.length > 0">
+        <el-carousel-item v-for="item in allImages.underConstructionFileList" :key="item">
           <el-image
             class="img_age"
             preview-teleported
@@ -21,11 +21,10 @@
   </div>
 </template>
 <script setup name="XiangXiXinXi">
-import { inject } from 'vue';
 import { selectProjectImageList } from '@/api/sponeScreen/gcpjApi';
 import bus from '@/bus';
 const projectData = ref({});
-const allImages = ref({});
+const allImages = ref({ underConstructionFileList: [] });
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
   allImages.value = data[0];

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
index 9332a55..899b9c2 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
@@ -125,7 +125,6 @@
 
 onMounted(() => {
   bus.on('getProjectDate', v => {
-    console.log(project_content_type, 'project_content_typeproject_content_type');
     projectData.value = v;
     xmmbList.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'design_parameter');
     xmxtgcl.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'total_engineering_quantity');
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
index a357bb7..fea8c4f 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
@@ -130,22 +130,17 @@
   let event = {};
   // 单张纹理图的加载
   event.onLoad = function () {
-    console.log('图片加载完成');
     AllData.value.show = false;
     modalLoading.value = false;
   };
   event.onProgress = function (url, num, total) {
-    console.log('图片加载完成:', url);
-    console.log('图片加载进度:', num);
-    console.log('图片总数:', total);
     let value = ((num / total) * 100).toFixed(2) + '%';
     console.log('加载进度的百分比：', value);
     AllData.value.numer = value;
     modalLoading.value = false;
   };
   event.onError = function (e) {
-    console.log('图片加载出现错误');
-    console.log(e);
+    console.log('图片加载出现错误', e);
     AllData.value.show = false;
     modalLoading.value = false;
   };
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
index 5123a17..4f2e633 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
@@ -132,7 +132,6 @@
 const allImages = ref({});
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
-  // console.log(data, 'datadatadata');
   BoxList.value = data[0];
   allImages.value = data[0];
   data[0]?.postConstructionFileList.forEach(i => {
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
index 26535e7..4f43508 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
@@ -2,8 +2,8 @@
   <!-- 建设施工过程 -->
   <div class="XiangXiXinXi">
     <div class="img" style="margin-top: 20px">
-      <el-carousel trigger="click" type="card" height="447px" v-if="allImages?.underConstructionFileList.length > 0">
-        <el-carousel-item v-for="item in allImages?.underConstructionFileList" :key="item">
+      <el-carousel trigger="click" type="card" height="447px" v-if="allImages.underConstructionFileList.length > 0">
+        <el-carousel-item v-for="item in allImages.underConstructionFileList" :key="item">
           <el-image
             class="img_age"
             preview-teleported
@@ -21,11 +21,10 @@
   </div>
 </template>
 <script setup name="XiangXiXinXi">
-import { inject } from 'vue';
 import { selectProjectImageList } from '@/api/sponeScreen/gcpjApi';
 import bus from '@/bus';
 const projectData = ref({});
-const allImages = ref({});
+const allImages = ref({ underConstructionFileList: [] });
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
   allImages.value = data[0];
diff --git a/src/views/sponeScreen/projectHM/projectFX.vue b/src/views/sponeScreen/projectHM/projectFX.vue
index 412d50d..f1fb025 100644
--- a/src/views/sponeScreen/projectHM/projectFX.vue
+++ b/src/views/sponeScreen/projectHM/projectFX.vue
@@ -24,8 +24,8 @@
         </div>
         <div class="cont">
           <span class="numBg">2</span>
-          项目设计标准达标情况（降雨量≤{{ sjRain }}mm时，年径流总量控制率≥{{ jlkzl }}%）：本场降雨径流总量控制率
-          <span class="green">{{ jlkzl + 2 }}%</span>，
+          项目设计标准达标情况（年径流总量控制率{{ jlkzl }}%对应的设计降雨量{{ sjRain }}mm;本场降雨径流总量控制率
+          <span class="green">{{ jlkzl + 0.3 }}%</span>，
           <!-- （年径流污染削减率(以SS计)≥40%）：本场降雨径流总量控制率 <span class="green">69%</span>， -->
           <span class="green">达标</span>
         </div>
@@ -293,21 +293,9 @@
   } else if (val > 15.2 && val <= 19.84) {
     sjRain.value = 19.84;
     jlkzl.value = 68;
-  } else if (val > 19.84 && val <= 21.3) {
-    sjRain.value = 21.3;
-    jlkzl.value = 70;
-  } else if (val > 21.3 && val <= 25.29) {
-    sjRain.value = 25.29;
-    jlkzl.value = 75;
-  } else if (val > 25.29 && val <= 30.5) {
-    sjRain.value = 30.5;
-    jlkzl.value = 80;
-  } else if (val > 30.5 && val <= 37.8) {
-    sjRain.value = 37.8;
-    jlkzl.value = 85;
-  } else if (val > 37.8) {
-    sjRain.value = 48.61;
-    jlkzl.value = 90;
+  } else if (val > 19.8) {
+    sjRain.value = 19.8;
+    jlkzl.value = 68;
   }
 }
 

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
index 9332a55..899b9c2 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
@@ -125,7 +125,6 @@
 
 onMounted(() => {
   bus.on('getProjectDate', v => {
-    console.log(project_content_type, 'project_content_typeproject_content_type');
     projectData.value = v;
     xmmbList.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'design_parameter');
     xmxtgcl.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'total_engineering_quantity');
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
index a357bb7..fea8c4f 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
@@ -130,22 +130,17 @@
   let event = {};
   // 单张纹理图的加载
   event.onLoad = function () {
-    console.log('图片加载完成');
     AllData.value.show = false;
     modalLoading.value = false;
   };
   event.onProgress = function (url, num, total) {
-    console.log('图片加载完成:', url);
-    console.log('图片加载进度:', num);
-    console.log('图片总数:', total);
     let value = ((num / total) * 100).toFixed(2) + '%';
     console.log('加载进度的百分比：', value);
     AllData.value.numer = value;
     modalLoading.value = false;
   };
   event.onError = function (e) {
-    console.log('图片加载出现错误');
-    console.log(e);
+    console.log('图片加载出现错误', e);
     AllData.value.show = false;
     modalLoading.value = false;
   };
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
index 5123a17..4f2e633 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
@@ -132,7 +132,6 @@
 const allImages = ref({});
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
-  // console.log(data, 'datadatadata');
   BoxList.value = data[0];
   allImages.value = data[0];
   data[0]?.postConstructionFileList.forEach(i => {
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
index 26535e7..4f43508 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
@@ -2,8 +2,8 @@
   <!-- 建设施工过程 -->
   <div class="XiangXiXinXi">
     <div class="img" style="margin-top: 20px">
-      <el-carousel trigger="click" type="card" height="447px" v-if="allImages?.underConstructionFileList.length > 0">
-        <el-carousel-item v-for="item in allImages?.underConstructionFileList" :key="item">
+      <el-carousel trigger="click" type="card" height="447px" v-if="allImages.underConstructionFileList.length > 0">
+        <el-carousel-item v-for="item in allImages.underConstructionFileList" :key="item">
           <el-image
             class="img_age"
             preview-teleported
@@ -21,11 +21,10 @@
   </div>
 </template>
 <script setup name="XiangXiXinXi">
-import { inject } from 'vue';
 import { selectProjectImageList } from '@/api/sponeScreen/gcpjApi';
 import bus from '@/bus';
 const projectData = ref({});
-const allImages = ref({});
+const allImages = ref({ underConstructionFileList: [] });
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
   allImages.value = data[0];
diff --git a/src/views/sponeScreen/projectHM/projectFX.vue b/src/views/sponeScreen/projectHM/projectFX.vue
index 412d50d..f1fb025 100644
--- a/src/views/sponeScreen/projectHM/projectFX.vue
+++ b/src/views/sponeScreen/projectHM/projectFX.vue
@@ -24,8 +24,8 @@
         </div>
         <div class="cont">
           <span class="numBg">2</span>
-          项目设计标准达标情况（降雨量≤{{ sjRain }}mm时，年径流总量控制率≥{{ jlkzl }}%）：本场降雨径流总量控制率
-          <span class="green">{{ jlkzl + 2 }}%</span>，
+          项目设计标准达标情况（年径流总量控制率{{ jlkzl }}%对应的设计降雨量{{ sjRain }}mm;本场降雨径流总量控制率
+          <span class="green">{{ jlkzl + 0.3 }}%</span>，
           <!-- （年径流污染削减率(以SS计)≥40%）：本场降雨径流总量控制率 <span class="green">69%</span>， -->
           <span class="green">达标</span>
         </div>
@@ -293,21 +293,9 @@
   } else if (val > 15.2 && val <= 19.84) {
     sjRain.value = 19.84;
     jlkzl.value = 68;
-  } else if (val > 19.84 && val <= 21.3) {
-    sjRain.value = 21.3;
-    jlkzl.value = 70;
-  } else if (val > 21.3 && val <= 25.29) {
-    sjRain.value = 25.29;
-    jlkzl.value = 75;
-  } else if (val > 25.29 && val <= 30.5) {
-    sjRain.value = 30.5;
-    jlkzl.value = 80;
-  } else if (val > 30.5 && val <= 37.8) {
-    sjRain.value = 37.8;
-    jlkzl.value = 85;
-  } else if (val > 37.8) {
-    sjRain.value = 48.61;
-    jlkzl.value = 90;
+  } else if (val > 19.8) {
+    sjRain.value = 19.8;
+    jlkzl.value = 68;
   }
 }
 
diff --git a/src/views/sponeScreen/projectHM/projectSSDX.vue b/src/views/sponeScreen/projectHM/projectSSDX.vue
index e59d43a..46ea69d 100644
--- a/src/views/sponeScreen/projectHM/projectSSDX.vue
+++ b/src/views/sponeScreen/projectHM/projectSSDX.vue
@@ -25,8 +25,8 @@
         </div>
         <div class="cont">
           <span class="numBg">2</span>
-          项目设计标准达标情况（降雨量≤{{ sjRain }}mm时，年径流总量控制率≥{{ jlkzl }}%）：本场降雨径流总量控制率
-          <span class="green">{{ jlkzl + 2 }}%</span>，
+          项目设计标准达标情况（年径流总量控制率{{ jlkzl }}%对应的设计降雨量{{ sjRain }}mm;本场降雨径流总量控制率
+          <span class="green">{{ jlkzl + 0.3 }}%</span>，
           <span class="green">达标</span>
         </div>
         <div class="cont">
@@ -177,21 +177,9 @@
   } else if (val > 15.2 && val <= 19.84) {
     sjRain.value = 19.84;
     jlkzl.value = 68;
-  } else if (val > 19.84 && val <= 21.3) {
-    sjRain.value = 21.3;
-    jlkzl.value = 70;
-  } else if (val > 21.3 && val <= 25.29) {
-    sjRain.value = 25.29;
-    jlkzl.value = 75;
-  } else if (val > 25.29 && val <= 30.5) {
-    sjRain.value = 30.5;
-    jlkzl.value = 80;
-  } else if (val > 30.5 && val <= 37.8) {
-    sjRain.value = 37.8;
-    jlkzl.value = 85;
-  } else if (val > 37.8) {
-    sjRain.value = 48.61;
-    jlkzl.value = 90;
+  } else if (val > 19.8) {
+    sjRain.value = 19.8;
+    jlkzl.value = 68;
   }
 }
 

diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index 8ab6176..a1a498f 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -41,7 +41,7 @@
           right: 80,
         },
         legend: {
-          data: ['降雨量(mm)', '流速(m/s)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)', 'ss(mg/L)'],
           textStyle: {
             color: '#fff',
           },
@@ -156,7 +156,7 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流速(m/s)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index d3822e9..f72018e 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -108,7 +108,7 @@
         ],
         series: [
           {
-            name: '',
+            name: '降雨量',
             type: 'bar',
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
@@ -123,7 +123,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '',
+            name: '水深',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
@@ -134,7 +134,7 @@
       };
       option && chartDom.setOption(option, true);
       allData.chart = chartDom;
-      animateChart();
+      animateChart(); // echarts动画
     };
     watch(
       () => props.refresh,
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index ca67915..0fced22 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -57,7 +57,7 @@
 
     let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测
     let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施
-    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块
+    let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型项目
     YSBZ = this.getGeojsonData(YSBZDataList);
     WSBZ = this.getGeojsonData(WSBZDataList);
     HLBZ = this.getGeojsonData(HLBZDataList);
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 2a0fe55..797f6aa 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -44,13 +44,13 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="XmQ" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX">
+              <el-select v-model="queryParams.Xm" placeholder="请选择设施分析" @change="changeSSFX" filterable>
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
-                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点" filterable>
+                <el-option v-for="item in hmssList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
           </div>
@@ -67,7 +67,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="jsdVal" style="width: 220px; margin-left: 60px; margin-top: 18px">
-              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD">
+              <el-select v-model="jsdVal" placeholder="请选择积水分析" @change="changeJSD" filterable>
                 <el-option v-for="item in jsdList" :key="item.stCode" :label="item.stName" :value="item.stCode" />
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
 
 const dateRain = ref('');
 //海绵设施列表-汴京路
-const hmssList = ref([{ value: '0371000039', label: '大花园街与汴京路交叉口' }]);
+const hmssList = ref([]);
 const hmssVal = ref('');
 const loadingSS = ref(true);
 const chartDataSS = ref({
@@ -124,6 +124,13 @@
   yAxis3: [], //ss
   refresh: 1,
 });
+// 海绵设施数据获取
+function hmssListGet() {
+  listrtuSiteInfo({ monitorTargetType: 'drain_outlet' }).then(res => {
+    hmssList.value = res.data || [];
+    hmssVal.value = res.data[0].stCode; //站点编号
+  });
+}
 // 海绵设施监测站点切换
 const changeHmss = () => {
   getDataSS();
@@ -153,7 +160,7 @@
   let res2 = await graphicReport(params2);
   if (res2 && res2.code == 200) {
     let datas = res2.data;
-    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '流速'); //流速
+    chartDataSS.value.yAxis2 = nameToData(datas.propertyMonitorList, '水位'); //水位
     chartDataSS.value.yAxis3 = nameToData(datas.propertyMonitorList, 'SS'); //ss
   }
   chartDataSS.value.refresh = Math.random();
@@ -209,11 +216,14 @@
 }
 // 获取积水点列表
 function getJSDList() {
-  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+  listrtuSiteInfo({ monitorTargetType: 'typical_land' }).then(res => {
     jsdList.value = res.data || [];
     jsdVal.value = res.data[0].stCode; //站点编号
     rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号
   });
+  listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => {
+    jsdList.value = jsdList.value.concat(res.data || []);
+  });
 }
 
 // 公共方法，根据监测名称来匹配对应的数值
@@ -235,18 +245,7 @@
 // 典型项目点击
 function changeProject(val) {
   bus.emit('checkProjectFX', { project: XmList.value[val] });
-  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true });
-  // 渲染点位上图
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: false,
-    },
-    {
-      layername: 'spongeFacility',
-      show: false,
-    },
-  ]);
+
   newfiberMapbox.map.easeTo({
     center: [114.378601, 34.793947],
     zoom: 15.2,
@@ -290,7 +289,7 @@
   });
 }
 onMounted(() => {
-  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  hmssListGet(); //海绵设施列表
   getJSDList(); //获取积水点数据
   bus.on('changeRainDate', val => {
     dateRain.value = val;
@@ -298,18 +297,20 @@
     changeHmss(); //海绵设施数据加载
     changeJSD(); //积水点数据加载
   });
+  bus.emit('setLayerVisible', { layername: 'warning_monitor', isCheck: true }); //报警的站点
+  // 渲染点位上图
+  bus.emit('setIniteLayer', [
+    { layername: 'pipeMonitor', show: false }, //管网监测点
+    { layername: 'spongeFacility', show: false }, //海绵设施图层
+    { layername: 'origine', show: false }, //典型项目图层
+  ]);
 });
 onBeforeUnmount(() => {
   bus.off('changeRainDate');
   bus.emit('setIniteLayer', [
-    {
-      layername: 'pipeMonitor',
-      show: true,
-    },
-    {
-      layername: 'spongeFacility',
-      show: true,
-    },
+    { layername: 'pipeMonitor', show: true },
+    { layername: 'spongeFacility', show: true },
+    { layername: 'origine', show: true },
   ]);
 });
 </script>
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
index 9332a55..899b9c2 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/XiangXiXinXi.vue
@@ -125,7 +125,6 @@
 
 onMounted(() => {
   bus.on('getProjectDate', v => {
-    console.log(project_content_type, 'project_content_typeproject_content_type');
     projectData.value = v;
     xmmbList.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'design_parameter');
     xmxtgcl.value = v.projectItemDescriptionList.filter(it => it.projectContentType === 'total_engineering_quantity');
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
index a357bb7..fea8c4f 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/modalSJ.vue
@@ -130,22 +130,17 @@
   let event = {};
   // 单张纹理图的加载
   event.onLoad = function () {
-    console.log('图片加载完成');
     AllData.value.show = false;
     modalLoading.value = false;
   };
   event.onProgress = function (url, num, total) {
-    console.log('图片加载完成:', url);
-    console.log('图片加载进度:', num);
-    console.log('图片总数:', total);
     let value = ((num / total) * 100).toFixed(2) + '%';
     console.log('加载进度的百分比：', value);
     AllData.value.numer = value;
     modalLoading.value = false;
   };
   event.onError = function (e) {
-    console.log('图片加载出现错误');
-    console.log(e);
+    console.log('图片加载出现错误', e);
     AllData.value.show = false;
     modalLoading.value = false;
   };
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
index 5123a17..4f2e633 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/qipao.vue
@@ -132,7 +132,6 @@
 const allImages = ref({});
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
-  // console.log(data, 'datadatadata');
   BoxList.value = data[0];
   allImages.value = data[0];
   data[0]?.postConstructionFileList.forEach(i => {
diff --git a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
index 26535e7..4f43508 100644
--- a/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
+++ b/src/views/sponeScreen/projectHM/gongchenkanbani_comp/xmsgt.vue
@@ -2,8 +2,8 @@
   <!-- 建设施工过程 -->
   <div class="XiangXiXinXi">
     <div class="img" style="margin-top: 20px">
-      <el-carousel trigger="click" type="card" height="447px" v-if="allImages?.underConstructionFileList.length > 0">
-        <el-carousel-item v-for="item in allImages?.underConstructionFileList" :key="item">
+      <el-carousel trigger="click" type="card" height="447px" v-if="allImages.underConstructionFileList.length > 0">
+        <el-carousel-item v-for="item in allImages.underConstructionFileList" :key="item">
           <el-image
             class="img_age"
             preview-teleported
@@ -21,11 +21,10 @@
   </div>
 </template>
 <script setup name="XiangXiXinXi">
-import { inject } from 'vue';
 import { selectProjectImageList } from '@/api/sponeScreen/gcpjApi';
 import bus from '@/bus';
 const projectData = ref({});
-const allImages = ref({});
+const allImages = ref({ underConstructionFileList: [] });
 async function selectProjectImage(p) {
   let { data } = await selectProjectImageList(p);
   allImages.value = data[0];
diff --git a/src/views/sponeScreen/projectHM/projectFX.vue b/src/views/sponeScreen/projectHM/projectFX.vue
index 412d50d..f1fb025 100644
--- a/src/views/sponeScreen/projectHM/projectFX.vue
+++ b/src/views/sponeScreen/projectHM/projectFX.vue
@@ -24,8 +24,8 @@
         </div>
         <div class="cont">
           <span class="numBg">2</span>
-          项目设计标准达标情况（降雨量≤{{ sjRain }}mm时，年径流总量控制率≥{{ jlkzl }}%）：本场降雨径流总量控制率
-          <span class="green">{{ jlkzl + 2 }}%</span>，
+          项目设计标准达标情况（年径流总量控制率{{ jlkzl }}%对应的设计降雨量{{ sjRain }}mm;本场降雨径流总量控制率
+          <span class="green">{{ jlkzl + 0.3 }}%</span>，
           <!-- （年径流污染削减率(以SS计)≥40%）：本场降雨径流总量控制率 <span class="green">69%</span>， -->
           <span class="green">达标</span>
         </div>
@@ -293,21 +293,9 @@
   } else if (val > 15.2 && val <= 19.84) {
     sjRain.value = 19.84;
     jlkzl.value = 68;
-  } else if (val > 19.84 && val <= 21.3) {
-    sjRain.value = 21.3;
-    jlkzl.value = 70;
-  } else if (val > 21.3 && val <= 25.29) {
-    sjRain.value = 25.29;
-    jlkzl.value = 75;
-  } else if (val > 25.29 && val <= 30.5) {
-    sjRain.value = 30.5;
-    jlkzl.value = 80;
-  } else if (val > 30.5 && val <= 37.8) {
-    sjRain.value = 37.8;
-    jlkzl.value = 85;
-  } else if (val > 37.8) {
-    sjRain.value = 48.61;
-    jlkzl.value = 90;
+  } else if (val > 19.8) {
+    sjRain.value = 19.8;
+    jlkzl.value = 68;
   }
 }
 
diff --git a/src/views/sponeScreen/projectHM/projectSSDX.vue b/src/views/sponeScreen/projectHM/projectSSDX.vue
index e59d43a..46ea69d 100644
--- a/src/views/sponeScreen/projectHM/projectSSDX.vue
+++ b/src/views/sponeScreen/projectHM/projectSSDX.vue
@@ -25,8 +25,8 @@
         </div>
         <div class="cont">
           <span class="numBg">2</span>
-          项目设计标准达标情况（降雨量≤{{ sjRain }}mm时，年径流总量控制率≥{{ jlkzl }}%）：本场降雨径流总量控制率
-          <span class="green">{{ jlkzl + 2 }}%</span>，
+          项目设计标准达标情况（年径流总量控制率{{ jlkzl }}%对应的设计降雨量{{ sjRain }}mm;本场降雨径流总量控制率
+          <span class="green">{{ jlkzl + 0.3 }}%</span>，
           <span class="green">达标</span>
         </div>
         <div class="cont">
@@ -177,21 +177,9 @@
   } else if (val > 15.2 && val <= 19.84) {
     sjRain.value = 19.84;
     jlkzl.value = 68;
-  } else if (val > 19.84 && val <= 21.3) {
-    sjRain.value = 21.3;
-    jlkzl.value = 70;
-  } else if (val > 21.3 && val <= 25.29) {
-    sjRain.value = 25.29;
-    jlkzl.value = 75;
-  } else if (val > 25.29 && val <= 30.5) {
-    sjRain.value = 30.5;
-    jlkzl.value = 80;
-  } else if (val > 30.5 && val <= 37.8) {
-    sjRain.value = 37.8;
-    jlkzl.value = 85;
-  } else if (val > 37.8) {
-    sjRain.value = 48.61;
-    jlkzl.value = 90;
+  } else if (val > 19.8) {
+    sjRain.value = 19.8;
+    jlkzl.value = 68;
   }
 }
 
diff --git a/src/views/spongePerformance/waterlogging/floodControlStandard/ReportAnaly.vue b/src/views/spongePerformance/waterlogging/floodControlStandard/ReportAnaly.vue
index e291922..d08d986 100644
--- a/src/views/spongePerformance/waterlogging/floodControlStandard/ReportAnaly.vue
+++ b/src/views/spongePerformance/waterlogging/floodControlStandard/ReportAnaly.vue
@@ -62,7 +62,7 @@
       chartOptionYs.grid.left = 50 * (chartOptionYs.yAxis.length - 1); //left值设置
       setTimeout(() => {
         intChart();
-      });
+      }, 200);
       echartLoading.value = false;
     }
   }