diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 1b24a1b..5008332 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -66,8 +66,8 @@
 
 // 退出登录
 function logOut() {
-  localStorage.removeItem('NFAppToken');
-  document.cookie = 'NFAppToken=' + '';
+  localStorage.removeItem('KFAppToken');
+  document.cookie = 'KFAppToken=' + '';
   proxy.showSuccessToast('退出成功');
   router.push('/login');
 }

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 1b24a1b..5008332 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -66,8 +66,8 @@
 
 // 退出登录
 function logOut() {
-  localStorage.removeItem('NFAppToken');
-  document.cookie = 'NFAppToken=' + '';
+  localStorage.removeItem('KFAppToken');
+  document.cookie = 'KFAppToken=' + '';
   proxy.showSuccessToast('退出成功');
   router.push('/login');
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0870d8c..8174527 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,11 +78,11 @@
   allData.loginLoading = true;
   // 默认存储密码
   if (allData.remberPass) {
-    localStorage.setItem('usernameNFApp', allData.userName);
-    localStorage.setItem('passwordNFApp', EncryptAES(allData.password));
+    localStorage.setItem('usernameKFApp', allData.userName);
+    localStorage.setItem('passwordKFApp', EncryptAES(allData.password));
   } else {
-    localStorage.removeItem('usernameNFApp');
-    localStorage.removeItem('passwordNFApp');
+    localStorage.removeItem('usernameKFApp');
+    localStorage.removeItem('passwordKFApp');
   }
   let params = {
     username: allData.userName,
@@ -94,23 +94,23 @@
 
   if (res && res.code == 200) {
     allData.loginLoading = false;
-    const { access_token } = res;
+    let access_token = res.data.access_token;
     pinias.$patch((state) => {
       state.token = access_token;
     });
-    localStorage.setItem('NFAppToken', access_token); //存储token
+    localStorage.setItem('KFAppToken', access_token); //存储token
     router.push('/home_homePage');
     // 获取用户个人详细信息
-    // getInfo().then((res2) => {
-    //   let datas = res2.data.user;
-    //   pinias.$patch((state) => {
-    //     state.userNo = datas.userId;
-    //     state.phonenumber = datas.phonenumber;
-    //     state.imageUrl = datas.avatar || userImages;
-    //     state.userName = datas.nickName || '管理员';
-    //     state.userDeptName = datas.dept.deptName;
-    //   });
-    // });
+    getInfo().then((res2) => {
+      let datas = res2.data.user;
+      pinias.$patch((state) => {
+        state.userNo = datas.userId;
+        state.phonenumber = datas.phonenumber;
+        state.imageUrl = datas.avatar || userImages;
+        state.userName = datas.nickName || '管理员';
+        state.userDeptName = datas.dept.deptName;
+      });
+    });
   } else {
     getCode();
     allData.loginLoading = false;
@@ -128,10 +128,10 @@
 onMounted(() => {
   getCode();
   if (allData.remberPass) {
-    const usernameNFApp = localStorage.getItem('usernameNFApp');
-    const passwordNFApp = localStorage.getItem('passwordNFApp');
-    allData.userName = usernameNFApp ? usernameNFApp : '';
-    allData.password = passwordNFApp ? DecryptAES(passwordNFApp) : '';
+    const usernameKFApp = localStorage.getItem('usernameKFApp');
+    const passwordKFApp = localStorage.getItem('passwordKFApp');
+    allData.userName = usernameKFApp ? usernameKFApp : '';
+    allData.password = passwordKFApp ? DecryptAES(passwordKFApp) : '';
   }
 });
 </script>

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 1b24a1b..5008332 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -66,8 +66,8 @@
 
 // 退出登录
 function logOut() {
-  localStorage.removeItem('NFAppToken');
-  document.cookie = 'NFAppToken=' + '';
+  localStorage.removeItem('KFAppToken');
+  document.cookie = 'KFAppToken=' + '';
   proxy.showSuccessToast('退出成功');
   router.push('/login');
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0870d8c..8174527 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,11 +78,11 @@
   allData.loginLoading = true;
   // 默认存储密码
   if (allData.remberPass) {
-    localStorage.setItem('usernameNFApp', allData.userName);
-    localStorage.setItem('passwordNFApp', EncryptAES(allData.password));
+    localStorage.setItem('usernameKFApp', allData.userName);
+    localStorage.setItem('passwordKFApp', EncryptAES(allData.password));
   } else {
-    localStorage.removeItem('usernameNFApp');
-    localStorage.removeItem('passwordNFApp');
+    localStorage.removeItem('usernameKFApp');
+    localStorage.removeItem('passwordKFApp');
   }
   let params = {
     username: allData.userName,
@@ -94,23 +94,23 @@
 
   if (res && res.code == 200) {
     allData.loginLoading = false;
-    const { access_token } = res;
+    let access_token = res.data.access_token;
     pinias.$patch((state) => {
       state.token = access_token;
     });
-    localStorage.setItem('NFAppToken', access_token); //存储token
+    localStorage.setItem('KFAppToken', access_token); //存储token
     router.push('/home_homePage');
     // 获取用户个人详细信息
-    // getInfo().then((res2) => {
-    //   let datas = res2.data.user;
-    //   pinias.$patch((state) => {
-    //     state.userNo = datas.userId;
-    //     state.phonenumber = datas.phonenumber;
-    //     state.imageUrl = datas.avatar || userImages;
-    //     state.userName = datas.nickName || '管理员';
-    //     state.userDeptName = datas.dept.deptName;
-    //   });
-    // });
+    getInfo().then((res2) => {
+      let datas = res2.data.user;
+      pinias.$patch((state) => {
+        state.userNo = datas.userId;
+        state.phonenumber = datas.phonenumber;
+        state.imageUrl = datas.avatar || userImages;
+        state.userName = datas.nickName || '管理员';
+        state.userDeptName = datas.dept.deptName;
+      });
+    });
   } else {
     getCode();
     allData.loginLoading = false;
@@ -128,10 +128,10 @@
 onMounted(() => {
   getCode();
   if (allData.remberPass) {
-    const usernameNFApp = localStorage.getItem('usernameNFApp');
-    const passwordNFApp = localStorage.getItem('passwordNFApp');
-    allData.userName = usernameNFApp ? usernameNFApp : '';
-    allData.password = passwordNFApp ? DecryptAES(passwordNFApp) : '';
+    const usernameKFApp = localStorage.getItem('usernameKFApp');
+    const passwordKFApp = localStorage.getItem('passwordKFApp');
+    allData.userName = usernameKFApp ? usernameKFApp : '';
+    allData.password = passwordKFApp ? DecryptAES(passwordKFApp) : '';
   }
 });
 </script>
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 19b129c..606f35f 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -5,7 +5,7 @@
       <div class="topTabsNF">
         <div
           class="tabsList"
-          v-for="(item, index) in AllData.TopTabsData"
+          v-for="item in AllData.TopTabsData"
           :key="item.status"
           @click="topTabsChange(item)"
           :class="{ tabsListActive: AllData.ActiveID == item.status }"
@@ -22,9 +22,9 @@
           v-model="AllData.searchV"
           confirm-type="search"
           placeholder="综合搜索"
-          @confirm="getPatrolTaskPage(true)"
+          @confirm="getList(true)"
         />
-        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getPatrolTaskPage(true)" />
+        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getList(true)" />
       </div>
     </div>
     <!-- 下部数据列表 -->
@@ -37,7 +37,7 @@
         :offset="50"
         @load="lowerRefresh"
       >
-        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList">
+        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList" @click="checkDetail(item)">
           <div class="dataListTitle">
             <!-- 标题 -->
             <div class="fontView">
@@ -122,9 +122,11 @@
 <script setup>
 import { nextTick, onMounted, reactive, getCurrentInstance } from 'vue';
 import { getImgPatrol } from '@/utils/common.js';
+import { patrolTaskpage, patrolTaskbeginPatrol, status_statistics, patrolTaskRestartPatrol } from '@/api/xuncha';
 import { getCurrentPositon } from '@/utils/common.js';
 import { useStore } from '@/pinia/store.js';
 import { useRouter } from 'vue-router';
+const { proxy } = getCurrentInstance();
 const pinias = useStore();
 const router = useRouter();
 const AllData = reactive({
@@ -148,36 +150,11 @@
       statusName: '已完成',
     },
   ],
+
   // 顶部tab选取项
   ActiveID: 'to_start',
   // 数据列表
-  dataList: [
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'expired',
-      sectionType: '',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'proceed',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-  ],
+  dataList: [],
   triggered: false,
   ListPage: {
     page: 1,
@@ -187,14 +164,6 @@
   searchV: '',
 });
 
-// 顶部tab切换事件
-const topTabsChange = (item) => {
-  AllData.ActiveID = item.status;
-  AllData.ListPage.page = 1;
-  // AllData.dataList = [];
-  // getPatrolTaskPage(true);
-};
-
 /**
  * 点击按钮执行巡查功能
  */
@@ -210,60 +179,159 @@
     // 继续巡查
     proxy.showSuccessToast('开始巡查');
     router.push({
-      // path: '/inspectionPipe',
-      // query: { type: type, num: num, id: id, sectionType: sectionType },
+      path: '/inspectionA',
+      query: { type: type, num: num, id: id, sectionType: sectionType },
     });
   }
 };
 
-//根据经纬度获取地名
 /**
  * 开始巡查
  */
 const BeginPatrol = (type, num, id, sectionType) => {
-  router.push({
-    path: '/inspectionPipe',
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', lng, '--', lat, '--', address);
+    patrolTaskbeginPatrol({
+      taskId: id,
+      startPlace: address,
+    }).then((res) => {
+      if (res && res.code == 200) {
+        proxy.showSuccessToast('开始巡查');
+        router.push({
+          path: '/inspectionA',
+          query: { id: id },
+        });
+      } else {
+        proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
+      }
+    });
   });
-
-  // getCurrentPositon((lng, lat, address) => {
-  //   // console.log('获取安卓定位参数--', lng, '--', lat);
-  //   // patrolTaskBeginPatrol({
-  //   //   taskId: id,
-  //   //   startPlace: address,
-  //   // }).then((res) => {
-  //   //   if (res && res.code == 200) {
-  //   //     proxy.showSuccessToast('开始巡查');
-  //   //     router.push({
-  //   //       path: '/inspectionPipe',
-  //   //       query: { type: type, num: num, id: id, sectionType: sectionType },
-  //   //     });
-  //   //   } else {
-  //   //     proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
-  //   //   }
-  //   // });
-  // });
 };
 
 /**
- * 获取当前状态下的任务列表
- * bol:true: 重置分页条件
+ * 重新巡查
  */
-const getPatrolTaskPage = async (bol) => {
-  pinias.showLoading();
-  AllData.finished = false;
-  AllData.loading = false;
+const BeginPatrol2 = (type, num, id, sectionType) => {
+  patrolTaskRestartPatrol({
+    taskId: id,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      proxy.showSuccessToast('重新开始巡查');
+      router.push({
+        path: '/inspectionA',
+        query: { id: id },
+      });
+    } else {
+      proxy.showFailToast('巡查启动失败,请稍后再试');
+    }
+  });
+};
+
+// 顶部tab切换事件
+const topTabsChange = (item) => {
+  AllData.ActiveID = item.status;
+  AllData.ListPage.page = 1;
+  AllData.dataList = [];
+  getList(true);
 };
 const lowerRefresh = (e) => {
-  AllData.finished = true;
-  AllData.loading = false;
-  // if (AllData.ListPage.total > AllData.dataList.length) {
-  //   AllData.ListPage.page += 1;
-  //   getPatrolTaskPage();
-  // } else {
-  //   AllData.finished = true;
-  //   AllData.loading = false;
-  // }
+  if (AllData.ListPage.total > AllData.dataList.length) {
+    AllData.ListPage.page += 1;
+    getList();
+  } else {
+    AllData.finished = true;
+    AllData.loading = false;
+  }
 };
+// 列表查询接口
+const getList = async (bol) => {
+  pinias.showLoading();
+  AllData.finished = false;
+  AllData.loading = true;
+  if (bol) {
+    // 初始化分页
+    AllData.ListPage.page = 1;
+    AllData.ListPage.size = 10;
+  }
+  let params = {
+    pageNum: AllData.ListPage.page,
+    pageSize: AllData.ListPage.size,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
+    fatherCode: -1,
+    taskName: AllData.searchV,
+    taskUserId: pinias.userNo,
+  };
+  let res = await patrolTaskpage(params);
+  if (res && res.code == 200) {
+    if (bol) {
+      // 直接覆盖所有信息
+      AllData.dataList = res.data;
+    } else {
+      // 追加列表信息
+      AllData.dataList = AllData.dataList.concat(res.data);
+    }
+    getTaskTypeNum(); //重新加载tab数据
+    AllData.ListPage.total = res.total;
+    pinias.hideLoading();
+    // 加载状态结束 状态更新为false
+    AllData.loading = false;
+  }
+};
+
+/**
+ * 获取当前任务类型的各个数量
+ */
+const getTaskTypeNum = () => {
+  let query = {
+    taskUserId: pinias.userNo,
+
+    taskName: AllData.searchV,
+  };
+  status_statistics(query).then((res) => {
+    if (res && res.code == 200) {
+      let data = res.data;
+      AllData.TopTabsData = [
+        {
+          count: null,
+          status: 'to_start',
+          statusName: '未完成',
+        },
+        {
+          count: null,
+          status: 'proceed',
+          statusName: '执行中',
+        },
+        {
+          count: null,
+          status: 'done',
+          statusName: '已完成',
+        },
+      ];
+      data.forEach((v, i) => {
+        // 处理数据 这里不要 expired 已超时的状态 status不会变,遍历获取其状态的值
+        if (v.status == 'to_start' || v.status == 'expired')
+          AllData.TopTabsData[0].count = AllData.TopTabsData[0].count + v.count;
+        if (v.status == 'proceed') AllData.TopTabsData[1].count = v.count;
+        if (v.status == 'done') AllData.TopTabsData[2].count = v.count;
+      });
+    }
+  });
+};
+
+// 已完成跳转详情
+function checkDetail(query) {
+  if (query.status == 'done') {
+    console.log('234');
+    router.push({
+      path: '/patroLogDetails',
+      query,
+    });
+  }
+}
+
+onMounted(() => {
+  getList();
+});
 </script>
 <style lang="less">
 .patrolTaskPipe {

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 1b24a1b..5008332 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -66,8 +66,8 @@
 
 // 退出登录
 function logOut() {
-  localStorage.removeItem('NFAppToken');
-  document.cookie = 'NFAppToken=' + '';
+  localStorage.removeItem('KFAppToken');
+  document.cookie = 'KFAppToken=' + '';
   proxy.showSuccessToast('退出成功');
   router.push('/login');
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0870d8c..8174527 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,11 +78,11 @@
   allData.loginLoading = true;
   // 默认存储密码
   if (allData.remberPass) {
-    localStorage.setItem('usernameNFApp', allData.userName);
-    localStorage.setItem('passwordNFApp', EncryptAES(allData.password));
+    localStorage.setItem('usernameKFApp', allData.userName);
+    localStorage.setItem('passwordKFApp', EncryptAES(allData.password));
   } else {
-    localStorage.removeItem('usernameNFApp');
-    localStorage.removeItem('passwordNFApp');
+    localStorage.removeItem('usernameKFApp');
+    localStorage.removeItem('passwordKFApp');
   }
   let params = {
     username: allData.userName,
@@ -94,23 +94,23 @@
 
   if (res && res.code == 200) {
     allData.loginLoading = false;
-    const { access_token } = res;
+    let access_token = res.data.access_token;
     pinias.$patch((state) => {
       state.token = access_token;
     });
-    localStorage.setItem('NFAppToken', access_token); //存储token
+    localStorage.setItem('KFAppToken', access_token); //存储token
     router.push('/home_homePage');
     // 获取用户个人详细信息
-    // getInfo().then((res2) => {
-    //   let datas = res2.data.user;
-    //   pinias.$patch((state) => {
-    //     state.userNo = datas.userId;
-    //     state.phonenumber = datas.phonenumber;
-    //     state.imageUrl = datas.avatar || userImages;
-    //     state.userName = datas.nickName || '管理员';
-    //     state.userDeptName = datas.dept.deptName;
-    //   });
-    // });
+    getInfo().then((res2) => {
+      let datas = res2.data.user;
+      pinias.$patch((state) => {
+        state.userNo = datas.userId;
+        state.phonenumber = datas.phonenumber;
+        state.imageUrl = datas.avatar || userImages;
+        state.userName = datas.nickName || '管理员';
+        state.userDeptName = datas.dept.deptName;
+      });
+    });
   } else {
     getCode();
     allData.loginLoading = false;
@@ -128,10 +128,10 @@
 onMounted(() => {
   getCode();
   if (allData.remberPass) {
-    const usernameNFApp = localStorage.getItem('usernameNFApp');
-    const passwordNFApp = localStorage.getItem('passwordNFApp');
-    allData.userName = usernameNFApp ? usernameNFApp : '';
-    allData.password = passwordNFApp ? DecryptAES(passwordNFApp) : '';
+    const usernameKFApp = localStorage.getItem('usernameKFApp');
+    const passwordKFApp = localStorage.getItem('passwordKFApp');
+    allData.userName = usernameKFApp ? usernameKFApp : '';
+    allData.password = passwordKFApp ? DecryptAES(passwordKFApp) : '';
   }
 });
 </script>
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 19b129c..606f35f 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -5,7 +5,7 @@
       <div class="topTabsNF">
         <div
           class="tabsList"
-          v-for="(item, index) in AllData.TopTabsData"
+          v-for="item in AllData.TopTabsData"
           :key="item.status"
           @click="topTabsChange(item)"
           :class="{ tabsListActive: AllData.ActiveID == item.status }"
@@ -22,9 +22,9 @@
           v-model="AllData.searchV"
           confirm-type="search"
           placeholder="综合搜索"
-          @confirm="getPatrolTaskPage(true)"
+          @confirm="getList(true)"
         />
-        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getPatrolTaskPage(true)" />
+        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getList(true)" />
       </div>
     </div>
     <!-- 下部数据列表 -->
@@ -37,7 +37,7 @@
         :offset="50"
         @load="lowerRefresh"
       >
-        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList">
+        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList" @click="checkDetail(item)">
           <div class="dataListTitle">
             <!-- 标题 -->
             <div class="fontView">
@@ -122,9 +122,11 @@
 <script setup>
 import { nextTick, onMounted, reactive, getCurrentInstance } from 'vue';
 import { getImgPatrol } from '@/utils/common.js';
+import { patrolTaskpage, patrolTaskbeginPatrol, status_statistics, patrolTaskRestartPatrol } from '@/api/xuncha';
 import { getCurrentPositon } from '@/utils/common.js';
 import { useStore } from '@/pinia/store.js';
 import { useRouter } from 'vue-router';
+const { proxy } = getCurrentInstance();
 const pinias = useStore();
 const router = useRouter();
 const AllData = reactive({
@@ -148,36 +150,11 @@
       statusName: '已完成',
     },
   ],
+
   // 顶部tab选取项
   ActiveID: 'to_start',
   // 数据列表
-  dataList: [
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'expired',
-      sectionType: '',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'proceed',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-  ],
+  dataList: [],
   triggered: false,
   ListPage: {
     page: 1,
@@ -187,14 +164,6 @@
   searchV: '',
 });
 
-// 顶部tab切换事件
-const topTabsChange = (item) => {
-  AllData.ActiveID = item.status;
-  AllData.ListPage.page = 1;
-  // AllData.dataList = [];
-  // getPatrolTaskPage(true);
-};
-
 /**
  * 点击按钮执行巡查功能
  */
@@ -210,60 +179,159 @@
     // 继续巡查
     proxy.showSuccessToast('开始巡查');
     router.push({
-      // path: '/inspectionPipe',
-      // query: { type: type, num: num, id: id, sectionType: sectionType },
+      path: '/inspectionA',
+      query: { type: type, num: num, id: id, sectionType: sectionType },
     });
   }
 };
 
-//根据经纬度获取地名
 /**
  * 开始巡查
  */
 const BeginPatrol = (type, num, id, sectionType) => {
-  router.push({
-    path: '/inspectionPipe',
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', lng, '--', lat, '--', address);
+    patrolTaskbeginPatrol({
+      taskId: id,
+      startPlace: address,
+    }).then((res) => {
+      if (res && res.code == 200) {
+        proxy.showSuccessToast('开始巡查');
+        router.push({
+          path: '/inspectionA',
+          query: { id: id },
+        });
+      } else {
+        proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
+      }
+    });
   });
-
-  // getCurrentPositon((lng, lat, address) => {
-  //   // console.log('获取安卓定位参数--', lng, '--', lat);
-  //   // patrolTaskBeginPatrol({
-  //   //   taskId: id,
-  //   //   startPlace: address,
-  //   // }).then((res) => {
-  //   //   if (res && res.code == 200) {
-  //   //     proxy.showSuccessToast('开始巡查');
-  //   //     router.push({
-  //   //       path: '/inspectionPipe',
-  //   //       query: { type: type, num: num, id: id, sectionType: sectionType },
-  //   //     });
-  //   //   } else {
-  //   //     proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
-  //   //   }
-  //   // });
-  // });
 };
 
 /**
- * 获取当前状态下的任务列表
- * bol:true: 重置分页条件
+ * 重新巡查
  */
-const getPatrolTaskPage = async (bol) => {
-  pinias.showLoading();
-  AllData.finished = false;
-  AllData.loading = false;
+const BeginPatrol2 = (type, num, id, sectionType) => {
+  patrolTaskRestartPatrol({
+    taskId: id,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      proxy.showSuccessToast('重新开始巡查');
+      router.push({
+        path: '/inspectionA',
+        query: { id: id },
+      });
+    } else {
+      proxy.showFailToast('巡查启动失败,请稍后再试');
+    }
+  });
+};
+
+// 顶部tab切换事件
+const topTabsChange = (item) => {
+  AllData.ActiveID = item.status;
+  AllData.ListPage.page = 1;
+  AllData.dataList = [];
+  getList(true);
 };
 const lowerRefresh = (e) => {
-  AllData.finished = true;
-  AllData.loading = false;
-  // if (AllData.ListPage.total > AllData.dataList.length) {
-  //   AllData.ListPage.page += 1;
-  //   getPatrolTaskPage();
-  // } else {
-  //   AllData.finished = true;
-  //   AllData.loading = false;
-  // }
+  if (AllData.ListPage.total > AllData.dataList.length) {
+    AllData.ListPage.page += 1;
+    getList();
+  } else {
+    AllData.finished = true;
+    AllData.loading = false;
+  }
 };
+// 列表查询接口
+const getList = async (bol) => {
+  pinias.showLoading();
+  AllData.finished = false;
+  AllData.loading = true;
+  if (bol) {
+    // 初始化分页
+    AllData.ListPage.page = 1;
+    AllData.ListPage.size = 10;
+  }
+  let params = {
+    pageNum: AllData.ListPage.page,
+    pageSize: AllData.ListPage.size,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
+    fatherCode: -1,
+    taskName: AllData.searchV,
+    taskUserId: pinias.userNo,
+  };
+  let res = await patrolTaskpage(params);
+  if (res && res.code == 200) {
+    if (bol) {
+      // 直接覆盖所有信息
+      AllData.dataList = res.data;
+    } else {
+      // 追加列表信息
+      AllData.dataList = AllData.dataList.concat(res.data);
+    }
+    getTaskTypeNum(); //重新加载tab数据
+    AllData.ListPage.total = res.total;
+    pinias.hideLoading();
+    // 加载状态结束 状态更新为false
+    AllData.loading = false;
+  }
+};
+
+/**
+ * 获取当前任务类型的各个数量
+ */
+const getTaskTypeNum = () => {
+  let query = {
+    taskUserId: pinias.userNo,
+
+    taskName: AllData.searchV,
+  };
+  status_statistics(query).then((res) => {
+    if (res && res.code == 200) {
+      let data = res.data;
+      AllData.TopTabsData = [
+        {
+          count: null,
+          status: 'to_start',
+          statusName: '未完成',
+        },
+        {
+          count: null,
+          status: 'proceed',
+          statusName: '执行中',
+        },
+        {
+          count: null,
+          status: 'done',
+          statusName: '已完成',
+        },
+      ];
+      data.forEach((v, i) => {
+        // 处理数据 这里不要 expired 已超时的状态 status不会变,遍历获取其状态的值
+        if (v.status == 'to_start' || v.status == 'expired')
+          AllData.TopTabsData[0].count = AllData.TopTabsData[0].count + v.count;
+        if (v.status == 'proceed') AllData.TopTabsData[1].count = v.count;
+        if (v.status == 'done') AllData.TopTabsData[2].count = v.count;
+      });
+    }
+  });
+};
+
+// 已完成跳转详情
+function checkDetail(query) {
+  if (query.status == 'done') {
+    console.log('234');
+    router.push({
+      path: '/patroLogDetails',
+      query,
+    });
+  }
+}
+
+onMounted(() => {
+  getList();
+});
 </script>
 <style lang="less">
 .patrolTaskPipe {
diff --git a/src/views/xuncha/components/TaskForm.vue b/src/views/xuncha/components/TaskForm.vue
index c72e93b..d0caea5 100644
--- a/src/views/xuncha/components/TaskForm.vue
+++ b/src/views/xuncha/components/TaskForm.vue
@@ -4,37 +4,46 @@
     <van-form @submit="onSubmitData">
       <div class="ContentView" id="ContentViewRiver">
         <van-field
-          v-model="value"
+          v-model="AllData.patrolTargetIdText"
+          is-link
+          readonly
+          label="项目名称"
+          @click="AllData.ShowHedao = true"
+          placeholder="请选择项目名称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入项目名称' }]"
+        />
+        <van-popup v-model:show="AllData.ShowHedao" round position="bottom">
+          <van-picker value-key="" :columns="AllData.range3" @cancel="onCancel" @confirm="onConfirmHedao" />
+        </van-popup>
+        <van-field
+          v-model="AllData.formData.problemType"
           label="问题类型"
           placeholder="请输入问题类型"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题类型' }]"
         />
         <van-field
-          v-model="value"
+          v-model="AllData.formData.checkItem"
           label="检查项"
           placeholder="请输入检查项"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入检查项' }]"
         />
-        <van-field label="是否整改" name="caseLevel" required :rules="[{ required: true, message: '请选择' }]">
+        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
           <template #input>
-            <van-radio-group v-model="AllData.formData.caseLevel" direction="horizontal">
-              <van-radio
-                :name="item.value"
-                v-for="item in AllData.formOptions.case_level"
-                :key="item.value"
-                @click="getAnJianName2(item)"
-              >
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
                 {{ item.label }}
               </van-radio>
             </van-radio-group>
           </template>
         </van-field>
         <van-field
-          v-model="AllData.formData.caseName"
+          v-model="AllData.formData.problemContent"
           rows="2"
           autosize
           label="问题描述"
@@ -43,7 +52,7 @@
           placeholder="请输入问题描述"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题描述' }]"
         />
 
         <div class="mediumList">
@@ -51,23 +60,12 @@
           <div class="picBox">
             <UploadImg
               :maxCount="3"
-              :saveFileArr="AllData.PicListData"
+              :saveFileArr="AllData.formData.sysFileSaveRequestList"
               :acceptFormat="'image/*'"
               @update:saveFileArr="getImgList"
             />
           </div>
         </div>
-        <!-- <div class="mediumList">
-          <span class="Title">现场视频(最多3个)</span>
-          <div class="picBox">
-            <UploadImg
-              :maxCount="3"
-              :saveFileArr="AllData.PicListData2"
-              :acceptFormat="'video/*'"
-              @update:saveFileArr="getVideoList"
-            ></UploadImg>
-          </div>
-        </div> -->
       </div>
       <div class="BottomView">
         <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
@@ -78,54 +76,98 @@
 </template>
 <script setup>
 import UploadImg from '@/views/components/uploadFile.vue';
+import { getProjectInfoList, patrolProblemadd } from '@/api/xuncha';
+import { useRouter, useRoute } from 'vue-router';
 // 获取父组件传过来的patrolLogId
 const props = defineProps({
   patrolLogId: String,
   MarkForData: Object,
 });
+const { proxy } = getCurrentInstance();
 const emits = defineEmits(['closeFormTransition']);
 const closeDaKa = () => {
   emits('closeFormTransition', 'AnJianUpdatas');
 };
+const route = useRoute();
 const AllData = reactive({
+  ShowHedao: false,
+  range3: [],
   formData: {
-    reportFlag: 0,
-    caseLevel: '',
-    caseType: '',
-    caseName: '',
-    caseSource: 'patrol_report',
-    caseContent: '',
-    patrolLogId: props.patrolLogId,
-    lonLat: '',
-    caseAddress: '',
-    fileSaveRequestList: [],
-    caseDataSource: 'task',
+    problemType: '',
+    sysFileSaveRequestList: [], //获取的图片数组
+    taskName: '',
+    checkItem: '',
+    isRectification: '',
+    problemContent: '',
+    patrolTaskId: '',
   },
+  patrolTargetIdText: '',
   formOptions: {
     case_level: [
       {
         value: '1',
-        label: 'aa',
+        label: '无需整改',
       },
       {
         value: '2',
-        label: 'bb',
+        label: '待整改',
       },
+      { value: '3', label: '整改已完成' },
     ],
     caseTypeData: [],
   },
-  PicListData: [], //获取的图片数组
-  PicListData2: [], //获取的视频数组
 });
 
 // 获取上传的图片
 function getImgList(e) {
-  AllData.PicListData = e;
+  e.forEach((item) => {
+    item.refField = 'pat_problem';
+  });
+  AllData.formData.sysFileSaveRequestList = e;
 }
-// 获取上传的视频
-function getVideoList(e) {
-  AllData.PicListData2 = e;
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  AllData.range3 = data.map((v) => {
+    return {
+      value: v.projectNo,
+      text: v.projectAbbreviation,
+    };
+  });
 }
+//项目名称选择
+const onConfirmHedao = ({ selectedOptions }) => {
+  AllData.ShowHedao = false;
+  AllData.patrolTargetIdText = selectedOptions[0].text;
+  AllData.formData.taskName = selectedOptions[0].value;
+};
+const onCancel = () => {
+  AllData.ShowHedao = false;
+};
+
+// 提交上报
+const onSubmitData = async () => {
+  patrolProblemadd(AllData.formData).then((response) => {
+    proxy.showSuccessToast('填报成功');
+    closeDaKa();
+  });
+};
+watch(
+  route,
+  (val) => {
+    if (!!!route.query.id) return;
+    setTimeout(() => {
+      //option为object类型，会序列化上个页面传递的参数
+      console.log('传递的参数111--', route.query); //打印出上个页面传递的参数。
+
+      AllData.formData.patrolTaskId = route.query.id;
+    });
+  },
+  { immediate: true }
+);
+onMounted(() => {
+  projectTypeListM();
+});
 </script>
 <style lang="less">
 .taskFormRiver {

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 1b24a1b..5008332 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -66,8 +66,8 @@
 
 // 退出登录
 function logOut() {
-  localStorage.removeItem('NFAppToken');
-  document.cookie = 'NFAppToken=' + '';
+  localStorage.removeItem('KFAppToken');
+  document.cookie = 'KFAppToken=' + '';
   proxy.showSuccessToast('退出成功');
   router.push('/login');
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0870d8c..8174527 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,11 +78,11 @@
   allData.loginLoading = true;
   // 默认存储密码
   if (allData.remberPass) {
-    localStorage.setItem('usernameNFApp', allData.userName);
-    localStorage.setItem('passwordNFApp', EncryptAES(allData.password));
+    localStorage.setItem('usernameKFApp', allData.userName);
+    localStorage.setItem('passwordKFApp', EncryptAES(allData.password));
   } else {
-    localStorage.removeItem('usernameNFApp');
-    localStorage.removeItem('passwordNFApp');
+    localStorage.removeItem('usernameKFApp');
+    localStorage.removeItem('passwordKFApp');
   }
   let params = {
     username: allData.userName,
@@ -94,23 +94,23 @@
 
   if (res && res.code == 200) {
     allData.loginLoading = false;
-    const { access_token } = res;
+    let access_token = res.data.access_token;
     pinias.$patch((state) => {
       state.token = access_token;
     });
-    localStorage.setItem('NFAppToken', access_token); //存储token
+    localStorage.setItem('KFAppToken', access_token); //存储token
     router.push('/home_homePage');
     // 获取用户个人详细信息
-    // getInfo().then((res2) => {
-    //   let datas = res2.data.user;
-    //   pinias.$patch((state) => {
-    //     state.userNo = datas.userId;
-    //     state.phonenumber = datas.phonenumber;
-    //     state.imageUrl = datas.avatar || userImages;
-    //     state.userName = datas.nickName || '管理员';
-    //     state.userDeptName = datas.dept.deptName;
-    //   });
-    // });
+    getInfo().then((res2) => {
+      let datas = res2.data.user;
+      pinias.$patch((state) => {
+        state.userNo = datas.userId;
+        state.phonenumber = datas.phonenumber;
+        state.imageUrl = datas.avatar || userImages;
+        state.userName = datas.nickName || '管理员';
+        state.userDeptName = datas.dept.deptName;
+      });
+    });
   } else {
     getCode();
     allData.loginLoading = false;
@@ -128,10 +128,10 @@
 onMounted(() => {
   getCode();
   if (allData.remberPass) {
-    const usernameNFApp = localStorage.getItem('usernameNFApp');
-    const passwordNFApp = localStorage.getItem('passwordNFApp');
-    allData.userName = usernameNFApp ? usernameNFApp : '';
-    allData.password = passwordNFApp ? DecryptAES(passwordNFApp) : '';
+    const usernameKFApp = localStorage.getItem('usernameKFApp');
+    const passwordKFApp = localStorage.getItem('passwordKFApp');
+    allData.userName = usernameKFApp ? usernameKFApp : '';
+    allData.password = passwordKFApp ? DecryptAES(passwordKFApp) : '';
   }
 });
 </script>
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 19b129c..606f35f 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -5,7 +5,7 @@
       <div class="topTabsNF">
         <div
           class="tabsList"
-          v-for="(item, index) in AllData.TopTabsData"
+          v-for="item in AllData.TopTabsData"
           :key="item.status"
           @click="topTabsChange(item)"
           :class="{ tabsListActive: AllData.ActiveID == item.status }"
@@ -22,9 +22,9 @@
           v-model="AllData.searchV"
           confirm-type="search"
           placeholder="综合搜索"
-          @confirm="getPatrolTaskPage(true)"
+          @confirm="getList(true)"
         />
-        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getPatrolTaskPage(true)" />
+        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getList(true)" />
       </div>
     </div>
     <!-- 下部数据列表 -->
@@ -37,7 +37,7 @@
         :offset="50"
         @load="lowerRefresh"
       >
-        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList">
+        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList" @click="checkDetail(item)">
           <div class="dataListTitle">
             <!-- 标题 -->
             <div class="fontView">
@@ -122,9 +122,11 @@
 <script setup>
 import { nextTick, onMounted, reactive, getCurrentInstance } from 'vue';
 import { getImgPatrol } from '@/utils/common.js';
+import { patrolTaskpage, patrolTaskbeginPatrol, status_statistics, patrolTaskRestartPatrol } from '@/api/xuncha';
 import { getCurrentPositon } from '@/utils/common.js';
 import { useStore } from '@/pinia/store.js';
 import { useRouter } from 'vue-router';
+const { proxy } = getCurrentInstance();
 const pinias = useStore();
 const router = useRouter();
 const AllData = reactive({
@@ -148,36 +150,11 @@
       statusName: '已完成',
     },
   ],
+
   // 顶部tab选取项
   ActiveID: 'to_start',
   // 数据列表
-  dataList: [
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'expired',
-      sectionType: '',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'proceed',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-  ],
+  dataList: [],
   triggered: false,
   ListPage: {
     page: 1,
@@ -187,14 +164,6 @@
   searchV: '',
 });
 
-// 顶部tab切换事件
-const topTabsChange = (item) => {
-  AllData.ActiveID = item.status;
-  AllData.ListPage.page = 1;
-  // AllData.dataList = [];
-  // getPatrolTaskPage(true);
-};
-
 /**
  * 点击按钮执行巡查功能
  */
@@ -210,60 +179,159 @@
     // 继续巡查
     proxy.showSuccessToast('开始巡查');
     router.push({
-      // path: '/inspectionPipe',
-      // query: { type: type, num: num, id: id, sectionType: sectionType },
+      path: '/inspectionA',
+      query: { type: type, num: num, id: id, sectionType: sectionType },
     });
   }
 };
 
-//根据经纬度获取地名
 /**
  * 开始巡查
  */
 const BeginPatrol = (type, num, id, sectionType) => {
-  router.push({
-    path: '/inspectionPipe',
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', lng, '--', lat, '--', address);
+    patrolTaskbeginPatrol({
+      taskId: id,
+      startPlace: address,
+    }).then((res) => {
+      if (res && res.code == 200) {
+        proxy.showSuccessToast('开始巡查');
+        router.push({
+          path: '/inspectionA',
+          query: { id: id },
+        });
+      } else {
+        proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
+      }
+    });
   });
-
-  // getCurrentPositon((lng, lat, address) => {
-  //   // console.log('获取安卓定位参数--', lng, '--', lat);
-  //   // patrolTaskBeginPatrol({
-  //   //   taskId: id,
-  //   //   startPlace: address,
-  //   // }).then((res) => {
-  //   //   if (res && res.code == 200) {
-  //   //     proxy.showSuccessToast('开始巡查');
-  //   //     router.push({
-  //   //       path: '/inspectionPipe',
-  //   //       query: { type: type, num: num, id: id, sectionType: sectionType },
-  //   //     });
-  //   //   } else {
-  //   //     proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
-  //   //   }
-  //   // });
-  // });
 };
 
 /**
- * 获取当前状态下的任务列表
- * bol:true: 重置分页条件
+ * 重新巡查
  */
-const getPatrolTaskPage = async (bol) => {
-  pinias.showLoading();
-  AllData.finished = false;
-  AllData.loading = false;
+const BeginPatrol2 = (type, num, id, sectionType) => {
+  patrolTaskRestartPatrol({
+    taskId: id,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      proxy.showSuccessToast('重新开始巡查');
+      router.push({
+        path: '/inspectionA',
+        query: { id: id },
+      });
+    } else {
+      proxy.showFailToast('巡查启动失败,请稍后再试');
+    }
+  });
+};
+
+// 顶部tab切换事件
+const topTabsChange = (item) => {
+  AllData.ActiveID = item.status;
+  AllData.ListPage.page = 1;
+  AllData.dataList = [];
+  getList(true);
 };
 const lowerRefresh = (e) => {
-  AllData.finished = true;
-  AllData.loading = false;
-  // if (AllData.ListPage.total > AllData.dataList.length) {
-  //   AllData.ListPage.page += 1;
-  //   getPatrolTaskPage();
-  // } else {
-  //   AllData.finished = true;
-  //   AllData.loading = false;
-  // }
+  if (AllData.ListPage.total > AllData.dataList.length) {
+    AllData.ListPage.page += 1;
+    getList();
+  } else {
+    AllData.finished = true;
+    AllData.loading = false;
+  }
 };
+// 列表查询接口
+const getList = async (bol) => {
+  pinias.showLoading();
+  AllData.finished = false;
+  AllData.loading = true;
+  if (bol) {
+    // 初始化分页
+    AllData.ListPage.page = 1;
+    AllData.ListPage.size = 10;
+  }
+  let params = {
+    pageNum: AllData.ListPage.page,
+    pageSize: AllData.ListPage.size,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
+    fatherCode: -1,
+    taskName: AllData.searchV,
+    taskUserId: pinias.userNo,
+  };
+  let res = await patrolTaskpage(params);
+  if (res && res.code == 200) {
+    if (bol) {
+      // 直接覆盖所有信息
+      AllData.dataList = res.data;
+    } else {
+      // 追加列表信息
+      AllData.dataList = AllData.dataList.concat(res.data);
+    }
+    getTaskTypeNum(); //重新加载tab数据
+    AllData.ListPage.total = res.total;
+    pinias.hideLoading();
+    // 加载状态结束 状态更新为false
+    AllData.loading = false;
+  }
+};
+
+/**
+ * 获取当前任务类型的各个数量
+ */
+const getTaskTypeNum = () => {
+  let query = {
+    taskUserId: pinias.userNo,
+
+    taskName: AllData.searchV,
+  };
+  status_statistics(query).then((res) => {
+    if (res && res.code == 200) {
+      let data = res.data;
+      AllData.TopTabsData = [
+        {
+          count: null,
+          status: 'to_start',
+          statusName: '未完成',
+        },
+        {
+          count: null,
+          status: 'proceed',
+          statusName: '执行中',
+        },
+        {
+          count: null,
+          status: 'done',
+          statusName: '已完成',
+        },
+      ];
+      data.forEach((v, i) => {
+        // 处理数据 这里不要 expired 已超时的状态 status不会变,遍历获取其状态的值
+        if (v.status == 'to_start' || v.status == 'expired')
+          AllData.TopTabsData[0].count = AllData.TopTabsData[0].count + v.count;
+        if (v.status == 'proceed') AllData.TopTabsData[1].count = v.count;
+        if (v.status == 'done') AllData.TopTabsData[2].count = v.count;
+      });
+    }
+  });
+};
+
+// 已完成跳转详情
+function checkDetail(query) {
+  if (query.status == 'done') {
+    console.log('234');
+    router.push({
+      path: '/patroLogDetails',
+      query,
+    });
+  }
+}
+
+onMounted(() => {
+  getList();
+});
 </script>
 <style lang="less">
 .patrolTaskPipe {
diff --git a/src/views/xuncha/components/TaskForm.vue b/src/views/xuncha/components/TaskForm.vue
index c72e93b..d0caea5 100644
--- a/src/views/xuncha/components/TaskForm.vue
+++ b/src/views/xuncha/components/TaskForm.vue
@@ -4,37 +4,46 @@
     <van-form @submit="onSubmitData">
       <div class="ContentView" id="ContentViewRiver">
         <van-field
-          v-model="value"
+          v-model="AllData.patrolTargetIdText"
+          is-link
+          readonly
+          label="项目名称"
+          @click="AllData.ShowHedao = true"
+          placeholder="请选择项目名称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入项目名称' }]"
+        />
+        <van-popup v-model:show="AllData.ShowHedao" round position="bottom">
+          <van-picker value-key="" :columns="AllData.range3" @cancel="onCancel" @confirm="onConfirmHedao" />
+        </van-popup>
+        <van-field
+          v-model="AllData.formData.problemType"
           label="问题类型"
           placeholder="请输入问题类型"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题类型' }]"
         />
         <van-field
-          v-model="value"
+          v-model="AllData.formData.checkItem"
           label="检查项"
           placeholder="请输入检查项"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入检查项' }]"
         />
-        <van-field label="是否整改" name="caseLevel" required :rules="[{ required: true, message: '请选择' }]">
+        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
           <template #input>
-            <van-radio-group v-model="AllData.formData.caseLevel" direction="horizontal">
-              <van-radio
-                :name="item.value"
-                v-for="item in AllData.formOptions.case_level"
-                :key="item.value"
-                @click="getAnJianName2(item)"
-              >
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
                 {{ item.label }}
               </van-radio>
             </van-radio-group>
           </template>
         </van-field>
         <van-field
-          v-model="AllData.formData.caseName"
+          v-model="AllData.formData.problemContent"
           rows="2"
           autosize
           label="问题描述"
@@ -43,7 +52,7 @@
           placeholder="请输入问题描述"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题描述' }]"
         />
 
         <div class="mediumList">
@@ -51,23 +60,12 @@
           <div class="picBox">
             <UploadImg
               :maxCount="3"
-              :saveFileArr="AllData.PicListData"
+              :saveFileArr="AllData.formData.sysFileSaveRequestList"
               :acceptFormat="'image/*'"
               @update:saveFileArr="getImgList"
             />
           </div>
         </div>
-        <!-- <div class="mediumList">
-          <span class="Title">现场视频(最多3个)</span>
-          <div class="picBox">
-            <UploadImg
-              :maxCount="3"
-              :saveFileArr="AllData.PicListData2"
-              :acceptFormat="'video/*'"
-              @update:saveFileArr="getVideoList"
-            ></UploadImg>
-          </div>
-        </div> -->
       </div>
       <div class="BottomView">
         <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
@@ -78,54 +76,98 @@
 </template>
 <script setup>
 import UploadImg from '@/views/components/uploadFile.vue';
+import { getProjectInfoList, patrolProblemadd } from '@/api/xuncha';
+import { useRouter, useRoute } from 'vue-router';
 // 获取父组件传过来的patrolLogId
 const props = defineProps({
   patrolLogId: String,
   MarkForData: Object,
 });
+const { proxy } = getCurrentInstance();
 const emits = defineEmits(['closeFormTransition']);
 const closeDaKa = () => {
   emits('closeFormTransition', 'AnJianUpdatas');
 };
+const route = useRoute();
 const AllData = reactive({
+  ShowHedao: false,
+  range3: [],
   formData: {
-    reportFlag: 0,
-    caseLevel: '',
-    caseType: '',
-    caseName: '',
-    caseSource: 'patrol_report',
-    caseContent: '',
-    patrolLogId: props.patrolLogId,
-    lonLat: '',
-    caseAddress: '',
-    fileSaveRequestList: [],
-    caseDataSource: 'task',
+    problemType: '',
+    sysFileSaveRequestList: [], //获取的图片数组
+    taskName: '',
+    checkItem: '',
+    isRectification: '',
+    problemContent: '',
+    patrolTaskId: '',
   },
+  patrolTargetIdText: '',
   formOptions: {
     case_level: [
       {
         value: '1',
-        label: 'aa',
+        label: '无需整改',
       },
       {
         value: '2',
-        label: 'bb',
+        label: '待整改',
       },
+      { value: '3', label: '整改已完成' },
     ],
     caseTypeData: [],
   },
-  PicListData: [], //获取的图片数组
-  PicListData2: [], //获取的视频数组
 });
 
 // 获取上传的图片
 function getImgList(e) {
-  AllData.PicListData = e;
+  e.forEach((item) => {
+    item.refField = 'pat_problem';
+  });
+  AllData.formData.sysFileSaveRequestList = e;
 }
-// 获取上传的视频
-function getVideoList(e) {
-  AllData.PicListData2 = e;
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  AllData.range3 = data.map((v) => {
+    return {
+      value: v.projectNo,
+      text: v.projectAbbreviation,
+    };
+  });
 }
+//项目名称选择
+const onConfirmHedao = ({ selectedOptions }) => {
+  AllData.ShowHedao = false;
+  AllData.patrolTargetIdText = selectedOptions[0].text;
+  AllData.formData.taskName = selectedOptions[0].value;
+};
+const onCancel = () => {
+  AllData.ShowHedao = false;
+};
+
+// 提交上报
+const onSubmitData = async () => {
+  patrolProblemadd(AllData.formData).then((response) => {
+    proxy.showSuccessToast('填报成功');
+    closeDaKa();
+  });
+};
+watch(
+  route,
+  (val) => {
+    if (!!!route.query.id) return;
+    setTimeout(() => {
+      //option为object类型，会序列化上个页面传递的参数
+      console.log('传递的参数111--', route.query); //打印出上个页面传递的参数。
+
+      AllData.formData.patrolTaskId = route.query.id;
+    });
+  },
+  { immediate: true }
+);
+onMounted(() => {
+  projectTypeListM();
+});
 </script>
 <style lang="less">
 .taskFormRiver {
diff --git a/src/views/xuncha/components/inspection.vue b/src/views/xuncha/components/inspection.vue
index 8476fb8..ec82515 100644
--- a/src/views/xuncha/components/inspection.vue
+++ b/src/views/xuncha/components/inspection.vue
@@ -5,7 +5,6 @@
     <!-- 底部按钮 -->
     <div class="BottomBtn">
       <div class="Btn Btn1" @click="patrolFilling(false)">问题填报</div>
-      <!-- <div class="Btn Btn2" @click="openPopup">取消巡查</div> -->
       <div class="Btn Btn3" @click="EndPatrolClick">结束巡查</div>
     </div>
 
@@ -24,17 +23,10 @@
     <!-- 结束巡查 -->
     <van-popup v-model:show="AllData.showCancel" position="bottom" closeable :style="{ width: '100%', height: '30%' }">
       <div class="QxBox">
-        <div class="Titlediv"></div>
-        <div class="Contentdiv">确认结束巡查吗？</div>
+        <div class="Titlediv">确认结束巡查吗？</div>
+        <!-- <div class="Contentdiv"></div> -->
         <div class="QxBoxBtn">
-          <van-button
-            round
-            :type="AllData.countDown == 0 ? 'primary' : 'default'"
-            :disabled="AllData.countDown == 0 ? false : true"
-            @click="TaskCancelPatrol"
-          >
-            结束巡查
-          </van-button>
+          <van-button round @click="TaskCancelPatrol"> 结束巡查 </van-button>
         </div>
       </div>
     </van-popup>
@@ -43,14 +35,23 @@
 
 <script setup>
 import { reactive, ref, getCurrentInstance, watch, onMounted, onBeforeUnmount } from 'vue';
-// import { timestampToTime, checkUserSystem } from '@/utils/common.js';
-// import CoordTransform from '@/utils/gis/CoorTransform.js';
-// import { getCurrentPositon } from '@/utils/common.js';
+import { timestampToTime, checkUserSystem, getCurrentPositon } from '@/utils/common.js';
 
-// const router = useRouter();
-// const route = useRoute();
-// const pinias = useStore();
+import { patrolTaskFinishPatrol, patrolTaskId } from '@/api/xuncha';
+
+import WKT from 'terraformer-wkt-parser';
+
+import { useRouter, useRoute } from 'vue-router';
+
 import TaskForm from './TaskForm'; // 表单组件
+const router = useRouter();
+const route = useRoute();
+// const pinias = useStore();
+
+const props = defineProps({
+  patrolLogId: String,
+  MarkForData: Object,
+});
 const { proxy } = getCurrentInstance();
 const AllData = reactive({
   taskID: '', //当前巡检任务ID
@@ -108,7 +109,7 @@
   AllData.showForm = !AllData.showForm;
 };
 
-// 结束巡查
+// 结束巡查点击弹框
 const EndPatrolClick = () => {
   AllData.showCancel = true;
 };
@@ -122,6 +123,65 @@
     // TaskMapRef.value.MaskUpdata(2);
   }
 };
+
+// 结束巡查关闭
+const TaskCancelPatrol = () => {
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', address);
+    // 获取当前巡检任务的所有轨迹信息
+    // patrolTaskId(route.query.id).then((res) => {
+    //   if (res && res.code == 200) {
+    //     let lengthKm = 0;
+    //     if (!!res.data.patrolPath) {
+    //       lengthKm = turf.length(WKT.parse(res.data.patrolPath));
+    //     } else {
+    //       lengthKm = 0;
+    //     }
+    let param = {
+      endPlace: address,
+      // patrolTaskId: props.taskID,
+      patrolLogId: route.query.id,
+      patrolTaskId: route.query.id,
+      // patrolName: AllData.formData.NoticeFont,
+      // fileSaveRequestList: AllData.PicListData.concat(AllData.PicListData2),
+      // logContent: AllData.formData.caseContent,
+      // patrolLength: Number(lengthKm).toFixed(1),
+    };
+    patrolTaskFinishPatrol(param).then((res) => {
+      if (res?.code == 200) {
+        proxy.showSuccessToast('结束成功');
+        router.push('/TaskInspection');
+        stopAndIosLocation(); // 原生安卓、ios结束websocket推送
+      }
+    });
+    //   }
+    // });
+  });
+};
+
+// 原生安卓、ios结束websocket推送
+function stopAndIosLocation() {
+  let systems = checkUserSystem();
+  if (systems == 'Android') {
+    console.log('安卓结束websocket---');
+    window.android.disconnect(String(props.patrolLogId));
+  } else if (systems == 'IOS') {
+    console.log('ios结束websocket---');
+    window.webkit.messageHandlers.stopLocation.postMessage({ data: { refid: props.patrolLogId } });
+  }
+}
+
+watch(
+  route,
+  (val) => {
+    if (!!!route.query.id) return;
+    setTimeout(() => {
+      //option为object类型，会序列化上个页面传递的参数
+      console.log('传递的参数222--', route.query.id); //打印出上个页面传递的参数。
+    });
+  },
+  { immediate: true }
+);
 </script>
 
 <style lang="less">

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 1b24a1b..5008332 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -66,8 +66,8 @@
 
 // 退出登录
 function logOut() {
-  localStorage.removeItem('NFAppToken');
-  document.cookie = 'NFAppToken=' + '';
+  localStorage.removeItem('KFAppToken');
+  document.cookie = 'KFAppToken=' + '';
   proxy.showSuccessToast('退出成功');
   router.push('/login');
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0870d8c..8174527 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,11 +78,11 @@
   allData.loginLoading = true;
   // 默认存储密码
   if (allData.remberPass) {
-    localStorage.setItem('usernameNFApp', allData.userName);
-    localStorage.setItem('passwordNFApp', EncryptAES(allData.password));
+    localStorage.setItem('usernameKFApp', allData.userName);
+    localStorage.setItem('passwordKFApp', EncryptAES(allData.password));
   } else {
-    localStorage.removeItem('usernameNFApp');
-    localStorage.removeItem('passwordNFApp');
+    localStorage.removeItem('usernameKFApp');
+    localStorage.removeItem('passwordKFApp');
   }
   let params = {
     username: allData.userName,
@@ -94,23 +94,23 @@
 
   if (res && res.code == 200) {
     allData.loginLoading = false;
-    const { access_token } = res;
+    let access_token = res.data.access_token;
     pinias.$patch((state) => {
       state.token = access_token;
     });
-    localStorage.setItem('NFAppToken', access_token); //存储token
+    localStorage.setItem('KFAppToken', access_token); //存储token
     router.push('/home_homePage');
     // 获取用户个人详细信息
-    // getInfo().then((res2) => {
-    //   let datas = res2.data.user;
-    //   pinias.$patch((state) => {
-    //     state.userNo = datas.userId;
-    //     state.phonenumber = datas.phonenumber;
-    //     state.imageUrl = datas.avatar || userImages;
-    //     state.userName = datas.nickName || '管理员';
-    //     state.userDeptName = datas.dept.deptName;
-    //   });
-    // });
+    getInfo().then((res2) => {
+      let datas = res2.data.user;
+      pinias.$patch((state) => {
+        state.userNo = datas.userId;
+        state.phonenumber = datas.phonenumber;
+        state.imageUrl = datas.avatar || userImages;
+        state.userName = datas.nickName || '管理员';
+        state.userDeptName = datas.dept.deptName;
+      });
+    });
   } else {
     getCode();
     allData.loginLoading = false;
@@ -128,10 +128,10 @@
 onMounted(() => {
   getCode();
   if (allData.remberPass) {
-    const usernameNFApp = localStorage.getItem('usernameNFApp');
-    const passwordNFApp = localStorage.getItem('passwordNFApp');
-    allData.userName = usernameNFApp ? usernameNFApp : '';
-    allData.password = passwordNFApp ? DecryptAES(passwordNFApp) : '';
+    const usernameKFApp = localStorage.getItem('usernameKFApp');
+    const passwordKFApp = localStorage.getItem('passwordKFApp');
+    allData.userName = usernameKFApp ? usernameKFApp : '';
+    allData.password = passwordKFApp ? DecryptAES(passwordKFApp) : '';
   }
 });
 </script>
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 19b129c..606f35f 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -5,7 +5,7 @@
       <div class="topTabsNF">
         <div
           class="tabsList"
-          v-for="(item, index) in AllData.TopTabsData"
+          v-for="item in AllData.TopTabsData"
           :key="item.status"
           @click="topTabsChange(item)"
           :class="{ tabsListActive: AllData.ActiveID == item.status }"
@@ -22,9 +22,9 @@
           v-model="AllData.searchV"
           confirm-type="search"
           placeholder="综合搜索"
-          @confirm="getPatrolTaskPage(true)"
+          @confirm="getList(true)"
         />
-        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getPatrolTaskPage(true)" />
+        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getList(true)" />
       </div>
     </div>
     <!-- 下部数据列表 -->
@@ -37,7 +37,7 @@
         :offset="50"
         @load="lowerRefresh"
       >
-        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList">
+        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList" @click="checkDetail(item)">
           <div class="dataListTitle">
             <!-- 标题 -->
             <div class="fontView">
@@ -122,9 +122,11 @@
 <script setup>
 import { nextTick, onMounted, reactive, getCurrentInstance } from 'vue';
 import { getImgPatrol } from '@/utils/common.js';
+import { patrolTaskpage, patrolTaskbeginPatrol, status_statistics, patrolTaskRestartPatrol } from '@/api/xuncha';
 import { getCurrentPositon } from '@/utils/common.js';
 import { useStore } from '@/pinia/store.js';
 import { useRouter } from 'vue-router';
+const { proxy } = getCurrentInstance();
 const pinias = useStore();
 const router = useRouter();
 const AllData = reactive({
@@ -148,36 +150,11 @@
       statusName: '已完成',
     },
   ],
+
   // 顶部tab选取项
   ActiveID: 'to_start',
   // 数据列表
-  dataList: [
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'expired',
-      sectionType: '',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'proceed',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-  ],
+  dataList: [],
   triggered: false,
   ListPage: {
     page: 1,
@@ -187,14 +164,6 @@
   searchV: '',
 });
 
-// 顶部tab切换事件
-const topTabsChange = (item) => {
-  AllData.ActiveID = item.status;
-  AllData.ListPage.page = 1;
-  // AllData.dataList = [];
-  // getPatrolTaskPage(true);
-};
-
 /**
  * 点击按钮执行巡查功能
  */
@@ -210,60 +179,159 @@
     // 继续巡查
     proxy.showSuccessToast('开始巡查');
     router.push({
-      // path: '/inspectionPipe',
-      // query: { type: type, num: num, id: id, sectionType: sectionType },
+      path: '/inspectionA',
+      query: { type: type, num: num, id: id, sectionType: sectionType },
     });
   }
 };
 
-//根据经纬度获取地名
 /**
  * 开始巡查
  */
 const BeginPatrol = (type, num, id, sectionType) => {
-  router.push({
-    path: '/inspectionPipe',
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', lng, '--', lat, '--', address);
+    patrolTaskbeginPatrol({
+      taskId: id,
+      startPlace: address,
+    }).then((res) => {
+      if (res && res.code == 200) {
+        proxy.showSuccessToast('开始巡查');
+        router.push({
+          path: '/inspectionA',
+          query: { id: id },
+        });
+      } else {
+        proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
+      }
+    });
   });
-
-  // getCurrentPositon((lng, lat, address) => {
-  //   // console.log('获取安卓定位参数--', lng, '--', lat);
-  //   // patrolTaskBeginPatrol({
-  //   //   taskId: id,
-  //   //   startPlace: address,
-  //   // }).then((res) => {
-  //   //   if (res && res.code == 200) {
-  //   //     proxy.showSuccessToast('开始巡查');
-  //   //     router.push({
-  //   //       path: '/inspectionPipe',
-  //   //       query: { type: type, num: num, id: id, sectionType: sectionType },
-  //   //     });
-  //   //   } else {
-  //   //     proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
-  //   //   }
-  //   // });
-  // });
 };
 
 /**
- * 获取当前状态下的任务列表
- * bol:true: 重置分页条件
+ * 重新巡查
  */
-const getPatrolTaskPage = async (bol) => {
-  pinias.showLoading();
-  AllData.finished = false;
-  AllData.loading = false;
+const BeginPatrol2 = (type, num, id, sectionType) => {
+  patrolTaskRestartPatrol({
+    taskId: id,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      proxy.showSuccessToast('重新开始巡查');
+      router.push({
+        path: '/inspectionA',
+        query: { id: id },
+      });
+    } else {
+      proxy.showFailToast('巡查启动失败,请稍后再试');
+    }
+  });
+};
+
+// 顶部tab切换事件
+const topTabsChange = (item) => {
+  AllData.ActiveID = item.status;
+  AllData.ListPage.page = 1;
+  AllData.dataList = [];
+  getList(true);
 };
 const lowerRefresh = (e) => {
-  AllData.finished = true;
-  AllData.loading = false;
-  // if (AllData.ListPage.total > AllData.dataList.length) {
-  //   AllData.ListPage.page += 1;
-  //   getPatrolTaskPage();
-  // } else {
-  //   AllData.finished = true;
-  //   AllData.loading = false;
-  // }
+  if (AllData.ListPage.total > AllData.dataList.length) {
+    AllData.ListPage.page += 1;
+    getList();
+  } else {
+    AllData.finished = true;
+    AllData.loading = false;
+  }
 };
+// 列表查询接口
+const getList = async (bol) => {
+  pinias.showLoading();
+  AllData.finished = false;
+  AllData.loading = true;
+  if (bol) {
+    // 初始化分页
+    AllData.ListPage.page = 1;
+    AllData.ListPage.size = 10;
+  }
+  let params = {
+    pageNum: AllData.ListPage.page,
+    pageSize: AllData.ListPage.size,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
+    fatherCode: -1,
+    taskName: AllData.searchV,
+    taskUserId: pinias.userNo,
+  };
+  let res = await patrolTaskpage(params);
+  if (res && res.code == 200) {
+    if (bol) {
+      // 直接覆盖所有信息
+      AllData.dataList = res.data;
+    } else {
+      // 追加列表信息
+      AllData.dataList = AllData.dataList.concat(res.data);
+    }
+    getTaskTypeNum(); //重新加载tab数据
+    AllData.ListPage.total = res.total;
+    pinias.hideLoading();
+    // 加载状态结束 状态更新为false
+    AllData.loading = false;
+  }
+};
+
+/**
+ * 获取当前任务类型的各个数量
+ */
+const getTaskTypeNum = () => {
+  let query = {
+    taskUserId: pinias.userNo,
+
+    taskName: AllData.searchV,
+  };
+  status_statistics(query).then((res) => {
+    if (res && res.code == 200) {
+      let data = res.data;
+      AllData.TopTabsData = [
+        {
+          count: null,
+          status: 'to_start',
+          statusName: '未完成',
+        },
+        {
+          count: null,
+          status: 'proceed',
+          statusName: '执行中',
+        },
+        {
+          count: null,
+          status: 'done',
+          statusName: '已完成',
+        },
+      ];
+      data.forEach((v, i) => {
+        // 处理数据 这里不要 expired 已超时的状态 status不会变,遍历获取其状态的值
+        if (v.status == 'to_start' || v.status == 'expired')
+          AllData.TopTabsData[0].count = AllData.TopTabsData[0].count + v.count;
+        if (v.status == 'proceed') AllData.TopTabsData[1].count = v.count;
+        if (v.status == 'done') AllData.TopTabsData[2].count = v.count;
+      });
+    }
+  });
+};
+
+// 已完成跳转详情
+function checkDetail(query) {
+  if (query.status == 'done') {
+    console.log('234');
+    router.push({
+      path: '/patroLogDetails',
+      query,
+    });
+  }
+}
+
+onMounted(() => {
+  getList();
+});
 </script>
 <style lang="less">
 .patrolTaskPipe {
diff --git a/src/views/xuncha/components/TaskForm.vue b/src/views/xuncha/components/TaskForm.vue
index c72e93b..d0caea5 100644
--- a/src/views/xuncha/components/TaskForm.vue
+++ b/src/views/xuncha/components/TaskForm.vue
@@ -4,37 +4,46 @@
     <van-form @submit="onSubmitData">
       <div class="ContentView" id="ContentViewRiver">
         <van-field
-          v-model="value"
+          v-model="AllData.patrolTargetIdText"
+          is-link
+          readonly
+          label="项目名称"
+          @click="AllData.ShowHedao = true"
+          placeholder="请选择项目名称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入项目名称' }]"
+        />
+        <van-popup v-model:show="AllData.ShowHedao" round position="bottom">
+          <van-picker value-key="" :columns="AllData.range3" @cancel="onCancel" @confirm="onConfirmHedao" />
+        </van-popup>
+        <van-field
+          v-model="AllData.formData.problemType"
           label="问题类型"
           placeholder="请输入问题类型"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题类型' }]"
         />
         <van-field
-          v-model="value"
+          v-model="AllData.formData.checkItem"
           label="检查项"
           placeholder="请输入检查项"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入检查项' }]"
         />
-        <van-field label="是否整改" name="caseLevel" required :rules="[{ required: true, message: '请选择' }]">
+        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
           <template #input>
-            <van-radio-group v-model="AllData.formData.caseLevel" direction="horizontal">
-              <van-radio
-                :name="item.value"
-                v-for="item in AllData.formOptions.case_level"
-                :key="item.value"
-                @click="getAnJianName2(item)"
-              >
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
                 {{ item.label }}
               </van-radio>
             </van-radio-group>
           </template>
         </van-field>
         <van-field
-          v-model="AllData.formData.caseName"
+          v-model="AllData.formData.problemContent"
           rows="2"
           autosize
           label="问题描述"
@@ -43,7 +52,7 @@
           placeholder="请输入问题描述"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题描述' }]"
         />
 
         <div class="mediumList">
@@ -51,23 +60,12 @@
           <div class="picBox">
             <UploadImg
               :maxCount="3"
-              :saveFileArr="AllData.PicListData"
+              :saveFileArr="AllData.formData.sysFileSaveRequestList"
               :acceptFormat="'image/*'"
               @update:saveFileArr="getImgList"
             />
           </div>
         </div>
-        <!-- <div class="mediumList">
-          <span class="Title">现场视频(最多3个)</span>
-          <div class="picBox">
-            <UploadImg
-              :maxCount="3"
-              :saveFileArr="AllData.PicListData2"
-              :acceptFormat="'video/*'"
-              @update:saveFileArr="getVideoList"
-            ></UploadImg>
-          </div>
-        </div> -->
       </div>
       <div class="BottomView">
         <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
@@ -78,54 +76,98 @@
 </template>
 <script setup>
 import UploadImg from '@/views/components/uploadFile.vue';
+import { getProjectInfoList, patrolProblemadd } from '@/api/xuncha';
+import { useRouter, useRoute } from 'vue-router';
 // 获取父组件传过来的patrolLogId
 const props = defineProps({
   patrolLogId: String,
   MarkForData: Object,
 });
+const { proxy } = getCurrentInstance();
 const emits = defineEmits(['closeFormTransition']);
 const closeDaKa = () => {
   emits('closeFormTransition', 'AnJianUpdatas');
 };
+const route = useRoute();
 const AllData = reactive({
+  ShowHedao: false,
+  range3: [],
   formData: {
-    reportFlag: 0,
-    caseLevel: '',
-    caseType: '',
-    caseName: '',
-    caseSource: 'patrol_report',
-    caseContent: '',
-    patrolLogId: props.patrolLogId,
-    lonLat: '',
-    caseAddress: '',
-    fileSaveRequestList: [],
-    caseDataSource: 'task',
+    problemType: '',
+    sysFileSaveRequestList: [], //获取的图片数组
+    taskName: '',
+    checkItem: '',
+    isRectification: '',
+    problemContent: '',
+    patrolTaskId: '',
   },
+  patrolTargetIdText: '',
   formOptions: {
     case_level: [
       {
         value: '1',
-        label: 'aa',
+        label: '无需整改',
       },
       {
         value: '2',
-        label: 'bb',
+        label: '待整改',
       },
+      { value: '3', label: '整改已完成' },
     ],
     caseTypeData: [],
   },
-  PicListData: [], //获取的图片数组
-  PicListData2: [], //获取的视频数组
 });
 
 // 获取上传的图片
 function getImgList(e) {
-  AllData.PicListData = e;
+  e.forEach((item) => {
+    item.refField = 'pat_problem';
+  });
+  AllData.formData.sysFileSaveRequestList = e;
 }
-// 获取上传的视频
-function getVideoList(e) {
-  AllData.PicListData2 = e;
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  AllData.range3 = data.map((v) => {
+    return {
+      value: v.projectNo,
+      text: v.projectAbbreviation,
+    };
+  });
 }
+//项目名称选择
+const onConfirmHedao = ({ selectedOptions }) => {
+  AllData.ShowHedao = false;
+  AllData.patrolTargetIdText = selectedOptions[0].text;
+  AllData.formData.taskName = selectedOptions[0].value;
+};
+const onCancel = () => {
+  AllData.ShowHedao = false;
+};
+
+// 提交上报
+const onSubmitData = async () => {
+  patrolProblemadd(AllData.formData).then((response) => {
+    proxy.showSuccessToast('填报成功');
+    closeDaKa();
+  });
+};
+watch(
+  route,
+  (val) => {
+    if (!!!route.query.id) return;
+    setTimeout(() => {
+      //option为object类型，会序列化上个页面传递的参数
+      console.log('传递的参数111--', route.query); //打印出上个页面传递的参数。
+
+      AllData.formData.patrolTaskId = route.query.id;
+    });
+  },
+  { immediate: true }
+);
+onMounted(() => {
+  projectTypeListM();
+});
 </script>
 <style lang="less">
 .taskFormRiver {
diff --git a/src/views/xuncha/components/inspection.vue b/src/views/xuncha/components/inspection.vue
index 8476fb8..ec82515 100644
--- a/src/views/xuncha/components/inspection.vue
+++ b/src/views/xuncha/components/inspection.vue
@@ -5,7 +5,6 @@
     <!-- 底部按钮 -->
     <div class="BottomBtn">
       <div class="Btn Btn1" @click="patrolFilling(false)">问题填报</div>
-      <!-- <div class="Btn Btn2" @click="openPopup">取消巡查</div> -->
       <div class="Btn Btn3" @click="EndPatrolClick">结束巡查</div>
     </div>
 
@@ -24,17 +23,10 @@
     <!-- 结束巡查 -->
     <van-popup v-model:show="AllData.showCancel" position="bottom" closeable :style="{ width: '100%', height: '30%' }">
       <div class="QxBox">
-        <div class="Titlediv"></div>
-        <div class="Contentdiv">确认结束巡查吗？</div>
+        <div class="Titlediv">确认结束巡查吗？</div>
+        <!-- <div class="Contentdiv"></div> -->
         <div class="QxBoxBtn">
-          <van-button
-            round
-            :type="AllData.countDown == 0 ? 'primary' : 'default'"
-            :disabled="AllData.countDown == 0 ? false : true"
-            @click="TaskCancelPatrol"
-          >
-            结束巡查
-          </van-button>
+          <van-button round @click="TaskCancelPatrol"> 结束巡查 </van-button>
         </div>
       </div>
     </van-popup>
@@ -43,14 +35,23 @@
 
 <script setup>
 import { reactive, ref, getCurrentInstance, watch, onMounted, onBeforeUnmount } from 'vue';
-// import { timestampToTime, checkUserSystem } from '@/utils/common.js';
-// import CoordTransform from '@/utils/gis/CoorTransform.js';
-// import { getCurrentPositon } from '@/utils/common.js';
+import { timestampToTime, checkUserSystem, getCurrentPositon } from '@/utils/common.js';
 
-// const router = useRouter();
-// const route = useRoute();
-// const pinias = useStore();
+import { patrolTaskFinishPatrol, patrolTaskId } from '@/api/xuncha';
+
+import WKT from 'terraformer-wkt-parser';
+
+import { useRouter, useRoute } from 'vue-router';
+
 import TaskForm from './TaskForm'; // 表单组件
+const router = useRouter();
+const route = useRoute();
+// const pinias = useStore();
+
+const props = defineProps({
+  patrolLogId: String,
+  MarkForData: Object,
+});
 const { proxy } = getCurrentInstance();
 const AllData = reactive({
   taskID: '', //当前巡检任务ID
@@ -108,7 +109,7 @@
   AllData.showForm = !AllData.showForm;
 };
 
-// 结束巡查
+// 结束巡查点击弹框
 const EndPatrolClick = () => {
   AllData.showCancel = true;
 };
@@ -122,6 +123,65 @@
     // TaskMapRef.value.MaskUpdata(2);
   }
 };
+
+// 结束巡查关闭
+const TaskCancelPatrol = () => {
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', address);
+    // 获取当前巡检任务的所有轨迹信息
+    // patrolTaskId(route.query.id).then((res) => {
+    //   if (res && res.code == 200) {
+    //     let lengthKm = 0;
+    //     if (!!res.data.patrolPath) {
+    //       lengthKm = turf.length(WKT.parse(res.data.patrolPath));
+    //     } else {
+    //       lengthKm = 0;
+    //     }
+    let param = {
+      endPlace: address,
+      // patrolTaskId: props.taskID,
+      patrolLogId: route.query.id,
+      patrolTaskId: route.query.id,
+      // patrolName: AllData.formData.NoticeFont,
+      // fileSaveRequestList: AllData.PicListData.concat(AllData.PicListData2),
+      // logContent: AllData.formData.caseContent,
+      // patrolLength: Number(lengthKm).toFixed(1),
+    };
+    patrolTaskFinishPatrol(param).then((res) => {
+      if (res?.code == 200) {
+        proxy.showSuccessToast('结束成功');
+        router.push('/TaskInspection');
+        stopAndIosLocation(); // 原生安卓、ios结束websocket推送
+      }
+    });
+    //   }
+    // });
+  });
+};
+
+// 原生安卓、ios结束websocket推送
+function stopAndIosLocation() {
+  let systems = checkUserSystem();
+  if (systems == 'Android') {
+    console.log('安卓结束websocket---');
+    window.android.disconnect(String(props.patrolLogId));
+  } else if (systems == 'IOS') {
+    console.log('ios结束websocket---');
+    window.webkit.messageHandlers.stopLocation.postMessage({ data: { refid: props.patrolLogId } });
+  }
+}
+
+watch(
+  route,
+  (val) => {
+    if (!!!route.query.id) return;
+    setTimeout(() => {
+      //option为object类型，会序列化上个页面传递的参数
+      console.log('传递的参数222--', route.query.id); //打印出上个页面传递的参数。
+    });
+  },
+  { immediate: true }
+);
 </script>
 
 <style lang="less">
diff --git a/src/views/xuncha/components/patroLogDetails.vue b/src/views/xuncha/components/patroLogDetails.vue
new file mode 100644
index 0000000..f4d8f2e
--- /dev/null
+++ b/src/views/xuncha/components/patroLogDetails.vue
@@ -0,0 +1,344 @@
+<template>
+  <div class="patroLogDetails">
+    <!-- 地图 -->
+    <div class="mapBox" :class="!allData.fullFlag ? 'mapFull' : ''">
+      <!-- <LogMap :patrolTrack="allData.path" :caseList="allData.caseList" ref="mapzxcdsfsd" /> -->
+      <div class="controlDiv">
+        <div class="controlDivList">
+          <img src="/src/assets/images/patroLog/play.png" alt="" @click="playLocus" />
+          <div class="controlDivFont" @click="playLocus">播放</div>
+        </div>
+        <div class="controlDivList">
+          <img src="/src/assets/images/patroLog/play.png" alt="" @click="suspend" />
+          <div class="controlDivFont" @click="suspend">暂停</div>
+        </div>
+        <div class="controlDivList">
+          <img src="/src/assets/images/patroLog/full-src.png" alt="" @click="fullScreen" />
+          <div class="controlDivFont" @click="fullScreen">全屏</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 底部详情 -->
+    <div class="publicDetailNF" v-if="allData.fullFlag">
+      <div class="InspectionRecord">
+        <div class="labelA">项目巡检记录</div>
+        <div class="singleDiv">
+          <text class="label">巡查记录编号</text>
+          <text class="value">{{ allData.detailsInfoTwo.basicInfoId }}</text>
+        </div>
+
+        <div class="singleDiv">
+          <text class="label">项目名称</text>
+          <text class="value">{{ allData.detailsInfoTwo.projectName }}</text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">巡检人 </text>
+          <text class="value">{{ allData.detailsInfoTwo.taskUserName }}</text>
+        </div>
+
+        <div class="singleDiv">
+          <text class="label">巡检日期</text>
+          <text class="value">{{ allData.detailsInfoTwo.realStartDatetime }}</text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">任务描述</text>
+          <text class="value">{{ allData.detailsInfoTwo.taskDescribe }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">备注</text>
+          <text class="value"> {{ allData.detailsInfoTwo.remark }} </text>
+        </div>
+      </div>
+
+      <div class="Problemrecord" v-for="(item, index) in allData.detailsInfo">
+        <div class="labelA">问题记录{{ index++ }}</div>
+        <div class="singleDiv">
+          <text class="label">问题类型 </text>
+          <text class="value"> {{ item.problemType }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">检查项 </text>
+          <text class="value"> {{ item.checkItem }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">巡检人 </text>
+          <text class="value"> {{ item.userName }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">巡检日期</text>
+          <text class="value">{{ item.createTime }}</text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">整改状态</text>
+          <text class="value"> {{ item.isRectification }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">问题描述</text>
+          <text class="value"> {{ item.problemContent }} </text>
+        </div>
+        <div class="singleImgDiv">
+          <text class="label">现场照片</text>
+          <div class="imgDiv">
+            <img
+              class="img"
+              v-for="(item1, index) in item.sysFileList"
+              :key="index"
+              :src="item1.url"
+              @click="clickImg(item1)"
+            />
+          </div>
+          <!-- 照片弹框 -->
+          <van-popup v-model:show="allData.show" closeable position="bottom" :style="{ height: '85%' }">
+            <img :src="allData.photo" alt="" class="photo" />
+          </van-popup>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { useRouter, useRoute } from 'vue-router';
+import { patrolProblemList, PatrolTaskID } from '@/api/xuncha';
+import { showImagePreview } from 'vant';
+const route = useRoute();
+const router = useRouter();
+const allData = reactive({
+  num: 1,
+  id: '',
+  fullFlag: true,
+  detailsInfo: {},
+  detailsInfoTwo: {},
+  path: [],
+  videoSrc: null,
+  imgList: [
+    // {
+    //   url: 'http://42.193.7.161:9000/newfiber-standard/2023/03/14/Screenshot_2023-03-14-17-14-32-53_a2e629f0ea915b4ed11e296a059c9a12_20230314200209A029.jpg',
+    // },
+  ],
+  videoList: [
+    // {
+    //   name: 'f210e3b80bf1dd5d867c633de815053e.mp4',
+    //   url: 'https://server1.wh-nf.cn:6084/mp4/etdzpdx_video01.mp4',
+    // },
+  ],
+  caseList: [],
+  patrolSectionId: '',
+  geometryBufferData: '',
+  show: false,
+  showvideo: false,
+  photo: '',
+  videoPop: '',
+  palyPath: null,
+  path: [],
+  center: '',
+  pathData: [],
+  planLineCenter: [],
+});
+// 获取项目巡检记录数据
+const getData = async () => {
+  let res = await patrolProblemList({ patrolTaskId: route.query.id });
+  if (res && res.code == 200) {
+    allData.detailsInfo = {
+      ...res.data,
+    };
+    console.log(allData.detailsInfo, ' allData.detailsInfo');
+  }
+};
+
+// 获取问题记录数据
+const getDatatwo = async () => {
+  let res = await PatrolTaskID(route.query.id);
+  if (res && res.code == 200) {
+    allData.detailsInfoTwo = {
+      ...res.data,
+    };
+  }
+};
+//照片弹框
+const clickImg = async (item) => {
+  showImagePreview([item.url]);
+};
+
+// 全屏
+const fullScreen = () => {
+  allData.fullFlag = !allData.fullFlag;
+  nextTick(() => {
+    // olMap.map.resize();
+  });
+};
+
+onMounted(() => {
+  getData();
+  getDatatwo();
+});
+</script>
+
+<style lang="less">
+.patroLogDetails {
+  width: 100%;
+  height: 100vh;
+  background: #fafafa;
+  .mapBox {
+    width: 100%;
+    height: 683px;
+    position: relative;
+    border: 1px solid red;
+    .controlDiv {
+      position: absolute;
+      top: 0px;
+      right: 45px;
+      width: 150px;
+      .controlDivList {
+        display: inline-block;
+        width: 150px;
+        height: 70px;
+        margin-top: 20px;
+        box-shadow: 0px 1px 21px 0px rgba(0, 28, 46, 0.3);
+        border-radius: 24px;
+
+        img {
+          width: 40px;
+          height: 40px;
+          margin: 8px;
+          float: left;
+          margin-top: 15px;
+        }
+
+        .controlDivFont {
+          float: left;
+          height: 48px;
+          line-height: 48px;
+          font-size: 30px;
+          font-family: PingFang SC;
+          font-weight: 500;
+          color: #333333;
+          margin-top: 10px;
+          margin-left: 8px;
+        }
+      }
+    }
+  }
+
+  .publicDetailNF {
+    padding: 10px 20px 10px 10px;
+    overflow: auto;
+    width: 90%;
+    height: calc(100% - 823px);
+    margin-left: 3%;
+
+    .InspectionRecord {
+      width: 100%;
+      background: #ffffff;
+      border-radius: 10px;
+    }
+    .Problemrecord {
+      margin-top: 20px;
+      width: 100%;
+      background: #ffffff;
+      border-radius: 10px;
+      //   height: calc(100% - 220px);
+    }
+    .labelA {
+      padding-top: 20px;
+      margin-left: 30px;
+      color: red;
+      font-size: 32px;
+    }
+    .singleDiv {
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid #eaeaea;
+      box-sizing: border-box;
+      min-height: 80px;
+      padding: 10px 0px;
+
+      .label {
+        width: 160px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #121212;
+        text-align: center;
+      }
+
+      .value {
+        flex: 1;
+        margin-left: 20px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #7b7b7e;
+        text-align: right;
+        line-height: 30px;
+
+        .tellDiv {
+          margin-left: 20px;
+          color: #145bf7;
+        }
+
+        .dealproDiv {
+          margin: 0 20px;
+          color: #409eff;
+        }
+      }
+    }
+    .singleImgDiv {
+      width: 100%;
+      min-height: 84px;
+      height: auto;
+      display: flex;
+
+      .label {
+        display: inline-block;
+        width: 140px;
+        height: 80px;
+        line-height: 80px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #121212;
+        text-align: center;
+      }
+
+      .imgDiv {
+        display: flex;
+        height: auto;
+        width: calc(100% - 140px);
+        text-align: right;
+        overflow: auto;
+
+        .img {
+          margin-right: 15px;
+          height: 105px;
+          width: 145px;
+          border-radius: 5px;
+          margin-top: 20px;
+          background: red;
+          &:last-child {
+            margin-right: 100px;
+          }
+        }
+      }
+
+      .videoDiv {
+        .value {
+          line-height: 50px;
+          color: #409eff;
+        }
+      }
+    }
+  }
+  .mapFull {
+    width: 100%;
+    height: 100%;
+  }
+  .photo {
+    margin-top: 80px;
+    margin-left: 30px;
+    width: 700px;
+    height: 1200px;
+  }
+}
+</style>

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
new file mode 100644
index 0000000..7d9088d
--- /dev/null
+++ b/src/api/xuncha.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+
+// 信息
+export function patrolTaskpage(params) {
+  return request({
+    url: '/business/patrolTask/page',
+    method: 'get',
+    params,
+  });
+}
+
+// 获取项目选择列表
+export function getProjectInfoList(params) {
+  return request({
+    url: '/business/projectInfoNew/list',
+    method: 'get',
+    params,
+  });
+}
+
+// 上传问题
+export function patrolProblemadd(data) {
+  return request({
+    url: '/business/patrolProblem/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 开始巡查
+export function patrolTaskbeginPatrol(data) {
+  return request({
+    url: '/business/patrolTask/beginPatrol',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 状态统计
+export function status_statistics(params) {
+  return request({
+    url: '/business/patrolTask/status_statistics',
+    method: 'get',
+    params,
+  });
+}
+// 结束巡查
+export function patrolTaskFinishPatrol(data) {
+  return request({
+    url: '/business/patrolTask/finishPatrol',
+    method: 'POST',
+    data: data,
+  });
+}
+
+// // 删除任务
+export function patrolTaskId(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'delete',
+  });
+}
+
+// 重新巡查
+export function patrolTaskRestartPatrol(query) {
+  return request({
+    url: '/business/patrolTask/restartPatrol',
+    method: 'PUT',
+    params: query,
+  });
+}
+
+// 问题统计
+export function patrolProblemList(params) {
+  return request({
+    url: '/business/patrolProblem/list',
+    method: 'get',
+    params,
+  });
+}
+
+// // 查询巡查任务
+export function PatrolTaskID(id) {
+  return request({
+    url: '/business/patrolTask/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 53324e4..fa88a84 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -3,14 +3,14 @@
 export const useStore = defineStore('HomePage', {
   state: () => {
     return {
-      token: '2222',
+      token: '',
       userNo: '', //用户名称
       loading: false, //全局loading效果
       imageUrl: '', //用户默认头像
       userName: '', //用户姓名
       userDeptName: '', //用户部门
       appMenuAuthList: [], //角色访问菜单权限
-      authType: 2, //权限类型  1-管理 2-操作
+      authType: 1, //权限类型  1-管理 2-操作
     };
   },
   persist: {
diff --git a/src/router/index.js b/src/router/index.js
index c2087d1..30b7cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,15 +46,21 @@
       path: '/TaskInspection',
       name: 'TaskInspection',
       component: () => import('@/views/xuncha/TaskInspection.vue'),
-      meta: { keepAlive: true, title: '任务巡查', ifShowHead: true, ifBack: true },
+      meta: { keepAlive: false, title: '任务巡查', ifShowHead: true, ifBack: true },
     },
     {
-      path: '/inspectionPipe',
-      name: 'inspectionPipe',
+      path: '/inspectionA',
+      name: 'inspectionA',
       component: () => import('@/views/xuncha/components/inspection.vue'),
       meta: { keepAlive: false, title: '开始巡查任务', ifShowHead: true },
     },
     {
+      path: '/patroLogDetails',
+      name: 'patroLogDetails',
+      component: () => import('@/views/xuncha/components/patroLogDetails.vue'),
+      meta: { keepAlive: false, title: '巡查记录详情', ifShowHead: true },
+    },
+    {
       path: '/editPassword',
       name: 'editPassword',
       component: () => import('@/views/home/editPassword.vue'),
diff --git a/src/utils/request.js b/src/utils/request.js
index d16fa70..e79fba9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@
       dataType: 'json',
       timeout: config.timeout || 8000,
     });
+
     //处理返回
     promise
       .then((res) => {
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index c5ea586..3841be3 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -22,12 +22,12 @@
 </template>
 
 <script setup name="headerPage">
-import { reactive, toRefs, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import bus from "@/utils/utils";
-import { checkUserSystem } from "@/utils/compatible.js";
+import { reactive, toRefs, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import bus from '@/utils/utils';
+import { checkUserSystem } from '@/utils/compatible.js';
 const allData = reactive({
-  title: "",
+  title: '',
   ifBack: true, //返回箭头是否显示
   ifShowHead: false, //整个头部bar是否显示
   ifSearch: false, //筛选icon
@@ -50,15 +50,15 @@
 };
 // 点击筛选
 const searchContent = () => {
-  bus.emit("goSearchRight", true);
+  bus.emit('goSearchRight', true);
 };
 onMounted(() => {
   // 安卓，ios顶部适配
   let sys = checkUserSystem();
-  if (sys == "Android") {
-    allData.barTop = "0Px";
+  if (sys == 'Android') {
+    allData.barTop = '30Px';
   } else {
-    allData.barTop = "0Px";
+    allData.barTop = '0Px';
   }
 });
 </script>
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index 788a7a1..615f959 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -16,19 +16,14 @@
     <div v-if="acceptFormat == 'video/*'">
       <!-- 显示视频列表 -->
       <div v-if="uploadList.length > 0">
-        <p
-          v-for="item in uploadList"
-          :key="item.data.name"
-          class="van-ellipsis blueFont"
-          @click="checkVideo(item.data.url)"
-        >
-          {{ item.data.originalName }}
+        <p v-for="item in uploadList" :key="item.name" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.originalName }}
         </p>
       </div>
       <!-- 查看视频弹窗 -->
-      <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
+      <!-- <van-popup v-model:show="showVideo" position="center" closeable class="uploadVideo" :style="{ width: '100%' }">
         <vue3VideoPlay width="100%" title="视频" :src="videoUrl" :autoPlay="true" />
-      </van-popup>
+      </van-popup> -->
     </div>
   </div>
 </template>
@@ -38,8 +33,8 @@
 import { fileUpload, fileDelete } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
-import 'vue3-video-play/dist/style.css';
-import vue3VideoPlay from 'vue3-video-play';
+// import 'vue3-video-play/dist/style.css';
+// import vue3VideoPlay from 'vue3-video-play';
 
 const props = defineProps({
   //最大上传数
@@ -74,13 +69,11 @@
 
 // 查看视频弹窗
 function checkVideo(url) {
-  console.log(url, 'url');
   videoUrl.value = url;
-  console.log(videoUrl.value, '1111');
+  console.log(videoUrl.value, '  videoUrl.value');
   showVideo.value = true;
 }
 // 开始上传图片
-
 const beforeRead = async (file) => {
   // console.log(file, '原本上传的文件--');
   // 压缩图片,大于500kb就压缩
@@ -98,9 +91,10 @@
   };
   formData.append('file', imgFile);
   let res = await fileUpload(formData, config);
-  if (res && res.data.code == 200) {
+  if (res && res.code == 200) {
     uploadList.value.push(res.data);
     console.log(uploadList.value, '  uploadList.value');
+
     emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
     proxy.showSuccessToast('上传成功');
   } else {
@@ -117,7 +111,7 @@
 };
 // 图片删除
 const deletePic = (file) => {
-  // console.log('图片删除--', file);
+  console.log('图片删除--', file);
   let fileIndex = null;
   uploadList.value.map((item, index) => {
     if (file.file.name == (item.originalName || item.name)) {
@@ -198,6 +192,7 @@
     };
     fileList.value.push(params);
     uploadList.value.push(params);
+    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 1b24a1b..5008332 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -66,8 +66,8 @@
 
 // 退出登录
 function logOut() {
-  localStorage.removeItem('NFAppToken');
-  document.cookie = 'NFAppToken=' + '';
+  localStorage.removeItem('KFAppToken');
+  document.cookie = 'KFAppToken=' + '';
   proxy.showSuccessToast('退出成功');
   router.push('/login');
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0870d8c..8174527 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,11 +78,11 @@
   allData.loginLoading = true;
   // 默认存储密码
   if (allData.remberPass) {
-    localStorage.setItem('usernameNFApp', allData.userName);
-    localStorage.setItem('passwordNFApp', EncryptAES(allData.password));
+    localStorage.setItem('usernameKFApp', allData.userName);
+    localStorage.setItem('passwordKFApp', EncryptAES(allData.password));
   } else {
-    localStorage.removeItem('usernameNFApp');
-    localStorage.removeItem('passwordNFApp');
+    localStorage.removeItem('usernameKFApp');
+    localStorage.removeItem('passwordKFApp');
   }
   let params = {
     username: allData.userName,
@@ -94,23 +94,23 @@
 
   if (res && res.code == 200) {
     allData.loginLoading = false;
-    const { access_token } = res;
+    let access_token = res.data.access_token;
     pinias.$patch((state) => {
       state.token = access_token;
     });
-    localStorage.setItem('NFAppToken', access_token); //存储token
+    localStorage.setItem('KFAppToken', access_token); //存储token
     router.push('/home_homePage');
     // 获取用户个人详细信息
-    // getInfo().then((res2) => {
-    //   let datas = res2.data.user;
-    //   pinias.$patch((state) => {
-    //     state.userNo = datas.userId;
-    //     state.phonenumber = datas.phonenumber;
-    //     state.imageUrl = datas.avatar || userImages;
-    //     state.userName = datas.nickName || '管理员';
-    //     state.userDeptName = datas.dept.deptName;
-    //   });
-    // });
+    getInfo().then((res2) => {
+      let datas = res2.data.user;
+      pinias.$patch((state) => {
+        state.userNo = datas.userId;
+        state.phonenumber = datas.phonenumber;
+        state.imageUrl = datas.avatar || userImages;
+        state.userName = datas.nickName || '管理员';
+        state.userDeptName = datas.dept.deptName;
+      });
+    });
   } else {
     getCode();
     allData.loginLoading = false;
@@ -128,10 +128,10 @@
 onMounted(() => {
   getCode();
   if (allData.remberPass) {
-    const usernameNFApp = localStorage.getItem('usernameNFApp');
-    const passwordNFApp = localStorage.getItem('passwordNFApp');
-    allData.userName = usernameNFApp ? usernameNFApp : '';
-    allData.password = passwordNFApp ? DecryptAES(passwordNFApp) : '';
+    const usernameKFApp = localStorage.getItem('usernameKFApp');
+    const passwordKFApp = localStorage.getItem('passwordKFApp');
+    allData.userName = usernameKFApp ? usernameKFApp : '';
+    allData.password = passwordKFApp ? DecryptAES(passwordKFApp) : '';
   }
 });
 </script>
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 19b129c..606f35f 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -5,7 +5,7 @@
       <div class="topTabsNF">
         <div
           class="tabsList"
-          v-for="(item, index) in AllData.TopTabsData"
+          v-for="item in AllData.TopTabsData"
           :key="item.status"
           @click="topTabsChange(item)"
           :class="{ tabsListActive: AllData.ActiveID == item.status }"
@@ -22,9 +22,9 @@
           v-model="AllData.searchV"
           confirm-type="search"
           placeholder="综合搜索"
-          @confirm="getPatrolTaskPage(true)"
+          @confirm="getList(true)"
         />
-        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getPatrolTaskPage(true)" />
+        <img :src="getImgPatrol('Search.png')" class="SearchIcon" alt="" @click="getList(true)" />
       </div>
     </div>
     <!-- 下部数据列表 -->
@@ -37,7 +37,7 @@
         :offset="50"
         @load="lowerRefresh"
       >
-        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList">
+        <div v-for="(item, index) in AllData.dataList" :key="index" class="dataList" @click="checkDetail(item)">
           <div class="dataListTitle">
             <!-- 标题 -->
             <div class="fontView">
@@ -122,9 +122,11 @@
 <script setup>
 import { nextTick, onMounted, reactive, getCurrentInstance } from 'vue';
 import { getImgPatrol } from '@/utils/common.js';
+import { patrolTaskpage, patrolTaskbeginPatrol, status_statistics, patrolTaskRestartPatrol } from '@/api/xuncha';
 import { getCurrentPositon } from '@/utils/common.js';
 import { useStore } from '@/pinia/store.js';
 import { useRouter } from 'vue-router';
+const { proxy } = getCurrentInstance();
 const pinias = useStore();
 const router = useRouter();
 const AllData = reactive({
@@ -148,36 +150,11 @@
       statusName: '已完成',
     },
   ],
+
   // 顶部tab选取项
   ActiveID: 'to_start',
   // 数据列表
-  dataList: [
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'expired',
-      sectionType: '',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'proceed',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-    {
-      taskName: '河道线路巡查测试2023090122',
-      planStartDatetime: '2023-09-22 00:00:00',
-      planEndDatetime: '2023-09-19 23:59:59',
-      status: 'to_start',
-    },
-  ],
+  dataList: [],
   triggered: false,
   ListPage: {
     page: 1,
@@ -187,14 +164,6 @@
   searchV: '',
 });
 
-// 顶部tab切换事件
-const topTabsChange = (item) => {
-  AllData.ActiveID = item.status;
-  AllData.ListPage.page = 1;
-  // AllData.dataList = [];
-  // getPatrolTaskPage(true);
-};
-
 /**
  * 点击按钮执行巡查功能
  */
@@ -210,60 +179,159 @@
     // 继续巡查
     proxy.showSuccessToast('开始巡查');
     router.push({
-      // path: '/inspectionPipe',
-      // query: { type: type, num: num, id: id, sectionType: sectionType },
+      path: '/inspectionA',
+      query: { type: type, num: num, id: id, sectionType: sectionType },
     });
   }
 };
 
-//根据经纬度获取地名
 /**
  * 开始巡查
  */
 const BeginPatrol = (type, num, id, sectionType) => {
-  router.push({
-    path: '/inspectionPipe',
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', lng, '--', lat, '--', address);
+    patrolTaskbeginPatrol({
+      taskId: id,
+      startPlace: address,
+    }).then((res) => {
+      if (res && res.code == 200) {
+        proxy.showSuccessToast('开始巡查');
+        router.push({
+          path: '/inspectionA',
+          query: { id: id },
+        });
+      } else {
+        proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
+      }
+    });
   });
-
-  // getCurrentPositon((lng, lat, address) => {
-  //   // console.log('获取安卓定位参数--', lng, '--', lat);
-  //   // patrolTaskBeginPatrol({
-  //   //   taskId: id,
-  //   //   startPlace: address,
-  //   // }).then((res) => {
-  //   //   if (res && res.code == 200) {
-  //   //     proxy.showSuccessToast('开始巡查');
-  //   //     router.push({
-  //   //       path: '/inspectionPipe',
-  //   //       query: { type: type, num: num, id: id, sectionType: sectionType },
-  //   //     });
-  //   //   } else {
-  //   //     proxy.showFailToast(res.msg || '巡查启动失败,请稍后再试');
-  //   //   }
-  //   // });
-  // });
 };
 
 /**
- * 获取当前状态下的任务列表
- * bol:true: 重置分页条件
+ * 重新巡查
  */
-const getPatrolTaskPage = async (bol) => {
-  pinias.showLoading();
-  AllData.finished = false;
-  AllData.loading = false;
+const BeginPatrol2 = (type, num, id, sectionType) => {
+  patrolTaskRestartPatrol({
+    taskId: id,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      proxy.showSuccessToast('重新开始巡查');
+      router.push({
+        path: '/inspectionA',
+        query: { id: id },
+      });
+    } else {
+      proxy.showFailToast('巡查启动失败,请稍后再试');
+    }
+  });
+};
+
+// 顶部tab切换事件
+const topTabsChange = (item) => {
+  AllData.ActiveID = item.status;
+  AllData.ListPage.page = 1;
+  AllData.dataList = [];
+  getList(true);
 };
 const lowerRefresh = (e) => {
-  AllData.finished = true;
-  AllData.loading = false;
-  // if (AllData.ListPage.total > AllData.dataList.length) {
-  //   AllData.ListPage.page += 1;
-  //   getPatrolTaskPage();
-  // } else {
-  //   AllData.finished = true;
-  //   AllData.loading = false;
-  // }
+  if (AllData.ListPage.total > AllData.dataList.length) {
+    AllData.ListPage.page += 1;
+    getList();
+  } else {
+    AllData.finished = true;
+    AllData.loading = false;
+  }
 };
+// 列表查询接口
+const getList = async (bol) => {
+  pinias.showLoading();
+  AllData.finished = false;
+  AllData.loading = true;
+  if (bol) {
+    // 初始化分页
+    AllData.ListPage.page = 1;
+    AllData.ListPage.size = 10;
+  }
+  let params = {
+    pageNum: AllData.ListPage.page,
+    pageSize: AllData.ListPage.size,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
+    fatherCode: -1,
+    taskName: AllData.searchV,
+    taskUserId: pinias.userNo,
+  };
+  let res = await patrolTaskpage(params);
+  if (res && res.code == 200) {
+    if (bol) {
+      // 直接覆盖所有信息
+      AllData.dataList = res.data;
+    } else {
+      // 追加列表信息
+      AllData.dataList = AllData.dataList.concat(res.data);
+    }
+    getTaskTypeNum(); //重新加载tab数据
+    AllData.ListPage.total = res.total;
+    pinias.hideLoading();
+    // 加载状态结束 状态更新为false
+    AllData.loading = false;
+  }
+};
+
+/**
+ * 获取当前任务类型的各个数量
+ */
+const getTaskTypeNum = () => {
+  let query = {
+    taskUserId: pinias.userNo,
+
+    taskName: AllData.searchV,
+  };
+  status_statistics(query).then((res) => {
+    if (res && res.code == 200) {
+      let data = res.data;
+      AllData.TopTabsData = [
+        {
+          count: null,
+          status: 'to_start',
+          statusName: '未完成',
+        },
+        {
+          count: null,
+          status: 'proceed',
+          statusName: '执行中',
+        },
+        {
+          count: null,
+          status: 'done',
+          statusName: '已完成',
+        },
+      ];
+      data.forEach((v, i) => {
+        // 处理数据 这里不要 expired 已超时的状态 status不会变,遍历获取其状态的值
+        if (v.status == 'to_start' || v.status == 'expired')
+          AllData.TopTabsData[0].count = AllData.TopTabsData[0].count + v.count;
+        if (v.status == 'proceed') AllData.TopTabsData[1].count = v.count;
+        if (v.status == 'done') AllData.TopTabsData[2].count = v.count;
+      });
+    }
+  });
+};
+
+// 已完成跳转详情
+function checkDetail(query) {
+  if (query.status == 'done') {
+    console.log('234');
+    router.push({
+      path: '/patroLogDetails',
+      query,
+    });
+  }
+}
+
+onMounted(() => {
+  getList();
+});
 </script>
 <style lang="less">
 .patrolTaskPipe {
diff --git a/src/views/xuncha/components/TaskForm.vue b/src/views/xuncha/components/TaskForm.vue
index c72e93b..d0caea5 100644
--- a/src/views/xuncha/components/TaskForm.vue
+++ b/src/views/xuncha/components/TaskForm.vue
@@ -4,37 +4,46 @@
     <van-form @submit="onSubmitData">
       <div class="ContentView" id="ContentViewRiver">
         <van-field
-          v-model="value"
+          v-model="AllData.patrolTargetIdText"
+          is-link
+          readonly
+          label="项目名称"
+          @click="AllData.ShowHedao = true"
+          placeholder="请选择项目名称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入项目名称' }]"
+        />
+        <van-popup v-model:show="AllData.ShowHedao" round position="bottom">
+          <van-picker value-key="" :columns="AllData.range3" @cancel="onCancel" @confirm="onConfirmHedao" />
+        </van-popup>
+        <van-field
+          v-model="AllData.formData.problemType"
           label="问题类型"
           placeholder="请输入问题类型"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题类型' }]"
         />
         <van-field
-          v-model="value"
+          v-model="AllData.formData.checkItem"
           label="检查项"
           placeholder="请输入检查项"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入检查项' }]"
         />
-        <van-field label="是否整改" name="caseLevel" required :rules="[{ required: true, message: '请选择' }]">
+        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
           <template #input>
-            <van-radio-group v-model="AllData.formData.caseLevel" direction="horizontal">
-              <van-radio
-                :name="item.value"
-                v-for="item in AllData.formOptions.case_level"
-                :key="item.value"
-                @click="getAnJianName2(item)"
-              >
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
                 {{ item.label }}
               </van-radio>
             </van-radio-group>
           </template>
         </van-field>
         <van-field
-          v-model="AllData.formData.caseName"
+          v-model="AllData.formData.problemContent"
           rows="2"
           autosize
           label="问题描述"
@@ -43,7 +52,7 @@
           placeholder="请输入问题描述"
           show-word-limit
           required
-          :rules="[{ required: true, message: '请输入' }]"
+          :rules="[{ required: true, message: '请输入问题描述' }]"
         />
 
         <div class="mediumList">
@@ -51,23 +60,12 @@
           <div class="picBox">
             <UploadImg
               :maxCount="3"
-              :saveFileArr="AllData.PicListData"
+              :saveFileArr="AllData.formData.sysFileSaveRequestList"
               :acceptFormat="'image/*'"
               @update:saveFileArr="getImgList"
             />
           </div>
         </div>
-        <!-- <div class="mediumList">
-          <span class="Title">现场视频(最多3个)</span>
-          <div class="picBox">
-            <UploadImg
-              :maxCount="3"
-              :saveFileArr="AllData.PicListData2"
-              :acceptFormat="'video/*'"
-              @update:saveFileArr="getVideoList"
-            ></UploadImg>
-          </div>
-        </div> -->
       </div>
       <div class="BottomView">
         <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
@@ -78,54 +76,98 @@
 </template>
 <script setup>
 import UploadImg from '@/views/components/uploadFile.vue';
+import { getProjectInfoList, patrolProblemadd } from '@/api/xuncha';
+import { useRouter, useRoute } from 'vue-router';
 // 获取父组件传过来的patrolLogId
 const props = defineProps({
   patrolLogId: String,
   MarkForData: Object,
 });
+const { proxy } = getCurrentInstance();
 const emits = defineEmits(['closeFormTransition']);
 const closeDaKa = () => {
   emits('closeFormTransition', 'AnJianUpdatas');
 };
+const route = useRoute();
 const AllData = reactive({
+  ShowHedao: false,
+  range3: [],
   formData: {
-    reportFlag: 0,
-    caseLevel: '',
-    caseType: '',
-    caseName: '',
-    caseSource: 'patrol_report',
-    caseContent: '',
-    patrolLogId: props.patrolLogId,
-    lonLat: '',
-    caseAddress: '',
-    fileSaveRequestList: [],
-    caseDataSource: 'task',
+    problemType: '',
+    sysFileSaveRequestList: [], //获取的图片数组
+    taskName: '',
+    checkItem: '',
+    isRectification: '',
+    problemContent: '',
+    patrolTaskId: '',
   },
+  patrolTargetIdText: '',
   formOptions: {
     case_level: [
       {
         value: '1',
-        label: 'aa',
+        label: '无需整改',
       },
       {
         value: '2',
-        label: 'bb',
+        label: '待整改',
       },
+      { value: '3', label: '整改已完成' },
     ],
     caseTypeData: [],
   },
-  PicListData: [], //获取的图片数组
-  PicListData2: [], //获取的视频数组
 });
 
 // 获取上传的图片
 function getImgList(e) {
-  AllData.PicListData = e;
+  e.forEach((item) => {
+    item.refField = 'pat_problem';
+  });
+  AllData.formData.sysFileSaveRequestList = e;
 }
-// 获取上传的视频
-function getVideoList(e) {
-  AllData.PicListData2 = e;
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  AllData.range3 = data.map((v) => {
+    return {
+      value: v.projectNo,
+      text: v.projectAbbreviation,
+    };
+  });
 }
+//项目名称选择
+const onConfirmHedao = ({ selectedOptions }) => {
+  AllData.ShowHedao = false;
+  AllData.patrolTargetIdText = selectedOptions[0].text;
+  AllData.formData.taskName = selectedOptions[0].value;
+};
+const onCancel = () => {
+  AllData.ShowHedao = false;
+};
+
+// 提交上报
+const onSubmitData = async () => {
+  patrolProblemadd(AllData.formData).then((response) => {
+    proxy.showSuccessToast('填报成功');
+    closeDaKa();
+  });
+};
+watch(
+  route,
+  (val) => {
+    if (!!!route.query.id) return;
+    setTimeout(() => {
+      //option为object类型，会序列化上个页面传递的参数
+      console.log('传递的参数111--', route.query); //打印出上个页面传递的参数。
+
+      AllData.formData.patrolTaskId = route.query.id;
+    });
+  },
+  { immediate: true }
+);
+onMounted(() => {
+  projectTypeListM();
+});
 </script>
 <style lang="less">
 .taskFormRiver {
diff --git a/src/views/xuncha/components/inspection.vue b/src/views/xuncha/components/inspection.vue
index 8476fb8..ec82515 100644
--- a/src/views/xuncha/components/inspection.vue
+++ b/src/views/xuncha/components/inspection.vue
@@ -5,7 +5,6 @@
     <!-- 底部按钮 -->
     <div class="BottomBtn">
       <div class="Btn Btn1" @click="patrolFilling(false)">问题填报</div>
-      <!-- <div class="Btn Btn2" @click="openPopup">取消巡查</div> -->
       <div class="Btn Btn3" @click="EndPatrolClick">结束巡查</div>
     </div>
 
@@ -24,17 +23,10 @@
     <!-- 结束巡查 -->
     <van-popup v-model:show="AllData.showCancel" position="bottom" closeable :style="{ width: '100%', height: '30%' }">
       <div class="QxBox">
-        <div class="Titlediv"></div>
-        <div class="Contentdiv">确认结束巡查吗？</div>
+        <div class="Titlediv">确认结束巡查吗？</div>
+        <!-- <div class="Contentdiv"></div> -->
         <div class="QxBoxBtn">
-          <van-button
-            round
-            :type="AllData.countDown == 0 ? 'primary' : 'default'"
-            :disabled="AllData.countDown == 0 ? false : true"
-            @click="TaskCancelPatrol"
-          >
-            结束巡查
-          </van-button>
+          <van-button round @click="TaskCancelPatrol"> 结束巡查 </van-button>
         </div>
       </div>
     </van-popup>
@@ -43,14 +35,23 @@
 
 <script setup>
 import { reactive, ref, getCurrentInstance, watch, onMounted, onBeforeUnmount } from 'vue';
-// import { timestampToTime, checkUserSystem } from '@/utils/common.js';
-// import CoordTransform from '@/utils/gis/CoorTransform.js';
-// import { getCurrentPositon } from '@/utils/common.js';
+import { timestampToTime, checkUserSystem, getCurrentPositon } from '@/utils/common.js';
 
-// const router = useRouter();
-// const route = useRoute();
-// const pinias = useStore();
+import { patrolTaskFinishPatrol, patrolTaskId } from '@/api/xuncha';
+
+import WKT from 'terraformer-wkt-parser';
+
+import { useRouter, useRoute } from 'vue-router';
+
 import TaskForm from './TaskForm'; // 表单组件
+const router = useRouter();
+const route = useRoute();
+// const pinias = useStore();
+
+const props = defineProps({
+  patrolLogId: String,
+  MarkForData: Object,
+});
 const { proxy } = getCurrentInstance();
 const AllData = reactive({
   taskID: '', //当前巡检任务ID
@@ -108,7 +109,7 @@
   AllData.showForm = !AllData.showForm;
 };
 
-// 结束巡查
+// 结束巡查点击弹框
 const EndPatrolClick = () => {
   AllData.showCancel = true;
 };
@@ -122,6 +123,65 @@
     // TaskMapRef.value.MaskUpdata(2);
   }
 };
+
+// 结束巡查关闭
+const TaskCancelPatrol = () => {
+  getCurrentPositon((lng, lat, address) => {
+    console.log('获取安卓定位参数--', address);
+    // 获取当前巡检任务的所有轨迹信息
+    // patrolTaskId(route.query.id).then((res) => {
+    //   if (res && res.code == 200) {
+    //     let lengthKm = 0;
+    //     if (!!res.data.patrolPath) {
+    //       lengthKm = turf.length(WKT.parse(res.data.patrolPath));
+    //     } else {
+    //       lengthKm = 0;
+    //     }
+    let param = {
+      endPlace: address,
+      // patrolTaskId: props.taskID,
+      patrolLogId: route.query.id,
+      patrolTaskId: route.query.id,
+      // patrolName: AllData.formData.NoticeFont,
+      // fileSaveRequestList: AllData.PicListData.concat(AllData.PicListData2),
+      // logContent: AllData.formData.caseContent,
+      // patrolLength: Number(lengthKm).toFixed(1),
+    };
+    patrolTaskFinishPatrol(param).then((res) => {
+      if (res?.code == 200) {
+        proxy.showSuccessToast('结束成功');
+        router.push('/TaskInspection');
+        stopAndIosLocation(); // 原生安卓、ios结束websocket推送
+      }
+    });
+    //   }
+    // });
+  });
+};
+
+// 原生安卓、ios结束websocket推送
+function stopAndIosLocation() {
+  let systems = checkUserSystem();
+  if (systems == 'Android') {
+    console.log('安卓结束websocket---');
+    window.android.disconnect(String(props.patrolLogId));
+  } else if (systems == 'IOS') {
+    console.log('ios结束websocket---');
+    window.webkit.messageHandlers.stopLocation.postMessage({ data: { refid: props.patrolLogId } });
+  }
+}
+
+watch(
+  route,
+  (val) => {
+    if (!!!route.query.id) return;
+    setTimeout(() => {
+      //option为object类型，会序列化上个页面传递的参数
+      console.log('传递的参数222--', route.query.id); //打印出上个页面传递的参数。
+    });
+  },
+  { immediate: true }
+);
 </script>
 
 <style lang="less">
diff --git a/src/views/xuncha/components/patroLogDetails.vue b/src/views/xuncha/components/patroLogDetails.vue
new file mode 100644
index 0000000..f4d8f2e
--- /dev/null
+++ b/src/views/xuncha/components/patroLogDetails.vue
@@ -0,0 +1,344 @@
+<template>
+  <div class="patroLogDetails">
+    <!-- 地图 -->
+    <div class="mapBox" :class="!allData.fullFlag ? 'mapFull' : ''">
+      <!-- <LogMap :patrolTrack="allData.path" :caseList="allData.caseList" ref="mapzxcdsfsd" /> -->
+      <div class="controlDiv">
+        <div class="controlDivList">
+          <img src="/src/assets/images/patroLog/play.png" alt="" @click="playLocus" />
+          <div class="controlDivFont" @click="playLocus">播放</div>
+        </div>
+        <div class="controlDivList">
+          <img src="/src/assets/images/patroLog/play.png" alt="" @click="suspend" />
+          <div class="controlDivFont" @click="suspend">暂停</div>
+        </div>
+        <div class="controlDivList">
+          <img src="/src/assets/images/patroLog/full-src.png" alt="" @click="fullScreen" />
+          <div class="controlDivFont" @click="fullScreen">全屏</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 底部详情 -->
+    <div class="publicDetailNF" v-if="allData.fullFlag">
+      <div class="InspectionRecord">
+        <div class="labelA">项目巡检记录</div>
+        <div class="singleDiv">
+          <text class="label">巡查记录编号</text>
+          <text class="value">{{ allData.detailsInfoTwo.basicInfoId }}</text>
+        </div>
+
+        <div class="singleDiv">
+          <text class="label">项目名称</text>
+          <text class="value">{{ allData.detailsInfoTwo.projectName }}</text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">巡检人 </text>
+          <text class="value">{{ allData.detailsInfoTwo.taskUserName }}</text>
+        </div>
+
+        <div class="singleDiv">
+          <text class="label">巡检日期</text>
+          <text class="value">{{ allData.detailsInfoTwo.realStartDatetime }}</text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">任务描述</text>
+          <text class="value">{{ allData.detailsInfoTwo.taskDescribe }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">备注</text>
+          <text class="value"> {{ allData.detailsInfoTwo.remark }} </text>
+        </div>
+      </div>
+
+      <div class="Problemrecord" v-for="(item, index) in allData.detailsInfo">
+        <div class="labelA">问题记录{{ index++ }}</div>
+        <div class="singleDiv">
+          <text class="label">问题类型 </text>
+          <text class="value"> {{ item.problemType }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">检查项 </text>
+          <text class="value"> {{ item.checkItem }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">巡检人 </text>
+          <text class="value"> {{ item.userName }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">巡检日期</text>
+          <text class="value">{{ item.createTime }}</text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">整改状态</text>
+          <text class="value"> {{ item.isRectification }} </text>
+        </div>
+        <div class="singleDiv">
+          <text class="label">问题描述</text>
+          <text class="value"> {{ item.problemContent }} </text>
+        </div>
+        <div class="singleImgDiv">
+          <text class="label">现场照片</text>
+          <div class="imgDiv">
+            <img
+              class="img"
+              v-for="(item1, index) in item.sysFileList"
+              :key="index"
+              :src="item1.url"
+              @click="clickImg(item1)"
+            />
+          </div>
+          <!-- 照片弹框 -->
+          <van-popup v-model:show="allData.show" closeable position="bottom" :style="{ height: '85%' }">
+            <img :src="allData.photo" alt="" class="photo" />
+          </van-popup>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { useRouter, useRoute } from 'vue-router';
+import { patrolProblemList, PatrolTaskID } from '@/api/xuncha';
+import { showImagePreview } from 'vant';
+const route = useRoute();
+const router = useRouter();
+const allData = reactive({
+  num: 1,
+  id: '',
+  fullFlag: true,
+  detailsInfo: {},
+  detailsInfoTwo: {},
+  path: [],
+  videoSrc: null,
+  imgList: [
+    // {
+    //   url: 'http://42.193.7.161:9000/newfiber-standard/2023/03/14/Screenshot_2023-03-14-17-14-32-53_a2e629f0ea915b4ed11e296a059c9a12_20230314200209A029.jpg',
+    // },
+  ],
+  videoList: [
+    // {
+    //   name: 'f210e3b80bf1dd5d867c633de815053e.mp4',
+    //   url: 'https://server1.wh-nf.cn:6084/mp4/etdzpdx_video01.mp4',
+    // },
+  ],
+  caseList: [],
+  patrolSectionId: '',
+  geometryBufferData: '',
+  show: false,
+  showvideo: false,
+  photo: '',
+  videoPop: '',
+  palyPath: null,
+  path: [],
+  center: '',
+  pathData: [],
+  planLineCenter: [],
+});
+// 获取项目巡检记录数据
+const getData = async () => {
+  let res = await patrolProblemList({ patrolTaskId: route.query.id });
+  if (res && res.code == 200) {
+    allData.detailsInfo = {
+      ...res.data,
+    };
+    console.log(allData.detailsInfo, ' allData.detailsInfo');
+  }
+};
+
+// 获取问题记录数据
+const getDatatwo = async () => {
+  let res = await PatrolTaskID(route.query.id);
+  if (res && res.code == 200) {
+    allData.detailsInfoTwo = {
+      ...res.data,
+    };
+  }
+};
+//照片弹框
+const clickImg = async (item) => {
+  showImagePreview([item.url]);
+};
+
+// 全屏
+const fullScreen = () => {
+  allData.fullFlag = !allData.fullFlag;
+  nextTick(() => {
+    // olMap.map.resize();
+  });
+};
+
+onMounted(() => {
+  getData();
+  getDatatwo();
+});
+</script>
+
+<style lang="less">
+.patroLogDetails {
+  width: 100%;
+  height: 100vh;
+  background: #fafafa;
+  .mapBox {
+    width: 100%;
+    height: 683px;
+    position: relative;
+    border: 1px solid red;
+    .controlDiv {
+      position: absolute;
+      top: 0px;
+      right: 45px;
+      width: 150px;
+      .controlDivList {
+        display: inline-block;
+        width: 150px;
+        height: 70px;
+        margin-top: 20px;
+        box-shadow: 0px 1px 21px 0px rgba(0, 28, 46, 0.3);
+        border-radius: 24px;
+
+        img {
+          width: 40px;
+          height: 40px;
+          margin: 8px;
+          float: left;
+          margin-top: 15px;
+        }
+
+        .controlDivFont {
+          float: left;
+          height: 48px;
+          line-height: 48px;
+          font-size: 30px;
+          font-family: PingFang SC;
+          font-weight: 500;
+          color: #333333;
+          margin-top: 10px;
+          margin-left: 8px;
+        }
+      }
+    }
+  }
+
+  .publicDetailNF {
+    padding: 10px 20px 10px 10px;
+    overflow: auto;
+    width: 90%;
+    height: calc(100% - 823px);
+    margin-left: 3%;
+
+    .InspectionRecord {
+      width: 100%;
+      background: #ffffff;
+      border-radius: 10px;
+    }
+    .Problemrecord {
+      margin-top: 20px;
+      width: 100%;
+      background: #ffffff;
+      border-radius: 10px;
+      //   height: calc(100% - 220px);
+    }
+    .labelA {
+      padding-top: 20px;
+      margin-left: 30px;
+      color: red;
+      font-size: 32px;
+    }
+    .singleDiv {
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid #eaeaea;
+      box-sizing: border-box;
+      min-height: 80px;
+      padding: 10px 0px;
+
+      .label {
+        width: 160px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #121212;
+        text-align: center;
+      }
+
+      .value {
+        flex: 1;
+        margin-left: 20px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #7b7b7e;
+        text-align: right;
+        line-height: 30px;
+
+        .tellDiv {
+          margin-left: 20px;
+          color: #145bf7;
+        }
+
+        .dealproDiv {
+          margin: 0 20px;
+          color: #409eff;
+        }
+      }
+    }
+    .singleImgDiv {
+      width: 100%;
+      min-height: 84px;
+      height: auto;
+      display: flex;
+
+      .label {
+        display: inline-block;
+        width: 140px;
+        height: 80px;
+        line-height: 80px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #121212;
+        text-align: center;
+      }
+
+      .imgDiv {
+        display: flex;
+        height: auto;
+        width: calc(100% - 140px);
+        text-align: right;
+        overflow: auto;
+
+        .img {
+          margin-right: 15px;
+          height: 105px;
+          width: 145px;
+          border-radius: 5px;
+          margin-top: 20px;
+          background: red;
+          &:last-child {
+            margin-right: 100px;
+          }
+        }
+      }
+
+      .videoDiv {
+        .value {
+          line-height: 50px;
+          color: #409eff;
+        }
+      }
+    }
+  }
+  .mapFull {
+    width: 100%;
+    height: 100%;
+  }
+  .photo {
+    margin-top: 80px;
+    margin-left: 30px;
+    width: 700px;
+    height: 1200px;
+  }
+}
+</style>
diff --git a/vite.config.js b/vite.config.js
index 5a203cd..d43716a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -10,8 +10,8 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 
 // const targetUrl = 'http://192.168.16.100:7200'; //陈迁
-const targetUrl = 'http://192.168.1.6:7300'; //杨辉
-// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+// const targetUrl = 'http://192.168.1.6:7300'; //杨辉
+const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 export default defineConfig({
   // 地址是和router中和ngix中配置的名称一致
@@ -82,7 +82,7 @@
       '/business': {
         target: targetUrl,
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/business/, '/business'),
+        rewrite: (p) => p.replace(/^\/business/, '/business'),
       },
       '/publicService': {
         target: targetUrl,