diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',
diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue
index 314b241..c9af27d 100644
--- a/src/views/floodSys/assetManage/pipelinePoint.vue
+++ b/src/views/floodSys/assetManage/pipelinePoint.vue
@@ -352,8 +352,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: 0,
-    bottomBuriedDepth: 0,
     groundElevation: null,
     // status: null,
     geometrys: null,
@@ -404,8 +402,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: null,
-    bottomBuriedDepth: null,
     groundElevation: null,
     remark: null,
     // status: null,

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',
diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue
index 314b241..c9af27d 100644
--- a/src/views/floodSys/assetManage/pipelinePoint.vue
+++ b/src/views/floodSys/assetManage/pipelinePoint.vue
@@ -352,8 +352,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: 0,
-    bottomBuriedDepth: 0,
     groundElevation: null,
     // status: null,
     geometrys: null,
@@ -404,8 +402,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: null,
-    bottomBuriedDepth: null,
     groundElevation: null,
     remark: null,
     // status: null,
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index b872e4f..01ed942 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -16,17 +16,15 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">黄河 100 年一遇，黄汴河、惠济河 50 年一遇，马家河、东护城河、运粮河 20 年一遇。</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">
-            开封市实施一渠六河连通综合治理工程，对东 护城河、西护城河（黄汴河）、南护城河（黄汴河）等 5 条河道 进行了综合治理
-          </div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" max-height="120">
+        <el-table ref="table" :data="tableData" height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
@@ -48,59 +46,63 @@
 </template>
 <script setup>
 import bus from '@/bus';
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const { proxy } = getCurrentInstance();
 const tabList = ref([
-  { id: 1, name: '防洪标准' },
-  { id: 2, name: '内涝标准' },
-  { id: 3, name: '内涝消除' },
+  { id: 'fhbz', name: '防洪标准' },
+  { id: 'nlbz', name: '内涝标准' },
+  { id: 'nlxc', name: '内涝消除' },
 ]);
-const curTab = ref(1);
+
+const curTab = ref('fhbz');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
+  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'fzbz');
-  } else if (curTab.value == 2) {
-    bus.emit('jhkhclick', 'nlfz');
+  if (curTab.value == 'fhbz') {
+    bus.emit('jhkhclick', 'fhbz');
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('jhkhclick', 'nlbz');
   } else {
     bus.emit('jhkhclick', 'nlxc');
   }
+  getjb();
+  getkhzn();
 };
 
 // 产出绩效公共指标信息
 async function getjb() {
   let res = await quotaCommomInfoList({
-    quotaCode: 'fhbz',
+    quotaCode: curTab.value,
   });
   if (res && res.code == 200) {
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
 async function getkhzn() {
   let res = await hmyztQuotaDataList({
-    quotaType: 'fhbz',
+    quotaType: curTab.value,
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
+    console.log('-----', tableData.value);
   }
 }
 
 onMounted(() => {
-  // getjb();
-  // getkhzn();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .chanChuJiXiao {
-  width: 100%;
+  width: 460px;
 
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -198,13 +200,13 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
+        overflow: auto;
       }
     }
   }

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',
diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue
index 314b241..c9af27d 100644
--- a/src/views/floodSys/assetManage/pipelinePoint.vue
+++ b/src/views/floodSys/assetManage/pipelinePoint.vue
@@ -352,8 +352,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: 0,
-    bottomBuriedDepth: 0,
     groundElevation: null,
     // status: null,
     geometrys: null,
@@ -404,8 +402,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: null,
-    bottomBuriedDepth: null,
     groundElevation: null,
     remark: null,
     // status: null,
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index b872e4f..01ed942 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -16,17 +16,15 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">黄河 100 年一遇，黄汴河、惠济河 50 年一遇，马家河、东护城河、运粮河 20 年一遇。</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">
-            开封市实施一渠六河连通综合治理工程，对东 护城河、西护城河（黄汴河）、南护城河（黄汴河）等 5 条河道 进行了综合治理
-          </div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" max-height="120">
+        <el-table ref="table" :data="tableData" height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
@@ -48,59 +46,63 @@
 </template>
 <script setup>
 import bus from '@/bus';
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const { proxy } = getCurrentInstance();
 const tabList = ref([
-  { id: 1, name: '防洪标准' },
-  { id: 2, name: '内涝标准' },
-  { id: 3, name: '内涝消除' },
+  { id: 'fhbz', name: '防洪标准' },
+  { id: 'nlbz', name: '内涝标准' },
+  { id: 'nlxc', name: '内涝消除' },
 ]);
-const curTab = ref(1);
+
+const curTab = ref('fhbz');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
+  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'fzbz');
-  } else if (curTab.value == 2) {
-    bus.emit('jhkhclick', 'nlfz');
+  if (curTab.value == 'fhbz') {
+    bus.emit('jhkhclick', 'fhbz');
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('jhkhclick', 'nlbz');
   } else {
     bus.emit('jhkhclick', 'nlxc');
   }
+  getjb();
+  getkhzn();
 };
 
 // 产出绩效公共指标信息
 async function getjb() {
   let res = await quotaCommomInfoList({
-    quotaCode: 'fhbz',
+    quotaCode: curTab.value,
   });
   if (res && res.code == 200) {
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
 async function getkhzn() {
   let res = await hmyztQuotaDataList({
-    quotaType: 'fhbz',
+    quotaType: curTab.value,
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
+    console.log('-----', tableData.value);
   }
 }
 
 onMounted(() => {
-  // getjb();
-  // getkhzn();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .chanChuJiXiao {
-  width: 100%;
+  width: 460px;
 
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -198,13 +200,13 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index dc7b464..2593e02 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="chanChuJiXiao"
-    :style="{
-      height: curTab == 1 ? '352px' : '382px',
-    }"
-  >
+  <div class="chanChuJiXiao">
     <div class="partTitleHM">
       黑臭水体
       <div class="tabs flex">
@@ -15,30 +10,34 @@
     </div>
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
           <div class="valsText">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
           <div class="valsText">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 2">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 2">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水量(万t/d)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 3">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 3">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水BOD浓度(mg/L)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
+
         <div class="achievements flex flex-j-left flex-align-center">
           <div class="titles titlecg">
             <div class="mbs">成果</div>
@@ -53,67 +52,18 @@
       </div>
     </div>
   </div>
-  <el-dialog v-model="opens" title="沋西渠" id="dialogContent" :modal-append-to-body="false" :close-on-click-modal="false" width="500px">
-    <div class="jcxx">
-      <el-tabs v-model="actitabs" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="基础信息" name="基础信息">
-          <div class="hcmsg">黑臭水体长度：&nbsp {{ hcdatas.blackRiverLength }}</div>
-          <div class="hcmsg">黑臭水体面积：&nbsp {{ hcdatas.blackRiverArea }}</div>
-          <div class="hcmsg">黑臭段起点：&nbsp {{ hcdatas.blackRiverStart }}</div>
-          <div class="hcmsg">黑臭段终点：&nbsp {{ hcdatas.blackRiverEnd }}</div>
-          <div>
-            治理照片：
-            <div class="img_box">
-              <img :src="item.url" alt="" class="img" v-for="item in photosList" />
-            </div>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="监测站数据" name="监测站数据">
-          <div class="jcsj" v-if="actitabs == '监测站数据'">
-            <el-table ref="table" :data="listTable" style="width: 100%" :max-height="260">
-              <el-table-column label="监测月份" prop="month" show-overflow-tooltip />
-              <el-table-column label="溶解氧" prop="DOX" show-overflow-tooltip />
-              <el-table-column label="COD" prop="COD" />
-              <el-table-column label="氨氮" prop="NH3N" />
-              <el-table-column label="总磷" prop="TP1" />
-            </el-table>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="工程治理介绍" name="工程治理介绍">
-          <div class="" v-if="actitabs == '工程治理介绍'">
-            <div>
-              {{ hcdatas.projectManageIntro }}
-            </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </el-dialog>
 </template>
 <script setup>
-// import { blackRiverList,sampleDetaillistTable ,quotaCommomInfoList,hmyztQuotaDataList} from '@/api/sponeScreen/jxkh.js'
+import bus from '@/bus';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
 
 const { proxy } = getCurrentInstance();
-const opens = ref(false);
-const actitabs = ref('基础信息');
-const photosList = ref([]);
 const hcdatas = ref('');
-const listTable = ref('');
 const tabs = ref([
-  {
-    id: 1,
-    name: '黑臭水体',
-  },
-  {
-    id: 2,
-    name: '生活污水',
-  },
-  {
-    id: 3,
-    name: '进水BOD',
-  },
+  { id: 1, name: '黑臭水体' },
+  { id: 2, name: '生活污水' },
+  { id: 3, name: '进水BOD' },
 ]);
 const curTab = ref(1);
 
@@ -123,9 +73,7 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-
   if (curTab.value == 1) {
-    opens.value = true;
     bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
   } else if (curTab.value == 2) {
@@ -148,7 +96,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -161,42 +108,18 @@
   }
 }
 
-//黑臭水体数据切换table
-const handleClick = ({ props: { name } }, event) => {
-  if (name == '监测数据') {
-    setTimeout(() => {
-      getRiverData();
-    }, 500);
-  } else if (name == '视频监控') {
-    videoInfo.value = '';
-  }
-};
-// 黑臭基础信息+工程治理介绍
-
+// 黑臭基础信息 地图点击可查看监测详情
 async function getHc() {
-  let res = await blackRiverList();
+  let res = await blackWaterInfoList();
   if (res && res.code == 200) {
-    hcdatas.value = res.data[0];
-  }
-}
-// 黑臭水体监测站数据
-async function gethcrtus() {
-  let param = {
-    sampleType: 'hcst',
-    sampleYear: '2023',
-    sampleMonth: '',
-  };
-  let res = await sampleDetaillistTable(param);
-  if (res && res.code == 200) {
-    listTable.value = res.data;
+    hcdatas.value = res.data;
   }
 }
 
 onMounted(() => {
-  // getHc()
-  // gethcrtus()
-  // getjb()
-  // getkhzn()
+  // getHc();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
@@ -280,11 +203,10 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         overflow-y: scroll;
         justify-content: flex-start;
         display: flex;

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',
diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue
index 314b241..c9af27d 100644
--- a/src/views/floodSys/assetManage/pipelinePoint.vue
+++ b/src/views/floodSys/assetManage/pipelinePoint.vue
@@ -352,8 +352,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: 0,
-    bottomBuriedDepth: 0,
     groundElevation: null,
     // status: null,
     geometrys: null,
@@ -404,8 +402,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: null,
-    bottomBuriedDepth: null,
     groundElevation: null,
     remark: null,
     // status: null,
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index b872e4f..01ed942 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -16,17 +16,15 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">黄河 100 年一遇，黄汴河、惠济河 50 年一遇，马家河、东护城河、运粮河 20 年一遇。</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">
-            开封市实施一渠六河连通综合治理工程，对东 护城河、西护城河（黄汴河）、南护城河（黄汴河）等 5 条河道 进行了综合治理
-          </div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" max-height="120">
+        <el-table ref="table" :data="tableData" height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
@@ -48,59 +46,63 @@
 </template>
 <script setup>
 import bus from '@/bus';
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const { proxy } = getCurrentInstance();
 const tabList = ref([
-  { id: 1, name: '防洪标准' },
-  { id: 2, name: '内涝标准' },
-  { id: 3, name: '内涝消除' },
+  { id: 'fhbz', name: '防洪标准' },
+  { id: 'nlbz', name: '内涝标准' },
+  { id: 'nlxc', name: '内涝消除' },
 ]);
-const curTab = ref(1);
+
+const curTab = ref('fhbz');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
+  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'fzbz');
-  } else if (curTab.value == 2) {
-    bus.emit('jhkhclick', 'nlfz');
+  if (curTab.value == 'fhbz') {
+    bus.emit('jhkhclick', 'fhbz');
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('jhkhclick', 'nlbz');
   } else {
     bus.emit('jhkhclick', 'nlxc');
   }
+  getjb();
+  getkhzn();
 };
 
 // 产出绩效公共指标信息
 async function getjb() {
   let res = await quotaCommomInfoList({
-    quotaCode: 'fhbz',
+    quotaCode: curTab.value,
   });
   if (res && res.code == 200) {
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
 async function getkhzn() {
   let res = await hmyztQuotaDataList({
-    quotaType: 'fhbz',
+    quotaType: curTab.value,
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
+    console.log('-----', tableData.value);
   }
 }
 
 onMounted(() => {
-  // getjb();
-  // getkhzn();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .chanChuJiXiao {
-  width: 100%;
+  width: 460px;
 
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -198,13 +200,13 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index dc7b464..2593e02 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="chanChuJiXiao"
-    :style="{
-      height: curTab == 1 ? '352px' : '382px',
-    }"
-  >
+  <div class="chanChuJiXiao">
     <div class="partTitleHM">
       黑臭水体
       <div class="tabs flex">
@@ -15,30 +10,34 @@
     </div>
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
           <div class="valsText">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
           <div class="valsText">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 2">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 2">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水量(万t/d)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 3">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 3">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水BOD浓度(mg/L)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
+
         <div class="achievements flex flex-j-left flex-align-center">
           <div class="titles titlecg">
             <div class="mbs">成果</div>
@@ -53,67 +52,18 @@
       </div>
     </div>
   </div>
-  <el-dialog v-model="opens" title="沋西渠" id="dialogContent" :modal-append-to-body="false" :close-on-click-modal="false" width="500px">
-    <div class="jcxx">
-      <el-tabs v-model="actitabs" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="基础信息" name="基础信息">
-          <div class="hcmsg">黑臭水体长度：&nbsp {{ hcdatas.blackRiverLength }}</div>
-          <div class="hcmsg">黑臭水体面积：&nbsp {{ hcdatas.blackRiverArea }}</div>
-          <div class="hcmsg">黑臭段起点：&nbsp {{ hcdatas.blackRiverStart }}</div>
-          <div class="hcmsg">黑臭段终点：&nbsp {{ hcdatas.blackRiverEnd }}</div>
-          <div>
-            治理照片：
-            <div class="img_box">
-              <img :src="item.url" alt="" class="img" v-for="item in photosList" />
-            </div>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="监测站数据" name="监测站数据">
-          <div class="jcsj" v-if="actitabs == '监测站数据'">
-            <el-table ref="table" :data="listTable" style="width: 100%" :max-height="260">
-              <el-table-column label="监测月份" prop="month" show-overflow-tooltip />
-              <el-table-column label="溶解氧" prop="DOX" show-overflow-tooltip />
-              <el-table-column label="COD" prop="COD" />
-              <el-table-column label="氨氮" prop="NH3N" />
-              <el-table-column label="总磷" prop="TP1" />
-            </el-table>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="工程治理介绍" name="工程治理介绍">
-          <div class="" v-if="actitabs == '工程治理介绍'">
-            <div>
-              {{ hcdatas.projectManageIntro }}
-            </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </el-dialog>
 </template>
 <script setup>
-// import { blackRiverList,sampleDetaillistTable ,quotaCommomInfoList,hmyztQuotaDataList} from '@/api/sponeScreen/jxkh.js'
+import bus from '@/bus';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
 
 const { proxy } = getCurrentInstance();
-const opens = ref(false);
-const actitabs = ref('基础信息');
-const photosList = ref([]);
 const hcdatas = ref('');
-const listTable = ref('');
 const tabs = ref([
-  {
-    id: 1,
-    name: '黑臭水体',
-  },
-  {
-    id: 2,
-    name: '生活污水',
-  },
-  {
-    id: 3,
-    name: '进水BOD',
-  },
+  { id: 1, name: '黑臭水体' },
+  { id: 2, name: '生活污水' },
+  { id: 3, name: '进水BOD' },
 ]);
 const curTab = ref(1);
 
@@ -123,9 +73,7 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-
   if (curTab.value == 1) {
-    opens.value = true;
     bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
   } else if (curTab.value == 2) {
@@ -148,7 +96,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -161,42 +108,18 @@
   }
 }
 
-//黑臭水体数据切换table
-const handleClick = ({ props: { name } }, event) => {
-  if (name == '监测数据') {
-    setTimeout(() => {
-      getRiverData();
-    }, 500);
-  } else if (name == '视频监控') {
-    videoInfo.value = '';
-  }
-};
-// 黑臭基础信息+工程治理介绍
-
+// 黑臭基础信息 地图点击可查看监测详情
 async function getHc() {
-  let res = await blackRiverList();
+  let res = await blackWaterInfoList();
   if (res && res.code == 200) {
-    hcdatas.value = res.data[0];
-  }
-}
-// 黑臭水体监测站数据
-async function gethcrtus() {
-  let param = {
-    sampleType: 'hcst',
-    sampleYear: '2023',
-    sampleMonth: '',
-  };
-  let res = await sampleDetaillistTable(param);
-  if (res && res.code == 200) {
-    listTable.value = res.data;
+    hcdatas.value = res.data;
   }
 }
 
 onMounted(() => {
-  // getHc()
-  // gethcrtus()
-  // getjb()
-  // getkhzn()
+  // getHc();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
@@ -280,11 +203,10 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         overflow-y: scroll;
         justify-content: flex-start;
         display: flex;
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index 856530d..4136405 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -12,17 +12,17 @@
 
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">{{ quotaInfo.improveGoals }}</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">{{ quotaInfo.reformMethod }}</div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
         <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
@@ -49,16 +49,11 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+
 const tabs = ref([
-  {
-    id: 1,
-    name: '可透水',
-  },
-  {
-    id: 2,
-    name: '天然水域',
-  },
+  { id: 1, name: '可透水' },
+  { id: 2, name: '天然水域' },
 ]);
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
@@ -87,7 +82,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -100,13 +94,13 @@
   }
 }
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .ktsmjPage {
-  width: 100%;
+  width: 460px;
   .ListBoxBody {
     background: rgba(8, 75, 125, 1);
     padding: 10px;
@@ -185,11 +179,11 @@
       .bottom {
         width: 100%;
         height: 40px;
-        line-height: 35px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
+        overflow: auto;
       }
     }
   }

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',
diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue
index 314b241..c9af27d 100644
--- a/src/views/floodSys/assetManage/pipelinePoint.vue
+++ b/src/views/floodSys/assetManage/pipelinePoint.vue
@@ -352,8 +352,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: 0,
-    bottomBuriedDepth: 0,
     groundElevation: null,
     // status: null,
     geometrys: null,
@@ -404,8 +402,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: null,
-    bottomBuriedDepth: null,
     groundElevation: null,
     remark: null,
     // status: null,
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index b872e4f..01ed942 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -16,17 +16,15 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">黄河 100 年一遇，黄汴河、惠济河 50 年一遇，马家河、东护城河、运粮河 20 年一遇。</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">
-            开封市实施一渠六河连通综合治理工程，对东 护城河、西护城河（黄汴河）、南护城河（黄汴河）等 5 条河道 进行了综合治理
-          </div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" max-height="120">
+        <el-table ref="table" :data="tableData" height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
@@ -48,59 +46,63 @@
 </template>
 <script setup>
 import bus from '@/bus';
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const { proxy } = getCurrentInstance();
 const tabList = ref([
-  { id: 1, name: '防洪标准' },
-  { id: 2, name: '内涝标准' },
-  { id: 3, name: '内涝消除' },
+  { id: 'fhbz', name: '防洪标准' },
+  { id: 'nlbz', name: '内涝标准' },
+  { id: 'nlxc', name: '内涝消除' },
 ]);
-const curTab = ref(1);
+
+const curTab = ref('fhbz');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
+  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'fzbz');
-  } else if (curTab.value == 2) {
-    bus.emit('jhkhclick', 'nlfz');
+  if (curTab.value == 'fhbz') {
+    bus.emit('jhkhclick', 'fhbz');
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('jhkhclick', 'nlbz');
   } else {
     bus.emit('jhkhclick', 'nlxc');
   }
+  getjb();
+  getkhzn();
 };
 
 // 产出绩效公共指标信息
 async function getjb() {
   let res = await quotaCommomInfoList({
-    quotaCode: 'fhbz',
+    quotaCode: curTab.value,
   });
   if (res && res.code == 200) {
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
 async function getkhzn() {
   let res = await hmyztQuotaDataList({
-    quotaType: 'fhbz',
+    quotaType: curTab.value,
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
+    console.log('-----', tableData.value);
   }
 }
 
 onMounted(() => {
-  // getjb();
-  // getkhzn();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .chanChuJiXiao {
-  width: 100%;
+  width: 460px;
 
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -198,13 +200,13 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index dc7b464..2593e02 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="chanChuJiXiao"
-    :style="{
-      height: curTab == 1 ? '352px' : '382px',
-    }"
-  >
+  <div class="chanChuJiXiao">
     <div class="partTitleHM">
       黑臭水体
       <div class="tabs flex">
@@ -15,30 +10,34 @@
     </div>
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
           <div class="valsText">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
           <div class="valsText">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 2">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 2">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水量(万t/d)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 3">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 3">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水BOD浓度(mg/L)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
+
         <div class="achievements flex flex-j-left flex-align-center">
           <div class="titles titlecg">
             <div class="mbs">成果</div>
@@ -53,67 +52,18 @@
       </div>
     </div>
   </div>
-  <el-dialog v-model="opens" title="沋西渠" id="dialogContent" :modal-append-to-body="false" :close-on-click-modal="false" width="500px">
-    <div class="jcxx">
-      <el-tabs v-model="actitabs" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="基础信息" name="基础信息">
-          <div class="hcmsg">黑臭水体长度：&nbsp {{ hcdatas.blackRiverLength }}</div>
-          <div class="hcmsg">黑臭水体面积：&nbsp {{ hcdatas.blackRiverArea }}</div>
-          <div class="hcmsg">黑臭段起点：&nbsp {{ hcdatas.blackRiverStart }}</div>
-          <div class="hcmsg">黑臭段终点：&nbsp {{ hcdatas.blackRiverEnd }}</div>
-          <div>
-            治理照片：
-            <div class="img_box">
-              <img :src="item.url" alt="" class="img" v-for="item in photosList" />
-            </div>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="监测站数据" name="监测站数据">
-          <div class="jcsj" v-if="actitabs == '监测站数据'">
-            <el-table ref="table" :data="listTable" style="width: 100%" :max-height="260">
-              <el-table-column label="监测月份" prop="month" show-overflow-tooltip />
-              <el-table-column label="溶解氧" prop="DOX" show-overflow-tooltip />
-              <el-table-column label="COD" prop="COD" />
-              <el-table-column label="氨氮" prop="NH3N" />
-              <el-table-column label="总磷" prop="TP1" />
-            </el-table>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="工程治理介绍" name="工程治理介绍">
-          <div class="" v-if="actitabs == '工程治理介绍'">
-            <div>
-              {{ hcdatas.projectManageIntro }}
-            </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </el-dialog>
 </template>
 <script setup>
-// import { blackRiverList,sampleDetaillistTable ,quotaCommomInfoList,hmyztQuotaDataList} from '@/api/sponeScreen/jxkh.js'
+import bus from '@/bus';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
 
 const { proxy } = getCurrentInstance();
-const opens = ref(false);
-const actitabs = ref('基础信息');
-const photosList = ref([]);
 const hcdatas = ref('');
-const listTable = ref('');
 const tabs = ref([
-  {
-    id: 1,
-    name: '黑臭水体',
-  },
-  {
-    id: 2,
-    name: '生活污水',
-  },
-  {
-    id: 3,
-    name: '进水BOD',
-  },
+  { id: 1, name: '黑臭水体' },
+  { id: 2, name: '生活污水' },
+  { id: 3, name: '进水BOD' },
 ]);
 const curTab = ref(1);
 
@@ -123,9 +73,7 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-
   if (curTab.value == 1) {
-    opens.value = true;
     bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
   } else if (curTab.value == 2) {
@@ -148,7 +96,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -161,42 +108,18 @@
   }
 }
 
-//黑臭水体数据切换table
-const handleClick = ({ props: { name } }, event) => {
-  if (name == '监测数据') {
-    setTimeout(() => {
-      getRiverData();
-    }, 500);
-  } else if (name == '视频监控') {
-    videoInfo.value = '';
-  }
-};
-// 黑臭基础信息+工程治理介绍
-
+// 黑臭基础信息 地图点击可查看监测详情
 async function getHc() {
-  let res = await blackRiverList();
+  let res = await blackWaterInfoList();
   if (res && res.code == 200) {
-    hcdatas.value = res.data[0];
-  }
-}
-// 黑臭水体监测站数据
-async function gethcrtus() {
-  let param = {
-    sampleType: 'hcst',
-    sampleYear: '2023',
-    sampleMonth: '',
-  };
-  let res = await sampleDetaillistTable(param);
-  if (res && res.code == 200) {
-    listTable.value = res.data;
+    hcdatas.value = res.data;
   }
 }
 
 onMounted(() => {
-  // getHc()
-  // gethcrtus()
-  // getjb()
-  // getkhzn()
+  // getHc();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
@@ -280,11 +203,10 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         overflow-y: scroll;
         justify-content: flex-start;
         display: flex;
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index 856530d..4136405 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -12,17 +12,17 @@
 
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">{{ quotaInfo.improveGoals }}</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">{{ quotaInfo.reformMethod }}</div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
         <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
@@ -49,16 +49,11 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+
 const tabs = ref([
-  {
-    id: 1,
-    name: '可透水',
-  },
-  {
-    id: 2,
-    name: '天然水域',
-  },
+  { id: 1, name: '可透水' },
+  { id: 2, name: '天然水域' },
 ]);
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
@@ -87,7 +82,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -100,13 +94,13 @@
   }
 }
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .ktsmjPage {
-  width: 100%;
+  width: 460px;
   .ListBoxBody {
     background: rgba(8, 75, 125, 1);
     padding: 10px;
@@ -185,11 +179,11 @@
       .bottom {
         width: 100%;
         height: 40px;
-        line-height: 35px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
index 3207fdd..d5dc15c 100644
--- a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
+++ b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
@@ -6,29 +6,45 @@
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">计划开工项目</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"></el-progress>
-            <p class="title2">54</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              status="success"
+            ></el-progress>
+            <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">完工率：90%</div>
+              <div class="title2">{{ jhtrhmzj.remark }}</div>
             </div>
           </div>
         </div>
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">实际竣工项目</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"></el-progress>
-            <p class="title2">60</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((sjjgxm.reformAchievement / sjjgxm.quotaTarget) * 100)"
+              status="success"
+            ></el-progress>
+            <p class="title2">{{ sjjgxm.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">完工率：90%</div>
+              <div class="title2">{{ sjjgxm.remark }}</div>
             </div>
           </div>
         </div>
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">计划投入海绵资金</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"> </el-progress>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              status="success"
+            >
+            </el-progress>
             <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
             <!-- {{reformAchievement/quotaTarget}} -->
             <div class="progressunit">
@@ -40,8 +56,14 @@
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">海绵资金使用</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"> </el-progress>
-            <p class="title2">{{ hmzjsy.quotaTarget || 90 }}</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((hmzjsy.reformAchievement / hmzjsy.quotaTarget) * 100)"
+              status="success"
+            >
+            </el-progress>
+            <p class="title2">{{ hmzjsy.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：亿元）</div>
               <div class="title2">{{ hmzjsy.remark }}</div>
@@ -65,7 +87,7 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
@@ -109,13 +131,13 @@
   }
 }
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .xiangMuJianShe {
-  margin-bottom: 10px;
+  margin: 10px 0px;
   width: 460px;
 
   .ListBoxBody {
@@ -220,11 +242,10 @@
     .bottom {
       width: 100%;
       height: 50px;
-      line-height: 25px;
       background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
       color: #58d6ff;
       font-size: 14px;
-      padding-left: 10px;
+      padding: 5px;
       overflow-y: scroll;
     }
   }

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',
diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue
index 314b241..c9af27d 100644
--- a/src/views/floodSys/assetManage/pipelinePoint.vue
+++ b/src/views/floodSys/assetManage/pipelinePoint.vue
@@ -352,8 +352,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: 0,
-    bottomBuriedDepth: 0,
     groundElevation: null,
     // status: null,
     geometrys: null,
@@ -404,8 +402,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: null,
-    bottomBuriedDepth: null,
     groundElevation: null,
     remark: null,
     // status: null,
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index b872e4f..01ed942 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -16,17 +16,15 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">黄河 100 年一遇，黄汴河、惠济河 50 年一遇，马家河、东护城河、运粮河 20 年一遇。</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">
-            开封市实施一渠六河连通综合治理工程，对东 护城河、西护城河（黄汴河）、南护城河（黄汴河）等 5 条河道 进行了综合治理
-          </div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" max-height="120">
+        <el-table ref="table" :data="tableData" height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
@@ -48,59 +46,63 @@
 </template>
 <script setup>
 import bus from '@/bus';
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const { proxy } = getCurrentInstance();
 const tabList = ref([
-  { id: 1, name: '防洪标准' },
-  { id: 2, name: '内涝标准' },
-  { id: 3, name: '内涝消除' },
+  { id: 'fhbz', name: '防洪标准' },
+  { id: 'nlbz', name: '内涝标准' },
+  { id: 'nlxc', name: '内涝消除' },
 ]);
-const curTab = ref(1);
+
+const curTab = ref('fhbz');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
+  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'fzbz');
-  } else if (curTab.value == 2) {
-    bus.emit('jhkhclick', 'nlfz');
+  if (curTab.value == 'fhbz') {
+    bus.emit('jhkhclick', 'fhbz');
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('jhkhclick', 'nlbz');
   } else {
     bus.emit('jhkhclick', 'nlxc');
   }
+  getjb();
+  getkhzn();
 };
 
 // 产出绩效公共指标信息
 async function getjb() {
   let res = await quotaCommomInfoList({
-    quotaCode: 'fhbz',
+    quotaCode: curTab.value,
   });
   if (res && res.code == 200) {
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
 async function getkhzn() {
   let res = await hmyztQuotaDataList({
-    quotaType: 'fhbz',
+    quotaType: curTab.value,
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
+    console.log('-----', tableData.value);
   }
 }
 
 onMounted(() => {
-  // getjb();
-  // getkhzn();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .chanChuJiXiao {
-  width: 100%;
+  width: 460px;
 
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -198,13 +200,13 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index dc7b464..2593e02 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="chanChuJiXiao"
-    :style="{
-      height: curTab == 1 ? '352px' : '382px',
-    }"
-  >
+  <div class="chanChuJiXiao">
     <div class="partTitleHM">
       黑臭水体
       <div class="tabs flex">
@@ -15,30 +10,34 @@
     </div>
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
           <div class="valsText">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
           <div class="valsText">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 2">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 2">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水量(万t/d)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 3">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 3">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水BOD浓度(mg/L)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
+
         <div class="achievements flex flex-j-left flex-align-center">
           <div class="titles titlecg">
             <div class="mbs">成果</div>
@@ -53,67 +52,18 @@
       </div>
     </div>
   </div>
-  <el-dialog v-model="opens" title="沋西渠" id="dialogContent" :modal-append-to-body="false" :close-on-click-modal="false" width="500px">
-    <div class="jcxx">
-      <el-tabs v-model="actitabs" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="基础信息" name="基础信息">
-          <div class="hcmsg">黑臭水体长度：&nbsp {{ hcdatas.blackRiverLength }}</div>
-          <div class="hcmsg">黑臭水体面积：&nbsp {{ hcdatas.blackRiverArea }}</div>
-          <div class="hcmsg">黑臭段起点：&nbsp {{ hcdatas.blackRiverStart }}</div>
-          <div class="hcmsg">黑臭段终点：&nbsp {{ hcdatas.blackRiverEnd }}</div>
-          <div>
-            治理照片：
-            <div class="img_box">
-              <img :src="item.url" alt="" class="img" v-for="item in photosList" />
-            </div>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="监测站数据" name="监测站数据">
-          <div class="jcsj" v-if="actitabs == '监测站数据'">
-            <el-table ref="table" :data="listTable" style="width: 100%" :max-height="260">
-              <el-table-column label="监测月份" prop="month" show-overflow-tooltip />
-              <el-table-column label="溶解氧" prop="DOX" show-overflow-tooltip />
-              <el-table-column label="COD" prop="COD" />
-              <el-table-column label="氨氮" prop="NH3N" />
-              <el-table-column label="总磷" prop="TP1" />
-            </el-table>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="工程治理介绍" name="工程治理介绍">
-          <div class="" v-if="actitabs == '工程治理介绍'">
-            <div>
-              {{ hcdatas.projectManageIntro }}
-            </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </el-dialog>
 </template>
 <script setup>
-// import { blackRiverList,sampleDetaillistTable ,quotaCommomInfoList,hmyztQuotaDataList} from '@/api/sponeScreen/jxkh.js'
+import bus from '@/bus';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
 
 const { proxy } = getCurrentInstance();
-const opens = ref(false);
-const actitabs = ref('基础信息');
-const photosList = ref([]);
 const hcdatas = ref('');
-const listTable = ref('');
 const tabs = ref([
-  {
-    id: 1,
-    name: '黑臭水体',
-  },
-  {
-    id: 2,
-    name: '生活污水',
-  },
-  {
-    id: 3,
-    name: '进水BOD',
-  },
+  { id: 1, name: '黑臭水体' },
+  { id: 2, name: '生活污水' },
+  { id: 3, name: '进水BOD' },
 ]);
 const curTab = ref(1);
 
@@ -123,9 +73,7 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-
   if (curTab.value == 1) {
-    opens.value = true;
     bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
   } else if (curTab.value == 2) {
@@ -148,7 +96,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -161,42 +108,18 @@
   }
 }
 
-//黑臭水体数据切换table
-const handleClick = ({ props: { name } }, event) => {
-  if (name == '监测数据') {
-    setTimeout(() => {
-      getRiverData();
-    }, 500);
-  } else if (name == '视频监控') {
-    videoInfo.value = '';
-  }
-};
-// 黑臭基础信息+工程治理介绍
-
+// 黑臭基础信息 地图点击可查看监测详情
 async function getHc() {
-  let res = await blackRiverList();
+  let res = await blackWaterInfoList();
   if (res && res.code == 200) {
-    hcdatas.value = res.data[0];
-  }
-}
-// 黑臭水体监测站数据
-async function gethcrtus() {
-  let param = {
-    sampleType: 'hcst',
-    sampleYear: '2023',
-    sampleMonth: '',
-  };
-  let res = await sampleDetaillistTable(param);
-  if (res && res.code == 200) {
-    listTable.value = res.data;
+    hcdatas.value = res.data;
   }
 }
 
 onMounted(() => {
-  // getHc()
-  // gethcrtus()
-  // getjb()
-  // getkhzn()
+  // getHc();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
@@ -280,11 +203,10 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         overflow-y: scroll;
         justify-content: flex-start;
         display: flex;
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index 856530d..4136405 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -12,17 +12,17 @@
 
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">{{ quotaInfo.improveGoals }}</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">{{ quotaInfo.reformMethod }}</div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
         <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
@@ -49,16 +49,11 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+
 const tabs = ref([
-  {
-    id: 1,
-    name: '可透水',
-  },
-  {
-    id: 2,
-    name: '天然水域',
-  },
+  { id: 1, name: '可透水' },
+  { id: 2, name: '天然水域' },
 ]);
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
@@ -87,7 +82,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -100,13 +94,13 @@
   }
 }
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .ktsmjPage {
-  width: 100%;
+  width: 460px;
   .ListBoxBody {
     background: rgba(8, 75, 125, 1);
     padding: 10px;
@@ -185,11 +179,11 @@
       .bottom {
         width: 100%;
         height: 40px;
-        line-height: 35px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
index 3207fdd..d5dc15c 100644
--- a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
+++ b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
@@ -6,29 +6,45 @@
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">计划开工项目</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"></el-progress>
-            <p class="title2">54</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              status="success"
+            ></el-progress>
+            <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">完工率：90%</div>
+              <div class="title2">{{ jhtrhmzj.remark }}</div>
             </div>
           </div>
         </div>
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">实际竣工项目</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"></el-progress>
-            <p class="title2">60</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((sjjgxm.reformAchievement / sjjgxm.quotaTarget) * 100)"
+              status="success"
+            ></el-progress>
+            <p class="title2">{{ sjjgxm.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">完工率：90%</div>
+              <div class="title2">{{ sjjgxm.remark }}</div>
             </div>
           </div>
         </div>
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">计划投入海绵资金</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"> </el-progress>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              status="success"
+            >
+            </el-progress>
             <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
             <!-- {{reformAchievement/quotaTarget}} -->
             <div class="progressunit">
@@ -40,8 +56,14 @@
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">海绵资金使用</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"> </el-progress>
-            <p class="title2">{{ hmzjsy.quotaTarget || 90 }}</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((hmzjsy.reformAchievement / hmzjsy.quotaTarget) * 100)"
+              status="success"
+            >
+            </el-progress>
+            <p class="title2">{{ hmzjsy.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：亿元）</div>
               <div class="title2">{{ hmzjsy.remark }}</div>
@@ -65,7 +87,7 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
@@ -109,13 +131,13 @@
   }
 }
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .xiangMuJianShe {
-  margin-bottom: 10px;
+  margin: 10px 0px;
   width: 460px;
 
   .ListBoxBody {
@@ -220,11 +242,10 @@
     .bottom {
       width: 100%;
       height: 50px;
-      line-height: 25px;
       background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
       color: #58d6ff;
       font-size: 14px;
-      padding-left: 10px;
+      padding: 5px;
       overflow-y: scroll;
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue b/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
index ee579aa..4bcdc34 100644
--- a/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
+++ b/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
@@ -2,7 +2,14 @@
   <!-- 雨水资源化利用 -->
   <div class="rainLYPage">
     <div class="ListBoxHeader">
-      <div class="partTitleHM">雨水资源化利用</div>
+      <div class="partTitleHM">
+        雨水资源化利用
+        <div class="tabs flex">
+          <div class="tabItem" v-for="item in tabList" :key="item.id" :class="{ active: curTab === item.id }" @click="tabClick(item)">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
     </div>
     <div class="ConstrucClass">
       <div class="content">
@@ -10,13 +17,13 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">达到 10 万立方米/年</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">开封市建成区内收集雨水后利用的调蓄水体有 4 处，分别为 龙亭湖、西北湖、金明池和中意湖。</div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
         <el-table ref="table" :data="tableData" max-height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
@@ -40,11 +47,12 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
-
+const tabList = ref([{ id: 1, name: '雨水资源化利用' }]);
+const curTab = ref(1);
 const tabClick = item => {
   curTab.value = item.id;
 };
@@ -58,7 +66,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -72,13 +79,13 @@
 }
 
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .rainLYPage {
-  width: 100%;
+  width: 460px;
   margin: 10px auto;
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -160,11 +167,10 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
         span {
@@ -180,7 +186,7 @@
     float: right;
     margin: 8px 40px 0px 0px;
     .tabItem {
-      width: 78px;
+      width: 105px;
       height: 24px;
       line-height: 24px;
       background: url('@/assets/newImgs/HMScreen/jxkh/normal.png') no-repeat;

diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js
index 9a7276b..c7b60a0 100644
--- a/src/api/sponeScreen/jxkh.js
+++ b/src/api/sponeScreen/jxkh.js
@@ -5,7 +5,7 @@
   return request({
     url: '/sponge/blackRiver/list',
     method: 'get',
-    // params
+    params,
   });
 }
 // 黑臭水体监测站数据
@@ -43,13 +43,3 @@
     params,
   });
 }
-
-// 降雨列表接口：
-
-export function dataAnalyseReport(params) {
-  return request({
-    url: '/business/siteHistoryMonitor/dataAnalyseReport',
-    method: 'get',
-    params,
-  });
-}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index 6603758..a247296 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -137,15 +137,11 @@
   let filenames = uploadList.value.find(item => file.name == item.originalName);
   // console.log(file, filenames);
   let fileUrl = (file.url && file.url.includes('blob')) || !!!file.url ? filenames.url : file.url;
-  ElMessageBox.confirm(`预览、下载此文件:  ${file.name}？`).then(
-    () => {
-      // 1，Base64进行转码,http
-      let b64Encoded = Base64.encode(fileUrl);
-      // let baseUrl = 'https://server1.wh-nf.cn:8115/';
-      window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
-    },
-    () => false
-  );
+
+  // 1，Base64进行转码,http  预览
+  let b64Encoded = Base64.encode(fileUrl);
+  // let baseUrl = 'https://server1.wh-nf.cn:8115/';
+  window.open(`previewUrl/onlinePreview?url=` + encodeURIComponent(b64Encoded));
 };
 // 上传的文件类型
 const accept = computed(() => {
diff --git a/src/views/dataAnalysis/rtuSiteInfo/index.vue b/src/views/dataAnalysis/rtuSiteInfo/index.vue
index 1497555..08502f5 100644
--- a/src/views/dataAnalysis/rtuSiteInfo/index.vue
+++ b/src/views/dataAnalysis/rtuSiteInfo/index.vue
@@ -213,6 +213,16 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
+            <el-form-item label="管径(m)" prop="pipelineDiameter">
+              <el-input-number :min="0" v-model="form.pipelineDiameter" placeholder="请输入" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="井深(m)" prop="bottomBuriedDepth">
+              <el-input-number :min="0" v-model="form.bottomBuriedDepth" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="安装高度(米)" prop="installHeight">
               <el-input v-model="form.installHeight" placeholder="请输入安装高度" />
             </el-form-item>
@@ -398,6 +408,8 @@
     id: '',
     installDate: '',
     installHeight: 0,
+    pipelineDiameter: 0,
+    bottomBuriedDepth: 0,
     lonLat: '',
     monitorIntervalMinute: '',
     monitorTargetType: '',
diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue
index 314b241..c9af27d 100644
--- a/src/views/floodSys/assetManage/pipelinePoint.vue
+++ b/src/views/floodSys/assetManage/pipelinePoint.vue
@@ -352,8 +352,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: 0,
-    bottomBuriedDepth: 0,
     groundElevation: null,
     // status: null,
     geometrys: null,
@@ -404,8 +402,6 @@
     ownershipUnits: null,
     operationalUnits: null,
     pointTexture: null,
-    pipelineDiameter: null,
-    bottomBuriedDepth: null,
     groundElevation: null,
     remark: null,
     // status: null,
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index b872e4f..01ed942 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -16,17 +16,15 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">黄河 100 年一遇，黄汴河、惠济河 50 年一遇，马家河、东护城河、运粮河 20 年一遇。</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">
-            开封市实施一渠六河连通综合治理工程，对东 护城河、西护城河（黄汴河）、南护城河（黄汴河）等 5 条河道 进行了综合治理
-          </div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" max-height="120">
+        <el-table ref="table" :data="tableData" height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
@@ -48,59 +46,63 @@
 </template>
 <script setup>
 import bus from '@/bus';
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const { proxy } = getCurrentInstance();
 const tabList = ref([
-  { id: 1, name: '防洪标准' },
-  { id: 2, name: '内涝标准' },
-  { id: 3, name: '内涝消除' },
+  { id: 'fhbz', name: '防洪标准' },
+  { id: 'nlbz', name: '内涝标准' },
+  { id: 'nlxc', name: '内涝消除' },
 ]);
-const curTab = ref(1);
+
+const curTab = ref('fhbz');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
+  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'fzbz');
-  } else if (curTab.value == 2) {
-    bus.emit('jhkhclick', 'nlfz');
+  if (curTab.value == 'fhbz') {
+    bus.emit('jhkhclick', 'fhbz');
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('jhkhclick', 'nlbz');
   } else {
     bus.emit('jhkhclick', 'nlxc');
   }
+  getjb();
+  getkhzn();
 };
 
 // 产出绩效公共指标信息
 async function getjb() {
   let res = await quotaCommomInfoList({
-    quotaCode: 'fhbz',
+    quotaCode: curTab.value,
   });
   if (res && res.code == 200) {
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
 async function getkhzn() {
   let res = await hmyztQuotaDataList({
-    quotaType: 'fhbz',
+    quotaType: curTab.value,
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
+    console.log('-----', tableData.value);
   }
 }
 
 onMounted(() => {
-  // getjb();
-  // getkhzn();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .chanChuJiXiao {
-  width: 100%;
+  width: 460px;
 
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -198,13 +200,13 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index dc7b464..2593e02 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="chanChuJiXiao"
-    :style="{
-      height: curTab == 1 ? '352px' : '382px',
-    }"
-  >
+  <div class="chanChuJiXiao">
     <div class="partTitleHM">
       黑臭水体
       <div class="tabs flex">
@@ -15,30 +10,34 @@
     </div>
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
           <div class="valsText">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
           <div class="valsText">{{ quotaInfo.reformMethod }}</div>
         </div>
-        <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
           <el-table-column label="提升成效" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 2">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 2">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水量(万t/d)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
-        <el-table ref="table" :data="tableData" style="width: 100%; height: 120px" max-height="120" v-if="curTab == 3">
+
+        <el-table ref="table" :data="tableData" height="120" v-if="curTab == 3">
           <el-table-column label="污水处理厂" prop="partitionName" show-overflow-tooltip />
           <el-table-column label="进水BOD浓度(mg/L)" prop="reformAchievement" show-overflow-tooltip />
         </el-table>
+
         <div class="achievements flex flex-j-left flex-align-center">
           <div class="titles titlecg">
             <div class="mbs">成果</div>
@@ -53,67 +52,18 @@
       </div>
     </div>
   </div>
-  <el-dialog v-model="opens" title="沋西渠" id="dialogContent" :modal-append-to-body="false" :close-on-click-modal="false" width="500px">
-    <div class="jcxx">
-      <el-tabs v-model="actitabs" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="基础信息" name="基础信息">
-          <div class="hcmsg">黑臭水体长度：&nbsp {{ hcdatas.blackRiverLength }}</div>
-          <div class="hcmsg">黑臭水体面积：&nbsp {{ hcdatas.blackRiverArea }}</div>
-          <div class="hcmsg">黑臭段起点：&nbsp {{ hcdatas.blackRiverStart }}</div>
-          <div class="hcmsg">黑臭段终点：&nbsp {{ hcdatas.blackRiverEnd }}</div>
-          <div>
-            治理照片：
-            <div class="img_box">
-              <img :src="item.url" alt="" class="img" v-for="item in photosList" />
-            </div>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="监测站数据" name="监测站数据">
-          <div class="jcsj" v-if="actitabs == '监测站数据'">
-            <el-table ref="table" :data="listTable" style="width: 100%" :max-height="260">
-              <el-table-column label="监测月份" prop="month" show-overflow-tooltip />
-              <el-table-column label="溶解氧" prop="DOX" show-overflow-tooltip />
-              <el-table-column label="COD" prop="COD" />
-              <el-table-column label="氨氮" prop="NH3N" />
-              <el-table-column label="总磷" prop="TP1" />
-            </el-table>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="工程治理介绍" name="工程治理介绍">
-          <div class="" v-if="actitabs == '工程治理介绍'">
-            <div>
-              {{ hcdatas.projectManageIntro }}
-            </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </el-dialog>
 </template>
 <script setup>
-// import { blackRiverList,sampleDetaillistTable ,quotaCommomInfoList,hmyztQuotaDataList} from '@/api/sponeScreen/jxkh.js'
+import bus from '@/bus';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
 
 const { proxy } = getCurrentInstance();
-const opens = ref(false);
-const actitabs = ref('基础信息');
-const photosList = ref([]);
 const hcdatas = ref('');
-const listTable = ref('');
 const tabs = ref([
-  {
-    id: 1,
-    name: '黑臭水体',
-  },
-  {
-    id: 2,
-    name: '生活污水',
-  },
-  {
-    id: 3,
-    name: '进水BOD',
-  },
+  { id: 1, name: '黑臭水体' },
+  { id: 2, name: '生活污水' },
+  { id: 3, name: '进水BOD' },
 ]);
 const curTab = ref(1);
 
@@ -123,9 +73,7 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-
   if (curTab.value == 1) {
-    opens.value = true;
     bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
   } else if (curTab.value == 2) {
@@ -148,7 +96,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -161,42 +108,18 @@
   }
 }
 
-//黑臭水体数据切换table
-const handleClick = ({ props: { name } }, event) => {
-  if (name == '监测数据') {
-    setTimeout(() => {
-      getRiverData();
-    }, 500);
-  } else if (name == '视频监控') {
-    videoInfo.value = '';
-  }
-};
-// 黑臭基础信息+工程治理介绍
-
+// 黑臭基础信息 地图点击可查看监测详情
 async function getHc() {
-  let res = await blackRiverList();
+  let res = await blackWaterInfoList();
   if (res && res.code == 200) {
-    hcdatas.value = res.data[0];
-  }
-}
-// 黑臭水体监测站数据
-async function gethcrtus() {
-  let param = {
-    sampleType: 'hcst',
-    sampleYear: '2023',
-    sampleMonth: '',
-  };
-  let res = await sampleDetaillistTable(param);
-  if (res && res.code == 200) {
-    listTable.value = res.data;
+    hcdatas.value = res.data;
   }
 }
 
 onMounted(() => {
-  // getHc()
-  // gethcrtus()
-  // getjb()
-  // getkhzn()
+  // getHc();
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
@@ -280,11 +203,10 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         overflow-y: scroll;
         justify-content: flex-start;
         display: flex;
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index 856530d..4136405 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -12,17 +12,17 @@
 
     <div class="ListBoxBody">
       <div class="content">
-        <div class="target flex flex-j-left">
+        <div class="target flex flex-j-left flex-align-center">
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">{{ quotaInfo.improveGoals }}</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
-        <div class="measures flex flex-j-left">
+        <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">{{ quotaInfo.reformMethod }}</div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
         <el-table ref="table" :data="tableData" style="width: 100%" max-height="120" v-if="curTab == 1">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
@@ -49,16 +49,11 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
+
 const tabs = ref([
-  {
-    id: 1,
-    name: '可透水',
-  },
-  {
-    id: 2,
-    name: '天然水域',
-  },
+  { id: 1, name: '可透水' },
+  { id: 2, name: '天然水域' },
 ]);
 const curTab = ref(1);
 const quotaInfo = ref({}); //改造措施数据
@@ -87,7 +82,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -100,13 +94,13 @@
   }
 }
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .ktsmjPage {
-  width: 100%;
+  width: 460px;
   .ListBoxBody {
     background: rgba(8, 75, 125, 1);
     padding: 10px;
@@ -185,11 +179,11 @@
       .bottom {
         width: 100%;
         height: 40px;
-        line-height: 35px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
+        overflow: auto;
       }
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
index 3207fdd..d5dc15c 100644
--- a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
+++ b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
@@ -6,29 +6,45 @@
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">计划开工项目</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"></el-progress>
-            <p class="title2">54</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              status="success"
+            ></el-progress>
+            <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">完工率：90%</div>
+              <div class="title2">{{ jhtrhmzj.remark }}</div>
             </div>
           </div>
         </div>
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">实际竣工项目</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"></el-progress>
-            <p class="title2">60</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((sjjgxm.reformAchievement / sjjgxm.quotaTarget) * 100)"
+              status="success"
+            ></el-progress>
+            <p class="title2">{{ sjjgxm.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">完工率：90%</div>
+              <div class="title2">{{ sjjgxm.remark }}</div>
             </div>
           </div>
         </div>
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">计划投入海绵资金</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"> </el-progress>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              status="success"
+            >
+            </el-progress>
             <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
             <!-- {{reformAchievement/quotaTarget}} -->
             <div class="progressunit">
@@ -40,8 +56,14 @@
         <div class="list">
           <div class="flex flex-wrap">
             <p class="title">海绵资金使用</p>
-            <el-progress :text-inside="true" :stroke-width="20" :percentage="Math.round(45)" status="success"> </el-progress>
-            <p class="title2">{{ hmzjsy.quotaTarget || 90 }}</p>
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="Math.round((hmzjsy.reformAchievement / hmzjsy.quotaTarget) * 100)"
+              status="success"
+            >
+            </el-progress>
+            <p class="title2">{{ hmzjsy.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：亿元）</div>
               <div class="title2">{{ hmzjsy.remark }}</div>
@@ -65,7 +87,7 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
@@ -109,13 +131,13 @@
   }
 }
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .xiangMuJianShe {
-  margin-bottom: 10px;
+  margin: 10px 0px;
   width: 460px;
 
   .ListBoxBody {
@@ -220,11 +242,10 @@
     .bottom {
       width: 100%;
       height: 50px;
-      line-height: 25px;
       background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
       color: #58d6ff;
       font-size: 14px;
-      padding-left: 10px;
+      padding: 5px;
       overflow-y: scroll;
     }
   }
diff --git a/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue b/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
index ee579aa..4bcdc34 100644
--- a/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
+++ b/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
@@ -2,7 +2,14 @@
   <!-- 雨水资源化利用 -->
   <div class="rainLYPage">
     <div class="ListBoxHeader">
-      <div class="partTitleHM">雨水资源化利用</div>
+      <div class="partTitleHM">
+        雨水资源化利用
+        <div class="tabs flex">
+          <div class="tabItem" v-for="item in tabList" :key="item.id" :class="{ active: curTab === item.id }" @click="tabClick(item)">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
     </div>
     <div class="ConstrucClass">
       <div class="content">
@@ -10,13 +17,13 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText">达到 10 万立方米/年</div>
+          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText">开封市建成区内收集雨水后利用的调蓄水体有 4 处，分别为 龙亭湖、西北湖、金明池和中意湖。</div>
+          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
         </div>
         <el-table ref="table" :data="tableData" max-height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
@@ -40,11 +47,12 @@
 </template>
 <script setup>
 const { proxy } = getCurrentInstance();
-// import { quotaCommomInfoList,hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js'
+import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
-
+const tabList = ref([{ id: 1, name: '雨水资源化利用' }]);
+const curTab = ref(1);
 const tabClick = item => {
   curTab.value = item.id;
 };
@@ -58,7 +66,6 @@
     let data = res.data;
     quotaInfo.value = data && data.length ? data[0] : {};
     quotaInfo.value.remarkData = quotaInfo.value.remark ? quotaInfo.value.remark.split('；') : [];
-    console.log(quotaInfo.value.remarkData);
   }
 }
 // 产出绩效公共指标信息
@@ -72,13 +79,13 @@
 }
 
 onMounted(() => {
-  // getjb()
-  // getkhzn()
+  getjb();
+  getkhzn();
 });
 </script>
 <style lang="scss" scoped>
 .rainLYPage {
-  width: 100%;
+  width: 460px;
   margin: 10px auto;
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
@@ -160,11 +167,10 @@
       .bottom {
         width: 100%;
         height: 50px;
-        line-height: 25px;
         background: linear-gradient(0deg, rgba(26, 109, 255, 0.2) 0%, rgba(40, 193, 250, 0.2) 100%) !important;
         color: #58d6ff;
         font-size: 14px;
-        padding-left: 10px;
+        padding: 5px;
         justify-content: flex-start;
         display: flex;
         span {
@@ -180,7 +186,7 @@
     float: right;
     margin: 8px 40px 0px 0px;
     .tabItem {
-      width: 78px;
+      width: 105px;
       height: 24px;
       line-height: 24px;
       background: url('@/assets/newImgs/HMScreen/jxkh/normal.png') no-repeat;
diff --git a/src/views/sponeScreen/evaluationKH/ziJinJiXiao.vue b/src/views/sponeScreen/evaluationKH/ziJinJiXiao.vue
index 5fe7589..ea4a45a 100644
--- a/src/views/sponeScreen/evaluationKH/ziJinJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/ziJinJiXiao.vue
@@ -5,7 +5,7 @@
     <div class="ListBoxBody">
       <div class="content">
         <div class="table_content">
-          <el-table ref="table" :data="tableData" height="200">
+          <el-table ref="table" :data="tableData">
             <el-table-column label="机制建设考核" prop="partitionName" show-overflow-tooltip />
             <el-table-column label="目标要求" prop="quotaTarget" show-overflow-tooltip />
             <el-table-column label="现状情况" prop="reformAchievement" />
@@ -18,35 +18,22 @@
         </div>
       </div>
     </div>
+    <el-dialog v-model="opens" title="资金绩效评价佐证材料" append-to-body width="700px">
+      <el-table :data="tableData2" style="width: 100%; margin-bottom: 30px" max-height="400">
+        <el-table-column type="index" label="序号" width="50"> </el-table-column>
+        <el-table-column prop="name" label="文件"> </el-table-column>
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="100">
+          <template #default="scope">
+            <div @click="handleFileDetail(scope.row)" style="cursor: pointer; color: #00d1ff">预览</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
-
-  <el-dialog
-    v-model="opens"
-    title="资金绩效评价详情"
-    id="dialogContent"
-    :modal-append-to-body="false"
-    :close-on-click-modal="false"
-    width="700px"
-  >
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <!-- <el-button type="primary" plain icon="Plus" @click="addFile">新增文件</el-button> -->
-      </el-col>
-    </el-row>
-    <el-table :data="tableData2" style="width: 100%" :max-height="400">
-      <el-table-column type="index" label="序号" width="50"> </el-table-column>
-      <el-table-column prop="name" label="文件"> </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width" width="100">
-        <template #default="scope">
-          <div @click="handleFileDetail(scope.row)">详情</div>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-dialog>
 </template>
 
 <script setup>
-// import { hmyztQuotaDataList, querySysFileByType } from '@/api/sponeScreen/jxkh.js';
+import { hmyztQuotaDataList, querySysFileByType } from '@/api/sponeScreen/jxkh.js';
 const { proxy } = getCurrentInstance();
 const tableData = ref([]);
 const tableData2 = ref([]);
@@ -61,7 +48,7 @@
 const monitorIconClick = async val => {
   opens.value = true;
 
-  const res = await querySysFileByType({ quotaType: val.remark, dataYear: 2023 });
+  const res = await querySysFileByType({ quotaType: val.remark });
   if (res?.code !== 200) return;
   tableData2.value = res?.data || [];
   console.log(tableData2.value, '8888888888');
@@ -72,7 +59,7 @@
   window.open(row.url);
 };
 onMounted(() => {
-  // getData();
+  getData();
 });
 </script>