diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e44eae9..2aaac20 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -38,14 +38,7 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table
-          :data="dataList"
-          v-loading="loading"
-          :max-height="280"
-          @row-click="clickLogData"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-        >
+        <el-table :data="dataList" v-loading="loading" :max-height="280" @row-click="clickLogData" highlight-current-row>
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -294,6 +287,7 @@
   queryParamstwo: {
     pageNum: 1,
     pageSize: 10,
+    fatherCode: '',
   },
 
   rules: {
@@ -309,7 +303,8 @@
 //搜索
 function handleQuery() {
   getList();
-  getList1();
+
+  // getList1();
 }
 //重置
 function resetQuery() {
@@ -380,13 +375,24 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
-  getList1(res.data[0].number);
+
+  // 判断任务详情
+  if (dataList.value.length != '') {
+    queryParamstwo.value.fatherCode = res.data[0].number;
+    // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+    getList1(res.data[0].number);
+  } else if (queryParamstwo.value.fatherCode == '' || dataList.value.length == '') {
+    // console.log('123');
+    dataListTwo.value = [];
+  }
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ fatherCode: code });
+  queryParamstwo.value.fatherCode = code;
+  // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
@@ -394,22 +400,9 @@
 
 //表格点击事件
 function clickLogData(val) {
-  console.log(val, '111');
-  queryParamstwo.value.fatherCode = val.number;
-  // if (val.index != '') {
-  //   console.log('1111');
-  //   return 'success-row';
-  // }
   getList1(val.number);
 }
 
-function tableRowClassName(row, rowIndex) {
-  row.row.index = row.rowIndex;
-  // AllData.activeIndex = row.rowIndex;
-  // console.log(row.row.index, 'row.rowIndex');
-  // console.log(AllData.activeIndex, 'AllData.activeIndex');
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e44eae9..2aaac20 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -38,14 +38,7 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table
-          :data="dataList"
-          v-loading="loading"
-          :max-height="280"
-          @row-click="clickLogData"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-        >
+        <el-table :data="dataList" v-loading="loading" :max-height="280" @row-click="clickLogData" highlight-current-row>
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -294,6 +287,7 @@
   queryParamstwo: {
     pageNum: 1,
     pageSize: 10,
+    fatherCode: '',
   },
 
   rules: {
@@ -309,7 +303,8 @@
 //搜索
 function handleQuery() {
   getList();
-  getList1();
+
+  // getList1();
 }
 //重置
 function resetQuery() {
@@ -380,13 +375,24 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
-  getList1(res.data[0].number);
+
+  // 判断任务详情
+  if (dataList.value.length != '') {
+    queryParamstwo.value.fatherCode = res.data[0].number;
+    // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+    getList1(res.data[0].number);
+  } else if (queryParamstwo.value.fatherCode == '' || dataList.value.length == '') {
+    // console.log('123');
+    dataListTwo.value = [];
+  }
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ fatherCode: code });
+  queryParamstwo.value.fatherCode = code;
+  // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
@@ -394,22 +400,9 @@
 
 //表格点击事件
 function clickLogData(val) {
-  console.log(val, '111');
-  queryParamstwo.value.fatherCode = val.number;
-  // if (val.index != '') {
-  //   console.log('1111');
-  //   return 'success-row';
-  // }
   getList1(val.number);
 }
 
-function tableRowClassName(row, rowIndex) {
-  row.row.index = row.rowIndex;
-  // AllData.activeIndex = row.rowIndex;
-  // console.log(row.row.index, 'row.rowIndex');
-  // console.log(AllData.activeIndex, 'AllData.activeIndex');
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index be14038..c0bc4eb 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -6,7 +6,7 @@
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务名称11</div>
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
         <div class="detail-value flex flex-align-center">
           {{ props.DataList.taskName }}
         </div>
@@ -17,11 +17,11 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查开始时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查结束时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realEndDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务状态</div>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e44eae9..2aaac20 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -38,14 +38,7 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table
-          :data="dataList"
-          v-loading="loading"
-          :max-height="280"
-          @row-click="clickLogData"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-        >
+        <el-table :data="dataList" v-loading="loading" :max-height="280" @row-click="clickLogData" highlight-current-row>
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -294,6 +287,7 @@
   queryParamstwo: {
     pageNum: 1,
     pageSize: 10,
+    fatherCode: '',
   },
 
   rules: {
@@ -309,7 +303,8 @@
 //搜索
 function handleQuery() {
   getList();
-  getList1();
+
+  // getList1();
 }
 //重置
 function resetQuery() {
@@ -380,13 +375,24 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
-  getList1(res.data[0].number);
+
+  // 判断任务详情
+  if (dataList.value.length != '') {
+    queryParamstwo.value.fatherCode = res.data[0].number;
+    // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+    getList1(res.data[0].number);
+  } else if (queryParamstwo.value.fatherCode == '' || dataList.value.length == '') {
+    // console.log('123');
+    dataListTwo.value = [];
+  }
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ fatherCode: code });
+  queryParamstwo.value.fatherCode = code;
+  // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
@@ -394,22 +400,9 @@
 
 //表格点击事件
 function clickLogData(val) {
-  console.log(val, '111');
-  queryParamstwo.value.fatherCode = val.number;
-  // if (val.index != '') {
-  //   console.log('1111');
-  //   return 'success-row';
-  // }
   getList1(val.number);
 }
 
-function tableRowClassName(row, rowIndex) {
-  row.row.index = row.rowIndex;
-  // AllData.activeIndex = row.rowIndex;
-  // console.log(row.row.index, 'row.rowIndex');
-  // console.log(AllData.activeIndex, 'AllData.activeIndex');
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index be14038..c0bc4eb 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -6,7 +6,7 @@
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务名称11</div>
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
         <div class="detail-value flex flex-align-center">
           {{ props.DataList.taskName }}
         </div>
@@ -17,11 +17,11 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查开始时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查结束时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realEndDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务状态</div>
diff --git a/src/views/longoPeration/SewageFactory.vue b/src/views/longoPeration/SewageFactory.vue
index 787686a..4cda30a 100644
--- a/src/views/longoPeration/SewageFactory.vue
+++ b/src/views/longoPeration/SewageFactory.vue
@@ -29,10 +29,8 @@
       <el-table-column label="创建时间" prop="createTime" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e44eae9..2aaac20 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -38,14 +38,7 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table
-          :data="dataList"
-          v-loading="loading"
-          :max-height="280"
-          @row-click="clickLogData"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-        >
+        <el-table :data="dataList" v-loading="loading" :max-height="280" @row-click="clickLogData" highlight-current-row>
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -294,6 +287,7 @@
   queryParamstwo: {
     pageNum: 1,
     pageSize: 10,
+    fatherCode: '',
   },
 
   rules: {
@@ -309,7 +303,8 @@
 //搜索
 function handleQuery() {
   getList();
-  getList1();
+
+  // getList1();
 }
 //重置
 function resetQuery() {
@@ -380,13 +375,24 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
-  getList1(res.data[0].number);
+
+  // 判断任务详情
+  if (dataList.value.length != '') {
+    queryParamstwo.value.fatherCode = res.data[0].number;
+    // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+    getList1(res.data[0].number);
+  } else if (queryParamstwo.value.fatherCode == '' || dataList.value.length == '') {
+    // console.log('123');
+    dataListTwo.value = [];
+  }
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ fatherCode: code });
+  queryParamstwo.value.fatherCode = code;
+  // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
@@ -394,22 +400,9 @@
 
 //表格点击事件
 function clickLogData(val) {
-  console.log(val, '111');
-  queryParamstwo.value.fatherCode = val.number;
-  // if (val.index != '') {
-  //   console.log('1111');
-  //   return 'success-row';
-  // }
   getList1(val.number);
 }
 
-function tableRowClassName(row, rowIndex) {
-  row.row.index = row.rowIndex;
-  // AllData.activeIndex = row.rowIndex;
-  // console.log(row.row.index, 'row.rowIndex');
-  // console.log(AllData.activeIndex, 'AllData.activeIndex');
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index be14038..c0bc4eb 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -6,7 +6,7 @@
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务名称11</div>
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
         <div class="detail-value flex flex-align-center">
           {{ props.DataList.taskName }}
         </div>
@@ -17,11 +17,11 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查开始时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查结束时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realEndDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务状态</div>
diff --git a/src/views/longoPeration/SewageFactory.vue b/src/views/longoPeration/SewageFactory.vue
index 787686a..4cda30a 100644
--- a/src/views/longoPeration/SewageFactory.vue
+++ b/src/views/longoPeration/SewageFactory.vue
@@ -29,10 +29,8 @@
       <el-table-column label="创建时间" prop="createTime" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 3e98eab..7604768 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.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">
+      <el-form-item label="台账名称" prop="title" style="width: 300px">
         <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="年份" prop="year">
-        <el-date-picker type="year" v-model="queryParams.year" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
+      <el-form-item label="年份" prop="checkDate">
+        <el-date-picker type="year" v-model="queryParams.checkDate" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -17,24 +17,32 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['floodSys:jing:add']">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
       </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="日期" prop="date" />
-      <el-table-column label="项目名称" prop="name" />
-      <el-table-column label="巡查人数" prop="unum" />
-      <el-table-column label="参加单位" prop="unit" />
+    <el-table v-loading="tableLoading" :data="tableData" max-height="580">
+      <el-table-column label="巡查日期" prop="checkDate" />
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人数" prop="patUserNumber"> </el-table-column>
+      <el-table-column label="项目数量" prop="projectNumber" />
+      <el-table-column label="参加单位" prop="intoUnit" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="备注" prop="remark" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,20 +58,45 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="90px" class="publicForm">
-        <el-form-item label="巡查日期" prop="date">
-          <el-date-picker type="date" v-model="formData.date" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
+        <el-form-item label="巡查日期" prop="checkDate">
+          <el-date-picker type="date" v-model="formData.checkDate" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="项目名称" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="项目名称" prop="projectList">
+          <el-select
+            clearable
+            v-model="formData.projectList"
+            style="width: 100%"
+            placeholder="请选择项目名称"
+            value-key="projectNo"
+            multiple
+            label="projectName"
+          >
+            <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="巡查人数" prop="degist">
-          <el-input type="number" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人员:" prop="patrolUserList">
+          <el-select
+            v-model="formData.patrolUserList"
+            placeholder="请选择巡查人员"
+            clearable
+            style="width: 100%"
+            value-key="userId"
+            label="nickName"
+            multiple
+          >
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="参加单位" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人数" prop="patUserNumber">
+          <el-input type="number" v-model="formData.patUserNumber" controls-position="right" />
         </el-form-item>
-        <el-form-item label="备注" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="参加单位" prop="intoUnit">
+          <el-input type="textarea" v-model="formData.intoUnit" controls-position="right" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -77,51 +110,35 @@
 </template>
 
 <script setup name="科普知识">
-import { knowledgePage, knowledgeAdd, knowledgeDel, knowledgeDetail, knowledgeEdit } from '@/api/publicService/index';
-
+import {
+  checkAndAcceptPage,
+  checkAndAcceptAdd,
+  checkAndAcceptDel,
+  checkAndAcceptDetail,
+  checkAndAcceptEdit,
+} from '@/api/publicService/index';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
-const tableData = ref([
-  {
-    date: '2023-12-06',
-    name: '胜园',
-    unum: '10',
-    unit: '由市海绵办牵头（韩）、市城管局（重点办）、市节水型（海绵）城市建设服务中心（张）、中规院（张、钊）、文投公司等相关人员参加',
-    createTime: '2023-12-06 10:23:10',
-    remark: '2023年10月19日下午预验收',
-  },
-  {
-    date: '2024-03-04',
-    name: '晋安路46号院、综合保税园区一期项目、南城墙（环城公园一期、三期、五期）东郊沟雨水泵站、龙亭北路、铁北街、五福路人行道海绵化改造项目',
-    unum: '9',
-    unit: '市海绵办牵头，联合市节水型（海绵）城市建设服务中心、中规院、市政管理处',
-    createTime: '2024-03-04 10:23:10',
-    remark: '',
-  },
-]);
+const tableData = ref([]);
+const userList = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const projectTList = ref([]);
 const allData = reactive({
-  formData: {
-    content: '',
-    degist: '',
-    title: '',
-    typeId: '',
-  },
+  formData: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    title: undefined,
-    typeId: undefined,
-    year: proxy.moment().subtract('1', 'year').format('YYYY'),
+    checkDate: '',
   },
   rulesForm: {
     postName: [{ required: true, message: '请输入', trigger: 'blur' }],
     degist: [{ required: true, message: '请输入', trigger: 'blur' }],
-    typeId: [{ required: true, message: '请选择', trigger: 'change' }],
+    checkDate: [{ required: true, message: '请选择巡查日期', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -129,8 +146,8 @@
 /** 获取查询数据列表 */
 function getDataList() {
   tableLoading.value = true;
-  knowledgePage(queryParams.value).then(response => {
-    // tableData.value = response.data;
+  checkAndAcceptPage(queryParams.value).then(response => {
+    tableData.value = response.data;
     total.value = response.total;
     tableLoading.value = false;
   });
@@ -138,6 +155,7 @@
 /** 取消按钮 */
 function cancelForm() {
   dialogShow.value = false;
+  proxy.resetForm('formRef'); //清空表单
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -149,37 +167,70 @@
   proxy.resetForm('queryRef');
   handleQuery();
 }
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+//查询人员列表
+function getUserList() {
+  listUser().then(res => {
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
+  });
+}
+
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
+  formData.value = {};
   dialogShow.value = true;
-  dialogTitle.value = '添加科普知识';
+  dialogTitle.value = '新增验收台账';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  const postId = row.id;
-  knowledgeDetail(postId).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改科普知识';
-    nextTick(() => {
-      formData.value = response.data;
-    });
+  dialogShow.value = true;
+  dialogTitle.value = '修改验收台账';
+  formData.value = { ...row };
+  // 做修改回显判断
+  formData.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  formData.value.patrolUserList.forEach(element => {
+    element = element.userId;
   });
+  formData.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
 }
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
     if (valid) {
-      if (dialogTitle.value == '修改科普知识') {
-        knowledgeEdit(formData.value).then(response => {
+      // 处理项目传参
+      formData.value.projectList = formData.value.projectList.map(obj => {
+        // console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+          }
+        });
+        return { projectNo: obj, projectName: nameXm };
+      });
+      // 处理人员传参
+      formData.value.patrolUserList = formData.value.patrolUserList.map(item => {
+        return { userId: item };
+      });
+
+      // console.log(formData.value, 'formData.value');
+      if (dialogTitle.value == '修改验收台账') {
+        checkAndAcceptEdit(formData.value).then(response => {
           proxy.$modal.msgSuccess('修改成功');
           dialogShow.value = false;
           getDataList();
         });
       } else {
         if (formData.value.id) delete formData.value.id;
-        knowledgeAdd(formData.value).then(response => {
+        checkAndAcceptAdd(formData.value).then(response => {
           proxy.$modal.msgSuccess('新增成功');
           dialogShow.value = false;
           getDataList();
@@ -194,7 +245,7 @@
   proxy.$modal
     .confirm('是否确认删除该数据项？')
     .then(function () {
-      return knowledgeDel(postIds);
+      return checkAndAcceptDel(postIds);
     })
     .then(() => {
       getDataList();
@@ -205,5 +256,7 @@
 
 onMounted(() => {
   getDataList();
+  projectTypeListM();
+  getUserList();
 });
 </script>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e44eae9..2aaac20 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -38,14 +38,7 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table
-          :data="dataList"
-          v-loading="loading"
-          :max-height="280"
-          @row-click="clickLogData"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-        >
+        <el-table :data="dataList" v-loading="loading" :max-height="280" @row-click="clickLogData" highlight-current-row>
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -294,6 +287,7 @@
   queryParamstwo: {
     pageNum: 1,
     pageSize: 10,
+    fatherCode: '',
   },
 
   rules: {
@@ -309,7 +303,8 @@
 //搜索
 function handleQuery() {
   getList();
-  getList1();
+
+  // getList1();
 }
 //重置
 function resetQuery() {
@@ -380,13 +375,24 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
-  getList1(res.data[0].number);
+
+  // 判断任务详情
+  if (dataList.value.length != '') {
+    queryParamstwo.value.fatherCode = res.data[0].number;
+    // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+    getList1(res.data[0].number);
+  } else if (queryParamstwo.value.fatherCode == '' || dataList.value.length == '') {
+    // console.log('123');
+    dataListTwo.value = [];
+  }
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ fatherCode: code });
+  queryParamstwo.value.fatherCode = code;
+  // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
@@ -394,22 +400,9 @@
 
 //表格点击事件
 function clickLogData(val) {
-  console.log(val, '111');
-  queryParamstwo.value.fatherCode = val.number;
-  // if (val.index != '') {
-  //   console.log('1111');
-  //   return 'success-row';
-  // }
   getList1(val.number);
 }
 
-function tableRowClassName(row, rowIndex) {
-  row.row.index = row.rowIndex;
-  // AllData.activeIndex = row.rowIndex;
-  // console.log(row.row.index, 'row.rowIndex');
-  // console.log(AllData.activeIndex, 'AllData.activeIndex');
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index be14038..c0bc4eb 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -6,7 +6,7 @@
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务名称11</div>
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
         <div class="detail-value flex flex-align-center">
           {{ props.DataList.taskName }}
         </div>
@@ -17,11 +17,11 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查开始时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查结束时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realEndDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务状态</div>
diff --git a/src/views/longoPeration/SewageFactory.vue b/src/views/longoPeration/SewageFactory.vue
index 787686a..4cda30a 100644
--- a/src/views/longoPeration/SewageFactory.vue
+++ b/src/views/longoPeration/SewageFactory.vue
@@ -29,10 +29,8 @@
       <el-table-column label="创建时间" prop="createTime" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 3e98eab..7604768 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.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">
+      <el-form-item label="台账名称" prop="title" style="width: 300px">
         <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="年份" prop="year">
-        <el-date-picker type="year" v-model="queryParams.year" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
+      <el-form-item label="年份" prop="checkDate">
+        <el-date-picker type="year" v-model="queryParams.checkDate" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -17,24 +17,32 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['floodSys:jing:add']">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
       </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="日期" prop="date" />
-      <el-table-column label="项目名称" prop="name" />
-      <el-table-column label="巡查人数" prop="unum" />
-      <el-table-column label="参加单位" prop="unit" />
+    <el-table v-loading="tableLoading" :data="tableData" max-height="580">
+      <el-table-column label="巡查日期" prop="checkDate" />
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人数" prop="patUserNumber"> </el-table-column>
+      <el-table-column label="项目数量" prop="projectNumber" />
+      <el-table-column label="参加单位" prop="intoUnit" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="备注" prop="remark" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,20 +58,45 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="90px" class="publicForm">
-        <el-form-item label="巡查日期" prop="date">
-          <el-date-picker type="date" v-model="formData.date" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
+        <el-form-item label="巡查日期" prop="checkDate">
+          <el-date-picker type="date" v-model="formData.checkDate" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="项目名称" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="项目名称" prop="projectList">
+          <el-select
+            clearable
+            v-model="formData.projectList"
+            style="width: 100%"
+            placeholder="请选择项目名称"
+            value-key="projectNo"
+            multiple
+            label="projectName"
+          >
+            <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="巡查人数" prop="degist">
-          <el-input type="number" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人员:" prop="patrolUserList">
+          <el-select
+            v-model="formData.patrolUserList"
+            placeholder="请选择巡查人员"
+            clearable
+            style="width: 100%"
+            value-key="userId"
+            label="nickName"
+            multiple
+          >
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="参加单位" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人数" prop="patUserNumber">
+          <el-input type="number" v-model="formData.patUserNumber" controls-position="right" />
         </el-form-item>
-        <el-form-item label="备注" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="参加单位" prop="intoUnit">
+          <el-input type="textarea" v-model="formData.intoUnit" controls-position="right" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -77,51 +110,35 @@
 </template>
 
 <script setup name="科普知识">
-import { knowledgePage, knowledgeAdd, knowledgeDel, knowledgeDetail, knowledgeEdit } from '@/api/publicService/index';
-
+import {
+  checkAndAcceptPage,
+  checkAndAcceptAdd,
+  checkAndAcceptDel,
+  checkAndAcceptDetail,
+  checkAndAcceptEdit,
+} from '@/api/publicService/index';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
-const tableData = ref([
-  {
-    date: '2023-12-06',
-    name: '胜园',
-    unum: '10',
-    unit: '由市海绵办牵头（韩）、市城管局（重点办）、市节水型（海绵）城市建设服务中心（张）、中规院（张、钊）、文投公司等相关人员参加',
-    createTime: '2023-12-06 10:23:10',
-    remark: '2023年10月19日下午预验收',
-  },
-  {
-    date: '2024-03-04',
-    name: '晋安路46号院、综合保税园区一期项目、南城墙（环城公园一期、三期、五期）东郊沟雨水泵站、龙亭北路、铁北街、五福路人行道海绵化改造项目',
-    unum: '9',
-    unit: '市海绵办牵头，联合市节水型（海绵）城市建设服务中心、中规院、市政管理处',
-    createTime: '2024-03-04 10:23:10',
-    remark: '',
-  },
-]);
+const tableData = ref([]);
+const userList = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const projectTList = ref([]);
 const allData = reactive({
-  formData: {
-    content: '',
-    degist: '',
-    title: '',
-    typeId: '',
-  },
+  formData: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    title: undefined,
-    typeId: undefined,
-    year: proxy.moment().subtract('1', 'year').format('YYYY'),
+    checkDate: '',
   },
   rulesForm: {
     postName: [{ required: true, message: '请输入', trigger: 'blur' }],
     degist: [{ required: true, message: '请输入', trigger: 'blur' }],
-    typeId: [{ required: true, message: '请选择', trigger: 'change' }],
+    checkDate: [{ required: true, message: '请选择巡查日期', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -129,8 +146,8 @@
 /** 获取查询数据列表 */
 function getDataList() {
   tableLoading.value = true;
-  knowledgePage(queryParams.value).then(response => {
-    // tableData.value = response.data;
+  checkAndAcceptPage(queryParams.value).then(response => {
+    tableData.value = response.data;
     total.value = response.total;
     tableLoading.value = false;
   });
@@ -138,6 +155,7 @@
 /** 取消按钮 */
 function cancelForm() {
   dialogShow.value = false;
+  proxy.resetForm('formRef'); //清空表单
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -149,37 +167,70 @@
   proxy.resetForm('queryRef');
   handleQuery();
 }
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+//查询人员列表
+function getUserList() {
+  listUser().then(res => {
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
+  });
+}
+
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
+  formData.value = {};
   dialogShow.value = true;
-  dialogTitle.value = '添加科普知识';
+  dialogTitle.value = '新增验收台账';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  const postId = row.id;
-  knowledgeDetail(postId).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改科普知识';
-    nextTick(() => {
-      formData.value = response.data;
-    });
+  dialogShow.value = true;
+  dialogTitle.value = '修改验收台账';
+  formData.value = { ...row };
+  // 做修改回显判断
+  formData.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  formData.value.patrolUserList.forEach(element => {
+    element = element.userId;
   });
+  formData.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
 }
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
     if (valid) {
-      if (dialogTitle.value == '修改科普知识') {
-        knowledgeEdit(formData.value).then(response => {
+      // 处理项目传参
+      formData.value.projectList = formData.value.projectList.map(obj => {
+        // console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+          }
+        });
+        return { projectNo: obj, projectName: nameXm };
+      });
+      // 处理人员传参
+      formData.value.patrolUserList = formData.value.patrolUserList.map(item => {
+        return { userId: item };
+      });
+
+      // console.log(formData.value, 'formData.value');
+      if (dialogTitle.value == '修改验收台账') {
+        checkAndAcceptEdit(formData.value).then(response => {
           proxy.$modal.msgSuccess('修改成功');
           dialogShow.value = false;
           getDataList();
         });
       } else {
         if (formData.value.id) delete formData.value.id;
-        knowledgeAdd(formData.value).then(response => {
+        checkAndAcceptAdd(formData.value).then(response => {
           proxy.$modal.msgSuccess('新增成功');
           dialogShow.value = false;
           getDataList();
@@ -194,7 +245,7 @@
   proxy.$modal
     .confirm('是否确认删除该数据项？')
     .then(function () {
-      return knowledgeDel(postIds);
+      return checkAndAcceptDel(postIds);
     })
     .then(() => {
       getDataList();
@@ -205,5 +256,7 @@
 
 onMounted(() => {
   getDataList();
+  projectTypeListM();
+  getUserList();
 });
 </script>
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index 0d795f3..33d11d0 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -38,10 +38,8 @@
       <el-table-column label="备注" prop="remark" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e44eae9..2aaac20 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -38,14 +38,7 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table
-          :data="dataList"
-          v-loading="loading"
-          :max-height="280"
-          @row-click="clickLogData"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-        >
+        <el-table :data="dataList" v-loading="loading" :max-height="280" @row-click="clickLogData" highlight-current-row>
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -294,6 +287,7 @@
   queryParamstwo: {
     pageNum: 1,
     pageSize: 10,
+    fatherCode: '',
   },
 
   rules: {
@@ -309,7 +303,8 @@
 //搜索
 function handleQuery() {
   getList();
-  getList1();
+
+  // getList1();
 }
 //重置
 function resetQuery() {
@@ -380,13 +375,24 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
-  getList1(res.data[0].number);
+
+  // 判断任务详情
+  if (dataList.value.length != '') {
+    queryParamstwo.value.fatherCode = res.data[0].number;
+    // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+    getList1(res.data[0].number);
+  } else if (queryParamstwo.value.fatherCode == '' || dataList.value.length == '') {
+    // console.log('123');
+    dataListTwo.value = [];
+  }
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ fatherCode: code });
+  queryParamstwo.value.fatherCode = code;
+  // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
@@ -394,22 +400,9 @@
 
 //表格点击事件
 function clickLogData(val) {
-  console.log(val, '111');
-  queryParamstwo.value.fatherCode = val.number;
-  // if (val.index != '') {
-  //   console.log('1111');
-  //   return 'success-row';
-  // }
   getList1(val.number);
 }
 
-function tableRowClassName(row, rowIndex) {
-  row.row.index = row.rowIndex;
-  // AllData.activeIndex = row.rowIndex;
-  // console.log(row.row.index, 'row.rowIndex');
-  // console.log(AllData.activeIndex, 'AllData.activeIndex');
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index be14038..c0bc4eb 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -6,7 +6,7 @@
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务名称11</div>
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
         <div class="detail-value flex flex-align-center">
           {{ props.DataList.taskName }}
         </div>
@@ -17,11 +17,11 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查开始时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查结束时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realEndDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务状态</div>
diff --git a/src/views/longoPeration/SewageFactory.vue b/src/views/longoPeration/SewageFactory.vue
index 787686a..4cda30a 100644
--- a/src/views/longoPeration/SewageFactory.vue
+++ b/src/views/longoPeration/SewageFactory.vue
@@ -29,10 +29,8 @@
       <el-table-column label="创建时间" prop="createTime" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 3e98eab..7604768 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.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">
+      <el-form-item label="台账名称" prop="title" style="width: 300px">
         <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="年份" prop="year">
-        <el-date-picker type="year" v-model="queryParams.year" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
+      <el-form-item label="年份" prop="checkDate">
+        <el-date-picker type="year" v-model="queryParams.checkDate" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -17,24 +17,32 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['floodSys:jing:add']">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
       </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="日期" prop="date" />
-      <el-table-column label="项目名称" prop="name" />
-      <el-table-column label="巡查人数" prop="unum" />
-      <el-table-column label="参加单位" prop="unit" />
+    <el-table v-loading="tableLoading" :data="tableData" max-height="580">
+      <el-table-column label="巡查日期" prop="checkDate" />
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人数" prop="patUserNumber"> </el-table-column>
+      <el-table-column label="项目数量" prop="projectNumber" />
+      <el-table-column label="参加单位" prop="intoUnit" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="备注" prop="remark" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,20 +58,45 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="90px" class="publicForm">
-        <el-form-item label="巡查日期" prop="date">
-          <el-date-picker type="date" v-model="formData.date" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
+        <el-form-item label="巡查日期" prop="checkDate">
+          <el-date-picker type="date" v-model="formData.checkDate" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="项目名称" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="项目名称" prop="projectList">
+          <el-select
+            clearable
+            v-model="formData.projectList"
+            style="width: 100%"
+            placeholder="请选择项目名称"
+            value-key="projectNo"
+            multiple
+            label="projectName"
+          >
+            <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="巡查人数" prop="degist">
-          <el-input type="number" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人员:" prop="patrolUserList">
+          <el-select
+            v-model="formData.patrolUserList"
+            placeholder="请选择巡查人员"
+            clearable
+            style="width: 100%"
+            value-key="userId"
+            label="nickName"
+            multiple
+          >
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="参加单位" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人数" prop="patUserNumber">
+          <el-input type="number" v-model="formData.patUserNumber" controls-position="right" />
         </el-form-item>
-        <el-form-item label="备注" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="参加单位" prop="intoUnit">
+          <el-input type="textarea" v-model="formData.intoUnit" controls-position="right" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -77,51 +110,35 @@
 </template>
 
 <script setup name="科普知识">
-import { knowledgePage, knowledgeAdd, knowledgeDel, knowledgeDetail, knowledgeEdit } from '@/api/publicService/index';
-
+import {
+  checkAndAcceptPage,
+  checkAndAcceptAdd,
+  checkAndAcceptDel,
+  checkAndAcceptDetail,
+  checkAndAcceptEdit,
+} from '@/api/publicService/index';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
-const tableData = ref([
-  {
-    date: '2023-12-06',
-    name: '胜园',
-    unum: '10',
-    unit: '由市海绵办牵头（韩）、市城管局（重点办）、市节水型（海绵）城市建设服务中心（张）、中规院（张、钊）、文投公司等相关人员参加',
-    createTime: '2023-12-06 10:23:10',
-    remark: '2023年10月19日下午预验收',
-  },
-  {
-    date: '2024-03-04',
-    name: '晋安路46号院、综合保税园区一期项目、南城墙（环城公园一期、三期、五期）东郊沟雨水泵站、龙亭北路、铁北街、五福路人行道海绵化改造项目',
-    unum: '9',
-    unit: '市海绵办牵头，联合市节水型（海绵）城市建设服务中心、中规院、市政管理处',
-    createTime: '2024-03-04 10:23:10',
-    remark: '',
-  },
-]);
+const tableData = ref([]);
+const userList = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const projectTList = ref([]);
 const allData = reactive({
-  formData: {
-    content: '',
-    degist: '',
-    title: '',
-    typeId: '',
-  },
+  formData: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    title: undefined,
-    typeId: undefined,
-    year: proxy.moment().subtract('1', 'year').format('YYYY'),
+    checkDate: '',
   },
   rulesForm: {
     postName: [{ required: true, message: '请输入', trigger: 'blur' }],
     degist: [{ required: true, message: '请输入', trigger: 'blur' }],
-    typeId: [{ required: true, message: '请选择', trigger: 'change' }],
+    checkDate: [{ required: true, message: '请选择巡查日期', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -129,8 +146,8 @@
 /** 获取查询数据列表 */
 function getDataList() {
   tableLoading.value = true;
-  knowledgePage(queryParams.value).then(response => {
-    // tableData.value = response.data;
+  checkAndAcceptPage(queryParams.value).then(response => {
+    tableData.value = response.data;
     total.value = response.total;
     tableLoading.value = false;
   });
@@ -138,6 +155,7 @@
 /** 取消按钮 */
 function cancelForm() {
   dialogShow.value = false;
+  proxy.resetForm('formRef'); //清空表单
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -149,37 +167,70 @@
   proxy.resetForm('queryRef');
   handleQuery();
 }
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+//查询人员列表
+function getUserList() {
+  listUser().then(res => {
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
+  });
+}
+
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
+  formData.value = {};
   dialogShow.value = true;
-  dialogTitle.value = '添加科普知识';
+  dialogTitle.value = '新增验收台账';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  const postId = row.id;
-  knowledgeDetail(postId).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改科普知识';
-    nextTick(() => {
-      formData.value = response.data;
-    });
+  dialogShow.value = true;
+  dialogTitle.value = '修改验收台账';
+  formData.value = { ...row };
+  // 做修改回显判断
+  formData.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  formData.value.patrolUserList.forEach(element => {
+    element = element.userId;
   });
+  formData.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
 }
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
     if (valid) {
-      if (dialogTitle.value == '修改科普知识') {
-        knowledgeEdit(formData.value).then(response => {
+      // 处理项目传参
+      formData.value.projectList = formData.value.projectList.map(obj => {
+        // console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+          }
+        });
+        return { projectNo: obj, projectName: nameXm };
+      });
+      // 处理人员传参
+      formData.value.patrolUserList = formData.value.patrolUserList.map(item => {
+        return { userId: item };
+      });
+
+      // console.log(formData.value, 'formData.value');
+      if (dialogTitle.value == '修改验收台账') {
+        checkAndAcceptEdit(formData.value).then(response => {
           proxy.$modal.msgSuccess('修改成功');
           dialogShow.value = false;
           getDataList();
         });
       } else {
         if (formData.value.id) delete formData.value.id;
-        knowledgeAdd(formData.value).then(response => {
+        checkAndAcceptAdd(formData.value).then(response => {
           proxy.$modal.msgSuccess('新增成功');
           dialogShow.value = false;
           getDataList();
@@ -194,7 +245,7 @@
   proxy.$modal
     .confirm('是否确认删除该数据项？')
     .then(function () {
-      return knowledgeDel(postIds);
+      return checkAndAcceptDel(postIds);
     })
     .then(() => {
       getDataList();
@@ -205,5 +256,7 @@
 
 onMounted(() => {
   getDataList();
+  projectTypeListM();
+  getUserList();
 });
 </script>
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index 0d795f3..33d11d0 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -38,10 +38,8 @@
       <el-table-column label="备注" prop="remark" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index 1e5bf44..73dfe2e 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -3,17 +3,17 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="问卷调查名称" prop="topicName">
+      <!-- <el-form-item label="问卷调查名称" prop="topicName">
         <el-input v-model="queryParams.topicName" placeholder="请输入" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="调查状态" prop="ifStart">
+      </el-form-item> -->
+      <!-- <el-form-item label="调查状态" prop="ifStart">
         <el-select v-model="queryParams.ifStart" placeholder="请选择" clearable>
           <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-      </el-form-item>
+      </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-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button> -->
       </el-form-item>
     </el-form>
     <!-- 按钮区域 -->

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 7c151ef..2054776 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -443,3 +443,45 @@
     method: 'get',
   });
 }
+
+// 验收台账列表
+export function checkAndAcceptPage(query) {
+  return request({
+    url: '/business/checkAndAccept/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 验收台账列表 详情
+export function checkAndAcceptDetail(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'get',
+  });
+}
+
+// 验收台账列表 新增
+export function checkAndAcceptAdd(data) {
+  return request({
+    url: '/business/checkAndAccept/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 验收台账 修改
+export function checkAndAcceptEdit(data) {
+  return request({
+    url: '/business/checkAndAccept/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 验收台账 删除
+export function checkAndAcceptDel(id) {
+  return request({
+    url: '/business/checkAndAccept/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 60b7c66..857d87d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -63,10 +63,10 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button v-if="scope.row.ishaveNotice == 1" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+          <el-button v-if="scope.row.ishaveNotice == 1" link type="warning" icon="Edit" @click="handlenotice(scope.row)"
             >发布整改通知</el-button
           >
-          <el-button link type="primary" v-if="scope.row.ishaveNotice == 2" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="warning" icon="Edit" v-if="scope.row.ishaveNotice == 2" @click="handleUpdate(scope.row)"
             >提交整改回复单</el-button
           >
         </template>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 448d718..e2bc4c0 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="180" />
       <el-table-column label="备注" prop="remark" width="180" />
-      <el-table-column label="操作" width="280">
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
           <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index e7dac3a..b1512bc 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -10,7 +10,9 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.useridlist[0].userName }}</div>
+        <div class="detail-value flex flex-align-center">
+          <p v-for="item in props.DataList.useridlist" style="margin-right: 10px">{{ item.userName }}</p>
+        </div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e44eae9..2aaac20 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -38,14 +38,7 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table
-          :data="dataList"
-          v-loading="loading"
-          :max-height="280"
-          @row-click="clickLogData"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-        >
+        <el-table :data="dataList" v-loading="loading" :max-height="280" @row-click="clickLogData" highlight-current-row>
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -294,6 +287,7 @@
   queryParamstwo: {
     pageNum: 1,
     pageSize: 10,
+    fatherCode: '',
   },
 
   rules: {
@@ -309,7 +303,8 @@
 //搜索
 function handleQuery() {
   getList();
-  getList1();
+
+  // getList1();
 }
 //重置
 function resetQuery() {
@@ -380,13 +375,24 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
-  getList1(res.data[0].number);
+
+  // 判断任务详情
+  if (dataList.value.length != '') {
+    queryParamstwo.value.fatherCode = res.data[0].number;
+    // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+    getList1(res.data[0].number);
+  } else if (queryParamstwo.value.fatherCode == '' || dataList.value.length == '') {
+    // console.log('123');
+    dataListTwo.value = [];
+  }
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ fatherCode: code });
+  queryParamstwo.value.fatherCode = code;
+  // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
@@ -394,22 +400,9 @@
 
 //表格点击事件
 function clickLogData(val) {
-  console.log(val, '111');
-  queryParamstwo.value.fatherCode = val.number;
-  // if (val.index != '') {
-  //   console.log('1111');
-  //   return 'success-row';
-  // }
   getList1(val.number);
 }
 
-function tableRowClassName(row, rowIndex) {
-  row.row.index = row.rowIndex;
-  // AllData.activeIndex = row.rowIndex;
-  // console.log(row.row.index, 'row.rowIndex');
-  // console.log(AllData.activeIndex, 'AllData.activeIndex');
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index be14038..c0bc4eb 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -6,7 +6,7 @@
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务名称11</div>
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
         <div class="detail-value flex flex-align-center">
           {{ props.DataList.taskName }}
         </div>
@@ -17,11 +17,11 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查开始时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查结束时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.realEndDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务状态</div>
diff --git a/src/views/longoPeration/SewageFactory.vue b/src/views/longoPeration/SewageFactory.vue
index 787686a..4cda30a 100644
--- a/src/views/longoPeration/SewageFactory.vue
+++ b/src/views/longoPeration/SewageFactory.vue
@@ -29,10 +29,8 @@
       <el-table-column label="创建时间" prop="createTime" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 3e98eab..7604768 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.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">
+      <el-form-item label="台账名称" prop="title" style="width: 300px">
         <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="年份" prop="year">
-        <el-date-picker type="year" v-model="queryParams.year" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
+      <el-form-item label="年份" prop="checkDate">
+        <el-date-picker type="year" v-model="queryParams.checkDate" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -17,24 +17,32 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['floodSys:jing:add']">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
       </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="日期" prop="date" />
-      <el-table-column label="项目名称" prop="name" />
-      <el-table-column label="巡查人数" prop="unum" />
-      <el-table-column label="参加单位" prop="unit" />
+    <el-table v-loading="tableLoading" :data="tableData" max-height="580">
+      <el-table-column label="巡查日期" prop="checkDate" />
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人数" prop="patUserNumber"> </el-table-column>
+      <el-table-column label="项目数量" prop="projectNumber" />
+      <el-table-column label="参加单位" prop="intoUnit" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="备注" prop="remark" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,20 +58,45 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="90px" class="publicForm">
-        <el-form-item label="巡查日期" prop="date">
-          <el-date-picker type="date" v-model="formData.date" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
+        <el-form-item label="巡查日期" prop="checkDate">
+          <el-date-picker type="date" v-model="formData.checkDate" value-format="YYYY-MM-DD" placeholder="请选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="项目名称" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="项目名称" prop="projectList">
+          <el-select
+            clearable
+            v-model="formData.projectList"
+            style="width: 100%"
+            placeholder="请选择项目名称"
+            value-key="projectNo"
+            multiple
+            label="projectName"
+          >
+            <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="巡查人数" prop="degist">
-          <el-input type="number" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人员:" prop="patrolUserList">
+          <el-select
+            v-model="formData.patrolUserList"
+            placeholder="请选择巡查人员"
+            clearable
+            style="width: 100%"
+            value-key="userId"
+            label="nickName"
+            multiple
+          >
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="参加单位" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+
+        <el-form-item label="巡查人数" prop="patUserNumber">
+          <el-input type="number" v-model="formData.patUserNumber" controls-position="right" />
         </el-form-item>
-        <el-form-item label="备注" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
+        <el-form-item label="参加单位" prop="intoUnit">
+          <el-input type="textarea" v-model="formData.intoUnit" controls-position="right" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -77,51 +110,35 @@
 </template>
 
 <script setup name="科普知识">
-import { knowledgePage, knowledgeAdd, knowledgeDel, knowledgeDetail, knowledgeEdit } from '@/api/publicService/index';
-
+import {
+  checkAndAcceptPage,
+  checkAndAcceptAdd,
+  checkAndAcceptDel,
+  checkAndAcceptDetail,
+  checkAndAcceptEdit,
+} from '@/api/publicService/index';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
-const tableData = ref([
-  {
-    date: '2023-12-06',
-    name: '胜园',
-    unum: '10',
-    unit: '由市海绵办牵头（韩）、市城管局（重点办）、市节水型（海绵）城市建设服务中心（张）、中规院（张、钊）、文投公司等相关人员参加',
-    createTime: '2023-12-06 10:23:10',
-    remark: '2023年10月19日下午预验收',
-  },
-  {
-    date: '2024-03-04',
-    name: '晋安路46号院、综合保税园区一期项目、南城墙（环城公园一期、三期、五期）东郊沟雨水泵站、龙亭北路、铁北街、五福路人行道海绵化改造项目',
-    unum: '9',
-    unit: '市海绵办牵头，联合市节水型（海绵）城市建设服务中心、中规院、市政管理处',
-    createTime: '2024-03-04 10:23:10',
-    remark: '',
-  },
-]);
+const tableData = ref([]);
+const userList = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const projectTList = ref([]);
 const allData = reactive({
-  formData: {
-    content: '',
-    degist: '',
-    title: '',
-    typeId: '',
-  },
+  formData: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    title: undefined,
-    typeId: undefined,
-    year: proxy.moment().subtract('1', 'year').format('YYYY'),
+    checkDate: '',
   },
   rulesForm: {
     postName: [{ required: true, message: '请输入', trigger: 'blur' }],
     degist: [{ required: true, message: '请输入', trigger: 'blur' }],
-    typeId: [{ required: true, message: '请选择', trigger: 'change' }],
+    checkDate: [{ required: true, message: '请选择巡查日期', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
@@ -129,8 +146,8 @@
 /** 获取查询数据列表 */
 function getDataList() {
   tableLoading.value = true;
-  knowledgePage(queryParams.value).then(response => {
-    // tableData.value = response.data;
+  checkAndAcceptPage(queryParams.value).then(response => {
+    tableData.value = response.data;
     total.value = response.total;
     tableLoading.value = false;
   });
@@ -138,6 +155,7 @@
 /** 取消按钮 */
 function cancelForm() {
   dialogShow.value = false;
+  proxy.resetForm('formRef'); //清空表单
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -149,37 +167,70 @@
   proxy.resetForm('queryRef');
   handleQuery();
 }
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+//查询人员列表
+function getUserList() {
+  listUser().then(res => {
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
+  });
+}
+
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
+  formData.value = {};
   dialogShow.value = true;
-  dialogTitle.value = '添加科普知识';
+  dialogTitle.value = '新增验收台账';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  const postId = row.id;
-  knowledgeDetail(postId).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改科普知识';
-    nextTick(() => {
-      formData.value = response.data;
-    });
+  dialogShow.value = true;
+  dialogTitle.value = '修改验收台账';
+  formData.value = { ...row };
+  // 做修改回显判断
+  formData.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  formData.value.patrolUserList.forEach(element => {
+    element = element.userId;
   });
+  formData.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
 }
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
     if (valid) {
-      if (dialogTitle.value == '修改科普知识') {
-        knowledgeEdit(formData.value).then(response => {
+      // 处理项目传参
+      formData.value.projectList = formData.value.projectList.map(obj => {
+        // console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+          }
+        });
+        return { projectNo: obj, projectName: nameXm };
+      });
+      // 处理人员传参
+      formData.value.patrolUserList = formData.value.patrolUserList.map(item => {
+        return { userId: item };
+      });
+
+      // console.log(formData.value, 'formData.value');
+      if (dialogTitle.value == '修改验收台账') {
+        checkAndAcceptEdit(formData.value).then(response => {
           proxy.$modal.msgSuccess('修改成功');
           dialogShow.value = false;
           getDataList();
         });
       } else {
         if (formData.value.id) delete formData.value.id;
-        knowledgeAdd(formData.value).then(response => {
+        checkAndAcceptAdd(formData.value).then(response => {
           proxy.$modal.msgSuccess('新增成功');
           dialogShow.value = false;
           getDataList();
@@ -194,7 +245,7 @@
   proxy.$modal
     .confirm('是否确认删除该数据项？')
     .then(function () {
-      return knowledgeDel(postIds);
+      return checkAndAcceptDel(postIds);
     })
     .then(() => {
       getDataList();
@@ -205,5 +256,7 @@
 
 onMounted(() => {
   getDataList();
+  projectTypeListM();
+  getUserList();
 });
 </script>
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index 0d795f3..33d11d0 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -38,10 +38,8 @@
       <el-table-column label="备注" prop="remark" />
       <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>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index 1e5bf44..73dfe2e 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -3,17 +3,17 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="问卷调查名称" prop="topicName">
+      <!-- <el-form-item label="问卷调查名称" prop="topicName">
         <el-input v-model="queryParams.topicName" placeholder="请输入" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="调查状态" prop="ifStart">
+      </el-form-item> -->
+      <!-- <el-form-item label="调查状态" prop="ifStart">
         <el-select v-model="queryParams.ifStart" placeholder="请选择" clearable>
           <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-      </el-form-item>
+      </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-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button> -->
       </el-form-item>
     </el-form>
     <!-- 按钮区域 -->
diff --git a/vite.config.js b/vite.config.js
index ea36ec6..24dcf41 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,8 +7,8 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 
 // const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
-// const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+const targetUrl = 'http://192.168.20.52:7300'; //杨辉
+// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {