diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 857d87d..ae7c745 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -10,8 +10,8 @@
           <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="isRectification">
-        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+      <el-form-item label="整改状态:" prop="isRectify">
+        <el-select clearable v-model="queryParams.isRectify" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -235,13 +235,12 @@
 const case_level = ref([
   {
     value: '1',
-    label: '无需整改',
+    label: '待整改',
   },
   {
     value: '2',
-    label: '待整改',
+    label: '已整改',
   },
-  { value: '3', label: '整改已完成' },
 ]);
 const projectTList = ref([]);
 const ConstructionUnit = ref([]);

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 857d87d..ae7c745 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -10,8 +10,8 @@
           <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="isRectification">
-        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+      <el-form-item label="整改状态:" prop="isRectify">
+        <el-select clearable v-model="queryParams.isRectify" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -235,13 +235,12 @@
 const case_level = ref([
   {
     value: '1',
-    label: '无需整改',
+    label: '待整改',
   },
   {
     value: '2',
-    label: '待整改',
+    label: '已整改',
   },
-  { value: '3', label: '整改已完成' },
 ]);
 const projectTList = ref([]);
 const ConstructionUnit = ref([]);
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index e2bc4c0..a54927f 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -451,7 +451,7 @@
   color: var(--el-disabled-text-color);
   cursor: not-allowed;
 }
-:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
-  background-color: #004565 !important;
-}
+// :deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
+//   background-color: #004565 !important;
+// }
 </style>

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 857d87d..ae7c745 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -10,8 +10,8 @@
           <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="isRectification">
-        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+      <el-form-item label="整改状态:" prop="isRectify">
+        <el-select clearable v-model="queryParams.isRectify" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -235,13 +235,12 @@
 const case_level = ref([
   {
     value: '1',
-    label: '无需整改',
+    label: '待整改',
   },
   {
     value: '2',
-    label: '待整改',
+    label: '已整改',
   },
-  { value: '3', label: '整改已完成' },
 ]);
 const projectTList = ref([]);
 const ConstructionUnit = ref([]);
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index e2bc4c0..a54927f 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -451,7 +451,7 @@
   color: var(--el-disabled-text-color);
   cursor: not-allowed;
 }
-:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
-  background-color: #004565 !important;
-}
+// :deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
+//   background-color: #004565 !important;
+// }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 2aaac20..619e959 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -140,13 +140,13 @@
           </el-table-column>
         </el-table>
         <!-- 分页 -->
-        <pagination
+        <!-- <pagination
           v-show="totaltwo > 0"
           :total="totaltwo"
           v-model:page="queryParamstwo.pageNum"
           v-model:limit="queryParamstwo.pageSize"
           @pagination="getList1"
-        />
+        /> -->
       </div>
     </div>
 
@@ -250,7 +250,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID } from '@/api/longoPeration/inspectiontasks';
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID, patrolTasklist } from '@/api/longoPeration/inspectiontasks';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import popupbox from './pop-upbox.vue'; //详情弹框
@@ -285,8 +285,8 @@
     fatherCode: 0,
   },
   queryParamstwo: {
-    pageNum: 1,
-    pageSize: 10,
+    // pageNum: 1,
+    // pageSize: 10,
     fatherCode: '',
   },
 
@@ -392,7 +392,7 @@
   loadingTwo.value = true;
   queryParamstwo.value.fatherCode = code;
   // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTasklist(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 857d87d..ae7c745 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -10,8 +10,8 @@
           <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="isRectification">
-        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+      <el-form-item label="整改状态:" prop="isRectify">
+        <el-select clearable v-model="queryParams.isRectify" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -235,13 +235,12 @@
 const case_level = ref([
   {
     value: '1',
-    label: '无需整改',
+    label: '待整改',
   },
   {
     value: '2',
-    label: '待整改',
+    label: '已整改',
   },
-  { value: '3', label: '整改已完成' },
 ]);
 const projectTList = ref([]);
 const ConstructionUnit = ref([]);
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index e2bc4c0..a54927f 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -451,7 +451,7 @@
   color: var(--el-disabled-text-color);
   cursor: not-allowed;
 }
-:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
-  background-color: #004565 !important;
-}
+// :deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
+//   background-color: #004565 !important;
+// }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 2aaac20..619e959 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -140,13 +140,13 @@
           </el-table-column>
         </el-table>
         <!-- 分页 -->
-        <pagination
+        <!-- <pagination
           v-show="totaltwo > 0"
           :total="totaltwo"
           v-model:page="queryParamstwo.pageNum"
           v-model:limit="queryParamstwo.pageSize"
           @pagination="getList1"
-        />
+        /> -->
       </div>
     </div>
 
@@ -250,7 +250,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID } from '@/api/longoPeration/inspectiontasks';
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID, patrolTasklist } from '@/api/longoPeration/inspectiontasks';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import popupbox from './pop-upbox.vue'; //详情弹框
@@ -285,8 +285,8 @@
     fatherCode: 0,
   },
   queryParamstwo: {
-    pageNum: 1,
-    pageSize: 10,
+    // pageNum: 1,
+    // pageSize: 10,
     fatherCode: '',
   },
 
@@ -392,7 +392,7 @@
   loadingTwo.value = true;
   queryParamstwo.value.fatherCode = code;
   // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTasklist(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index c0bc4eb..c3c9f69 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -74,7 +74,7 @@
       <el-empty v-else description="暂无图片" :image-size="30" />
     </div> -->
 
-    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px" :max-height="250">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="问题类型" prop="problemType">
         <!-- <template #default="scope">

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 857d87d..ae7c745 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -10,8 +10,8 @@
           <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="isRectification">
-        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+      <el-form-item label="整改状态:" prop="isRectify">
+        <el-select clearable v-model="queryParams.isRectify" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -235,13 +235,12 @@
 const case_level = ref([
   {
     value: '1',
-    label: '无需整改',
+    label: '待整改',
   },
   {
     value: '2',
-    label: '待整改',
+    label: '已整改',
   },
-  { value: '3', label: '整改已完成' },
 ]);
 const projectTList = ref([]);
 const ConstructionUnit = ref([]);
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index e2bc4c0..a54927f 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -451,7 +451,7 @@
   color: var(--el-disabled-text-color);
   cursor: not-allowed;
 }
-:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
-  background-color: #004565 !important;
-}
+// :deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
+//   background-color: #004565 !important;
+// }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 2aaac20..619e959 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -140,13 +140,13 @@
           </el-table-column>
         </el-table>
         <!-- 分页 -->
-        <pagination
+        <!-- <pagination
           v-show="totaltwo > 0"
           :total="totaltwo"
           v-model:page="queryParamstwo.pageNum"
           v-model:limit="queryParamstwo.pageSize"
           @pagination="getList1"
-        />
+        /> -->
       </div>
     </div>
 
@@ -250,7 +250,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID } from '@/api/longoPeration/inspectiontasks';
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID, patrolTasklist } from '@/api/longoPeration/inspectiontasks';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import popupbox from './pop-upbox.vue'; //详情弹框
@@ -285,8 +285,8 @@
     fatherCode: 0,
   },
   queryParamstwo: {
-    pageNum: 1,
-    pageSize: 10,
+    // pageNum: 1,
+    // pageSize: 10,
     fatherCode: '',
   },
 
@@ -392,7 +392,7 @@
   loadingTwo.value = true;
   queryParamstwo.value.fatherCode = code;
   // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTasklist(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index c0bc4eb..c3c9f69 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -74,7 +74,7 @@
       <el-empty v-else description="暂无图片" :image-size="30" />
     </div> -->
 
-    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px" :max-height="250">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="问题类型" prop="problemType">
         <!-- <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 7604768..cedb189 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -3,8 +3,10 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="台账名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <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="checkDate">
         <el-date-picker type="year" v-model="queryParams.checkDate" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
@@ -90,13 +92,13 @@
         </el-form-item>
 
         <el-form-item label="巡查人数" prop="patUserNumber">
-          <el-input type="number" v-model="formData.patUserNumber" controls-position="right" />
+          <el-input type="number" placeholder="请输入巡查人数" v-model="formData.patUserNumber" controls-position="right" />
         </el-form-item>
         <el-form-item label="参加单位" prop="intoUnit">
-          <el-input type="textarea" v-model="formData.intoUnit" controls-position="right" />
+          <el-input type="textarea" placeholder="请输入参加单位" 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-input type="textarea" placeholder="请输入备注" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -109,7 +111,7 @@
   </div>
 </template>
 
-<script setup name="科普知识">
+<script setup>
 import {
   checkAndAcceptPage,
   checkAndAcceptAdd,
@@ -136,9 +138,11 @@
     checkDate: '',
   },
   rulesForm: {
-    postName: [{ required: true, message: '请输入', trigger: 'blur' }],
-    degist: [{ required: true, message: '请输入', trigger: 'blur' }],
+    intoUnit: [{ required: true, message: '请输入参加单位', trigger: 'blur' }],
+    patUserNumber: [{ required: true, message: '请输入巡检人数', trigger: 'blur' }],
     checkDate: [{ required: true, message: '请选择巡查日期', trigger: 'change' }],
+    projectList: [{ required: true, message: '请选择项目名称', trigger: 'change' }],
+    patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 857d87d..ae7c745 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -10,8 +10,8 @@
           <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="isRectification">
-        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+      <el-form-item label="整改状态:" prop="isRectify">
+        <el-select clearable v-model="queryParams.isRectify" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -235,13 +235,12 @@
 const case_level = ref([
   {
     value: '1',
-    label: '无需整改',
+    label: '待整改',
   },
   {
     value: '2',
-    label: '待整改',
+    label: '已整改',
   },
-  { value: '3', label: '整改已完成' },
 ]);
 const projectTList = ref([]);
 const ConstructionUnit = ref([]);
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index e2bc4c0..a54927f 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -451,7 +451,7 @@
   color: var(--el-disabled-text-color);
   cursor: not-allowed;
 }
-:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
-  background-color: #004565 !important;
-}
+// :deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
+//   background-color: #004565 !important;
+// }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 2aaac20..619e959 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -140,13 +140,13 @@
           </el-table-column>
         </el-table>
         <!-- 分页 -->
-        <pagination
+        <!-- <pagination
           v-show="totaltwo > 0"
           :total="totaltwo"
           v-model:page="queryParamstwo.pageNum"
           v-model:limit="queryParamstwo.pageSize"
           @pagination="getList1"
-        />
+        /> -->
       </div>
     </div>
 
@@ -250,7 +250,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID } from '@/api/longoPeration/inspectiontasks';
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID, patrolTasklist } from '@/api/longoPeration/inspectiontasks';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import popupbox from './pop-upbox.vue'; //详情弹框
@@ -285,8 +285,8 @@
     fatherCode: 0,
   },
   queryParamstwo: {
-    pageNum: 1,
-    pageSize: 10,
+    // pageNum: 1,
+    // pageSize: 10,
     fatherCode: '',
   },
 
@@ -392,7 +392,7 @@
   loadingTwo.value = true;
   queryParamstwo.value.fatherCode = code;
   // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTasklist(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index c0bc4eb..c3c9f69 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -74,7 +74,7 @@
       <el-empty v-else description="暂无图片" :image-size="30" />
     </div> -->
 
-    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px" :max-height="250">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="问题类型" prop="problemType">
         <!-- <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 7604768..cedb189 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -3,8 +3,10 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="台账名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <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="checkDate">
         <el-date-picker type="year" v-model="queryParams.checkDate" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
@@ -90,13 +92,13 @@
         </el-form-item>
 
         <el-form-item label="巡查人数" prop="patUserNumber">
-          <el-input type="number" v-model="formData.patUserNumber" controls-position="right" />
+          <el-input type="number" placeholder="请输入巡查人数" v-model="formData.patUserNumber" controls-position="right" />
         </el-form-item>
         <el-form-item label="参加单位" prop="intoUnit">
-          <el-input type="textarea" v-model="formData.intoUnit" controls-position="right" />
+          <el-input type="textarea" placeholder="请输入参加单位" 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-input type="textarea" placeholder="请输入备注" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -109,7 +111,7 @@
   </div>
 </template>
 
-<script setup name="科普知识">
+<script setup>
 import {
   checkAndAcceptPage,
   checkAndAcceptAdd,
@@ -136,9 +138,11 @@
     checkDate: '',
   },
   rulesForm: {
-    postName: [{ required: true, message: '请输入', trigger: 'blur' }],
-    degist: [{ required: true, message: '请输入', trigger: 'blur' }],
+    intoUnit: [{ required: true, message: '请输入参加单位', trigger: 'blur' }],
+    patUserNumber: [{ required: true, message: '请输入巡检人数', trigger: 'blur' }],
     checkDate: [{ required: true, message: '请选择巡查日期', trigger: 'change' }],
+    projectList: [{ required: true, message: '请选择项目名称', trigger: 'change' }],
+    patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index 33d11d0..a85fe78 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -1,18 +1,15 @@
 <template>
-  <!-- 长效运维子系统 督查巡查台账 -->
+  <!-- 长效运维子系统 验收台账 -->
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="台账名称" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="巡查类型" prop="typeId">
-        <el-select v-model="queryParams.typeId" placeholder="请选择" clearable>
-          <el-option v-for="item in xcLedger_type" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <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="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>
@@ -22,18 +19,26 @@
     <!-- 按钮区域 -->
     <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="type" />
-      <el-table-column label="项目名称" prop="name" />
-      <el-table-column label="项目数量" prop="pnum" />
-      <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">
@@ -55,28 +60,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="typeId">
-          <el-select v-model="formData.typeId" placeholder="请选择" clearable>
-            <el-option v-for="item in xcLedger_type" :key="item.value" :label="item.label" :value="item.value" />
+        <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="textarea" 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="number" 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="number" 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="degist">
-          <el-input type="textarea" v-model="formData.degist" 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="remark">
+          <el-input type="textarea" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -89,82 +111,59 @@
   </div>
 </template>
 
-<script setup name="科普知识">
-import { knowledgePage, knowledgeAdd, knowledgeDel, knowledgeDetail, knowledgeEdit } from '@/api/publicService/index';
-
+<script setup>
+import { overSeePage, overSeeAdd, overSeeDel, overSeeEdit } from '@/api/publicService/index';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
-// const { xcLedger_type } = proxy.useDict('xcLedger_type'); //获取接口返回字典数据
-const xcLedger_type = ref([
-  { value: '1', label: '巡查' },
-  { value: '2', label: '绩效考核' },
-  { value: '4', label: '月巡查' },
-  { value: '5', label: '整改巡查' },
-  { value: '6', label: '督察' },
-  { value: '7', label: '节日巡查' },
-  { value: '8', label: '人大调研' },
-]);
 const tableData = ref([
   {
-    date: '2023-02-23',
+    checkDate: '2023-02-23',
     type: '巡查',
-    name: '道路雨水管渠及泵站进出水管渠非开挖修复、汴京路（公园路-工农路）、汴京路东郊沟雨水泵站新建项目、龙亭北路（龙亭西路—内环路）、五福路（五一路—中山路）、铁路北沿街（解放路—侯庄桥）',
-    pnum: '6',
-    unum: '6',
-    unit: '市城管局、市海绵中心工作人员、中规院专家、市政设计院',
+    projectList:
+      '道路雨水管渠及泵站进出水管渠非开挖修复、汴京路（公园路-工农路）、汴京路东郊沟雨水泵站新建项目、龙亭北路（龙亭西路—内环路）、五福路（五一路—中山路）、铁路北沿街（解放路—侯庄桥）',
+    patUserNumber: '6',
+    projectNumber: '6',
+    intoUnit: '市城管局、市海绵中心工作人员、中规院专家、市政设计院',
     createTime: '2023-02-23 10:23:10',
-    remark: '',
-  },
-  {
-    date: '2023-09-19',
-    type: '整改巡查',
-    name: '晋安路46号院、综合保税园区一期项目、南城墙（环城公园一期、三期、五期）',
-    pnum: '3',
-    unum: '2',
-    unit: '市节水型(海绵)城市建设服务中心业务科室及中规院',
-    createTime: '2023-09-20 10:23:10',
     remark: '示范区46号院项目现场基本完成、环城墙公园一三五期整改现场停工。',
   },
 ]);
+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);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  knowledgePage(queryParams.value).then(response => {
-    // tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  // tableLoading.value = true;
+  // overSeePage(queryParams.value).then(response => {
+  //   // tableData.value = response.data;
+  //   total.value = response.total;
+  tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
   dialogShow.value = false;
+  proxy.resetForm('formRef'); //清空表单
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -176,37 +175,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 == '修改督查巡查台账') {
+        overSeeEdit(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 => {
+        overSeeAdd(formData.value).then(response => {
           proxy.$modal.msgSuccess('新增成功');
           dialogShow.value = false;
           getDataList();
@@ -221,7 +253,7 @@
   proxy.$modal
     .confirm('是否确认删除该数据项？')
     .then(function () {
-      return knowledgeDel(postIds);
+      return overSeeDel(postIds);
     })
     .then(() => {
       getDataList();
@@ -232,5 +264,7 @@
 
 onMounted(() => {
   getDataList();
+  projectTypeListM();
+  getUserList();
 });
 </script>

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 13d02f3..fb7dd45 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -7,6 +7,13 @@
     params: query,
   });
 }
+export function patrolTasklist(query) {
+  return request({
+    url: '/business/patrolTask/list',
+    method: 'get',
+    params: query,
+  });
+}
 // // 查询巡查任务
 export function PatrolTaskID(id) {
   return request({
diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 2054776..be18943 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -485,3 +485,37 @@
     method: 'delete',
   });
 }
+
+//分页查询督查巡查台账
+export function overSeePage(query) {
+  return request({
+    url: '/business/overSee/page',
+    method: 'get',
+    params: query,
+  });
+}
+// 督查巡查台账 新增
+export function overSeeAdd(data) {
+  return request({
+    url: '/business/overSee/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 督查巡查台账 修改
+export function overSeeEdit(data) {
+  return request({
+    url: '/business/overSee/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 督查巡查台账  删除
+export function overSeeDel(id) {
+  return request({
+    url: '/business/overSee/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 857d87d..ae7c745 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -10,8 +10,8 @@
           <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="isRectification">
-        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+      <el-form-item label="整改状态:" prop="isRectify">
+        <el-select clearable v-model="queryParams.isRectify" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -235,13 +235,12 @@
 const case_level = ref([
   {
     value: '1',
-    label: '无需整改',
+    label: '待整改',
   },
   {
     value: '2',
-    label: '待整改',
+    label: '已整改',
   },
-  { value: '3', label: '整改已完成' },
 ]);
 const projectTList = ref([]);
 const ConstructionUnit = ref([]);
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index e2bc4c0..a54927f 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -451,7 +451,7 @@
   color: var(--el-disabled-text-color);
   cursor: not-allowed;
 }
-:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
-  background-color: #004565 !important;
-}
+// :deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) {
+//   background-color: #004565 !important;
+// }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 2aaac20..619e959 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -140,13 +140,13 @@
           </el-table-column>
         </el-table>
         <!-- 分页 -->
-        <pagination
+        <!-- <pagination
           v-show="totaltwo > 0"
           :total="totaltwo"
           v-model:page="queryParamstwo.pageNum"
           v-model:limit="queryParamstwo.pageSize"
           @pagination="getList1"
-        />
+        /> -->
       </div>
     </div>
 
@@ -250,7 +250,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID } from '@/api/longoPeration/inspectiontasks';
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage, PatrolTaskID, patrolTasklist } from '@/api/longoPeration/inspectiontasks';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import popupbox from './pop-upbox.vue'; //详情弹框
@@ -285,8 +285,8 @@
     fatherCode: 0,
   },
   queryParamstwo: {
-    pageNum: 1,
-    pageSize: 10,
+    // pageNum: 1,
+    // pageSize: 10,
     fatherCode: '',
   },
 
@@ -392,7 +392,7 @@
   loadingTwo.value = true;
   queryParamstwo.value.fatherCode = code;
   // console.log(queryParamstwo.value.fatherCode, 'queryParamstwo.value.fatherCode');
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTasklist(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index c0bc4eb..c3c9f69 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -74,7 +74,7 @@
       <el-empty v-else description="暂无图片" :image-size="30" />
     </div> -->
 
-    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px" :max-height="250">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="问题类型" prop="problemType">
         <!-- <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 7604768..cedb189 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -3,8 +3,10 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="台账名称" prop="title" style="width: 300px">
-        <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <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="checkDate">
         <el-date-picker type="year" v-model="queryParams.checkDate" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
@@ -90,13 +92,13 @@
         </el-form-item>
 
         <el-form-item label="巡查人数" prop="patUserNumber">
-          <el-input type="number" v-model="formData.patUserNumber" controls-position="right" />
+          <el-input type="number" placeholder="请输入巡查人数" v-model="formData.patUserNumber" controls-position="right" />
         </el-form-item>
         <el-form-item label="参加单位" prop="intoUnit">
-          <el-input type="textarea" v-model="formData.intoUnit" controls-position="right" />
+          <el-input type="textarea" placeholder="请输入参加单位" 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-input type="textarea" placeholder="请输入备注" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -109,7 +111,7 @@
   </div>
 </template>
 
-<script setup name="科普知识">
+<script setup>
 import {
   checkAndAcceptPage,
   checkAndAcceptAdd,
@@ -136,9 +138,11 @@
     checkDate: '',
   },
   rulesForm: {
-    postName: [{ required: true, message: '请输入', trigger: 'blur' }],
-    degist: [{ required: true, message: '请输入', trigger: 'blur' }],
+    intoUnit: [{ required: true, message: '请输入参加单位', trigger: 'blur' }],
+    patUserNumber: [{ required: true, message: '请输入巡检人数', trigger: 'blur' }],
     checkDate: [{ required: true, message: '请选择巡查日期', trigger: 'change' }],
+    projectList: [{ required: true, message: '请选择项目名称', trigger: 'change' }],
+    patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index 33d11d0..a85fe78 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -1,18 +1,15 @@
 <template>
-  <!-- 长效运维子系统 督查巡查台账 -->
+  <!-- 长效运维子系统 验收台账 -->
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="台账名称" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="巡查类型" prop="typeId">
-        <el-select v-model="queryParams.typeId" placeholder="请选择" clearable>
-          <el-option v-for="item in xcLedger_type" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <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="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>
@@ -22,18 +19,26 @@
     <!-- 按钮区域 -->
     <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="type" />
-      <el-table-column label="项目名称" prop="name" />
-      <el-table-column label="项目数量" prop="pnum" />
-      <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">
@@ -55,28 +60,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="typeId">
-          <el-select v-model="formData.typeId" placeholder="请选择" clearable>
-            <el-option v-for="item in xcLedger_type" :key="item.value" :label="item.label" :value="item.value" />
+        <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="textarea" 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="number" 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="number" 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="degist">
-          <el-input type="textarea" v-model="formData.degist" 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="remark">
+          <el-input type="textarea" v-model="formData.remark" controls-position="right" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -89,82 +111,59 @@
   </div>
 </template>
 
-<script setup name="科普知识">
-import { knowledgePage, knowledgeAdd, knowledgeDel, knowledgeDetail, knowledgeEdit } from '@/api/publicService/index';
-
+<script setup>
+import { overSeePage, overSeeAdd, overSeeDel, overSeeEdit } from '@/api/publicService/index';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
-// const { xcLedger_type } = proxy.useDict('xcLedger_type'); //获取接口返回字典数据
-const xcLedger_type = ref([
-  { value: '1', label: '巡查' },
-  { value: '2', label: '绩效考核' },
-  { value: '4', label: '月巡查' },
-  { value: '5', label: '整改巡查' },
-  { value: '6', label: '督察' },
-  { value: '7', label: '节日巡查' },
-  { value: '8', label: '人大调研' },
-]);
 const tableData = ref([
   {
-    date: '2023-02-23',
+    checkDate: '2023-02-23',
     type: '巡查',
-    name: '道路雨水管渠及泵站进出水管渠非开挖修复、汴京路（公园路-工农路）、汴京路东郊沟雨水泵站新建项目、龙亭北路（龙亭西路—内环路）、五福路（五一路—中山路）、铁路北沿街（解放路—侯庄桥）',
-    pnum: '6',
-    unum: '6',
-    unit: '市城管局、市海绵中心工作人员、中规院专家、市政设计院',
+    projectList:
+      '道路雨水管渠及泵站进出水管渠非开挖修复、汴京路（公园路-工农路）、汴京路东郊沟雨水泵站新建项目、龙亭北路（龙亭西路—内环路）、五福路（五一路—中山路）、铁路北沿街（解放路—侯庄桥）',
+    patUserNumber: '6',
+    projectNumber: '6',
+    intoUnit: '市城管局、市海绵中心工作人员、中规院专家、市政设计院',
     createTime: '2023-02-23 10:23:10',
-    remark: '',
-  },
-  {
-    date: '2023-09-19',
-    type: '整改巡查',
-    name: '晋安路46号院、综合保税园区一期项目、南城墙（环城公园一期、三期、五期）',
-    pnum: '3',
-    unum: '2',
-    unit: '市节水型(海绵)城市建设服务中心业务科室及中规院',
-    createTime: '2023-09-20 10:23:10',
     remark: '示范区46号院项目现场基本完成、环城墙公园一三五期整改现场停工。',
   },
 ]);
+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);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  knowledgePage(queryParams.value).then(response => {
-    // tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  // tableLoading.value = true;
+  // overSeePage(queryParams.value).then(response => {
+  //   // tableData.value = response.data;
+  //   total.value = response.total;
+  tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
   dialogShow.value = false;
+  proxy.resetForm('formRef'); //清空表单
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -176,37 +175,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 == '修改督查巡查台账') {
+        overSeeEdit(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 => {
+        overSeeAdd(formData.value).then(response => {
           proxy.$modal.msgSuccess('新增成功');
           dialogShow.value = false;
           getDataList();
@@ -221,7 +253,7 @@
   proxy.$modal
     .confirm('是否确认删除该数据项？')
     .then(function () {
-      return knowledgeDel(postIds);
+      return overSeeDel(postIds);
     })
     .then(() => {
       getDataList();
@@ -232,5 +264,7 @@
 
 onMounted(() => {
   getDataList();
+  projectTypeListM();
+  getUserList();
 });
 </script>
diff --git a/src/views/sponeScreen/longYW/InspectionTasks.vue b/src/views/sponeScreen/longYW/InspectionTasks.vue
index 9a1c9b3..7732db1 100644
--- a/src/views/sponeScreen/longYW/InspectionTasks.vue
+++ b/src/views/sponeScreen/longYW/InspectionTasks.vue
@@ -19,14 +19,26 @@
       <div class="scrollTitle flex">
         <p>巡查任务名称</p>
         <p>巡查人员</p>
-        <p>巡查状态</p>
+        <p>任务状态</p>
         <p>操作</p>
       </div>
       <Vue3SeamlessScroll :list="tableData" :singleHeight="50" :singleWaitTime="1500" :hover="true" class="scroll">
         <div class="scrollCont flex" v-for="item in tableData" :key="item.id">
-          <p class="ellipsis">{{ item.start }}</p>
-          <p class="ellipsis">{{ item.end }}</p>
-          <p class="ellipsis">{{ item.num }}</p>
+          <p class="ellipsis" :title="item.taskName">{{ item.taskName }}</p>
+          <p class="ellipsis" v-for="item2 in item.taskUserList">{{ item2.userName }}</p>
+          <p class="ellipsis">
+            {{
+              item.status == 'to_start'
+                ? '未开始'
+                : item.status == 'proceed'
+                ? '进行中'
+                : item.status == 'done'
+                ? '已完成'
+                : item.status == 'expired'
+                ? '超时'
+                : ''
+            }}
+          </p>
           <p class="ellipsis reports" @click="checkReport(item)">详情</p>
         </div>
       </Vue3SeamlessScroll>
@@ -34,41 +46,58 @@
   </div>
 
   <!-- 弹框 -->
-  <el-dialog title="巡查日志详情" v-model="dialogShowXq" width="800px" append-to-body>
-    <PatrolDialog></PatrolDialog>
+  <el-dialog
+    title="巡查日志详情"
+    v-model="dialogShowXq"
+    width="1200px"
+    append-to-body
+    :close-on-click-modal="false"
+    class="dialog-detail-box"
+  >
+    <popupbox :DataList="DataList" :pathData="pathData" :pathGeometry="pathGeometry"></popupbox>
   </el-dialog>
 </template>
 
 <script setup>
-import PatrolDialog from './PatrolDialog';
+import { patrolTaskpage, PatrolTaskID } from '@/api/longoPeration/inspectiontasks';
 import { Vue3SeamlessScroll } from 'vue3-seamless-scroll';
-
+import popupbox from '@/views/longoPeration/Patrolmanagement/pop-upbox'; //详情弹框
 const { proxy } = getCurrentInstance();
 const date = ref(proxy.moment(new Date()).format('YYYY-MM'));
-
 const dialogShowXq = ref(false);
-const tableData = ref([
-  { start: '海绵项目1', end: '李强', num: '正在巡查', id: 1 },
-  { start: '海绵项目2', end: '李强', num: '已结束', id: 1 },
-  { start: '海绵项目3', end: '李强', num: '正在巡查', id: 1 },
-  { start: '海绵项目4', end: '李强', num: '已结束', id: 1 },
-  { start: '海绵项目5', end: '李强', num: '已结束', id: 1 },
-  { start: '海绵项目6', end: '李强', num: '已结束', id: 1 },
-]);
+const tableData = ref([]);
+const DataList = ref([]);
+const pathData = ref([]);
+const pathGeometry = ref([]);
 const AllData = reactive({
-  queryParams: {},
+  queryParams: { pageNum: 1, pageSize: 20 },
 });
 
-function checkReport() {
-  dialogShowXq.value = true;
-}
-
 const { queryParams } = toRefs(AllData);
+
+/** 主任务查询列表 */
+const getList = async () => {
+  let res = await patrolTaskpage(queryParams.value);
+  tableData.value = res.data;
+  console.log(tableData.value, '111111111111');
+};
+async function checkReport(row) {
+  dialogShowXq.value = true;
+  DataList.value = { ...row };
+
+  let res = await PatrolTaskID(row.id);
+  if (res && res.code == 200) {
+    // console.log('res.data--', res.data);
+    pathData.value = res.data.patrolPathLngLat;
+    pathGeometry.value = res.data.patrolPath;
+  }
+}
+getList();
 </script>
 
 <style lang="scss" scoped>
 .ConstrucClass {
-  width: 100%;
+  width: 460px;
   height: 30%;
   background: #004565;
   opacity: 0.8;