diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue
index eefff4b..5405074 100644
--- a/src/views/longoPeration/LSCaseIssues.vue
+++ b/src/views/longoPeration/LSCaseIssues.vue
@@ -85,7 +85,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue
index eefff4b..5405074 100644
--- a/src/views/longoPeration/LSCaseIssues.vue
+++ b/src/views/longoPeration/LSCaseIssues.vue
@@ -85,7 +85,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue
index dd5fe6a..84798fb 100644
--- a/src/views/longoPeration/ProblemStatistics.vue
+++ b/src/views/longoPeration/ProblemStatistics.vue
@@ -159,11 +159,11 @@
 /** 搜索列表 */
 const getList = async () => {
   if (queryParams.value.timer) {
-    queryParams.value.projectStartTime = queryParams.value.timer[0];
-    queryParams.value.projectEndTime = queryParams.value.timer[1];
+    queryParams.value.startTime = queryParams.value.timer[0];
+    queryParams.value.endTime = queryParams.value.timer[1];
   } else {
-    queryParams.value.projectStartTime = '';
-    queryParams.value.projectEndTime = '';
+    queryParams.value.startTime = '';
+    queryParams.value.endTime = '';
   }
   loading.value = true;
   let res = await patrolProblempage(queryParams.value);

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue
index eefff4b..5405074 100644
--- a/src/views/longoPeration/LSCaseIssues.vue
+++ b/src/views/longoPeration/LSCaseIssues.vue
@@ -85,7 +85,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue
index dd5fe6a..84798fb 100644
--- a/src/views/longoPeration/ProblemStatistics.vue
+++ b/src/views/longoPeration/ProblemStatistics.vue
@@ -159,11 +159,11 @@
 /** 搜索列表 */
 const getList = async () => {
   if (queryParams.value.timer) {
-    queryParams.value.projectStartTime = queryParams.value.timer[0];
-    queryParams.value.projectEndTime = queryParams.value.timer[1];
+    queryParams.value.startTime = queryParams.value.timer[0];
+    queryParams.value.endTime = queryParams.value.timer[1];
   } else {
-    queryParams.value.projectStartTime = '';
-    queryParams.value.projectEndTime = '';
+    queryParams.value.startTime = '';
+    queryParams.value.endTime = '';
   }
   loading.value = true;
   let res = await patrolProblempage(queryParams.value);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index caf4d1d..ed42f5e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -7,6 +7,7 @@
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.waterloggingName">{{ allData.dataList.waterloggingName }}</div>
+      <div class="titleNamePP" v-if="allData.dataList.materialName">{{ allData.dataList.materialName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
       </div>
@@ -128,6 +129,17 @@
         <div id="chartPopupRainC"></div>
       </div>
     </div>
+    <!-- 物资 -->
+    <div class="basicInfo" v-if="allData.dataList.materialDetails">
+      <div class="materialContent">
+        <div class="materialName">负责人：</div>
+        <div class="materialValue">{{ allData.dataList.header }}</div>
+      </div>
+      <div class="materialContent">
+        <div class="materialName">物资详情：</div>
+        <div class="materialValue">{{ allData.dataList.materialDetails }}</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -346,7 +358,7 @@
         lat: popupCenter[1],
       },
       anchor: 'center',
-      offsets: [-130, 130],
+      offsets: [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -419,7 +431,26 @@
       cursor: pointer;
     }
   }
-
+  .materialContent {
+    display: flex;
+    align-items: center;
+    .materialName {
+      margin: 3px;
+      width: 80px;
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      color: #b8ecff;
+    }
+    .materialValue {
+      margin: 3px;
+      width: 300px;
+      font-size: 14px;
+      font-weight: 400;
+      color: #b8ecff;
+      word-wrap: break-word;
+    }
+  }
   .basicContentCP {
     .contentInfo {
       display: flex;

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue
index eefff4b..5405074 100644
--- a/src/views/longoPeration/LSCaseIssues.vue
+++ b/src/views/longoPeration/LSCaseIssues.vue
@@ -85,7 +85,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue
index dd5fe6a..84798fb 100644
--- a/src/views/longoPeration/ProblemStatistics.vue
+++ b/src/views/longoPeration/ProblemStatistics.vue
@@ -159,11 +159,11 @@
 /** 搜索列表 */
 const getList = async () => {
   if (queryParams.value.timer) {
-    queryParams.value.projectStartTime = queryParams.value.timer[0];
-    queryParams.value.projectEndTime = queryParams.value.timer[1];
+    queryParams.value.startTime = queryParams.value.timer[0];
+    queryParams.value.endTime = queryParams.value.timer[1];
   } else {
-    queryParams.value.projectStartTime = '';
-    queryParams.value.projectEndTime = '';
+    queryParams.value.startTime = '';
+    queryParams.value.endTime = '';
   }
   loading.value = true;
   let res = await patrolProblempage(queryParams.value);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index caf4d1d..ed42f5e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -7,6 +7,7 @@
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.waterloggingName">{{ allData.dataList.waterloggingName }}</div>
+      <div class="titleNamePP" v-if="allData.dataList.materialName">{{ allData.dataList.materialName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
       </div>
@@ -128,6 +129,17 @@
         <div id="chartPopupRainC"></div>
       </div>
     </div>
+    <!-- 物资 -->
+    <div class="basicInfo" v-if="allData.dataList.materialDetails">
+      <div class="materialContent">
+        <div class="materialName">负责人：</div>
+        <div class="materialValue">{{ allData.dataList.header }}</div>
+      </div>
+      <div class="materialContent">
+        <div class="materialName">物资详情：</div>
+        <div class="materialValue">{{ allData.dataList.materialDetails }}</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -346,7 +358,7 @@
         lat: popupCenter[1],
       },
       anchor: 'center',
-      offsets: [-130, 130],
+      offsets: [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -419,7 +431,26 @@
       cursor: pointer;
     }
   }
-
+  .materialContent {
+    display: flex;
+    align-items: center;
+    .materialName {
+      margin: 3px;
+      width: 80px;
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      color: #b8ecff;
+    }
+    .materialValue {
+      margin: 3px;
+      width: 300px;
+      font-size: 14px;
+      font-weight: 400;
+      color: #b8ecff;
+      word-wrap: break-word;
+    }
+  }
   .basicContentCP {
     .contentInfo {
       display: flex;
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 65cd264..b0cacdc 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -24,7 +24,7 @@
 import { FloodPreventionMaterialList } from '@/api/longoPeration/MaterialManagement';
 import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
-import yuanTous from '@/assets/newImgs/layerIcon/yuanTous.png';
+import yuanTous from '@/assets/newImgs/layerIcon/floodPreventionMaterial.png';
 import bus from '@/bus/index';
 
 const { proxy } = getCurrentInstance();
@@ -98,6 +98,8 @@
       data.forEach(element => {
         let feature = turf.point([Number(element.lon), Number(element.lat)], element);
         feature.properties.name = element.address;
+        element.materialName = element.address;
+        element.lonLat = element.lon + ',' + element.lat;
         materialFeatures.push(feature);
       });
       let materialGeojson = turf.featureCollection(materialFeatures);
@@ -114,6 +116,7 @@
     });
     bus.emit('setIniteLayer', initeLayerList);
     newfiberMapBoxVectorLayer.removeByIds(['materialFeatures']);
+    newfiberMapbox.map.removeImage('materialFeatures');
   }
 };
 onMounted(() => {
@@ -123,7 +126,13 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
+    console.log(e);
     console.log('clickfeature--', clickfeature.properties);
+    bus.emit('popupcontent', {
+      popupShow: true,
+      point: [e.lngLat.lng, e.lngLat.lat],
+      popupInfo: clickfeature.properties,
+    });
   });
 });
 </script>

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue
index eefff4b..5405074 100644
--- a/src/views/longoPeration/LSCaseIssues.vue
+++ b/src/views/longoPeration/LSCaseIssues.vue
@@ -85,7 +85,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue
index dd5fe6a..84798fb 100644
--- a/src/views/longoPeration/ProblemStatistics.vue
+++ b/src/views/longoPeration/ProblemStatistics.vue
@@ -159,11 +159,11 @@
 /** 搜索列表 */
 const getList = async () => {
   if (queryParams.value.timer) {
-    queryParams.value.projectStartTime = queryParams.value.timer[0];
-    queryParams.value.projectEndTime = queryParams.value.timer[1];
+    queryParams.value.startTime = queryParams.value.timer[0];
+    queryParams.value.endTime = queryParams.value.timer[1];
   } else {
-    queryParams.value.projectStartTime = '';
-    queryParams.value.projectEndTime = '';
+    queryParams.value.startTime = '';
+    queryParams.value.endTime = '';
   }
   loading.value = true;
   let res = await patrolProblempage(queryParams.value);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index caf4d1d..ed42f5e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -7,6 +7,7 @@
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.waterloggingName">{{ allData.dataList.waterloggingName }}</div>
+      <div class="titleNamePP" v-if="allData.dataList.materialName">{{ allData.dataList.materialName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
       </div>
@@ -128,6 +129,17 @@
         <div id="chartPopupRainC"></div>
       </div>
     </div>
+    <!-- 物资 -->
+    <div class="basicInfo" v-if="allData.dataList.materialDetails">
+      <div class="materialContent">
+        <div class="materialName">负责人：</div>
+        <div class="materialValue">{{ allData.dataList.header }}</div>
+      </div>
+      <div class="materialContent">
+        <div class="materialName">物资详情：</div>
+        <div class="materialValue">{{ allData.dataList.materialDetails }}</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -346,7 +358,7 @@
         lat: popupCenter[1],
       },
       anchor: 'center',
-      offsets: [-130, 130],
+      offsets: [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -419,7 +431,26 @@
       cursor: pointer;
     }
   }
-
+  .materialContent {
+    display: flex;
+    align-items: center;
+    .materialName {
+      margin: 3px;
+      width: 80px;
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      color: #b8ecff;
+    }
+    .materialValue {
+      margin: 3px;
+      width: 300px;
+      font-size: 14px;
+      font-weight: 400;
+      color: #b8ecff;
+      word-wrap: break-word;
+    }
+  }
   .basicContentCP {
     .contentInfo {
       display: flex;
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 65cd264..b0cacdc 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -24,7 +24,7 @@
 import { FloodPreventionMaterialList } from '@/api/longoPeration/MaterialManagement';
 import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
-import yuanTous from '@/assets/newImgs/layerIcon/yuanTous.png';
+import yuanTous from '@/assets/newImgs/layerIcon/floodPreventionMaterial.png';
 import bus from '@/bus/index';
 
 const { proxy } = getCurrentInstance();
@@ -98,6 +98,8 @@
       data.forEach(element => {
         let feature = turf.point([Number(element.lon), Number(element.lat)], element);
         feature.properties.name = element.address;
+        element.materialName = element.address;
+        element.lonLat = element.lon + ',' + element.lat;
         materialFeatures.push(feature);
       });
       let materialGeojson = turf.featureCollection(materialFeatures);
@@ -114,6 +116,7 @@
     });
     bus.emit('setIniteLayer', initeLayerList);
     newfiberMapBoxVectorLayer.removeByIds(['materialFeatures']);
+    newfiberMapbox.map.removeImage('materialFeatures');
   }
 };
 onMounted(() => {
@@ -123,7 +126,13 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
+    console.log(e);
     console.log('clickfeature--', clickfeature.properties);
+    bus.emit('popupcontent', {
+      popupShow: true,
+      point: [e.lngLat.lng, e.lngLat.lat],
+      popupInfo: clickfeature.properties,
+    });
   });
 });
 </script>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index e461e71..b862cff 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -182,6 +182,9 @@
   if (!newfiberMapbox) return;
   newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName('waterFlow'));
   newfiberMapBoxVectorLayer.removeByIds(['materialFeatures']);
+  if (newfiberMapbox.map.hasImage('materialFeatures')) {
+    newfiberMapbox.map.removeImage('materialFeatures');
+  }
   bus.emit('setIniteLayer', [
     {
       layername: 'YSBZ', //雨水泵站

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue
index eefff4b..5405074 100644
--- a/src/views/longoPeration/LSCaseIssues.vue
+++ b/src/views/longoPeration/LSCaseIssues.vue
@@ -85,7 +85,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue
index dd5fe6a..84798fb 100644
--- a/src/views/longoPeration/ProblemStatistics.vue
+++ b/src/views/longoPeration/ProblemStatistics.vue
@@ -159,11 +159,11 @@
 /** 搜索列表 */
 const getList = async () => {
   if (queryParams.value.timer) {
-    queryParams.value.projectStartTime = queryParams.value.timer[0];
-    queryParams.value.projectEndTime = queryParams.value.timer[1];
+    queryParams.value.startTime = queryParams.value.timer[0];
+    queryParams.value.endTime = queryParams.value.timer[1];
   } else {
-    queryParams.value.projectStartTime = '';
-    queryParams.value.projectEndTime = '';
+    queryParams.value.startTime = '';
+    queryParams.value.endTime = '';
   }
   loading.value = true;
   let res = await patrolProblempage(queryParams.value);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index caf4d1d..ed42f5e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -7,6 +7,7 @@
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.waterloggingName">{{ allData.dataList.waterloggingName }}</div>
+      <div class="titleNamePP" v-if="allData.dataList.materialName">{{ allData.dataList.materialName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
       </div>
@@ -128,6 +129,17 @@
         <div id="chartPopupRainC"></div>
       </div>
     </div>
+    <!-- 物资 -->
+    <div class="basicInfo" v-if="allData.dataList.materialDetails">
+      <div class="materialContent">
+        <div class="materialName">负责人：</div>
+        <div class="materialValue">{{ allData.dataList.header }}</div>
+      </div>
+      <div class="materialContent">
+        <div class="materialName">物资详情：</div>
+        <div class="materialValue">{{ allData.dataList.materialDetails }}</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -346,7 +358,7 @@
         lat: popupCenter[1],
       },
       anchor: 'center',
-      offsets: [-130, 130],
+      offsets: [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -419,7 +431,26 @@
       cursor: pointer;
     }
   }
-
+  .materialContent {
+    display: flex;
+    align-items: center;
+    .materialName {
+      margin: 3px;
+      width: 80px;
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      color: #b8ecff;
+    }
+    .materialValue {
+      margin: 3px;
+      width: 300px;
+      font-size: 14px;
+      font-weight: 400;
+      color: #b8ecff;
+      word-wrap: break-word;
+    }
+  }
   .basicContentCP {
     .contentInfo {
       display: flex;
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 65cd264..b0cacdc 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -24,7 +24,7 @@
 import { FloodPreventionMaterialList } from '@/api/longoPeration/MaterialManagement';
 import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
-import yuanTous from '@/assets/newImgs/layerIcon/yuanTous.png';
+import yuanTous from '@/assets/newImgs/layerIcon/floodPreventionMaterial.png';
 import bus from '@/bus/index';
 
 const { proxy } = getCurrentInstance();
@@ -98,6 +98,8 @@
       data.forEach(element => {
         let feature = turf.point([Number(element.lon), Number(element.lat)], element);
         feature.properties.name = element.address;
+        element.materialName = element.address;
+        element.lonLat = element.lon + ',' + element.lat;
         materialFeatures.push(feature);
       });
       let materialGeojson = turf.featureCollection(materialFeatures);
@@ -114,6 +116,7 @@
     });
     bus.emit('setIniteLayer', initeLayerList);
     newfiberMapBoxVectorLayer.removeByIds(['materialFeatures']);
+    newfiberMapbox.map.removeImage('materialFeatures');
   }
 };
 onMounted(() => {
@@ -123,7 +126,13 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
+    console.log(e);
     console.log('clickfeature--', clickfeature.properties);
+    bus.emit('popupcontent', {
+      popupShow: true,
+      point: [e.lngLat.lng, e.lngLat.lat],
+      popupInfo: clickfeature.properties,
+    });
   });
 });
 </script>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index e461e71..b862cff 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -182,6 +182,9 @@
   if (!newfiberMapbox) return;
   newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName('waterFlow'));
   newfiberMapBoxVectorLayer.removeByIds(['materialFeatures']);
+  if (newfiberMapbox.map.hasImage('materialFeatures')) {
+    newfiberMapbox.map.removeImage('materialFeatures');
+  }
   bus.emit('setIniteLayer', [
     {
       layername: 'YSBZ', //雨水泵站
diff --git a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue
index e90a207..338b4ca 100644
--- a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue
+++ b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue
@@ -2,7 +2,7 @@
   <!-- 污水处理厂进水BOD -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="统计年份" prop="date">
+      <el-form-item label="统计年份" prop="year">
         <el-date-picker
           type="year"
           v-model="queryParams.year"

diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js
index cb24476..9654e06 100644
--- a/src/api/spongePerformance/naturalWaterArea.js
+++ b/src/api/spongePerformance/naturalWaterArea.js
@@ -46,11 +46,18 @@
 // 可透水地面面积积详情列表
 export const kstdmAreaByYear = params => {
   return request({
-    url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+    url: `/sponge/performanceResultTspumj/list`,
     method: 'get',
     params,
   });
 };
+// export const kstdmAreaByYear = params => {
+//   return request({
+//     url: `/sponge/performanceEvaluate/kstdmAreaByYear`,
+//     method: 'get',
+//     params,
+//   });
+// };
 // 业务分页搜索海绵考核评估项数据类型
 export const yszylyDetailList = params => {
   return request({
diff --git a/src/assets/newImgs/layerIcon/floodPreventionMaterial.png b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
new file mode 100644
index 0000000..d479682
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/floodPreventionMaterial.png
Binary files differ
diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue
index f382cba..c7534aa 100644
--- a/src/views/document/fileManagement/updateRecord/index.vue
+++ b/src/views/document/fileManagement/updateRecord/index.vue
@@ -98,7 +98,7 @@
   if (!file) return;
   window.open(file.url);
   documentAccessRecordAdd({
-    fileId: row.id,
+    fileId: row.fileId,
   });
 };
 
diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue
index fa31e23..84c53c5 100644
--- a/src/views/floodSys/floodOneMap/commonPopupRain.vue
+++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue
@@ -219,7 +219,7 @@
   height: 476px;
   background-image: url('@/assets/newImgs/layer1.png');
   background-size: 100% 100%;
-  z-index: 115;
+  z-index: 1150;
   position: absolute;
   top: 80px;
   left: 530px;
diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index a3af685..cc788a6 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -534,54 +534,54 @@
 };
 //获取管网监测统计分析
 const getSuperVisePipeData = async () => {
-  let params = {
-    startTime: allData.pipeTime[0],
-    endTime: allData.pipeTime[1],
-    stCode: allData.supervisePipeCode,
-  };
-  let res = await graphicReport(params);
-  if (res && res.code == 200) {
-    let datas = res.data;
-    if (!!!datas) return;
-    if (datas.propertyMonitorList.length > 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [
-        datas.propertyMonitorList[2].monitorPropertyName,
-        datas.propertyMonitorList[0].monitorPropertyName,
-      ];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorList.length == 1) {
-      chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
-    } else if (datas.propertyMonitorXList.length == 0) {
-      chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
-      chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[0].data = [];
-      chartOption.floodOneMapPipeSupervise.series[1].data = [];
-      chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
-      chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
-      chartOption.floodOneMapPipeSupervise.series[0].name = '';
-      chartOption.floodOneMapPipeSupervise.series[1].name = '';
-    }
-    // 设置鼠标滚轮放大缩小展示数据区间
-    chartOption.floodOneMapPipeSupervise.dataZoom = [
-      { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
-    ];
-    initPipeChart();
-  }
+  // let params = {
+  //   startTime: allData.pipeTime[0],
+  //   endTime: allData.pipeTime[1],
+  //   stCode: allData.supervisePipeCode,
+  // };
+  // let res = await graphicReport(params);
+  // if (res && res.code == 200) {
+  //   let datas = res.data;
+  //   if (!!!datas) return;
+  //   if (datas.propertyMonitorList.length > 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [
+  //       datas.propertyMonitorList[2].monitorPropertyName,
+  //       datas.propertyMonitorList[0].monitorPropertyName,
+  //     ];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorList.length == 1) {
+  //     chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName];
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit;
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName;
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist;
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据
+  //   } else if (datas.propertyMonitorXList.length == 0) {
+  //     chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据
+  //     chartOption.floodOneMapPipeSupervise.xAxis[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[0].data = [];
+  //     chartOption.floodOneMapPipeSupervise.series[1].data = [];
+  //     chartOption.floodOneMapPipeSupervise.yAxis[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.yAxis[1].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[0].name = '';
+  //     chartOption.floodOneMapPipeSupervise.series[1].name = '';
+  //   }
+  //   // 设置鼠标滚轮放大缩小展示数据区间
+  //   chartOption.floodOneMapPipeSupervise.dataZoom = [
+  //     { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] },
+  //   ];
+  //   initPipeChart();
+  // }
 };
 //管网监测趋势图
 let pipeChart = null;
@@ -810,24 +810,24 @@
 const tableData6 = ref([]);
 const tableData71 = ref([]);
 const tableRef71 = ref(null);
-const tableLoading71 = ref(true);
+// const tableLoading71 = ref(true);
 //获取源头地块
 const getOrinignList = async () => {
-  tableLoading71.value = true;
-  let res = await orinignList();
-  if (res && res.code == 200) {
-    let data = res.data;
-    let params = data[0].stCodes;
-    let res1 = await orinignDataList(params);
-    if (res1 && res1.code == 200) {
-      tableData71.value = res1.data;
-      tableData71.value.forEach((item, index) => {
-        item.dataTime = res1.data[index].monitorValueList[0].tt;
-      });
-      tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
-      tableLoading71.value = false;
-    }
-  }
+  // tableLoading71.value = true;
+  // let res = await orinignList();
+  // if (res && res.code == 200) {
+  //   let data = res.data;
+  //   let params = data[0].stCodes;
+  //   let res1 = await orinignDataList(params);
+  //   if (res1 && res1.code == 200) {
+  //     tableData71.value = res1.data;
+  //     tableData71.value.forEach((item, index) => {
+  //       item.dataTime = res1.data[index].monitorValueList[0].tt;
+  //     });
+  //     tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中
+  //     tableLoading71.value = false;
+  //   }
+  // }
 };
 const tableData7 = ref([]);
 //获取厂站概况
diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue
index be44d99..b50387c 100644
--- a/src/views/floodSys/floodOneMap/tabSelect.vue
+++ b/src/views/floodSys/floodOneMap/tabSelect.vue
@@ -239,7 +239,7 @@
   bottom: 1%;
   left: 450px;
   position: absolute;
-  z-index: 115;
+  z-index: 1150;
   .changeTab {
     width: 175px;
     height: 43px;
diff --git a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
index af503ce..903ea8a 100644
--- a/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
+++ b/src/views/floodSys/scada/alertService/components/abilityAnalysis.vue
@@ -291,8 +291,7 @@
 function getSearchSiteList() {
   getInfolist().then(res => {
     projectList.value = res.data;
-    console.log(res.data, '111');
-    queryParams.value.stCode = res.data[1].stationCode;
+    if (infoList.type == 1) queryParams.value.stCode = res.data[0].stCode;
     changeStation();
   });
 }
diff --git a/src/views/floodSys/scada/alertService/components/reportService.vue b/src/views/floodSys/scada/alertService/components/reportService.vue
index 9f96b50..511f706 100644
--- a/src/views/floodSys/scada/alertService/components/reportService.vue
+++ b/src/views/floodSys/scada/alertService/components/reportService.vue
@@ -181,7 +181,7 @@
   dialogShow.value = true;
 
   if (t == 2) {
-    dialogTitle.value = '修改告警1';
+    dialogTitle.value = '修改告警';
     plcWarnConfigInfo(id).then(({ data }) => {
       infoList.value = data;
       keyLit.value++;
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 3548f11..6521b57 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -86,8 +86,8 @@
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查任务名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+            <el-form-item label="项目名称:" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue
index eefff4b..5405074 100644
--- a/src/views/longoPeration/LSCaseIssues.vue
+++ b/src/views/longoPeration/LSCaseIssues.vue
@@ -85,7 +85,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称:" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入巡查任务名称" :disabled="true" />
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue
index dd5fe6a..84798fb 100644
--- a/src/views/longoPeration/ProblemStatistics.vue
+++ b/src/views/longoPeration/ProblemStatistics.vue
@@ -159,11 +159,11 @@
 /** 搜索列表 */
 const getList = async () => {
   if (queryParams.value.timer) {
-    queryParams.value.projectStartTime = queryParams.value.timer[0];
-    queryParams.value.projectEndTime = queryParams.value.timer[1];
+    queryParams.value.startTime = queryParams.value.timer[0];
+    queryParams.value.endTime = queryParams.value.timer[1];
   } else {
-    queryParams.value.projectStartTime = '';
-    queryParams.value.projectEndTime = '';
+    queryParams.value.startTime = '';
+    queryParams.value.endTime = '';
   }
   loading.value = true;
   let res = await patrolProblempage(queryParams.value);
diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue
index caf4d1d..ed42f5e 100644
--- a/src/views/sponeScreen/gisMF/cesiumPopup.vue
+++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue
@@ -7,6 +7,7 @@
       <div class="titleNamePP" v-if="allData.dataList.roadName">{{ allData.dataList.roadName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.stName">{{ allData.dataList.stName }}</div>
       <div class="titleNamePP" v-if="allData.dataList.waterloggingName">{{ allData.dataList.waterloggingName }}</div>
+      <div class="titleNamePP" v-if="allData.dataList.materialName">{{ allData.dataList.materialName }}</div>
       <div class="PopupClosed">
         <el-icon :size="18" @click="closePopupCES"><Close /></el-icon>
       </div>
@@ -128,6 +129,17 @@
         <div id="chartPopupRainC"></div>
       </div>
     </div>
+    <!-- 物资 -->
+    <div class="basicInfo" v-if="allData.dataList.materialDetails">
+      <div class="materialContent">
+        <div class="materialName">负责人：</div>
+        <div class="materialValue">{{ allData.dataList.header }}</div>
+      </div>
+      <div class="materialContent">
+        <div class="materialName">物资详情：</div>
+        <div class="materialValue">{{ allData.dataList.materialDetails }}</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -346,7 +358,7 @@
         lat: popupCenter[1],
       },
       anchor: 'center',
-      offsets: [-130, 130],
+      offsets: [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -419,7 +431,26 @@
       cursor: pointer;
     }
   }
-
+  .materialContent {
+    display: flex;
+    align-items: center;
+    .materialName {
+      margin: 3px;
+      width: 80px;
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      color: #b8ecff;
+    }
+    .materialValue {
+      margin: 3px;
+      width: 300px;
+      font-size: 14px;
+      font-weight: 400;
+      color: #b8ecff;
+      word-wrap: break-word;
+    }
+  }
   .basicContentCP {
     .contentInfo {
       display: flex;
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 65cd264..b0cacdc 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -24,7 +24,7 @@
 import { FloodPreventionMaterialList } from '@/api/longoPeration/MaterialManagement';
 import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
-import yuanTous from '@/assets/newImgs/layerIcon/yuanTous.png';
+import yuanTous from '@/assets/newImgs/layerIcon/floodPreventionMaterial.png';
 import bus from '@/bus/index';
 
 const { proxy } = getCurrentInstance();
@@ -98,6 +98,8 @@
       data.forEach(element => {
         let feature = turf.point([Number(element.lon), Number(element.lat)], element);
         feature.properties.name = element.address;
+        element.materialName = element.address;
+        element.lonLat = element.lon + ',' + element.lat;
         materialFeatures.push(feature);
       });
       let materialGeojson = turf.featureCollection(materialFeatures);
@@ -114,6 +116,7 @@
     });
     bus.emit('setIniteLayer', initeLayerList);
     newfiberMapBoxVectorLayer.removeByIds(['materialFeatures']);
+    newfiberMapbox.map.removeImage('materialFeatures');
   }
 };
 onMounted(() => {
@@ -123,7 +126,13 @@
       [e.point.x - 10 / 2, e.point.y - 10 / 2],
       [e.point.x + 10 / 2, e.point.y + 10 / 2],
     ])[0];
+    console.log(e);
     console.log('clickfeature--', clickfeature.properties);
+    bus.emit('popupcontent', {
+      popupShow: true,
+      point: [e.lngLat.lng, e.lngLat.lat],
+      popupInfo: clickfeature.properties,
+    });
   });
 });
 </script>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index e461e71..b862cff 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -182,6 +182,9 @@
   if (!newfiberMapbox) return;
   newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName('waterFlow'));
   newfiberMapBoxVectorLayer.removeByIds(['materialFeatures']);
+  if (newfiberMapbox.map.hasImage('materialFeatures')) {
+    newfiberMapbox.map.removeImage('materialFeatures');
+  }
   bus.emit('setIniteLayer', [
     {
       layername: 'YSBZ', //雨水泵站
diff --git a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue
index e90a207..338b4ca 100644
--- a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue
+++ b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue
@@ -2,7 +2,7 @@
   <!-- 污水处理厂进水BOD -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="统计年份" prop="date">
+      <el-form-item label="统计年份" prop="year">
         <el-date-picker
           type="year"
           v-model="queryParams.year"
diff --git a/src/views/spongePerformance/waterlogging/permeableGroundArea/tableDalgo.vue b/src/views/spongePerformance/waterlogging/permeableGroundArea/tableDalgo.vue
index 5e86153..0591cb9 100644
--- a/src/views/spongePerformance/waterlogging/permeableGroundArea/tableDalgo.vue
+++ b/src/views/spongePerformance/waterlogging/permeableGroundArea/tableDalgo.vue
@@ -47,8 +47,8 @@
       </el-form>
       <el-table :data="tableData" v-loading="tableLoading" max-height="300">
         <el-table-column label="项目名称" prop="projectName" />
-        <el-table-column label="占地面积(k㎡)" prop="projectArea" />
-        <el-table-column label="透水铺装面积(k㎡)" prop="projectKstmjArea" />
+        <!-- <el-table-column label="占地面积(k㎡)" prop="projectArea" /> -->
+        <el-table-column label="透水铺装面积(k㎡)" prop="area" />
       </el-table>
     </div>
   </div>