diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss
index 11fab46..0af61a8 100644
--- a/src/assets/styles/publicXG.scss
+++ b/src/assets/styles/publicXG.scss
@@ -11,6 +11,9 @@
 .text-center {
   text-align: center;
 }
+.pointer {
+  cursor: pointer;
+}
 .mt-10 {
   margin-top: 10px !important;
 }

diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss
index 11fab46..0af61a8 100644
--- a/src/assets/styles/publicXG.scss
+++ b/src/assets/styles/publicXG.scss
@@ -11,6 +11,9 @@
 .text-center {
   text-align: center;
 }
+.pointer {
+  cursor: pointer;
+}
 .mt-10 {
   margin-top: 10px !important;
 }
diff --git a/src/views/dataAnalysis/manualAssay/blackWater.vue b/src/views/dataAnalysis/manualAssay/blackWater.vue
index 2b7d436..df0269f 100644
--- a/src/views/dataAnalysis/manualAssay/blackWater.vue
+++ b/src/views/dataAnalysis/manualAssay/blackWater.vue
@@ -3,11 +3,11 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="采样地点" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入采样地点" clearable />
       </el-form-item>
 
-      <el-form-item style="width: 150px">
+      <el-form-item label="年份">
         <el-date-picker
           type="year"
           v-model="queryParams.trainTime"
@@ -37,7 +37,20 @@
       <el-table-column label="土壤渗透系数(m/d)" prop="title" />
       <el-table-column label="孔系度(%)" prop="people" />
       <el-table-column label="土壤容重(g/cm³)" prop="content" />
-
+      <el-table-column label="检测报告" prop="report">
+        <template #default="scope">
+          <span
+            class="pointer"
+            @click="
+              previewPdf(
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/07/15/4-2-6 2022年示范区老旧小区改造项目（二）竣工验收报告_20240715154024A438.pdf'
+              )
+            "
+          >
+            检测报告.pdf
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -57,41 +70,33 @@
     />
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="500px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="采样日期:" prop="trainTime">
-              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采样地点:" prop="address">
-              <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="土壤渗透系数:" prop="title">
-              <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="孔系度:" prop="people">
-              <el-input type="text" v-model="formData.people" placeholder="请输入孔系度" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="土壤容重:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入土壤容重" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="采样日期:" prop="trainTime">
+          <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
+        </el-form-item>
+        <el-form-item label="采样地点:" prop="address">
+          <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="土壤渗透系数:" prop="title">
+          <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="孔系度:" prop="people">
+          <el-input type="text" v-model="formData.people" placeholder="请输入孔系度" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="土壤容重:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入土壤容重" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="检测报告:" prop="reportList">
+          <ImageFileUpload
+            :limit="1"
+            :saveFileArr="formData.reportList"
+            :listType="'text'"
+            :refField="'trfield'"
+            :refType="'tr_site_info'"
+            :fileType="['pdf']"
+          ></ImageFileUpload>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -104,9 +109,9 @@
 </template>
 
 <script setup>
-// import BlackWater from '@/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/detial/index.vue';
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+
 const { proxy } = getCurrentInstance();
 
 const tableData = ref([]);
@@ -118,7 +123,7 @@
 
 const allData = reactive({
   formData: {
-    filelist: [],
+    reportList: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -136,7 +141,7 @@
     title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
     people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
     content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
-    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
+    reportList: [{ required: true, message: '请选择检测报告', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -225,6 +230,10 @@
   //   .catch(() => {});
 }
 
+function previewPdf(url) {
+  window.open(url);
+}
+
 onMounted(() => {
   getDataList();
 });

diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss
index 11fab46..0af61a8 100644
--- a/src/assets/styles/publicXG.scss
+++ b/src/assets/styles/publicXG.scss
@@ -11,6 +11,9 @@
 .text-center {
   text-align: center;
 }
+.pointer {
+  cursor: pointer;
+}
 .mt-10 {
   margin-top: 10px !important;
 }
diff --git a/src/views/dataAnalysis/manualAssay/blackWater.vue b/src/views/dataAnalysis/manualAssay/blackWater.vue
index 2b7d436..df0269f 100644
--- a/src/views/dataAnalysis/manualAssay/blackWater.vue
+++ b/src/views/dataAnalysis/manualAssay/blackWater.vue
@@ -3,11 +3,11 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="采样地点" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入采样地点" clearable />
       </el-form-item>
 
-      <el-form-item style="width: 150px">
+      <el-form-item label="年份">
         <el-date-picker
           type="year"
           v-model="queryParams.trainTime"
@@ -37,7 +37,20 @@
       <el-table-column label="土壤渗透系数(m/d)" prop="title" />
       <el-table-column label="孔系度(%)" prop="people" />
       <el-table-column label="土壤容重(g/cm³)" prop="content" />
-
+      <el-table-column label="检测报告" prop="report">
+        <template #default="scope">
+          <span
+            class="pointer"
+            @click="
+              previewPdf(
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/07/15/4-2-6 2022年示范区老旧小区改造项目（二）竣工验收报告_20240715154024A438.pdf'
+              )
+            "
+          >
+            检测报告.pdf
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -57,41 +70,33 @@
     />
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="500px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="采样日期:" prop="trainTime">
-              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采样地点:" prop="address">
-              <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="土壤渗透系数:" prop="title">
-              <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="孔系度:" prop="people">
-              <el-input type="text" v-model="formData.people" placeholder="请输入孔系度" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="土壤容重:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入土壤容重" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="采样日期:" prop="trainTime">
+          <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
+        </el-form-item>
+        <el-form-item label="采样地点:" prop="address">
+          <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="土壤渗透系数:" prop="title">
+          <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="孔系度:" prop="people">
+          <el-input type="text" v-model="formData.people" placeholder="请输入孔系度" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="土壤容重:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入土壤容重" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="检测报告:" prop="reportList">
+          <ImageFileUpload
+            :limit="1"
+            :saveFileArr="formData.reportList"
+            :listType="'text'"
+            :refField="'trfield'"
+            :refType="'tr_site_info'"
+            :fileType="['pdf']"
+          ></ImageFileUpload>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -104,9 +109,9 @@
 </template>
 
 <script setup>
-// import BlackWater from '@/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/detial/index.vue';
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+
 const { proxy } = getCurrentInstance();
 
 const tableData = ref([]);
@@ -118,7 +123,7 @@
 
 const allData = reactive({
   formData: {
-    filelist: [],
+    reportList: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -136,7 +141,7 @@
     title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
     people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
     content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
-    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
+    reportList: [{ required: true, message: '请选择检测报告', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -225,6 +230,10 @@
   //   .catch(() => {});
 }
 
+function previewPdf(url) {
+  window.open(url);
+}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/dataAnalysis/manualAssay/landWater.vue b/src/views/dataAnalysis/manualAssay/landWater.vue
index 63f9890..31d38c6 100644
--- a/src/views/dataAnalysis/manualAssay/landWater.vue
+++ b/src/views/dataAnalysis/manualAssay/landWater.vue
@@ -1,13 +1,12 @@
 <template>
-  <!-- 数据采集子系统 人工化验  士壤本底检测-->
+  <!-- 数据采集子系统 人工化验  下垫面化验采集-->
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="采样地点" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入采样地点" clearable />
       </el-form-item>
-
-      <el-form-item style="width: 150px">
+      <el-form-item label="年份">
         <el-date-picker
           type="year"
           v-model="queryParams.trainTime"
@@ -16,12 +15,12 @@
           style="width: 100%"
         ></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -29,6 +28,7 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
@@ -37,10 +37,23 @@
       <el-table-column label="pH" prop="title" />
       <el-table-column label="悬浮物SS(mg/L)" prop="people" />
       <el-table-column label="COD(mg/L)" prop="content" />
-
       <el-table-column label="总氮TN(mg/L)" prop="title" />
       <el-table-column label="总磷TP(mg/L)" prop="people" />
       <el-table-column label="氨氮(mg/L)" prop="content" />
+      <el-table-column label="检测报告" prop="report">
+        <template #default="scope">
+          <span
+            class="pointer"
+            @click="
+              previewPdf(
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/07/15/4-2-6 2022年示范区老旧小区改造项目（二）竣工验收报告_20240715154024A438.pdf'
+              )
+            "
+          >
+            检测报告.pdf
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,60 +74,41 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="采样日期:" prop="trainTime">
-              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采样地点:" prop="address">
-              <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="pH:" prop="title">
-              <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="悬浮物(SS):" prop="people">
-              <el-input type="text" v-model="formData.people" placeholder="请输入悬浮物(SS)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="COD:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入COD" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="总氮(TN):" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入总氮(TN)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="总磷(TP):" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入总磷(TP)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="氨氮:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入氨氮" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm flex50">
+        <el-form-item label="采样日期:" prop="trainTime">
+          <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
+        </el-form-item>
+        <el-form-item label="采样地点:" prop="address">
+          <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="pH:" prop="title">
+          <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="悬浮物(SS):" prop="people">
+          <el-input type="text" v-model="formData.people" placeholder="请输入悬浮物(SS)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="COD:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入COD" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="总氮(TN):" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入总氮(TN)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="总磷(TP):" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入总磷(TP)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="氨氮:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入氨氮" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="检测报告:" prop="reportList">
+          <ImageFileUpload
+            :limit="1"
+            :saveFileArr="formData.reportList"
+            :listType="'text'"
+            :refField="'trfield'"
+            :refType="'tr_site_info'"
+            :fileType="['pdf']"
+          ></ImageFileUpload>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -128,6 +122,8 @@
 
 <script setup>
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+
 const { proxy } = getCurrentInstance();
 
 const tableData = ref([]);
@@ -139,7 +135,7 @@
 
 const allData = reactive({
   formData: {
-    filelist: [],
+    reportList: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -157,7 +153,7 @@
     title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
     people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
     content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
-    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
+    reportList: [{ required: true, message: '请选择检测报告', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -246,6 +242,10 @@
   //   .catch(() => {});
 }
 
+function previewPdf(url) {
+  window.open(url);
+}
+
 onMounted(() => {
   getDataList();
 });

diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss
index 11fab46..0af61a8 100644
--- a/src/assets/styles/publicXG.scss
+++ b/src/assets/styles/publicXG.scss
@@ -11,6 +11,9 @@
 .text-center {
   text-align: center;
 }
+.pointer {
+  cursor: pointer;
+}
 .mt-10 {
   margin-top: 10px !important;
 }
diff --git a/src/views/dataAnalysis/manualAssay/blackWater.vue b/src/views/dataAnalysis/manualAssay/blackWater.vue
index 2b7d436..df0269f 100644
--- a/src/views/dataAnalysis/manualAssay/blackWater.vue
+++ b/src/views/dataAnalysis/manualAssay/blackWater.vue
@@ -3,11 +3,11 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="采样地点" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入采样地点" clearable />
       </el-form-item>
 
-      <el-form-item style="width: 150px">
+      <el-form-item label="年份">
         <el-date-picker
           type="year"
           v-model="queryParams.trainTime"
@@ -37,7 +37,20 @@
       <el-table-column label="土壤渗透系数(m/d)" prop="title" />
       <el-table-column label="孔系度(%)" prop="people" />
       <el-table-column label="土壤容重(g/cm³)" prop="content" />
-
+      <el-table-column label="检测报告" prop="report">
+        <template #default="scope">
+          <span
+            class="pointer"
+            @click="
+              previewPdf(
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/07/15/4-2-6 2022年示范区老旧小区改造项目（二）竣工验收报告_20240715154024A438.pdf'
+              )
+            "
+          >
+            检测报告.pdf
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -57,41 +70,33 @@
     />
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="500px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="采样日期:" prop="trainTime">
-              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采样地点:" prop="address">
-              <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="土壤渗透系数:" prop="title">
-              <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="孔系度:" prop="people">
-              <el-input type="text" v-model="formData.people" placeholder="请输入孔系度" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="土壤容重:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入土壤容重" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="采样日期:" prop="trainTime">
+          <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
+        </el-form-item>
+        <el-form-item label="采样地点:" prop="address">
+          <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="土壤渗透系数:" prop="title">
+          <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="孔系度:" prop="people">
+          <el-input type="text" v-model="formData.people" placeholder="请输入孔系度" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="土壤容重:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入土壤容重" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="检测报告:" prop="reportList">
+          <ImageFileUpload
+            :limit="1"
+            :saveFileArr="formData.reportList"
+            :listType="'text'"
+            :refField="'trfield'"
+            :refType="'tr_site_info'"
+            :fileType="['pdf']"
+          ></ImageFileUpload>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -104,9 +109,9 @@
 </template>
 
 <script setup>
-// import BlackWater from '@/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/detial/index.vue';
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+
 const { proxy } = getCurrentInstance();
 
 const tableData = ref([]);
@@ -118,7 +123,7 @@
 
 const allData = reactive({
   formData: {
-    filelist: [],
+    reportList: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -136,7 +141,7 @@
     title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
     people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
     content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
-    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
+    reportList: [{ required: true, message: '请选择检测报告', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -225,6 +230,10 @@
   //   .catch(() => {});
 }
 
+function previewPdf(url) {
+  window.open(url);
+}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/dataAnalysis/manualAssay/landWater.vue b/src/views/dataAnalysis/manualAssay/landWater.vue
index 63f9890..31d38c6 100644
--- a/src/views/dataAnalysis/manualAssay/landWater.vue
+++ b/src/views/dataAnalysis/manualAssay/landWater.vue
@@ -1,13 +1,12 @@
 <template>
-  <!-- 数据采集子系统 人工化验  士壤本底检测-->
+  <!-- 数据采集子系统 人工化验  下垫面化验采集-->
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="采样地点" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入采样地点" clearable />
       </el-form-item>
-
-      <el-form-item style="width: 150px">
+      <el-form-item label="年份">
         <el-date-picker
           type="year"
           v-model="queryParams.trainTime"
@@ -16,12 +15,12 @@
           style="width: 100%"
         ></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -29,6 +28,7 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
@@ -37,10 +37,23 @@
       <el-table-column label="pH" prop="title" />
       <el-table-column label="悬浮物SS(mg/L)" prop="people" />
       <el-table-column label="COD(mg/L)" prop="content" />
-
       <el-table-column label="总氮TN(mg/L)" prop="title" />
       <el-table-column label="总磷TP(mg/L)" prop="people" />
       <el-table-column label="氨氮(mg/L)" prop="content" />
+      <el-table-column label="检测报告" prop="report">
+        <template #default="scope">
+          <span
+            class="pointer"
+            @click="
+              previewPdf(
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/07/15/4-2-6 2022年示范区老旧小区改造项目（二）竣工验收报告_20240715154024A438.pdf'
+              )
+            "
+          >
+            检测报告.pdf
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,60 +74,41 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="采样日期:" prop="trainTime">
-              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采样地点:" prop="address">
-              <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="pH:" prop="title">
-              <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="悬浮物(SS):" prop="people">
-              <el-input type="text" v-model="formData.people" placeholder="请输入悬浮物(SS)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="COD:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入COD" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="总氮(TN):" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入总氮(TN)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="总磷(TP):" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入总磷(TP)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="氨氮:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入氨氮" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm flex50">
+        <el-form-item label="采样日期:" prop="trainTime">
+          <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
+        </el-form-item>
+        <el-form-item label="采样地点:" prop="address">
+          <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="pH:" prop="title">
+          <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="悬浮物(SS):" prop="people">
+          <el-input type="text" v-model="formData.people" placeholder="请输入悬浮物(SS)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="COD:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入COD" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="总氮(TN):" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入总氮(TN)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="总磷(TP):" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入总磷(TP)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="氨氮:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入氨氮" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="检测报告:" prop="reportList">
+          <ImageFileUpload
+            :limit="1"
+            :saveFileArr="formData.reportList"
+            :listType="'text'"
+            :refField="'trfield'"
+            :refType="'tr_site_info'"
+            :fileType="['pdf']"
+          ></ImageFileUpload>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -128,6 +122,8 @@
 
 <script setup>
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+
 const { proxy } = getCurrentInstance();
 
 const tableData = ref([]);
@@ -139,7 +135,7 @@
 
 const allData = reactive({
   formData: {
-    filelist: [],
+    reportList: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -157,7 +153,7 @@
     title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
     people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
     content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
-    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
+    reportList: [{ required: true, message: '请选择检测报告', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -246,6 +242,10 @@
   //   .catch(() => {});
 }
 
+function previewPdf(url) {
+  window.open(url);
+}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/dataAnalysis/manualAssay/urbanRivers.vue b/src/views/dataAnalysis/manualAssay/urbanRivers.vue
index fac378d..26234dd 100644
--- a/src/views/dataAnalysis/manualAssay/urbanRivers.vue
+++ b/src/views/dataAnalysis/manualAssay/urbanRivers.vue
@@ -1,13 +1,12 @@
 <template>
-  <!-- 数据采集子系统 人工化验  士壤本底检测-->
+  <!-- 数据采集子系统 人工化验  海绵设施采集-->
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="采样地点" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入采样地点" clearable />
       </el-form-item>
-
-      <el-form-item style="width: 150px">
+      <el-form-item label="年份">
         <el-date-picker
           type="year"
           v-model="queryParams.trainTime"
@@ -16,7 +15,6 @@
           style="width: 100%"
         ></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
@@ -37,10 +35,23 @@
       <el-table-column label="pH" prop="title" />
       <el-table-column label="悬浮物SS(mg/L)" prop="people" />
       <el-table-column label="COD(mg/L)" prop="content" />
-
       <el-table-column label="总氮TN(mg/L)" prop="title" />
       <el-table-column label="总磷TP(mg/L)" prop="people" />
       <el-table-column label="氨氮(mg/L)" prop="content" />
+      <el-table-column label="检测报告" prop="report">
+        <template #default="scope">
+          <span
+            class="pointer"
+            @click="
+              previewPdf(
+                'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/07/15/4-2-6 2022年示范区老旧小区改造项目（二）竣工验收报告_20240715154024A438.pdf'
+              )
+            "
+          >
+            检测报告.pdf
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -62,60 +73,42 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="采样日期:" prop="trainTime">
-              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采样地点:" prop="address">
-              <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="pH:" prop="title">
-              <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="悬浮物(SS):" prop="people">
-              <el-input type="text" v-model="formData.people" placeholder="请输入悬浮物(SS)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="COD:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入COD" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="总氮(TN):" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入总氮(TN)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="总磷(TP):" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入总磷(TP)" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="氨氮:" prop="content">
-              <el-input type="text" v-model="formData.content" placeholder="请输入氨氮" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="采样日期:" prop="trainTime">
+          <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择采样日期" />
+        </el-form-item>
+        <el-form-item label="采样地点:" prop="address">
+          <el-input type="text" v-model="formData.address" placeholder="请输入采样地点" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="pH:" prop="title">
+          <el-input type="text" v-model="formData.title" placeholder="请输入土壤渗透系数" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="悬浮物(SS):" prop="people">
+          <el-input type="text" v-model="formData.people" placeholder="请输入悬浮物(SS)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="COD:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入COD" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="总氮(TN):" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入总氮(TN)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="总磷(TP):" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入总磷(TP)" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="氨氮:" prop="content">
+          <el-input type="text" v-model="formData.content" placeholder="请输入氨氮" clearable style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="检测报告:" prop="reportList">
+          <ImageFileUpload
+            :limit="1"
+            :saveFileArr="formData.reportList"
+            :listType="'text'"
+            :refField="'trfield'"
+            :refType="'tr_site_info'"
+            :fileType="['pdf']"
+          ></ImageFileUpload>
+        </el-form-item>
       </el-form>
+
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
@@ -128,6 +121,7 @@
 
 <script setup>
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
 
 const tableData = ref([]);
@@ -139,7 +133,7 @@
 
 const allData = reactive({
   formData: {
-    filelist: [],
+    reportList: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -157,7 +151,7 @@
     title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
     people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
     content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
-    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
+    reportList: [{ required: true, message: '请选择检测报告', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -246,6 +240,10 @@
   //   .catch(() => {});
 }
 
+function previewPdf(url) {
+  window.open(url);
+}
+
 onMounted(() => {
   getDataList();
 });