diff --git a/.env.development b/.env.development
index edc5753..b2b3cc4 100644
--- a/.env.development
+++ b/.env.development
@@ -5,33 +5,22 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
-# 李陈杰 209
 # VITE_APP_BASE_API = 'http://192.168.110.209:8899'
-# 李陈杰 209
-#  VITE_APP_BASE_API = 'http://192.168.110.209:8899'
-# 曾涛
-# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
-# 罗成
-# VITE_APP_BASE_API = 'http://192.168.110.188:8899'
-# 朱银
-# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
-#曾涛
-# VITE_APP_BASE_API = 'http://192.168.110.171:8899'
-# 屈展航
-# VITE_APP_BASE_API = 'http://192.168.110.210:8899'
-
+VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+# GO开发环境
+VITE_APP_BASE_API_GO = 'http://xny.yj-3d.com:7464'
+# VITE_APP_BASE_API_GO = 'http://192.168.110.188:8919'
 
 # ws
 VITE_APP_BASE_WS_API = 'ws://192.168.110.149:8899/resource/websocket'
 # EARTH
-VITE_APP_BASE_EARTH_API = "http://192.168.110.2:8895"
+VITE_APP_BASE_EARTH_API = "http://xny.yj-3d.com:8895"
 
 # 无人机接口地址
 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'
 
 # 应用访问路径 例如使用前缀 /admin/
-VITE_APP_CONTEXT_PATH = '/'
+VITE_APP_CONTEXT_PATH = '/' 
 
 # 监控地址
 VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/admin/applications'
diff --git a/.env.production b/.env.production
index 8870fdc..911deb6 100644
--- a/.env.production
+++ b/.env.production
@@ -14,7 +14,10 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
+# GO生产环境
+VITE_APP_BASE_API_GO = 'http://58.17.134.85:7464'
 VITE_APP_BASE_API = 'http://xny.yj-3d.com:8899'
+VITE_APP_BASE_EARTH_API = "http://xny.yj-3d.com:8895"
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
diff --git a/src/views/demo3/bar1.vue b/npm
similarity index 100%
rename from src/views/demo3/bar1.vue
rename to npm
diff --git a/package.json b/package.json
index 3f899c3..00923e0 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "echarts-gl": "^2.0.9",
     "element-plus": "2.8.8",
     "esbuild": "^0.25.0",
+    "exceljs": "^4.4.0",
     "ezuikit-js": "^8.1.10",
     "file-saver": "^2.0.5",
     "fuse.js": "7.0.0",
@@ -66,6 +67,7 @@
     "vue-json-pretty": "2.4.0",
     "vue-print-nb": "^1.7.5",
     "vue-router": "4.4.5",
+    "vue-simple-uploader": "^1.0.3",
     "vue-types": "5.1.3",
     "vue3-print-nb": "^0.1.4",
     "vue3-scroll-seamless": "^1.0.6",
diff --git a/public/assets/demo/Sunny.png b/public/assets/demo/Sunny.png
index 14c94d4..a1c65ac 100644
Binary files a/public/assets/demo/Sunny.png and b/public/assets/demo/Sunny.png differ
diff --git a/public/assets/demo/sunny copy.png b/public/assets/demo/sunny copy.png
deleted file mode 100644
index a1c65ac..0000000
Binary files a/public/assets/demo/sunny copy.png and /dev/null differ
diff --git a/public/assets/demo/sunnyBig.png b/public/assets/demo/sunnyBig.png
new file mode 100644
index 0000000..14c94d4
Binary files /dev/null and b/public/assets/demo/sunnyBig.png differ
diff --git a/src/api/cory/contactnotice/index.ts b/src/api/cory/contactnotice/index.ts
index 89e28c3..76498ca 100644
--- a/src/api/cory/contactnotice/index.ts
+++ b/src/api/cory/contactnotice/index.ts
@@ -16,6 +16,17 @@ export const listContactnotice = (query?: ContactnoticeQuery): AxiosPromise<Cont
   });
 };
 
+/**
+ * 根据项目id查询项目班组班组长信息列表
+ * @param projectId
+ */
+export const listProjectTeamForeman = (projectId: string | number): AxiosPromise<any[]> => {
+  return request({
+    url: '/project/projectTeam/listForeman/' + projectId,
+    method: 'get'
+  });
+};
+
 /**
  * 查询联系单详细
  * @param id
diff --git a/src/api/gis/index.ts b/src/api/gis/index.ts
index e6c9de9..9269e20 100644
--- a/src/api/gis/index.ts
+++ b/src/api/gis/index.ts
@@ -1,4 +1,5 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
+import request1 from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import {
   QualityVO,
@@ -12,15 +13,29 @@ import {
   weatherVO,
   safetyDayVO
 } from './type';
+/**
+ * 查询大屏质量列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getQualityList = (query?: any): AxiosPromise<QualityVO> => {
+  return request({
+    url: '/zm/api/v1/system/busInspectionTicket/gisQualityManagementList',
+    method: 'get',
+    params: query
+  });
+};
+
 /**
  * 查询大屏质量信息
  * @param query
  * @returns {*}
  */
 
-export const getQualityList = (query?: Query): AxiosPromise<QualityVO> => {
+export const getQualityMsg = (query?: any): AxiosPromise<QualityVO> => {
   return request({
-    url: '/quality/qualityInspection/gis',
+    url: '/zm/api/v1/system/busInspectionTicket/gisQualityManagement',
     method: 'get',
     params: query
   });
@@ -32,14 +47,27 @@ export const getQualityList = (query?: Query): AxiosPromise<QualityVO> => {
  * @returns {*}
  */
 
-export const getprojectNewsList = (query?: Query): AxiosPromise<projectNewsVO[]> => {
+export const getprojectNewsList = (query?: any): AxiosPromise<projectNewsVO[]> => {
   return request({
-    url: '/project/projectNews/list/gis',
+    url: '/zm/api/v1/system/sysProjectIntroduce/list',
     method: 'get',
     params: query
   });
 };
 
+/**
+ * 查询进度管理列表
+ * @param query
+ * @returns {*}
+ */
+export const getProgressList = (): AxiosPromise<any> => {
+  return request({
+    url: '/zm/api/v1/system/workStatus/getParentProgress',
+    method: 'get',
+    params: { fangzhenId: 22034 }
+  });
+};
+
 /**
  * 获取项目新闻详细信息
  * @param query
@@ -48,8 +76,9 @@ export const getprojectNewsList = (query?: Query): AxiosPromise<projectNewsVO[]>
 
 export const getprojectNewsDetailList = (id: number): AxiosPromise<projectNewsDetailVO> => {
   return request({
-    url: '/project/projectNews/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/sysProjectIntroduce/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -59,9 +88,23 @@ export const getprojectNewsDetailList = (id: number): AxiosPromise<projectNewsDe
  * @returns {*}
  */
 
-export const getsafetyInspectionList = (query?: Query): AxiosPromise<safetyInspectionVO> => {
+export const getsafetyInspectionMsg = (query?: Query): AxiosPromise<safetyInspectionVO> => {
+  return request({
+    url: '/zm/api/v1/system/busHseManagement/gisSafetyManagement',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询大屏安全列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getsafetyInspectionList = (query?: any): AxiosPromise<safetyInspectionVO> => {
   return request({
-    url: '/safety/safetyInspection/gis',
+    url: '/zm/api/v1/system/busHseManagement/gisSafetyManagementList',
     method: 'get',
     params: query
   });
@@ -75,7 +118,7 @@ export const getsafetyInspectionList = (query?: Query): AxiosPromise<safetyInspe
 
 export const getConstructionUserList = (query?: Query): AxiosPromise<ConstructionUserVO> => {
   return request({
-    url: '/project/constructionUser/gis',
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/attendanceCount',
     method: 'get',
     params: query
   });
@@ -89,7 +132,7 @@ export const getConstructionUserList = (query?: Query): AxiosPromise<Constructio
 
 export const getMachineryrList = (query?: Query): AxiosPromise<MachineryrVO[]> => {
   return request({
-    url: '/machinery/machinery/list/gis',
+    url: '/zm/api/v1/system/busMachinery/mechanicalCondition',
     method: 'get',
     params: query
   });
@@ -103,7 +146,7 @@ export const getMachineryrList = (query?: Query): AxiosPromise<MachineryrVO[]> =
 
 export const getMaterialsList = (query?: Query): AxiosPromise<MaterialsVO[]> => {
   return request({
-    url: '/materials/materials/list/gis',
+    url: '/zm/api/v1/system/busEquipmentMaterialsInventory/excelindex',
     method: 'get',
     params: query
   });
@@ -115,10 +158,11 @@ export const getMaterialsList = (query?: Query): AxiosPromise<MaterialsVO[]> =>
  * @returns {*}
  */
 
-export const getweatherList = (id?: string): AxiosPromise<weatherVO[]> => {
+export const getweatherList = (): AxiosPromise<weatherVO[]> => {
   return request({
-    url: '/project/project/weather/' + id,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/weather',
+    method: 'get',
+    params: { location: '106.54,23.47' }
   });
 };
 
@@ -129,8 +173,21 @@ export const getweatherList = (id?: string): AxiosPromise<weatherVO[]> => {
  */
 
 export const getSafetyDay = (id?: string): AxiosPromise<safetyDayVO> => {
-  return request({
+  return request1({
     url: '/project/project/safetyDay/' + id,
     method: 'get'
   });
 };
+
+/**
+ * 查询项目Ai检测
+ * @param query
+ * @returns {*}
+ */
+export const getAISafetyInspectionList = (query?: any): AxiosPromise<any> => {
+  return request({
+    url: '/zm/api/v1/system/busTour/tourSearchAllList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/login.ts b/src/api/login.ts
index 854b387..ad6715f 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -2,6 +2,7 @@ import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { LoginData, LoginResult, TenantInfo, UserProject, VerifyCodeResult } from './types';
 import { UserInfo } from '@/api/system/user/types';
+import requestGo from '@/utils/request-go';
 
 // pc端固定客户端授权id
 const clientId = import.meta.env.VITE_APP_CLIENT_ID;
@@ -119,3 +120,19 @@ export function getUserProject(): AxiosPromise<UserProject[]> {
     method: 'get'
   });
 }
+
+//获取Go服务Token
+export function getGoToken(): AxiosPromise<any> {
+  return requestGo({
+    url: '/zm/api/v1/system/login',
+    method: 'post',
+    data: {
+      status: 'yjdsj',
+      verifyCode: '1111',
+      // username: 'admin',
+      // password: 'zmkg@2023A'
+      username: 'admin',
+      password: 'zmkg@2023C'
+    }
+  });
+}
diff --git a/src/api/machinery/machinery/index.ts b/src/api/machinery/machinery/index.ts
index 27ecba7..a1a6d20 100644
--- a/src/api/machinery/machinery/index.ts
+++ b/src/api/machinery/machinery/index.ts
@@ -1,63 +1,45 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { MachineryForm, MachineryQuery, MachineryVO } from '@/api/machinery/machinery/types';
-
-/**
- * 查询机械列表
- * @param query
- * @returns {*}
- */
-
-export const listMachinery = (query?: MachineryQuery): AxiosPromise<MachineryVO[]> => {
+import request from '@/utils/request-go';
+// 查询机械列表
+export function listBusMachinery(query: object) {
   return request({
-    url: '/machinery/machinery/list',
+    url: '/zm/api/v1/system/busMachinery/list',
     method: 'get',
     params: query
   });
-};
-
-/**
- * 查询机械详细
- * @param id
- */
-export const getMachinery = (id: string | number): AxiosPromise<MachineryVO> => {
+}
+// 查询机械详细
+export function getBusMachinery(id: number) {
   return request({
-    url: '/machinery/machinery/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/busMachinery/get',
+    method: 'get',
+    params: {
+      id: id.toString()
+    }
   });
-};
-
-/**
- * 新增机械
- * @param data
- */
-export const addMachinery = (data: MachineryForm): AxiosPromise<string | number> => {
+}
+// 新增机械
+export function addBusMachinery(data: object) {
   return request({
-    url: '/machinery/machinery',
+    url: '/zm/api/v1/system/busMachinery/add',
     method: 'post',
     data: data
   });
-};
-
-/**
- * 修改机械
- * @param data
- */
-export const updateMachinery = (data: MachineryForm) => {
+}
+// 修改机械
+export function updateBusMachinery(data: object) {
   return request({
-    url: '/machinery/machinery',
+    url: '/zm/api/v1/system/busMachinery/edit',
     method: 'put',
     data: data
   });
-};
-
-/**
- * 删除机械
- * @param id
- */
-export const delMachinery = (id: string | number | Array<string | number>) => {
+}
+// 删除机械
+export function delBusMachinery(ids: number[]) {
   return request({
-    url: '/machinery/machinery/' + id,
-    method: 'delete'
+    url: '/zm/api/v1/system/busMachinery/delete',
+    method: 'delete',
+    data: {
+      ids: ids
+    }
   });
-};
+}
diff --git a/src/api/machinery/machineryDetail/index.ts b/src/api/machinery/machineryDetail/index.ts
index 809c367..f7baa88 100644
--- a/src/api/machinery/machineryDetail/index.ts
+++ b/src/api/machinery/machineryDetail/index.ts
@@ -1,63 +1,45 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO } from '@/api/machinery/machineryDetail/types';
-
-/**
- * 查询机械详情列表
- * @param query
- * @returns {*}
- */
-
-export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<MachineryDetailVO[]> => {
+import request from '@/utils/request-go';
+// 查询机械详情列表
+export function listBusMachineryDetail(query: object) {
   return request({
-    url: '/machinery/machineryDetail/list',
+    url: '/zm/api/v1/system/busMachineryDetail/list',
     method: 'get',
     params: query
   });
-};
-
-/**
- * 查询机械详情详细
- * @param id
- */
-export const getMachineryDetail = (id: string | number): AxiosPromise<MachineryDetailVO> => {
+}
+// 查询机械详情详细
+export function getBusMachineryDetail(id: number) {
   return request({
-    url: '/machinery/machineryDetail/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/busMachineryDetail/get',
+    method: 'get',
+    params: {
+      id: id.toString()
+    }
   });
-};
-
-/**
- * 新增机械详情
- * @param data
- */
-export const addMachineryDetail = (data: MachineryDetailForm): AxiosPromise<string | number> => {
+}
+// 新增机械详情
+export function addBusMachineryDetail(data: object) {
   return request({
-    url: '/machinery/machineryDetail',
+    url: '/zm/api/v1/system/busMachineryDetail/add',
     method: 'post',
     data: data
   });
-};
-
-/**
- * 修改机械详情
- * @param data
- */
-export const updateMachineryDetail = (data: MachineryDetailForm) => {
+}
+// 修改机械详情
+export function updateBusMachineryDetail(data: object) {
   return request({
-    url: '/machinery/machineryDetail',
+    url: '/zm/api/v1/system/busMachineryDetail/edit',
     method: 'put',
     data: data
   });
-};
-
-/**
- * 删除机械详情
- * @param id
- */
-export const delMachineryDetail = (id: string | number | Array<string | number>) => {
+}
+// 删除机械详情
+export function delBusMachineryDetail(ids: number[]) {
   return request({
-    url: '/machinery/machineryDetail/' + id,
-    method: 'delete'
+    url: '/zm/api/v1/system/busMachineryDetail/delete',
+    method: 'delete',
+    data: {
+      ids: ids
+    }
   });
-};
+}
diff --git a/src/api/materials/company/index.ts b/src/api/materials/company/index.ts
index 1996df8..463f21b 100644
--- a/src/api/materials/company/index.ts
+++ b/src/api/materials/company/index.ts
@@ -1,3 +1,4 @@
+import requestGo from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types';
@@ -9,8 +10,8 @@ import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/ty
  */
 
 export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> => {
-  return request({
-    url: '/materials/company/list',
+  return requestGo({
+    url: '/zm/api/v1/system/busCompany/list',
     method: 'get',
     params: query
   });
diff --git a/src/api/materials/materials/index.ts b/src/api/materials/materials/index.ts
index 04a2153..3908cc6 100644
--- a/src/api/materials/materials/index.ts
+++ b/src/api/materials/materials/index.ts
@@ -1,3 +1,4 @@
+import requestGo from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';
@@ -8,8 +9,8 @@ import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/mate
  * @returns {*}
  */
 export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[]> => {
-  return request({
-    url: '/materials/materials/list',
+  return requestGo({
+    url: '/zm/api/v1/system/busEquipmentMaterials/list',
     method: 'get',
     params: query
   });
@@ -20,9 +21,12 @@ export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[
  * @param id
  */
 export const getMaterials = (id: string | number): AxiosPromise<MaterialsVO> => {
-  return request({
-    url: '/materials/materials/' + id,
-    method: 'get'
+  return requestGo({
+    url: '/zm/api/v1/system/busEquipmentMaterials/get',
+    method: 'get',
+    params: {
+      equipmentMaterialsId: id
+    }
   });
 };
 
diff --git a/src/api/materials/materialsInventory/index.ts b/src/api/materials/materialsInventory/index.ts
index e0796b7..514c949 100644
--- a/src/api/materials/materialsInventory/index.ts
+++ b/src/api/materials/materialsInventory/index.ts
@@ -1,3 +1,4 @@
+import requestGo from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
@@ -9,8 +10,8 @@ import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO }
  */
 
 export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise<MaterialsInventoryVO[]> => {
-  return request({
-    url: '/materials/materialsInventory/list',
+  return requestGo({
+    url: '/zm/api/v1/system/busEquipmentMaterialsInventory/excellist',
     method: 'get',
     params: query
   });
diff --git a/src/api/menu.ts b/src/api/menu.ts
index fc1d542..a65bb63 100644
--- a/src/api/menu.ts
+++ b/src/api/menu.ts
@@ -4,6 +4,8 @@ import { RouteRecordRaw } from 'vue-router';
 
 // 获取路由
 export function getRouters(id: string): AxiosPromise<RouteRecordRaw[]> {
+  console.log('🚀 ~ getRouters ~ id:', id);
+
   return request({
     url: '/system/menu/getRouters/' + id,
     method: 'get'
diff --git a/src/api/other/ys7DeviceImg/index.ts b/src/api/other/ys7DeviceImg/index.ts
index bc814c2..35288a9 100644
--- a/src/api/other/ys7DeviceImg/index.ts
+++ b/src/api/other/ys7DeviceImg/index.ts
@@ -1,3 +1,4 @@
+import request1 from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { Ys7DeviceImgVO, Ys7DeviceImgForm, Ys7DeviceImgQuery } from '@/api/other/ys7DeviceImg/types';
@@ -9,8 +10,8 @@ import { Ys7DeviceImgVO, Ys7DeviceImgForm, Ys7DeviceImgQuery } from '@/api/other
  */
 
 export const listYs7DeviceImg = (query?: Ys7DeviceImgQuery): AxiosPromise<Ys7DeviceImgVO[]> => {
-  return request({
-    url: '/other/ys7DeviceImg/list',
+  return request1({
+    url: '/zm/api/v1/system/ys7DevicesImg/list',
     method: 'get',
     params: query
   });
@@ -56,8 +57,9 @@ export const updateYs7DeviceImg = (data: Ys7DeviceImgForm) => {
  * @param id
  */
 export const delYs7DeviceImg = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/other/ys7DeviceImg/' + id,
-    method: 'delete'
+  return request1({
+    url: '/zm/api/v1/system/ys7DevicesImg/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
diff --git a/src/api/project/attendance/index.ts b/src/api/project/attendance/index.ts
index 87866a6..0f09869 100644
--- a/src/api/project/attendance/index.ts
+++ b/src/api/project/attendance/index.ts
@@ -9,6 +9,7 @@ import {
   AttendanceMonthVO,
   AttendanceMonthQuery
 } from '@/api/project/attendance/types';
+import requestGo from '@/utils/request-go';
 
 /**
  * 查询考勤列表
@@ -45,8 +46,8 @@ export const listAttendanceTwoWeek = (query?: AttendanceTwoWeekQuery): AxiosProm
  */
 
 export const listAttendanceMonth = (query?: AttendanceMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
-  return request({
-    url: '/project/attendance/list/month/byUserId',
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionUser/pcQueryBasedOnOpenid',
     method: 'get',
     params: query
   });
diff --git a/src/api/project/busSalaryDetails/index.ts b/src/api/project/busSalaryDetails/index.ts
index 7041181..0b62b42 100644
--- a/src/api/project/busSalaryDetails/index.ts
+++ b/src/api/project/busSalaryDetails/index.ts
@@ -1,15 +1,61 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-
-/**
- * 分页查询项目薪资详情列表
- * @param query
- * @returns {*}
- */
-export const listBusSalaryDetails = (query?: any): AxiosPromise<any[]> => {
-  return request({
-    url: '/contractor/userSalaryDetail/salaryPageList',
+import request from '@/utils/request-go';
+// 查询员工工资考核记录列表
+export function listBusSalaryDetails(query: object) {
+  return request({
+    url: '/zm/api/v1/system/busSalaryDetails/list',
     method: 'get',
     params: query
   });
-};
+}
+// 查询员工工资考核记录详细
+export function getBusSalaryDetails(id: number) {
+  return request({
+    url: '/zm/api/v1/system/busSalaryDetails/get',
+    method: 'get',
+    params: {
+      id: id.toString()
+    }
+  });
+}
+// 新增员工工资考核记录
+export function addBusSalaryDetails(data: object) {
+  return request({
+    url: '/zm/api/v1/system/busSalaryDetails/add',
+    method: 'post',
+    data: data
+  });
+}
+// 修改员工工资考核记录
+export function updateBusSalaryDetails(data: object) {
+  return request({
+    url: '/zm/api/v1/system/busSalaryDetails/edit',
+    method: 'put',
+    data: data
+  });
+}
+// 删除员工工资考核记录
+export function delBusSalaryDetails(ids: number[]) {
+  return request({
+    url: '/zm/api/v1/system/busSalaryDetails/delete',
+    method: 'delete',
+    data: {
+      ids: ids
+    }
+  });
+}
+// 根据身份证获取当前考勤记录明细
+export function getByIdDetail(params) {
+  return request({
+    url: '/zm/api/v1/system/busSalaryDetails/getByIdDetail',
+    method: 'get',
+    params
+  });
+}
+// 工资条获取(可根据项目or班组or施工人员)
+export function salarySheet(params) {
+  return request({
+    url: '/zm/api/v1/system/busSalaryDetails/salarySheet',
+    method: 'get',
+    params
+  });
+}
diff --git a/src/api/project/constructionBlacklist/index.ts b/src/api/project/constructionBlacklist/index.ts
index 3407e0d..c19967d 100644
--- a/src/api/project/constructionBlacklist/index.ts
+++ b/src/api/project/constructionBlacklist/index.ts
@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { ConstructionBlacklistVO, ConstructionBlacklistForm, ConstructionBlacklistQuery } from '@/api/project/constructionBlacklist/types';
+import requestGo from '@/utils/request-go';
 
 /**
  * 查询黑名单列表
@@ -32,8 +33,8 @@ export const getConstructionBlacklist = (id: string | number): AxiosPromise<Cons
  * @param data
  */
 export const addConstructionBlacklist = (data: ConstructionBlacklistForm) => {
-  return request({
-    url: '/project/constructionBlacklist',
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionBlacklist/add',
     method: 'post',
     data: data
   });
@@ -56,8 +57,11 @@ export const updateConstructionBlacklist = (data: ConstructionBlacklistForm) =>
  * @param id
  */
 export const delConstructionBlacklist = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/project/constructionBlacklist/' + id,
-    method: 'delete'
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionBlacklist/delete',
+    method: 'delete',
+    data: {
+      openids: id
+    }
   });
 };
diff --git a/src/api/project/constructionUser/index.ts b/src/api/project/constructionUser/index.ts
index aad0902..a29bba6 100644
--- a/src/api/project/constructionUser/index.ts
+++ b/src/api/project/constructionUser/index.ts
@@ -1,4 +1,4 @@
-import request, { download } from '@/utils/request';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import {
   ConstructionUserForm,
@@ -14,6 +14,7 @@ import {
   ConstructionMonthQuery
 } from '@/api/project/constructionUser/types';
 import { AttendanceMonthVO } from '../attendance/types';
+import requestGo from '@/utils/request-go';
 
 /**
  * 查询施工人员月份考勤列表
@@ -22,8 +23,8 @@ import { AttendanceMonthVO } from '../attendance/types';
  */
 
 export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
-  return request({
-    url: '/contractor/constructionUser/list/attendance/month',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busAttendance/byOpenId',
     method: 'get',
     params: query
   });
@@ -35,8 +36,22 @@ export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosProm
  */
 
 export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<ConstructionUserVO[]> => {
-  return request({
-    url: '/contractor/constructionUser/list',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/personnelInquiry',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询施工人员列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listConstructionUserInTeam = (query?: ConstructionUserQuery): AxiosPromise<ConstructionUserVO[]> => {
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/list',
     method: 'get',
     params: query
   });
@@ -47,8 +62,8 @@ export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromis
  * @param id
  */
 export const getConstructionUser = (id: string | number): AxiosPromise<ConstructionUserVO> => {
-  return request({
-    url: '/contractor/constructionUser/' + id,
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/getDetails?id=' + id,
     method: 'get'
   });
 };
@@ -58,8 +73,8 @@ export const getConstructionUser = (id: string | number): AxiosPromise<Construct
  * @param data
  */
 export const transferConstructionUser = (data: skipType) => {
-  return request({
-    url: '/contractor/constructionUser/change/project',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/changePay',
     method: 'put',
     data: data
   });
@@ -69,8 +84,8 @@ export const transferConstructionUser = (data: skipType) => {
  * 查询项目以及项目下的分包公司列表
  */
 export const getProjectContractorList = () => {
-  return request({
-    url: '/project/project/list/project/contractorList',
+  return requestGo({
+    url: '/zm/api/v1/system/sysProject/list?pageNum=1&pageSize=1000',
     method: 'get'
   });
 };
@@ -80,8 +95,8 @@ export const getProjectContractorList = () => {
  * @param data
  */
 export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<string | number> => {
-  return request({
-    url: '/contractor/constructionUser',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/add',
     method: 'post',
     data: data
   });
@@ -92,8 +107,8 @@ export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<st
  * @param data
  */
 export const updateConstructionUser = (data: ConstructionUserForm) => {
-  return request({
-    url: '/contractor/constructionUser',
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionUser/pcEdit',
     method: 'put',
     data: data
   });
@@ -103,10 +118,11 @@ export const updateConstructionUser = (data: ConstructionUserForm) => {
  * 删除施工人员
  * @param id
  */
-export const delConstructionUser = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/constructionUser/' + id,
-    method: 'delete'
+export const delConstructionUser = (data) => {
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/delete',
+    method: 'delete',
+    data
   });
 };
 
@@ -115,9 +131,9 @@ export const delConstructionUser = (id: string | number | Array<string | number>
  * @param data
  */
 export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) => {
-  return request({
-    url: '/contractor/constructionUser/batch/status',
-    method: 'put',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/changeState',
+    method: 'delete',
     data: data
   });
 };
@@ -127,8 +143,8 @@ export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) =
  * @param data
  */
 export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
-    url: '/contractor/constructionUser/batch/clock',
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionUser/oneClickOpen',
     method: 'put',
     data: data
   });
@@ -139,8 +155,8 @@ export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayC
  * @param data
  */
 export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
-    url: '/contractor/constructionUser/clock',
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionUser/clockingCondition',
     method: 'put',
     data: data
   });
@@ -151,8 +167,8 @@ export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPl
  * @param data
  */
 export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) => {
-  return request({
-    url: '/contractor/constructionUser/salary',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/payEdit',
     method: 'put',
     data: data
   });
@@ -163,10 +179,10 @@ export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) =
  * @param query
  */
 export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
-  return request({
-    url: '/project/constructionUserExit/list',
-    method: 'get',
-    params: query
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionUser/departureRecord',
+    method: 'post',
+    data: query
   });
 };
 
@@ -175,19 +191,26 @@ export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
  * @param query
  */
 export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
-  let { projectId } = query;
-  const fileName = projectId + '_project.zip';
-  return download('/contractor/constructionUserFile/exportFileTemplate', query, fileName);
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionUser/templateExport',
+    method: 'get',
+    params: query
+  });
 };
+// export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
+//   let { projectId } = query;
+//   const fileName = projectId + '_project.zip';
+//   return request.download('/zm/api/v1/system/busConstructionUser/templateExport', query, fileName, 'get');
+// };
 
 /**
  * 施工人员退场
  * @param data
  */
 export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
-  return request({
-    url: '/project/projectTeamMember/',
-    method: 'delete',
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionUser/departure',
+    method: 'post',
     data
   });
 };
diff --git a/src/api/project/constructionUserFile/index.ts b/src/api/project/constructionUserFile/index.ts
index 8916b3b..17c27d3 100644
--- a/src/api/project/constructionUserFile/index.ts
+++ b/src/api/project/constructionUserFile/index.ts
@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQuery } from '@/api/project/constructionUserFile/types';
+import requestGo from '@/utils/request-go';
 
 /**
  * 查询施工人员文件存储列表
@@ -9,8 +10,8 @@ import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQ
  */
 
 export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => {
-  return request({
-    url: '/contractor/constructionUserFile/list',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/get',
     method: 'get',
     params: query
   });
diff --git a/src/api/project/contractor/index.ts b/src/api/project/contractor/index.ts
index e63b992..e3c9cac 100644
--- a/src/api/project/contractor/index.ts
+++ b/src/api/project/contractor/index.ts
@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
+import requestGo from '@/utils/request-go';
 
 /**
  * 查询分包单位列表
@@ -9,8 +10,8 @@ import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/con
  */
 
 export const listContractor = (query?: ContractorQuery): AxiosPromise<ContractorVO[]> => {
-  return request({
-    url: '/contractor/contractor/list',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busLabourservice/list',
     method: 'get',
     params: query
   });
@@ -21,8 +22,8 @@ export const listContractor = (query?: ContractorQuery): AxiosPromise<Contractor
  * @param id
  */
 export const getContractor = (id: string | number): AxiosPromise<ContractorVO> => {
-  return request({
-    url: '/contractor/contractor/' + id,
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busLabourservice/get?id=' + id,
     method: 'get'
   });
 };
@@ -32,8 +33,8 @@ export const getContractor = (id: string | number): AxiosPromise<ContractorVO> =
  * @param data
  */
 export const addContractor = (data: ContractorForm): AxiosPromise<string | number> => {
-  return request({
-    url: '/contractor/contractor',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busLabourservice/add',
     method: 'post',
     data: data
   });
@@ -44,8 +45,8 @@ export const addContractor = (data: ContractorForm): AxiosPromise<string | numbe
  * @param data
  */
 export const updateContractor = (data: ContractorForm) => {
-  return request({
-    url: '/contractor/contractor',
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busLabourservice/edit',
     method: 'put',
     data: data
   });
@@ -56,8 +57,11 @@ export const updateContractor = (data: ContractorForm) => {
  * @param id
  */
 export const delContractor = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/contractor/' + id,
-    method: 'delete'
+  return requestGo({
+    url: '/zm/api/wxApplet/wxApplet/busLabourservice/delete',
+    method: 'delete',
+    data: {
+      ids: id
+    }
   });
 };
diff --git a/src/api/project/goUser/index.ts b/src/api/project/goUser/index.ts
new file mode 100644
index 0000000..74fedd0
--- /dev/null
+++ b/src/api/project/goUser/index.ts
@@ -0,0 +1,87 @@
+import request from '@/utils/request-go';
+// 人员 考勤 补卡 请假接口 对接go 后台
+// 获取施工人员列表
+export const getBusConstructionUser = (params) => {
+  return request({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/list',
+    method: 'get',
+    params
+  });
+};
+// 根据项目获取班组列表
+export const getSysProjectTeamList = (params) => {
+  return request({
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/list',
+    method: 'get',
+    params
+  });
+};
+
+// 获取人员详情
+export const getDetails = (id) => {
+  return request({
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/getDetails',
+    method: 'get',
+    params: {
+      id: id
+    }
+  });
+};
+// 获取考勤列表数据
+export const pcSelectBelowProjectOfPersonnel = (params) => {
+  return request({
+    url: '/zm/api/v1/system/busConstructionUser/pcSelectBelowProjectOfPersonnel',
+    method: 'get',
+    params
+  });
+};
+// 获取考勤列表数据
+export const busAttendancepCList = (params) => {
+  return request({
+    url: '/zm/api/wxApplet/wxApplet/busAttendance/pCList',
+    method: 'get',
+    params
+  });
+};
+// 获取考勤图表数据
+export const pcCollectDataForTwoWeeks = (params) => {
+  return request({
+    url: '/zm/api/v1/system/busConstructionUser/pcCollectDataForTwoWeeks',
+    method: 'get',
+    params
+  });
+};
+// 获取补卡申请
+export const busReissueACardList = (params) => {
+  return request({
+    url: '/zm/api/v1/system/busReissueACard/list',
+    method: 'get',
+    params
+  });
+};
+// 获取请假列表
+export const busAskforleaveList = (params) => {
+  return request({
+    url: '/zm/api/v1/system/busAskforleave/list',
+    method: 'get',
+    params
+  });
+};
+// 获取字典
+export const getDictData = (dictType) => {
+  return request({
+    url: '/zm/api/v1/system/dict/data/getDictData',
+    method: 'get',
+    params: {
+      dictType: dictType,
+      defaultValue: ''
+    }
+  });
+};
+export const busHseSecurityLogList = (params) => {
+  return request({
+    url: '/zm/api/v1/system/busHseSecurityLog/list',
+    method: 'get',
+    params
+  });
+};
\ No newline at end of file
diff --git a/src/api/project/leave/index.ts b/src/api/project/leave/index.ts
index 50bdc04..39242b9 100644
--- a/src/api/project/leave/index.ts
+++ b/src/api/project/leave/index.ts
@@ -1,8 +1,8 @@
-import request from '@/utils/request';
+// import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { LeaveVO, LeaveForm, LeaveQuery } from '@/api/project/leave/types';
 import { AuditReissueCardForm } from '../reissueCard/types';
-
+import request from '@/utils/request-go';
 /**
  * 查询施工人员请假申请列表
  * @param query
@@ -11,7 +11,7 @@ import { AuditReissueCardForm } from '../reissueCard/types';
 
 export const listLeave = (query?: LeaveQuery): AxiosPromise<LeaveVO[]> => {
   return request({
-    url: '/project/leave/list',
+    url: '/zm/api/v1/system/busAskforleave/list',
     method: 'get',
     params: query
   });
diff --git a/src/api/project/project/index.ts b/src/api/project/project/index.ts
index 23cd9ad..68e901d 100644
--- a/src/api/project/project/index.ts
+++ b/src/api/project/project/index.ts
@@ -1,6 +1,21 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { childProjectQuery, ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types';
+import requestGo from '@/utils/request-go';
+
+/**
+ * 查询项目列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProjectGo = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> => {
+  return requestGo({
+    url: '/zm/api/v1/system/sysProject/list',
+    method: 'get',
+    params: { ...query, isShow: '2' }
+  });
+};
 
 /**
  * 查询项目列表
@@ -12,7 +27,7 @@ export const listProject = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> =>
   return request({
     url: '/project/project/list',
     method: 'get',
-    params: query
+    params: { ...query }
   });
 };
 
@@ -245,7 +260,6 @@ export const delAttendanceRange = (id) => {
   });
 };
 
-
 // 修改项目打卡范围
 export const updateAttendanceRange = (data) => {
   return request({
@@ -262,4 +276,4 @@ export const getAttendanceRangeList = (data) => {
     method: 'get',
     params: data
   });
-};
\ No newline at end of file
+};
diff --git a/src/api/project/projectTeam/index.ts b/src/api/project/projectTeam/index.ts
index 8d0b39a..a8540c0 100644
--- a/src/api/project/projectTeam/index.ts
+++ b/src/api/project/projectTeam/index.ts
@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { ProjectTeamForemanResp, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types';
 
@@ -10,7 +10,7 @@ import { ProjectTeamForemanResp, ProjectTeamForm, ProjectTeamQuery, ProjectTeamV
 
 export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise<ProjectTeamVO[]> => {
   return request({
-    url: '/project/projectTeam/list',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise<ProjectT
  */
 export const listProjectTeamForeman = (projectId: string | number): AxiosPromise<ProjectTeamForemanResp[]> => {
   return request({
-    url: '/project/projectTeam/listForeman/' + projectId,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/get',
+    method: 'get',
+    params: { projectId }
   });
 };
 
@@ -33,8 +34,9 @@ export const listProjectTeamForeman = (projectId: string | number): AxiosPromise
  */
 export const getProjectTeam = (id: string | number): AxiosPromise<ProjectTeamVO> => {
   return request({
-    url: '/project/projectTeam/' + id,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -44,7 +46,7 @@ export const getProjectTeam = (id: string | number): AxiosPromise<ProjectTeamVO>
  */
 export const addProjectTeam = (data: ProjectTeamForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/projectTeam',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/add',
     method: 'post',
     data: data
   });
@@ -56,7 +58,7 @@ export const addProjectTeam = (data: ProjectTeamForm): AxiosPromise<string | num
  */
 export const updateProjectTeam = (data: ProjectTeamForm) => {
   return request({
-    url: '/project/projectTeam',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/edit',
     method: 'put',
     data: data
   });
@@ -66,18 +68,19 @@ export const updateProjectTeam = (data: ProjectTeamForm) => {
  * 删除项目班组
  * @param id
  */
-export const delProjectTeam = (id: string | number | Array<string | number>) => {
+export const delProjectTeam = (ids: string | number | Array<string | number>) => {
   return request({
-    url: '/project/projectTeam/' + id,
-    method: 'delete'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/delete',
+    method: 'delete',
+    params: { ids }
   });
 };
 
-// 获取项目得打卡范围
-export const getProjectTeamClockIn = (params) => {
+// 根据项目或班组导出出勤记录(班组)
+export function exportSalary(data: any) {
   return request({
-    url: '/project/projectTeam/rangeList',
-    method: 'get',
-    params
+    url: '/zm/api/v1/system/busConstructionUser/exportSalary',
+    method: 'post',
+    data
   });
-};
\ No newline at end of file
+}
diff --git a/src/api/project/projectTeamMember/index.ts b/src/api/project/projectTeamMember/index.ts
index c64cee2..98d19bd 100644
--- a/src/api/project/projectTeamMember/index.ts
+++ b/src/api/project/projectTeamMember/index.ts
@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
 
@@ -10,7 +10,7 @@ import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } fr
 
 export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise<ProjectTeamMemberVO[]> => {
   return request({
-    url: '/project/projectTeamMember/list',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosProm
  */
 export const getProjectTeamMember = (id: string | number): AxiosPromise<ProjectTeamMemberVO> => {
   return request({
-    url: '/project/projectTeamMember/' + id,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -33,7 +34,7 @@ export const getProjectTeamMember = (id: string | number): AxiosPromise<ProjectT
  */
 export const addProjectTeamMember = (data: ProjectTeamMemberForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/projectTeamMember',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/add',
     method: 'post',
     data: data
   });
@@ -45,7 +46,7 @@ export const addProjectTeamMember = (data: ProjectTeamMemberForm): AxiosPromise<
  */
 export const updateProjectTeamMember = (data: ProjectTeamMemberForm) => {
   return request({
-    url: '/project/projectTeamMember',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/edit',
     method: 'put',
     data: data
   });
@@ -57,7 +58,8 @@ export const updateProjectTeamMember = (data: ProjectTeamMemberForm) => {
  */
 export const delProjectTeamMember = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/project/projectTeamMember/' + id,
-    method: 'delete'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
diff --git a/src/api/project/salaryExcel/index.ts b/src/api/project/salaryExcel/index.ts
new file mode 100644
index 0000000..6f0bd00
--- /dev/null
+++ b/src/api/project/salaryExcel/index.ts
@@ -0,0 +1,50 @@
+import request from '@/utils/request-go';
+// 读取所有导入列表数据（汇总）
+export function readAllImportedListData() {
+  return request({
+    url: '/zm/api/v1/system/busPayrollList/readAllImportedListData',
+    method: 'get'
+  });
+}
+
+// 工资（excel导入形成的）列表
+export function busPayrollList(query: any) {
+  return request({
+    url: '/zm/api/v1/system/busPayrollList/list',
+    method: 'get',
+    params: query
+  });
+}
+// 根据工资表的id获取到源excel（只允许查看）
+export function getTheSourceExcelAccordingToTheIdOfThePayroll(query: any) {
+  return request({
+    url: '/zm/api/v1/system/busPayrollList/getTheSourceExcelAccordingToTheIdOfThePayroll',
+    method: 'get',
+    params: query
+  });
+}
+// 根据工资表的id获取到源excel（只允许查看）
+export function importExcelPaySheet(query: any) {
+  return request({
+    url: '/zm/api/v1/system/busPayrollList/importExcelPaySheet',
+    method: 'post',
+    data: query
+  });
+}
+// 根据工资表的id获取到源excel（只允许查看）
+export function deletePayroll(query: any) {
+  return request({
+    url: '/zm/api/v1/system/busPayrollList/deletePayroll',
+    method: 'DELETE',
+    params: query
+  });
+}
+
+// 查询施工单位列表
+export function listBusLabourservice(query: object) {
+  return request({
+    url: '/zm/api/wxApplet/wxApplet/busLabourservice/list',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/project/workWage/index.ts b/src/api/project/workWage/index.ts
index 01ed29d..8842c0f 100644
--- a/src/api/project/workWage/index.ts
+++ b/src/api/project/workWage/index.ts
@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { WorkWageVO, WorkWageForm, WorkWageQuery } from '@/api/project/workWage/types';
 
@@ -10,7 +10,7 @@ import { WorkWageVO, WorkWageForm, WorkWageQuery } from '@/api/project/workWage/
 
 export const listWorkWage = (query?: WorkWageQuery): AxiosPromise<WorkWageVO[]> => {
   return request({
-    url: '/project/workWage/list',
+    url: '/zm/api/v1/system/busTypeOfWage/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listWorkWage = (query?: WorkWageQuery): AxiosPromise<WorkWageVO[]>
  */
 export const getWorkWage = (id: string | number): AxiosPromise<WorkWageVO> => {
   return request({
-    url: '/project/workWage/' + id,
+    url: '/zm/api/v1/system/busTypeOfWage/get?id=' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getWorkWage = (id: string | number): AxiosPromise<WorkWageVO> => {
  */
 export const addWorkWage = (data: WorkWageForm) => {
   return request({
-    url: '/project/workWage',
+    url: '/zm/api/v1/system/busTypeOfWage/add',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addWorkWage = (data: WorkWageForm) => {
  */
 export const updateWorkWage = (data: WorkWageForm) => {
   return request({
-    url: '/project/workWage',
+    url: '/zm/api/v1/system/busTypeOfWage/edit',
     method: 'put',
     data: data
   });
@@ -57,7 +57,20 @@ export const updateWorkWage = (data: WorkWageForm) => {
  */
 export const delWorkWage = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/project/workWage/' + id,
-    method: 'delete'
+    url: '/zm/api/v1/system/busTypeOfWage/delete',
+    method: 'delete',
+    data: {
+      ids: id
+    }
+  });
+};
+
+/**
+ * 查询工种类型
+ */
+export const getTypeOfWork = () => {
+  return request({
+    url: '/zm/api/v1/system/dict/data/getDictData?dictType=type_of_work',
+    method: 'get'
   });
 };
diff --git a/src/api/quality/documentQualityMeeting/index.ts b/src/api/quality/documentQualityMeeting/index.ts
new file mode 100644
index 0000000..5b6e81b
--- /dev/null
+++ b/src/api/quality/documentQualityMeeting/index.ts
@@ -0,0 +1,89 @@
+import request from '@/utils/request-go';
+// 查询质量会议树形结构
+export function documentQualityMeetingTreeStructure(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/qualityTreeStructure',
+    method: 'get',
+    params: query
+  });
+}
+// 查询质量会议文件列表
+export function documentQualityMeetingList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/list',
+    method: 'get',
+    params: query
+  });
+}
+// 质量会议添加
+export function documentQualityMeetingAdd(data: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/add',
+    method: 'post',
+    data
+  });
+}
+// 质量会议修改文件名
+export function documentQualityMeetingEdit(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/edit',
+    method: 'put',
+    params: query
+  });
+}
+// 质量会议删除文件
+export function documentQualityMeetingDelete(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/delete',
+    method: 'delete',
+    params: query
+  });
+}
+// 质量会议获取指定id信息
+export function documentProductionDrawingGet(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentProductionDrawing/get',
+    method: 'get',
+    params: query
+  });
+}
+// 新建文件夹
+export function documentQualityMeetingNewFolder(data: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/qualityNewFolderData',
+    method: 'post',
+    data
+  });
+}
+// 单文件下载
+export function documentQualityMeetingDownload(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/qualityDataUniFileDownload',
+    method: 'get',
+    params: query
+  });
+}
+// 获取pid
+export function getSelectByPid(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/qualitySelectByPid',
+    method: 'get',
+    params: query
+  });
+}
+// 回收站恢复
+export function qualityDataRecyclingStation(data: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/qualityDataRecyclingStation',
+    method: 'put',
+    data
+  });
+}
+// 回收站列表数据
+export function qualityRecycleBinList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentQualityMeeting/qualityRecycleBinList',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/quality/onlineListquality/Online.ts b/src/api/quality/onlineListquality/Online.ts
new file mode 100644
index 0000000..d9db454
--- /dev/null
+++ b/src/api/quality/onlineListquality/Online.ts
@@ -0,0 +1,92 @@
+import request from '@/utils/request-go';
+// 在线word编辑接口
+// 获取目录 树形数据
+export function treeStructureList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/document/treeStructure',
+    method: 'get',
+    params: query
+  });
+}
+// 根据目录信息获取文档
+export function documentList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/document/list',
+    method: 'get',
+    params: query
+  });
+}
+// 修改母板名称
+export function documentEdit(data: object) {
+  return request({
+    url: '/zm/api/v1/system/document/edit',
+    method: 'put',
+    data
+  });
+}
+// 获取模板list
+export function documentAllList(query) {
+  return request({
+    url: '/zm/api/v1/system/document/allList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 删除母板
+export function documentDelete(ids: any) {
+  return request({
+    url: '/zm/api/v1/system/document/delete',
+    method: 'delete',
+    params: {
+      ids
+    }
+  });
+}
+// 新增母板
+export function documentAdd(data: object) {
+  return request({
+    url: '/zm/api/v1/system/document/add',
+    method: 'post',
+    data: data
+  });
+}
+// 新建文件夹
+export function documentNewFolder(data: object) {
+  return request({
+    url: '/zm/api/v1/system/document/newFolder',
+    method: 'post',
+    data: data
+  });
+}
+// 下载文件夹 - 模板
+export function compressedDownload(relativePath) {
+  return request({
+    url: '/zm/api/v1/system/document/compressedDownload',
+    method: 'get',
+    params: {
+      relativePath
+    }
+  });
+}
+// 下载文件夹 - 资料
+export function uniFolderDownload(relativePath) {
+  return request({
+    url: '/zm/api/v1/system/documentData/dataCompressedDownload',
+    method: 'get',
+    params: {
+      relativePath
+    }
+  });
+}
+// 下载文件 - 资料
+export function uniFileDownload(relativePath) {
+  return request({
+    url: '/zm/api/v1/system/documentData/uniFileDownload',
+    method: 'get',
+    responseType: 'blob',
+    params: {
+      relativePath
+    }
+  });
+}
diff --git a/src/api/quality/onlineListquality/profile.ts b/src/api/quality/onlineListquality/profile.ts
new file mode 100644
index 0000000..b1c50af
--- /dev/null
+++ b/src/api/quality/onlineListquality/profile.ts
@@ -0,0 +1,100 @@
+import request from '@/utils/request-go';
+// 工程资料模块
+//添加工程资料
+export function templateDataAdd(data: object) {
+  return request({
+    url: '/zm/api/v1/system/templateData/add',
+    method: 'post',
+    data
+  });
+}
+// 获取工程列表
+export function templateDataList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateData/list',
+    method: 'get',
+    params: query
+  });
+}
+
+// 删除工程资料
+export function templateDataDel(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateData/delete',
+    method: 'delete',
+    params: query
+  });
+}
+// 修改工程资料
+export function templateDataEdit(data: object) {
+  return request({
+    url: '/zm/api/v1/system/templateData/edit',
+    method: 'put',
+    data
+  });
+}
+// 工程资料下级模板接口
+// 添加
+export function templateDataJuniorAdd(data: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataJunior/add',
+    method: 'post',
+    data
+  });
+}
+// 删除
+export function templateDataJuniorDel(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataJunior/delete',
+    method: 'delete',
+    params: query
+  });
+}
+// 修改
+export function templateDataJuniorEdit(data: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataJunior/edit',
+    method: 'put',
+    data
+  });
+}
+// 列表
+export function templateDataJuniorList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataJunior/list',
+    method: 'get',
+    params: query
+  });
+}
+// 获取源数据
+export function templateDataSourceDataList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataSourceData/list',
+    method: 'get',
+    params: query
+  });
+}
+// 添加数据源
+export function templateDataSourceDataAdd(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataSourceData/add',
+    method: 'get',
+    params: query
+  });
+}
+// 修改数据源
+export function templateDataSourceDataEdit(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataSourceData/edit',
+    method: 'get',
+    params: query
+  });
+}
+// 删除数据源
+export function templateDataSourceDataDel(query: object) {
+  return request({
+    url: '/zm/api/v1/system/templateDataSourceData/delete',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/quality/onlineListquality/profileData.ts b/src/api/quality/onlineListquality/profileData.ts
new file mode 100644
index 0000000..d1af756
--- /dev/null
+++ b/src/api/quality/onlineListquality/profileData.ts
@@ -0,0 +1,129 @@
+import request from '@/utils/request-go';
+// 工程资料模块
+//工程列表
+export function documentDataList(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/list',
+    method: 'get',
+    params: query
+  });
+}
+//工程列表（无分页）
+export function documentDataListUnPage(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/sonFile',
+    method: 'get',
+    params: query
+  });
+}
+// 添加工程资料
+export function documentDataAdd(data: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/add',
+    method: 'post',
+    data
+  });
+}
+// 新建文件夹
+export function documentDataNewFolder(data: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/newFolder',
+    method: 'post',
+    data
+  });
+}
+// 删除工程资料
+export function documentDataDelete(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/delete',
+    method: 'delete',
+    params: {
+      ids: query
+    }
+  });
+}
+// 修改工程资料
+export function documentDataEdit(data: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/edit',
+    method: 'put',
+    data
+  });
+}
+// 获取资料树形结构
+export function treeStructureData(query: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/treeStructureData',
+    method: 'get',
+    params: query
+  });
+}
+
+// 复制模板
+export function onlineImport(data: object) {
+  return request({
+    url: '/zm/api/v1/system/documentData/onlineImport',
+    method: 'put',
+    data
+  });
+}
+// 工程资料列表数据
+export function documentDataAllList(query) {
+  return request({
+    url: '/zm/api/v1/system/documentData/allList',
+    method: 'get',
+    params: query
+  });
+}
+// 文件拖动
+export function onlineMobile(data) {
+  return request({
+    url: '/zm/api/v1/system/documentData/onlineMobile',
+    method: 'put',
+    data
+  });
+}
+
+// 回收站文件删除或恢复 资料部分
+export function dataRecyclingStation(data) {
+  return request({
+    url: '/zm/api/v1/system/documentData/dataRecyclingStation',
+    method: 'put',
+    data
+  });
+}
+// 回收站文件删除或恢复 模板部分
+export function templateRecycleBin(data) {
+  return request({
+    url: '/zm/api/v1/system/documentData/templateRecycleBin',
+    method: 'put',
+    data
+  });
+}
+//资料文件模糊查询（查询资料里面的所有文件，限制文件为ppt、excel、word）
+export function dataFileQuery(query) {
+  return request({
+    url: '/zm/api/v1/system/documentData/dataFileQuery',
+    method: 'get',
+    params: query
+  });
+}
+// 资料-查看-获取详细信息
+export function getProfileDetail(id) {
+  return request({
+    url: '/zm/api/v1/system/documentData/get',
+    method: 'get',
+    params: {
+      id
+    }
+  });
+}
+
+// 查询项目列表 所有项目 无用户限制
+export function listSysProjectAll(query: object) {
+  return request({
+    url: '/zm/api/v1/system/sysProject/listAll',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/quality/qualityConstructionLog/index.ts b/src/api/quality/qualityConstructionLog/index.ts
index fbcb46c..8ab2202 100644
--- a/src/api/quality/qualityConstructionLog/index.ts
+++ b/src/api/quality/qualityConstructionLog/index.ts
@@ -1,3 +1,4 @@
+import requestGo from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructionLogQuery } from '@/api/quality/qualityConstructionLog/types';
@@ -9,8 +10,8 @@ import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructi
  */
 
 export const listQualityConstructionLog = (query?: QualityConstructionLogQuery): AxiosPromise<QualityConstructionLogVO[]> => {
-  return request({
-    url: '/quality/qualityConstructionLog/list',
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionLog/list',
     method: 'get',
     params: query
   });
@@ -21,9 +22,10 @@ export const listQualityConstructionLog = (query?: QualityConstructionLogQuery):
  * @param id
  */
 export const getQualityConstructionLog = (id: string | number): AxiosPromise<QualityConstructionLogVO> => {
-  return request({
-    url: '/quality/qualityConstructionLog/' + id,
-    method: 'get'
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionLog/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -56,8 +58,9 @@ export const updateQualityConstructionLog = (data: QualityConstructionLogForm) =
  * @param id
  */
 export const delQualityConstructionLog = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/quality/qualityConstructionLog/' + id,
-    method: 'delete'
+  return requestGo({
+    url: '/zm/api/v1/system/busConstructionLog/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
diff --git a/src/api/quality/qualityInspection/index.ts b/src/api/quality/qualityInspection/index.ts
index 82c8a4f..9f90b21 100644
--- a/src/api/quality/qualityInspection/index.ts
+++ b/src/api/quality/qualityInspection/index.ts
@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { QualityInspectionVO, QualityInspectionForm, QualityInspectionQuery } from '@/api/quality/qualityInspection/types';
 
@@ -10,7 +10,7 @@ import { QualityInspectionVO, QualityInspectionForm, QualityInspectionQuery } fr
 
 export const listQualityInspection = (query?: QualityInspectionQuery): AxiosPromise<QualityInspectionVO[]> => {
   return request({
-    url: '/quality/qualityInspection/list',
+    url: '/zm/api/v1/system/busInspectionTicket/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listQualityInspection = (query?: QualityInspectionQuery): AxiosProm
  */
 export const getQualityInspection = (id: string | number): AxiosPromise<QualityInspectionVO> => {
   return request({
-    url: '/quality/qualityInspection/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/busInspectionTicket/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -33,7 +34,7 @@ export const getQualityInspection = (id: string | number): AxiosPromise<QualityI
  */
 export const addQualityInspection = (data: QualityInspectionForm) => {
   return request({
-    url: '/quality/qualityInspection',
+    url: '/zm/api/v1/system/busInspectionTicket/add',
     method: 'post',
     data: data
   });
@@ -45,7 +46,7 @@ export const addQualityInspection = (data: QualityInspectionForm) => {
  */
 export const updateQualityInspection = (data: QualityInspectionForm) => {
   return request({
-    url: '/quality/qualityInspection',
+    url: '/zm/api/v1/system/busInspectionTicket/editVerification',
     method: 'put',
     data: data
   });
@@ -57,7 +58,32 @@ export const updateQualityInspection = (data: QualityInspectionForm) => {
  */
 export const delQualityInspection = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/quality/qualityInspection/' + id,
-    method: 'delete'
+    url: '/zm/api/v1/system/busInspectionTicket/delete',
+    method: 'delete',
+    data: {
+      ids: id
+    }
   });
 };
+
+// 下载OSS对象存储
+export function downLoadOss(ossId: { id?: string | number; idList?: string | number | Array<string | number> }, url: string, fileName: string) {
+  return request.download(url, ossId, fileName);
+}
+
+// 查询项目下的所有人员
+export function acquisitionOfCorrectivePersonnel(projectId: string | number) {
+  return request({
+    url: '/zm/api/v1/system/busInspectionTicket/acquisitionOfCorrectivePersonnel?projectId=' + projectId,
+    method: 'get'
+  });
+}
+
+// 编辑校验
+export function editVerification(data: any) {
+  return request({
+    url: '/zm/api/v1/system/busInspectionTicket/editVerification',
+    method: 'post',
+    data: data
+  });
+}
diff --git a/src/api/safety/documentSafetyMeeting/index.ts b/src/api/safety/documentSafetyMeeting/index.ts
index 8ed5baf..2ee143d 100644
--- a/src/api/safety/documentSafetyMeeting/index.ts
+++ b/src/api/safety/documentSafetyMeeting/index.ts
@@ -1,33 +1,24 @@
-import request from '@/utils/request';
-import {
-  documentSafetyMeetingListFile,
-  documentSafetyMeetingListFolder,
-  documentSafetyMeetingListQuery,
-  documentSafetyMeetingListVo,
-  documentRecycleBinListQuery,
-  documentRecycleBinListVO
-} from './type';
-import { AxiosPromise } from 'axios';
+import request from '@/utils/request-go';
 // 查询安全会议结构
 export function documentCompletionTreeStructure(query: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/list',
+    url: '/zm/api/v1/system/documentSafetyMeeting/safetyTreeStructure',
     method: 'get',
     params: query
   });
 }
 // 查询安全会议文件列表
-export function documentCompletionList(query: documentSafetyMeetingListQuery): AxiosPromise<documentSafetyMeetingListVo> {
+export function documentCompletionList(query: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/list',
+    url: '/zm/api/v1/system/documentSafetyMeeting/list',
     method: 'get',
     params: query
   });
 }
 // 安全会议添加
-export function documentCompletionAdd(data: documentSafetyMeetingListFile) {
+export function documentCompletionAdd(data: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/file',
+    url: '/zm/api/v1/system/documentSafetyMeeting/add',
     method: 'post',
     data
   });
@@ -35,29 +26,31 @@ export function documentCompletionAdd(data: documentSafetyMeetingListFile) {
 // 安全会议修改文件名
 export function documentCompletionEdit(query: object) {
   return request({
-    url: '/api/v1/system/documentSafetyMeeting/edit',
+    url: '/zm/api/v1/system/documentSafetyMeeting/edit',
     method: 'put',
     params: query
   });
 }
 // 安全会议删除文件
-export function documentCompletionDelete(id: string) {
+export function documentCompletionDelete(query: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/' + id,
-    method: 'delete'
+    url: '/zm/api/v1/system/documentSafetyMeeting/delete',
+    method: 'delete',
+    params: query
   });
 }
 // 安全会议获取指定id信息
-export function documentCompletionGet(id: string) {
+export function documentCompletionGet(query: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/documentSafetyMeeting/get',
+    method: 'get',
+    params: query
   });
 }
 // 新建文件夹
-export function newFolder(data: documentSafetyMeetingListFolder): AxiosPromise<any> {
+export function newFolder(data: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/folder',
+    url: '/zm/api/v1/system/documentSafetyMeeting/safetyNewFolderData',
     method: 'post',
     data
   });
@@ -65,23 +58,24 @@ export function newFolder(data: documentSafetyMeetingListFolder): AxiosPromise<a
 // 单文件下载
 export function uniFileDownload(query: object) {
   return request({
-    url: '/api/v1/system/documentSafetyMeeting/safetyDataUniFileDownload',
+    url: '/zm/api/v1/system/documentSafetyMeeting/safetyDataUniFileDownload',
     method: 'get',
     params: query
   });
 }
 // 回收站恢复
-export function completionDataRecyclingStation(id: string[]) {
+export function completionDataRecyclingStation(data: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/recovery/' + id,
-    method: 'put'
+    url: '/zm/api/v1/system/documentSafetyMeeting/safetyDataRecyclingStation',
+    method: 'put',
+    data
   });
 }
 // 回收站列表数据
-export function documentRecycleBinList(query: documentRecycleBinListQuery): AxiosPromise<documentRecycleBinListVO> {
+export function documentRecycleBinList(query: object) {
   return request({
-    url: '/safety/documentSafetyMeeting/recycleBin/list',
+    url: '/zm/api/v1/system/documentSafetyMeeting/safetyRecycleBinList',
     method: 'get',
-    params: { ...query, fileType: '2' }
+    params: query
   });
 }
diff --git a/src/api/safety/recognizeRecord/index.ts b/src/api/safety/recognizeRecord/index.ts
index b197db7..c3782ec 100644
--- a/src/api/safety/recognizeRecord/index.ts
+++ b/src/api/safety/recognizeRecord/index.ts
@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { RecognizeRecordVO, RecognizeRecordForm, RecognizeRecordQuery } from '@/api/safety/recognizeRecord/types';
 
@@ -9,8 +10,8 @@ import { RecognizeRecordVO, RecognizeRecordForm, RecognizeRecordQuery } from '@/
  */
 
 export const listRecognizeRecord = (query?: RecognizeRecordQuery): AxiosPromise<RecognizeRecordVO[]> => {
-  return request({
-    url: '/safety/recognizeRecord/list',
+  return request1({
+    url: '/zm/api/v1/system/busTour/list',
     method: 'get',
     params: query
   });
@@ -56,8 +57,9 @@ export const updateRecognizeRecord = (data: RecognizeRecordForm) => {
  * @param id
  */
 export const delRecognizeRecord = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/safety/recognizeRecord/' + id,
-    method: 'delete'
+  return request1({
+    url: '/zm/api/v1/system/busTour/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
diff --git a/src/api/safety/safetyInspection/index.ts b/src/api/safety/safetyInspection/index.ts
index 8fc0707..155aa49 100644
--- a/src/api/safety/safetyInspection/index.ts
+++ b/src/api/safety/safetyInspection/index.ts
@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { SafetyInspectionForm, SafetyInspectionQuery, SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
 
@@ -9,8 +10,8 @@ import { SafetyInspectionForm, SafetyInspectionQuery, SafetyInspectionVO } from
  */
 
 export const listSafetyInspection = (query?: SafetyInspectionQuery): AxiosPromise<SafetyInspectionVO[]> => {
-  return request({
-    url: '/safety/safetyInspection/list',
+  return request1({
+    url: '/zm/api/v1/system/busHseManagement/list',
     method: 'get',
     params: query
   });
@@ -20,10 +21,11 @@ export const listSafetyInspection = (query?: SafetyInspectionQuery): AxiosPromis
  * 查询安全巡检工单详细
  * @param id
  */
-export const getSafetyInspection = (id: string | number): AxiosPromise<SafetyInspectionVO> => {
-  return request({
-    url: '/safety/safetyInspection/' + id,
-    method: 'get'
+export const getSafetyInspection = (query): AxiosPromise<SafetyInspectionVO> => {
+  return request1({
+    url: '/zm/api/v1/system/busHseManagement/get',
+    method: 'get',
+    params: query
   });
 };
 
@@ -56,9 +58,10 @@ export const updateSafetyInspection = (data: SafetyInspectionForm) => {
  * @param id
  */
 export const delSafetyInspection = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/safety/safetyInspection/' + id,
-    method: 'delete'
+  return request1({
+    url: '/zm/api/v1/system/busHseManagement/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
 /**
diff --git a/src/api/safety/safetyLog/index.ts b/src/api/safety/safetyLog/index.ts
index 3389bd0..72385c2 100644
--- a/src/api/safety/safetyLog/index.ts
+++ b/src/api/safety/safetyLog/index.ts
@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { SafetyLogForm, SafetyLogQuery, SafetyLogVO } from '@/api/safety/safetyLog/types';
+import requestGo from '@/utils/request-go';
 
 /**
  * 查询安全日志列表
@@ -21,8 +22,8 @@ export const listSafetyLog = (query?: SafetyLogQuery): AxiosPromise<SafetyLogVO[
  * @param id
  */
 export const getSafetyLog = (id: string | number): AxiosPromise<SafetyLogVO> => {
-  return request({
-    url: '/safety/safetyLog/' + id,
+  return requestGo({
+    url: '/zm/api/v1/system/busHseSecurityLog/get?id=' + id,
     method: 'get'
   });
 };
@@ -32,8 +33,8 @@ export const getSafetyLog = (id: string | number): AxiosPromise<SafetyLogVO> =>
  * @param data
  */
 export const addSafetyLog = (data: SafetyLogForm) => {
-  return request({
-    url: '/safety/safetyLog',
+  return requestGo({
+    url: '/zm/api/v1/system/busHseSecurityLog/addText',
     method: 'post',
     data: data
   });
@@ -56,8 +57,9 @@ export const updateSafetyLog = (data: SafetyLogForm) => {
  * @param id
  */
 export const delSafetyLog = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/safety/safetyLog/' + id,
-    method: 'delete'
+  return requestGo({
+    url: '/zm/api/v1/system/busHseSecurityLog/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
diff --git a/src/api/safety/safetyWeeklyReport/index.ts b/src/api/safety/safetyWeeklyReport/index.ts
index c3717ff..7bc80db 100644
--- a/src/api/safety/safetyWeeklyReport/index.ts
+++ b/src/api/safety/safetyWeeklyReport/index.ts
@@ -1,3 +1,4 @@
+import requestGo from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { SafetyWeeklyReportForm, SafetyWeeklyReportQuery, SafetyWeeklyReportVO } from '@/api/safety/safetyWeeklyReport/types';
@@ -9,8 +10,8 @@ import { SafetyWeeklyReportForm, SafetyWeeklyReportQuery, SafetyWeeklyReportVO }
  */
 
 export const listSafetyWeeklyReport = (query?: SafetyWeeklyReportQuery): AxiosPromise<SafetyWeeklyReportVO[]> => {
-  return request({
-    url: '/safety/safetyWeeklyReport/list',
+  return requestGo({
+    url: '/zm/api/v1/system/busWeeklySecurityReport/list',
     method: 'get',
     params: query
   });
@@ -21,9 +22,12 @@ export const listSafetyWeeklyReport = (query?: SafetyWeeklyReportQuery): AxiosPr
  * @param id
  */
 export const getSafetyWeeklyReport = (id: string | number): AxiosPromise<SafetyWeeklyReportVO> => {
-  return request({
-    url: '/safety/safetyWeeklyReport/' + id,
-    method: 'get'
+  return requestGo({
+    url: '/zm/api/v1/system/busWeeklySecurityReport/get',
+    method: 'get',
+    params: {
+      id
+    }
   });
 };
 
@@ -32,8 +36,8 @@ export const getSafetyWeeklyReport = (id: string | number): AxiosPromise<SafetyW
  * @param data
  */
 export const addSafetyWeeklyReport = (data: SafetyWeeklyReportForm) => {
-  return request({
-    url: '/safety/safetyWeeklyReport',
+  return requestGo({
+    url: '/zm/api/v1/system/busWeeklySecurityReport/add',
     method: 'post',
     data: data
   });
@@ -56,8 +60,9 @@ export const updateSafetyWeeklyReport = (data: SafetyWeeklyReportForm) => {
  * @param id
  */
 export const delSafetyWeeklyReport = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/safety/safetyWeeklyReport/' + id,
-    method: 'delete'
+  return requestGo({
+    url: '/zm/api/v1/system/busWeeklySecurityReport/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
diff --git a/src/api/safety/teamMeeting/index.ts b/src/api/safety/teamMeeting/index.ts
index e0c518d..268c6dd 100644
--- a/src/api/safety/teamMeeting/index.ts
+++ b/src/api/safety/teamMeeting/index.ts
@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { TeamMeetingForm, TeamMeetingQuery, TeamMeetingVO } from '@/api/safety/teamMeeting/types';
 
@@ -9,8 +10,8 @@ import { TeamMeetingForm, TeamMeetingQuery, TeamMeetingVO } from '@/api/safety/t
  */
 
 export const listTeamMeeting = (query?: TeamMeetingQuery): AxiosPromise<TeamMeetingVO[]> => {
-  return request({
-    url: '/safety/teamMeeting/list',
+  return request1({
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamSquad/list',
     method: 'get',
     params: query
   });
@@ -20,10 +21,11 @@ export const listTeamMeeting = (query?: TeamMeetingQuery): AxiosPromise<TeamMeet
  * 查询站班会详细
  * @param id
  */
-export const getTeamMeeting = (id: string | number): AxiosPromise<TeamMeetingVO> => {
-  return request({
-    url: '/safety/teamMeeting/' + id,
-    method: 'get'
+export const getTeamMeeting = (query): AxiosPromise<TeamMeetingVO> => {
+  return request1({
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamSquad/get',
+    method: 'get',
+    params: query
   });
 };
 
@@ -56,9 +58,12 @@ export const updateTeamMeeting = (data: TeamMeetingForm) => {
  * @param id
  */
 export const delTeamMeeting = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/safety/teamMeeting/' + id,
-    method: 'delete'
+  return request1({
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamSquad/delete',
+    method: 'delete',
+    data: {
+      ids: id
+    }
   });
 };
 // 查询项目班组下的成员列表
diff --git a/src/api/safety/violationLevel/index.ts b/src/api/safety/violationLevel/index.ts
index 1085314..7b2d4dd 100644
--- a/src/api/safety/violationLevel/index.ts
+++ b/src/api/safety/violationLevel/index.ts
@@ -1,3 +1,4 @@
+import request1 from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { ViolationLevelVO, ViolationLevelForm, ViolationLevelQuery } from '@/api/safety/violationLevel/types';
@@ -9,8 +10,8 @@ import { ViolationLevelVO, ViolationLevelForm, ViolationLevelQuery } from '@/api
  */
 
 export const listViolationLevel = (query?: ViolationLevelQuery): AxiosPromise<ViolationLevelVO[]> => {
-  return request({
-    url: '/safety/violationLevel/list',
+  return request1({
+    url: '/zm/api/v1/system/busViolationLevel/list',
     method: 'get',
     params: query
   });
@@ -21,8 +22,8 @@ export const listViolationLevel = (query?: ViolationLevelQuery): AxiosPromise<Vi
  * @param id
  */
 export const getViolationLevel = (id: string | number): AxiosPromise<ViolationLevelVO> => {
-  return request({
-    url: '/safety/violationLevel/' + id,
+  return request1({
+    url: '/zm/api/v1/system/busViolationLevel/get?id=' + id,
     method: 'get'
   });
 };
@@ -32,8 +33,8 @@ export const getViolationLevel = (id: string | number): AxiosPromise<ViolationLe
  * @param data
  */
 export const addViolationLevel = (data: ViolationLevelForm) => {
-  return request({
-    url: '/safety/violationLevel',
+  return request1({
+    url: '/zm/api/v1/system/busViolationLevel/add',
     method: 'post',
     data: data
   });
@@ -44,8 +45,8 @@ export const addViolationLevel = (data: ViolationLevelForm) => {
  * @param data
  */
 export const updateViolationLevel = (data: ViolationLevelForm) => {
-  return request({
-    url: '/safety/violationLevel',
+  return request1({
+    url: '/zm/api/v1/system/busViolationLevel/edit',
     method: 'put',
     data: data
   });
@@ -56,8 +57,9 @@ export const updateViolationLevel = (data: ViolationLevelForm) => {
  * @param id
  */
 export const delViolationLevel = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/safety/violationLevel/' + id,
-    method: 'delete'
+  return request1({
+    url: '/zm/api/v1/system/busViolationLevel/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
diff --git a/src/api/safety/violationRecord/index.ts b/src/api/safety/violationRecord/index.ts
index 81d44e3..0d5080e 100644
--- a/src/api/safety/violationRecord/index.ts
+++ b/src/api/safety/violationRecord/index.ts
@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { ViolationRecordVO, ViolationRecordForm, ViolationRecordQuery } from '@/api/safety/violationRecord/types';
 
@@ -9,8 +10,8 @@ import { ViolationRecordVO, ViolationRecordForm, ViolationRecordQuery } from '@/
  */
 
 export const listViolationRecord = (query?: ViolationRecordQuery): AxiosPromise<ViolationRecordVO[]> => {
-  return request({
-    url: '/safety/violationRecord/list',
+  return request1({
+    url: '/zm/api/v1/system/busViolationRecord/list',
     method: 'get',
     params: query
   });
@@ -20,9 +21,9 @@ export const listViolationRecord = (query?: ViolationRecordQuery): AxiosPromise<
  * 查询违规记录详细
  * @param id
  */
-export const getViolationRecord = (id: string | number): AxiosPromise<ViolationRecordVO> => {
-  return request({
-    url: '/safety/violationRecord/' + id,
+export const getViolationRecord = (id: string): AxiosPromise<ViolationRecordVO> => {
+  return request1({
+    url: '/zm/api/v1/system/busViolationRecord/get?id=' + id,
     method: 'get'
   });
 };
@@ -32,8 +33,8 @@ export const getViolationRecord = (id: string | number): AxiosPromise<ViolationR
  * @param data
  */
 export const addViolationRecord = (data: any) => {
-  return request({
-    url: '/safety/violationRecord/handler',
+  return request1({
+    url: '/zm/api/v1/system/busViolationRecord/selectTheViolator',
     method: 'post',
     data: data
   });
@@ -56,28 +57,17 @@ export const updateViolationRecord = (data: ViolationRecordForm) => {
  * @param id
  */
 export const delViolationRecord = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/safety/violationRecord/' + id,
-    method: 'delete'
+  return request1({
+    url: '/zm/api/v1/system/busViolationRecord/delete',
+    method: 'delete',
+    data: { ids: id }
   });
 };
-/**
- * 新增违规记录复查
- */
-export const addSafetyInspectionReview = (data: any) => {
-  return request({
-    url: '/safety/violationRecord/review',
-    method: 'post',
-    data: data
-  });
-}
-/**
- * 新增违规记录整改
- */
-export const addSafetyInspectionRectification = (data: any) => {
-  return request({
-    url: '/safety/violationRecord/rectification',
-    method: 'post',
-    data: data
+
+export function listBusConstructionUser(query: object) {
+  return request1({
+    url: '/zm/api/v1/system/busConstructionUser/list',
+    method: 'get',
+    params: query
   });
 }
diff --git a/src/api/system/landTransfer/enterRoad/index.ts b/src/api/system/landTransfer/enterRoad/index.ts
index a575127..22bf2f1 100644
--- a/src/api/system/landTransfer/enterRoad/index.ts
+++ b/src/api/system/landTransfer/enterRoad/index.ts
@@ -69,4 +69,4 @@ export const importEnterRoad = (projectId: any, data: any) => {
     method: 'post',
     data: data
   });
-};
\ No newline at end of file
+};
diff --git a/src/api/system/landTransfer/landBlock/index.ts b/src/api/system/landTransfer/landBlock/index.ts
index 06e3aad..3f070c0 100644
--- a/src/api/system/landTransfer/landBlock/index.ts
+++ b/src/api/system/landTransfer/landBlock/index.ts
@@ -78,9 +78,9 @@ export const delLandBlock = (id: string | number | Array<string | number>) => {
 };
 
 // 地块信息导入
-export const importLandBlock = (projectId:any,data: any) => {
+export const importLandBlock = (projectId: any, data: any) => {
   return request({
-    url: '/land/landBlock/upload/'+projectId,
+    url: '/land/landBlock/upload/' + projectId,
     method: 'post',
     data: data
   });
diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts
index 9f028ab..78f0519 100644
--- a/src/api/system/post/index.ts
+++ b/src/api/system/post/index.ts
@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { PostForm, PostQuery, PostVO } from './types';
 import { AxiosPromise } from 'axios';
+import requestGo from '@/utils/request-go';
 
 // 查询岗位列表
 export function listPost(query: { pageNum: number; pageSize: number }): AxiosPromise<PostVO[]> {
@@ -13,8 +14,8 @@ export function listPost(query: { pageNum: number; pageSize: number }): AxiosPro
 
 // 查询岗位列表
 export function listTreeByProject(): AxiosPromise<PostVO[]> {
-  return request({
-    url: '/system/dept/list/tree',
+  return requestGo({
+    url: '/zm/api/v1/system/post/list?pageNum=1&pageSize=100',
     method: 'get'
   });
 }
diff --git a/src/api/types.ts b/src/api/types.ts
index 59f7850..affa38c 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -67,6 +67,7 @@ export interface UserProject {
   projectId: string;
   projectName: string;
   shortName: string;
+  goId: string;
 }
 
 export interface IdAndNameVO {
diff --git a/src/assets/icons/file.png b/src/assets/icons/file.png
new file mode 100644
index 0000000..cf70ecf
Binary files /dev/null and b/src/assets/icons/file.png differ
diff --git a/src/assets/icons/file1.png b/src/assets/icons/file1.png
new file mode 100644
index 0000000..eb8ff97
Binary files /dev/null and b/src/assets/icons/file1.png differ
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index dca5657..779f01d 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -59,7 +59,7 @@
               <el-link :href="`${file.url}`" :underline="false" target="_blank">
                 <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
               </el-link>
-              <div class="ele-upload-list__item-content-action">
+              <div class="upload-list__item-content-action">
                 <el-button type="danger" link @click="handleDelete(index)">删除</el-button>
               </div>
             </li>
@@ -70,7 +70,7 @@
       <el-icon v-if="isConstruction">
         <Plus />
       </el-icon>
-      <template #file="{ file }">
+      <!-- <template #file="{ file }">
         <div class="pdf" v-if="isConstruction">
           <img src="@/assets/icons/svg/pdf.png" alt="" />
           <el-text class="w-148px text-center" truncated>
@@ -89,7 +89,7 @@
             </a>
           </div>
         </div>
-      </template>
+      </template> -->
     </el-upload>
   </div>
 </template>
@@ -125,6 +125,8 @@ const props = defineProps({
   autoUpload: propTypes.bool.def(true),
   // 是否显示文件列表
   showFileList: propTypes.bool.def(false),
+  // 上传类型
+  isGo: propTypes.bool.def(false),
   // 默认显示的文件列表
   defaultFileList: {
     type: Array as any,
@@ -156,9 +158,12 @@ const emit = defineEmits(['update:modelValue', 'handleChange', 'handleRemove']);
 
 const number = ref(0);
 const uploadList = ref<any[]>([]);
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const baseUrl = props.isGo ? import.meta.env.VITE_APP_BASE_API_GO : import.meta.env.VITE_APP_BASE_API;
 const uploadFileUrl = ref(baseUrl + props.uploadUrl); // 上传文件服务器地址
-const headers = ref(globalHeaders());
+const headers = ref({
+  ...globalHeaders(),
+  'Authorization': props.isGo ? `Bearer ${proxy.$cache.local.get('goToken') || ''}` : `Bearer ${proxy.$cache.local.get('Admin-Token') || ''}`
+});
 const pendingFiles = ref<UploadFile[]>([]);
 
 const realUploadUrl = computed(() => {
@@ -221,7 +226,12 @@ watch(
 );
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
-  if (!validateFile(file)) return false;
+  if (!validateFile(file)) {
+    if (props.isGo) {
+      fileList.value = [];
+    }
+    return false;
+  }
   proxy?.$modal.loading('正在上传文件，请稍候...');
   number.value++;
   return true;
@@ -261,7 +271,7 @@ interface UploadFileWithOssId extends UploadFile {
 }
 
 const handleUploadSuccess = (res: any, file: UploadFileWithOssId) => {
-  if (res.code === 200) {
+  if (res.code === 200 || res.code === 0) {
     console.log('上传成功');
     // 上传成功，不管 data 是否为空
     uploadList.value.push({
@@ -271,6 +281,9 @@ const handleUploadSuccess = (res: any, file: UploadFileWithOssId) => {
     });
   } else {
     console.log('失败', res);
+    if (props.isGo) {
+      fileList.value = [];
+    }
 
     number.value--;
     proxy?.$modal.closeLoading();
@@ -322,12 +335,15 @@ const handleDelete = async (index: string | number, type?: string) => {
       delOss(index);
       fileList.value = fileList.value.filter((f) => f.ossId !== index);
     } else {
-      let ossId = fileList.value[index].ossId;
-      delOss(ossId);
+      if (!props.isGo) {
+        let ossId = fileList.value[index].ossId;
+        delOss(ossId);
+      }
       index = parseInt(index as string);
       fileList.value.splice(index, 1);
     }
   } finally {
+    // fileList.value = [];
     emit('handleRemove');
     emit('update:modelValue', listToString(fileList.value));
   }
@@ -484,7 +500,7 @@ defineExpose({ submitUpload });
   }
 }
 
-.upload-file-list .ele-upload-list__item-content {
+.upload-file-list .upload-list__item-content {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -509,7 +525,7 @@ defineExpose({ submitUpload });
   z-index: 1;
 }
 
-.ele-upload-list__item-content-action .el-link {
+.upload-list__item-content-action .el-link {
   margin-right: 10px;
 }
 
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index d20d762..ef092ef 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -64,6 +64,15 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
+  isGo: {
+    type: Boolean,
+    default: false
+  },
+  // 图片上传路径
+  action: {
+    type: String,
+    default: ''
+  },
   // 是否支持压缩，默认否
   compressSupport: {
     type: Boolean,
@@ -84,8 +93,10 @@ const uploadList = ref<any[]>([]);
 const dialogImageUrl = ref('');
 const dialogVisible = ref(false);
 
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(baseUrl + '/resource/oss/upload'); // 上传的图片服务器地址
+const baseUrl = props.isGo ? import.meta.env.VITE_APP_BASE_API_GO : import.meta.env.VITE_APP_BASE_API;
+const uploadImgUrl = ref(baseUrl + (props.action ? props.action : '/resource/oss/upload')); // 上传的图片服务器地址
+console.log('🚀 ~ uploadImgUrl:', uploadImgUrl.value, baseUrl, props.action);
+
 const headers = ref(globalHeaders());
 
 const fileList = ref<any[]>([]);
diff --git a/src/components/ProjectSelector/index.vue b/src/components/ProjectSelector/index.vue
index 1259482..e7c49d7 100644
--- a/src/components/ProjectSelector/index.vue
+++ b/src/components/ProjectSelector/index.vue
@@ -50,6 +50,7 @@ const handleSelect = async (projectId: string) => {
   const userStore = useUserStore();
   const permissionStore = usePermissionStore();
   const selectedProject = projects.value.find((p) => p.id === projectId);
+  console.log('🚀 ~ handleSelect ~ selectedProject:', selectedProject);
   if (!selectedProject) return;
   const loadingInstance = ElLoading.service({
     lock: true,
diff --git a/src/components/bigUploader/index.vue b/src/components/bigUploader/index.vue
new file mode 100644
index 0000000..45606d6
--- /dev/null
+++ b/src/components/bigUploader/index.vue
@@ -0,0 +1,427 @@
+<template>
+  <div class="uploader-container" v-show="panelShow">
+    <div class="header">
+      <span>文件列表</span>
+      <span class="shrink" @click="closeHandle">
+        <el-icon style="vertical-align: middle"><DArrowRight /></el-icon>
+      </span>
+    </div>
+    <div class="box">
+      <uploader
+        ref="uploaderRef"
+        :options="options"
+        :file-status-text="handleFileStatusText"
+        :autoStart="true"
+        @file-added="onFileAdded"
+        @file-success="onFileSuccess"
+        @file-progress="onFileProgress"
+        @file-error="onFileError"
+        class="uploader-example"
+      >
+        <uploader-unsupport></uploader-unsupport>
+        <div v-show="false">
+          <uploader-btn ref="uploadBtn" :attrs="all">选择文件</uploader-btn>
+          <!-- <uploader-btn :attrs="image">选择图片</uploader-btn>
+					<uploader-btn :directory="true">选择文件夹</uploader-btn> -->
+        </div>
+        <uploader-list>
+          <template v-slot="props">
+            <ul class="file-list">
+              <li v-for="file in props.fileList" :key="file.id">
+                <uploader-file :ref="'file_' + file.id" :class="'file_' + file.id" :file="file" :list="true"></uploader-file>
+              </li>
+              <div class="no-file" v-if="!props.fileList.length">暂无待上传文件</div>
+            </ul>
+          </template>
+        </uploader-list>
+      </uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+import SparkMD5 from 'spark-md5';
+import axios from 'axios';
+import { bigUpload } from '@/store/modules/bigUpload';
+const stores = bigUpload();
+import { ElMessage, ElLoading } from 'element-plus';
+const instance = axios.create({
+  baseURL: '',
+  timeout: 1000 * 60 * 60 * 24
+});
+import sign from '@/utils/sign.js';
+import { getGoToken } from '@/utils/auth';
+const BASE_URL = 'http://58.17.134.85:8920';
+const acceptConfig = ['.zip', '.rar']; //文件
+// const acceptConfig = {
+// 	// image: ['gif', 'jpg', 'jpeg', 'png', 'bmp', 'webp'],
+// 	// video: ['mp4', 'm3u8', 'rmvb', 'avi', 'swf', '3gp', 'mkv', 'flv'],
+// 	// audio: ['mp3', 'wav', 'wma', 'ogg', 'aac', 'flac'],
+// 	// document: ['doc', 'txt', 'docx', 'pages', 'epub', 'pdf', 'numbers', 'csv', 'xls', 'xlsx', 'keynote', 'ppt', 'pptx', 'zip'],
+// 	// document: ['.zip', '.rar'],
+// 	// all() {
+// 	// 	return [...this.document];
+// 	// },
+// };
+export default {
+  name: 'bigUploader',
+  data() {
+    return {
+      options: {
+        target: BASE_URL + '/zm/api/v1/system/bigUpload/upload', // 目标上传 URL(线上不加baseURL)
+        chunkSize: '2048000', // 分片大小
+        fileParameterName: 'upfile', //上传文件时文件的参数名，默认 file
+        maxChunkRetries: 3, //最大自动失败重试上传次数
+        testChunks: true, //是否开启服务器分片校验
+        // 服务器分片校验函数，秒传及断点续传基础
+        // 可选的函数用于根据 XHR 响应内容检测每个块是否上传成功了，传入的参数是：Uploader.Chunk 实例以及请求响应信息。
+        // 这样就没必要上传（测试）所有的块了
+        checkChunkUploadedByResponse: function (chunk, message) {
+          // try {
+          // 	let objMessage = JSON.parse(message);
+          // 	const { code, data } = objMessage;
+          // 	console.log(code);
+          // 	if (code === 0) {
+          // 		if (data.skipUpload) {
+          // 			return true;
+          // 		}
+          // 		console.log((data.uploaded || []).indexOf(chunk.offset + 1));
+          // 		return (data.uploaded || []).indexOf(chunk.offset + 1) >= 0;
+          // 	}
+          // } catch (e) {
+          // 	console.error(e);
+          // }
+          return false;
+        },
+        headers: {
+          Authorization: null
+        },
+        query: (file, chunk) => {
+          return {
+            ...file.params
+          };
+        }
+      },
+      image: {
+        accept: 'image/*'
+      },
+      all: {
+        accept: []
+      },
+      statusText: {
+        success: '成功了',
+        error: '出错了',
+        uploading: '上传中',
+        paused: '暂停中',
+        waiting: '等待中'
+      },
+      uploadType: '', //
+      uploadTypesList: [
+        // 上传区分 安全考试
+        { id: 1000, label: '安全考试上传' },
+        { id: 1001, label: '工资资料上传' },
+        { id: 1002, label: '工资资料模板上传' },
+        { id: 1003, label: '竣工图上传' },
+        { id: 1003, label: '竣工图上传' },
+        { id: 1004, label: '倾斜模板上传' },
+        { id: 1005, label: '员工资料上传' },
+        { id: 1006, label: '可研及专题报告' },
+        { id: 1007, label: '施工图' },
+        { id: 10000, label: '大文件上传' },
+        { id: 1008, label: '质量会议上传' },
+        { id: 1010, label: '安全会议上传' }
+      ],
+      acceptList: [], //需要上传的类型
+      uploadTypes: ''
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      console.log('挂载', getGoToken());
+
+      this.mittBus.on('bigUploader.uploadFile', this.uploadFile);
+    });
+  },
+  computed: {
+    panelShow() {
+      return stores.panelShow;
+    },
+    uploadBtn() {
+      return this.$refs.uploadBtn && this.$refs.uploadBtn.btn;
+    }
+  },
+  methods: {
+    openHandle() {
+      stores.setPanelShow(true);
+    },
+    closeHandle() {
+      this.$refs.uploaderRef.uploader.files = [];
+      this.$refs.uploaderRef.uploader.fileList = [];
+      stores.setPanelShow(false);
+    },
+    uploadFile(obj) {
+      this.uploadType = obj.type;
+      this.uploadTypes = obj.types;
+      if (!this.options.headers.Authorization) {
+        this.options.headers.Authorization = 'Bearer ' + getGoToken();
+      }
+      // 修改accept值
+      if (this.uploadBtn) {
+        this.uploadBtn.querySelector('input').accept = obj.accept;
+      }
+      if (this.uploadBtn) {
+        this.$nextTick(() => {
+          this.uploadBtn.click();
+        });
+      }
+    },
+    handleFileStatusText(status, response) {
+      if (status === 'success') {
+        const { code, data } = response;
+        if (code === 0 && data.needMerge === true) {
+          return '文件合并中...';
+        } else {
+          return this.statusText[status];
+        }
+      } else {
+        return this.statusText[status];
+      }
+    },
+    //上传过程中出错了
+    onFileError(rootFile, file, response, chunk) {
+      console.error(rootFile, file, response, chunk);
+    },
+    // 设置自定义状态
+    setStatus(id, text) {
+      this.$nextTick(() => {
+        if (this.$refs['file_' + id]) {
+          const el = this.$refs['file_' + id][0].$el.getElementsByClassName('uploader-file-status')[0].getElementsByTagName('span')[0];
+          const parent = el.parentNode;
+          const para = document.createElement('span');
+          para.appendChild(document.createTextNode(text));
+          para.className = 'para';
+          el.style.display = 'none';
+          parent.appendChild(para);
+        }
+      });
+    },
+    // 删除自定义状态
+    removeStatus(id) {
+      try {
+        const els = this.$refs['file_' + id][0].$el.getElementsByClassName('uploader-file-status')[0].getElementsByClassName('para');
+        if (els && els.length > 0) {
+          const parent = els[0].parentNode;
+          for (let i = 0; i < els.length; i++) {
+            parent.removeChild(els[i]);
+          }
+        }
+        const firstSpan = this.$refs['file_' + id][0].$el.getElementsByClassName('uploader-file-status')[0].getElementsByTagName('span')[0];
+        firstSpan.style.display = '';
+      } catch (e) {
+        console.error(e);
+      }
+    },
+    /**
+     文件上传成功事件
+     第一个参数 rootFile 就是成功上传的文件所属的根 Uploader.File 对象，它应该包含或者等于成功上传文件；
+     第二个参数 file 就是当前成功的 Uploader.File 对象本身；
+     第三个参数 message 就是服务端响应内容，永远都是字符串；
+     第四个参数 chunk 就是 Uploader.Chunk 实例， 它就是该文件的最后一个块实例，如果你想得到请求响应码的话，chunk.xhr.status 就是。
+     */
+    onFileSuccess(rootFile, file, response, chunk) {
+      try {
+        let res = JSON.parse(response);
+        const { code, data } = res;
+        if (code === 0) {
+          // 如果服务端返回需要合并
+          if (data.needMerge) {
+            // 文件合并操作
+            let obj = {
+              identifier: data.identifier,
+              totalChunks: data.totalChunks,
+              totalSize: data.totalSize,
+              filename: data.filename,
+              token: getGoToken()
+            };
+            if (this.uploadType) {
+              //后台需要的参数
+              obj.num = '1'.toString();
+            }
+            if (this.uploadType == 3 || this.uploadType == 100 || this.uploadType == 101 || this.uploadType == 102) {
+              //后台需要的参数
+              obj.num = '2'.toString();
+            }
+            let header = {
+              Authorization: 'Bearer ' + getGoToken(),
+              ...sign(obj)
+            };
+            // 请求合并
+            instance
+              .post('/zm/api/v1/system/bigUpload/uploadMerge', obj, {
+                headers: header
+              })
+              .then((res) => {
+                const { status, data } = res;
+                return data;
+              })
+              .then((res) => {
+                let { code, data } = res;
+                if (code === 0) {
+                  this.setStatus(file.id, this.statusText['success']);
+                  this.setMittBus(data, file);
+                }
+              });
+          } else {
+            // 不需要合并
+            // 秒传或普通上传
+            this.setMittBus(data, file);
+          }
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    },
+    // 返回响应请求
+    setMittBus(data, file) {
+      let index = '';
+      this.uploadTypesList.forEach((item) => {
+        if (item.id == this.uploadTypes) {
+          index = this.uploadTypes;
+        }
+      });
+      console.log(data);
+      console.log(file);
+      this.mittBus.emit('bigUploader.uploadFileSuccess' + index, { ...data, fileType: file.fileType });
+    },
+    // 一个文件在上传中
+    onFileProgress(rootFile, file, chunk) {
+      // 上传过程中
+      // console.log(`上传中 ${file.name}，chunk：${chunk.startByte / 1024 / 1024} ~ ${chunk.endByte / 1024 / 1024}`);
+    },
+    // 这个事件一般用作文件校验，如果说返回了 false，那么这个文件就会被忽略，不会添加到文件上传列表中。
+    onFileAdded(file) {
+      this.computeMD5(file);
+      //  将额外的参数赋值到每个文件上，解决了不同文件使用不同params的需求
+      if (this.uploadType) {
+        //后台需要的参数
+        let num = '1'.toString();
+        if (this.uploadType == 3) {
+          //后台需要的参数
+          num = '2'.toString();
+        } else if (this.uploadType == 100 || this.uploadType == 101 || this.uploadType == 102) {
+          //竣工图文件上传
+          num = '2'.toString();
+        }
+        file.params = { ...this.params, num };
+      } else {
+        file.params = { ...this.params };
+      }
+      this.openHandle();
+    },
+    computeMD5(file) {
+      let fileReader = new FileReader();
+      let time = new Date().getTime();
+      let blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
+      // 分片序号
+      let currentChunk = 0;
+      // 分片大小
+      const chunkSize = 10 * 1024 * 1000;
+      // 分片总数量
+      let chunks = Math.ceil(file.size / chunkSize);
+      let spark = new SparkMD5.ArrayBuffer();
+      this.setStatus(file.id, 'md5计算中');
+      file.pause();
+      loadNext();
+      fileReader.onload = (e) => {
+        spark.append(e.target.result);
+        if (currentChunk < chunks) {
+          currentChunk++;
+          loadNext();
+          // 实时展示MD5的计算进度
+          this.$nextTick(() => {
+            const loading = ElLoading.service({
+              lock: true,
+              text: '正在文件检验中……',
+              background: 'rgba(0, 0, 0, 0.7)'
+            });
+            if (((currentChunk / chunks) * 100).toFixed(0) == 100) {
+              loading.close();
+            }
+            // console.log('校验MD5 ' + ((currentChunk / chunks) * 100).toFixed(0) + '%');
+          });
+        } else {
+          let md5 = spark.end();
+          this.computeMD5Success(md5, file);
+          this.removeStatus(file.id);
+          // console.log(`MD5计算完毕：${file.name} \nMD5：${md5} \n分片：${chunks} 大小:${file.size} 用时：${new Date().getTime() - time} ms`);
+        }
+      };
+      fileReader.onerror = function () {
+        // console.error();
+        ElMessage.error(`文件${file.name}读取出错，请检查该文件`);
+        file.cancel();
+      };
+      function loadNext() {
+        let start = currentChunk * chunkSize;
+        let end = start + chunkSize >= file.size ? file.size : start + chunkSize;
+        fileReader.readAsArrayBuffer(blobSlice.call(file.file, start, end));
+      }
+    },
+    // md5 计算完毕
+    computeMD5Success(md5, file) {
+      file.uniqueIdentifier = md5;
+      file.resume();
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.uploader-min {
+  background-color: #fff;
+  z-index: 9999;
+  position: absolute;
+  right: 0;
+  bottom: 10px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
+  padding: 15px;
+  cursor: pointer;
+}
+.uploader-container {
+  background-color: #fff;
+  z-index: 9999;
+  position: absolute;
+  right: 0;
+  bottom: 10px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
+}
+
+.header {
+  background-color: #fff;
+  height: 35px;
+  line-height: 35px;
+  display: flex;
+  padding: 0 10px;
+  justify-content: space-between;
+  .shrink {
+    cursor: pointer;
+  }
+}
+.box {
+  max-height: 200px;
+  overflow-y: scroll;
+}
+
+.uploader-example {
+  width: 550px;
+  padding: 15px;
+  font-size: 12px;
+}
+.uploader-example .uploader-btn {
+  margin-right: 4px;
+}
+.uploader-example .uploader-list {
+  overflow-x: hidden;
+  overflow-y: hidden;
+}
+</style>
diff --git a/src/components/uploadImg/index.vue b/src/components/uploadImg/index.vue
new file mode 100644
index 0000000..ee5f100
--- /dev/null
+++ b/src/components/uploadImg/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <div class="up-img" v-if="limit > 1">
+    <el-upload
+      v-model:file-list="dataFileList"
+      :limit="limit"
+      :action="action"
+      :multiple="multiple"
+      :list-type="listType"
+      :on-success="handleAvatarSuccess"
+      :on-preview="handlePictureCardPreview"
+      :on-remove="handleRemove"
+      :on-exceed="handleExceed"
+      :before-upload="beforeAvatarUpload"
+      :data="dataParam"
+      :name="fileName"
+      :headers="headers"
+      ref="elUploadRef"
+    >
+      <el-icon><Plus /></el-icon>
+    </el-upload>
+    <el-dialog v-model="dialogVisible">
+      <img w-full :src="dialogImageUrl" alt="Preview Image" />
+    </el-dialog>
+  </div>
+  <div v-else>
+    <div class="up-img">
+      <el-upload
+        ref="elUploadRef"
+        v-model:file-list="dataFileList"
+        :limit="limit"
+        class="avatar-uploader"
+        :action="action"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess"
+        :before-upload="beforeAvatarUpload"
+        :on-preview="handlePictureCardPreview"
+        :on-remove="handleRemove"
+        :on-exceed="handleExceed"
+        :data="dataParam"
+        :name="fileName"
+        :headers="headers"
+      >
+        <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, computed, getCurrentInstance, reactive, toRefs } from 'vue';
+import type { UploadProps, UploadUserFile, UploadInstance } from 'element-plus';
+import { ElMessage, genFileId } from 'element-plus';
+import _ from 'lodash';
+import sign from '@/utils/sign.js';
+export default defineComponent({
+  name: 'uploadImg',
+  props: {
+    action: { type: String, default: '' }, //上传地址
+    name: { type: String, default: 'file' }, //上传文件类型
+    limit: { type: Number, default: 1 }, //上传最大数量
+    method: { type: String, default: 'post' }, //设置上传请求方法
+    multiple: { type: Boolean, default: true }, //是否支持多选文件
+    showFileList: { type: Boolean, default: true }, //是否显示已上传文件列表
+    drag: { type: Boolean, default: false }, //是否启用拖拽上传
+    accept: { type: String, default: '' }, //接受上传的文件类型格式
+    disabled: { type: Boolean, default: false }, //是否是否禁止上传
+    listType: { type: String, default: 'picture-card' }, //是否启用拖拽上传
+    uploadSize: { type: Number, default: 100 }, //上传文件大小
+    modelValue: {
+      type: Array,
+      default: function () {
+        return [];
+      }
+    },
+    uploadData: { type: Object, default: {} },
+    fileName: {
+      type: String,
+      default: 'file'
+    }
+  },
+  setup(props, { emit }) {
+    const baseURL: string | undefined | boolean = import.meta.env.VITE_APP_BASE_API_GO;
+    const { proxy } = getCurrentInstance() as any;
+    const token = proxy?.$cache.local.get('goToken');
+    const dialogImageUrl = ref('');
+    const elUploadRef = ref<UploadInstance>();
+    const dialogVisible = ref(false);
+    const imageUrl = ref('');
+    const state = reactive({
+      fileName: props.fileName
+    });
+    const headers = reactive({
+      Authorization: 'Bearer ' + token,
+      ...sign({ token: token, ...props.uploadData })
+    });
+    const dataParam = reactive({
+      token: token,
+      ...props.uploadData
+    });
+    let uploadedFile: Array<any> = [];
+    const dataFileList = computed({
+      get: () => {
+        let value: Array<UploadUserFile> = (props.modelValue as UploadUserFile[]) || [];
+        if (value.length) {
+          value.map((item: UploadUserFile) => {
+            if (item.url) {
+              // item.url = proxy.getUpFileUrl(item.url);
+            }
+            return item;
+          });
+        }
+        uploadedFile = _.cloneDeep(value);
+        return value;
+      },
+      set: (val) => {
+        emit('uploadData', val);
+      }
+    });
+    const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+      if (rawFile.type.substring(0, 5) !== 'image') {
+        ElMessage.error('请上传图片文件');
+        return false;
+      } else if (rawFile.size / 1024 / 1024 > props.uploadSize) {
+        ElMessage.error('上传文件超过' + props.uploadSize + 'M');
+        return false;
+      }
+      return true;
+    };
+    const handleRemove: UploadProps['onRemove'] = (file) => {
+      uploadedFile.splice(
+        uploadedFile.findIndex((item: any) => item.uid === file.uid),
+        1
+      );
+      setDataFileList();
+    };
+    const handleExceed = (files) => {
+      elUploadRef.value!.clearFiles();
+      const file = files[0];
+      file.uid = genFileId();
+      elUploadRef.value!.handleStart(file);
+      elUploadRef.value!.submit();
+      // ElMessage.error('最多可上传' + props.limit + '个文件,已超出最大限制数。');
+    };
+    const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+      dialogImageUrl.value = uploadFile.url!;
+      dialogVisible.value = true;
+    };
+    const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
+      emit('uploadImageAuth', response); //返回认证的数据
+      if (props.limit == 1) {
+        uploadedFile = [];
+        imageUrl.value = URL.createObjectURL(uploadFile.raw!);
+      }
+      uploadedFile = uploadedFile.filter((item: UploadUserFile) => {
+        return item.raw?.uid != uploadFile.raw?.uid;
+      });
+      if (response.code === 0) {
+        // if (response.data.name) {
+        // 	uploadedFile.push({
+        // 		// 单图
+        // 		name: response.data.name,
+        // 		url: response.data.path,
+        // 		fileType: response.data.type,
+        // 		size: response.data.size,
+        // 	});
+        // } else {
+        // 	console.log(response.data);
+        // 	if (response.data.list) {
+        // 		uploadedFile.push({
+        // 			// 多图
+        // 			name: response.data.list[0].name,
+        // 			url: response.data.list[0].path,
+        // 			fileType: response.data.list[0].type,
+        // 			size: response.data.list[0].size,
+        // 		});
+        // 		return;
+        // 	}
+        uploadedFile.push({
+          // 多图
+          name: response.data[0].name,
+          url: response.data[0].path,
+          fileType: response.data[0].type,
+          size: response.data[0].size
+        });
+        // }
+
+        setDataFileList();
+      } else {
+        ElMessage.error(response.message);
+        imageUrl.value = '';
+      }
+      emit('uploadImageAuth1', uploadedFile); //返回认证的数据
+    };
+    const setDataFileList = () => {
+      dataFileList.value = uploadedFile;
+    };
+    return {
+      dataFileList,
+      imageUrl,
+      baseURL,
+      dialogVisible,
+      dialogImageUrl,
+      handleExceed,
+      beforeAvatarUpload,
+      handleRemove,
+      handlePictureCardPreview,
+      handleAvatarSuccess,
+      dataParam,
+      headers,
+      elUploadRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+
+<style scoped>
+.up-img :deep(.avatar-uploader .avatar) {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+.up-img :deep(.avatar-uploader .el-upload) {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.up-img :deep(.avatar-uploader .el-upload:hover) {
+  border-color: var(--el-color-primary);
+}
+
+.up-img :deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/main.ts b/src/main.ts
index 8197ba2..94ff1c3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -55,12 +55,14 @@ setLocal('host', '121.37.237.116');
 setLocal('rtmpPort', '28451');
 setLocal('rtcPort', '28453');
 setLocal('dockSocketUrl', 'ws://58.17.134.85:9512/websocket');
+window['$HOSTSRC'] = 'ws://58.17.134.85:8920/ws';
 
 // 修改 el-dialog 默认点击遮照为不关闭
 /*import { ElDialog } from 'element-plus';
 ElDialog.props.closeOnClickModal.default = false;*/
 // **main.js**
 import { vue3ScrollSeamless } from 'vue3-scroll-seamless';
+import uploader from 'vue-simple-uploader';
 import bus from './utils/bus';
 import $message from '@/plugins/modal';
 
@@ -74,6 +76,8 @@ app.use(print);
 app.use(i18n);
 app.use(VXETable);
 app.use(plugins);
+app.use(uploader);
+
 app.use(bus);
 app.component('vue3ScrollSeamless', vue3ScrollSeamless);
 // 自定义指令
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 7efcf2d..4678281 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -45,7 +45,9 @@ export const usePermissionStore = defineStore('permission', () => {
     sidebarRouters.value = routes;
   };
   const generateRoutes = async (): Promise<RouteRecordRaw[]> => {
-    const res = await getRouters(useUserStoreHook().selectedProject?.id || '0');
+    const id = useUserStoreHook().selectedProject ? useUserStoreHook().selectedProject.id : '0';
+    console.log('🚀 ~ generateRoutes ~ useUserStoreHook().selectedProject?.id:', id);
+    const res = await getRouters(id);
     const { data } = res;
     const sdata = JSON.parse(JSON.stringify(data));
     const rdata = JSON.parse(JSON.stringify(data));
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index e04a9f5..00081bc 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -44,9 +44,9 @@ export const useUserStore = defineStore('user', () => {
   const permissionList = ref<Array<any>>([]); // 用户所有权限列表
   const roleList = ref<Array<any>>([]); // 用户所有角色列表
 
-  const projects = ref<Array<{ id: string; name: string }>>([]);
+  const projects = ref<Array<{ id: string; name: string; goId: string }>>([]);
   // 从localStorage获取缓存的项目，如果没有则默认为null
-  const selectedProject = ref<{ id: string; name: string } | null>(getSelectedProjectFromStorage());
+  const selectedProject = ref<{ id: string; name: string; goId: string } | null>(getSelectedProjectFromStorage());
   const ProjectTeamList = ref<SpecialType[] | null>(getProjectTeamListFromStorage());
 
   /**
@@ -72,7 +72,8 @@ export const useUserStore = defineStore('user', () => {
     if (projectRes?.data) {
       const projectList = projectRes.data.map((p) => ({
         id: p.projectId,
-        name: p.projectName || '未知项目'
+        name: p.projectName || '未知项目',
+        goId: p.goId
       }));
       setProjects(projectList);
       // 如果有缓存的选中项目，且该项目在当前项目列表中存在，则使用缓存的项目
@@ -144,6 +145,7 @@ export const useUserStore = defineStore('user', () => {
     roles.value = [];
     permissions.value = [];
     removeToken();
+    $cache.local.remove('goToken'); // 清除Go服务Token缓存
     // 清除项目缓存
     $cache.local.remove('selectedProject');
     $cache.local.remove('ProjectTeamList');
@@ -153,11 +155,12 @@ export const useUserStore = defineStore('user', () => {
     avatar.value = value;
   };
 
-  const setProjects = (projectList: Array<{ id: string; name: string }>) => {
+  const setProjects = (projectList: Array<{ id: string; name: string; goId: string }>) => {
     projects.value = projectList;
   };
 
-  const setSelectedProject = (project: { id: string; name: string }) => {
+  const setSelectedProject = (project: { id: string; name: string; goId: string }) => {
+    console.log('🚀 ~ setSelectedProject ~ project:', project);
     selectedProject.value = project;
     saveSelectedProjectToStorage(project);
   };
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 0b21b0b..33152c7 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -10,6 +10,10 @@ export const setToken = (access_token: string) => (tokenStorage.value = access_t
 
 export const removeToken = () => (tokenStorage.value = null);
 
+export const getGoToken = () => {
+  return getLocal('goToken');
+};
+
 export const getDockSocketUrl = () => {
   return getLocal('dockSocketUrl');
 };
diff --git a/src/utils/exportDataToExcel.js b/src/utils/exportDataToExcel.js
new file mode 100644
index 0000000..50ae697
--- /dev/null
+++ b/src/utils/exportDataToExcel.js
@@ -0,0 +1,146 @@
+// 封装exceljs
+import ExcelJS from 'exceljs';
+import FileSaver from 'file-saver';
+/**
+ * 导出数据到Excel方法
+ * @param {Array[Object]} config.data 表格数据
+ * @param {Array[String]} config.fields 字段列表
+ * @param {Array[String]} config.headers excel表头列表[[]]，可以是多级表头[['A1'，'B1'],['A2'，'B2']]
+ * @param {Array[Object]} config.merges 需要合并的单元格，需要考虑表头的行数[{row:1, col:1, rowspan: 1, colspan: 2}]
+ * @param {Array[Object]} config.attrs 单元格样式配置
+ * @param {Array[Object]} config.views 工作表视图配置
+ * @param {Array[Number]} config.columnsWidth 每个字段列对应的宽度
+ * @param {Object} config.protect 工作表保护【此配置会保护全表，一般推荐只针对单元格进行保护配置】
+ * @param {String} config.sheetName 工作表名称，默认从sheet1开始
+ * @param {String} fileName excel文件名称
+ */
+export function exportDataToExcel(config, fileName) {
+	if (!config) return;
+	const options = {
+		fileName: fileName || `导出excel文件【${Date.now()}】.xlsx`,
+		worksheets: [],
+	};
+	if (!Array.isArray(config)) {
+		config = [config];
+	}
+	config.forEach((item) => {
+		// 深拷贝data【JSON.stringify有缺陷，可自行换成_.cloneDeep】
+		const data = JSON.parse(JSON.stringify(item.data));
+		const results = data.map((obj) => {
+			return item.fields.map((key) => {
+				return obj[key];
+			});
+		});
+		// 生成完整excel数据
+		let excelData = [];
+		excelData = excelData.concat(item.headers).concat(results);
+		// 单元格合并处理【excel数据的第一行/列是从1开始】
+		let excelMerges = [];
+		excelMerges = item.merges.map((m) => {
+			return [m.row + 1, m.col + 1, m.row + m.rowspan, m.col + m.colspan];
+		});
+		// 单元格配置处理【excel数据的第一行/列是从1开始】
+		let excelAttrs = [];
+		excelAttrs = item.attrs.map((attr) => {
+			attr.rowStart += 1;
+			attr.rowEnd += 1;
+			attr.colStart += 1;
+			attr.colEnd += 1;
+			return attr;
+		});
+		options.worksheets.push({
+			data: excelData,
+			merges: excelMerges,
+			attrs: excelAttrs,
+			views: item.views,
+			columnsWidth: item.columnsWidth,
+			protect: item.protect,
+			sheetName: item.sheetName,
+		});
+	});
+	createExcel(options);
+}
+// 创建Excel文件方法
+async function createExcel(options) {
+	if (!options.worksheets.length) return;
+	// 创建工作簿
+	const workbook = new ExcelJS.Workbook();
+	for (let i = 0; i < options.worksheets.length; i++) {
+		const sheetOption = options.worksheets[i];
+		// 创建工作表
+		const sheet = workbook.addWorksheet(sheetOption.sheetName || 'sheet' + (i + 1));
+		// 添加数据行
+		sheet.addRows(sheetOption.data);
+		// 配置视图
+		sheet.views = sheetOption.views;
+		// 单元格合并处理【开始行，开始列，结束行，结束列】
+		if (sheetOption.merges) {
+			sheetOption.merges.forEach((item) => {
+				sheet.mergeCells(item);
+			});
+		}
+		// 工作表保护
+		if (sheetOption.protect) {
+			const res = await sheet.protect(sheetOption.protect.password, sheetOption.protect.options);
+		}
+		// 单元格样式处理
+		if (sheetOption.attrs.length) {
+			sheetOption.attrs.forEach((item) => {
+				const attr = item.attr || {};
+				// 获取开始行-结束行; 开始列-结束列
+				const rowStart = item.rowStart;
+				const rowEnd = item.rowEnd;
+				const colStart = item.colStart;
+				const colEnd = item.colEnd;
+				if (rowStart) {
+					// 设置行
+					for (let r = rowStart; r <= rowEnd; r++) {
+						// 获取当前行
+						const row = sheet.getRow(r);
+						if (colStart) {
+							// 列设置
+							for (let c = colStart; c <= colEnd; c++) {
+								// 获取当前单元格
+								const cell = row.getCell(c);
+								Object.keys(attr).forEach((key) => {
+									// 给当前单元格设置定义的样式
+									cell[key] = attr[key];
+								});
+							}
+						} else {
+							// 未设置列，整行设置【大纲级别】
+							Object.keys(attr).forEach((key) => {
+								row[key] = attr[key];
+							});
+						}
+					}
+				} else if (colStart) {
+					// 未设置行，只设置了列
+					for (let c = colStart; c <= colEnd; c++) {
+						// 获取当前列，整列设置【大纲级别】
+						const column = sheet.getColumn(c);
+						Object.keys(attr).forEach((key) => {
+							column[key] = attr[key];
+						});
+					}
+				} else {
+					// 没有设置具体的行列，则为整表设置
+					Object.keys(attr).forEach((key) => {
+						sheet[key] = attr[key];
+					});
+				}
+			});
+		}
+		// 列宽设置
+		if (sheetOption.columnsWidth) {
+			for (let i = 0; i < sheet.columns.length; i++) {
+				sheet.columns[i].width = sheetOption.columnsWidth[i];
+			}
+		}
+	}
+	// 生成excel文件
+	workbook.xlsx.writeBuffer().then((buffer) => {
+		// application/octet-stream 二进制数据
+		FileSaver.saveAs(new Blob([buffer], { type: 'application/octet-stream' }), options.fileName);
+	});
+}
diff --git a/src/utils/exportExcel.ts b/src/utils/exportExcel.ts
new file mode 100644
index 0000000..ecd7a74
--- /dev/null
+++ b/src/utils/exportExcel.ts
@@ -0,0 +1,212 @@
+import { exportSalary } from '@/api/project/projectTeam';
+import { exportDataToExcel } from '@/utils/exportDataToExcel.js';
+
+export function useExcelExport() {
+  // 数据整合函数
+  const exportConfig = (obj, proxy, times) => {
+    // 如果导出前要处理数据，需要深克隆一份表格数据，然后进行处理
+    let time = proxy.parseTime(new Date(times), '{y}年{m}月'); // 当前年月
+    let header1 = ['建筑施工企业现场人员考勤表（' + time + '）'];
+    let projectName = '项目部名称:' + obj.projectName;
+    let teamName = '班组类别:' + obj.teamName;
+    let header2 = [];
+    let header3 = [projectName + '                       ' + teamName];
+    const header = ['序号', '姓名/日期', '身份证号'];
+    let columnsWidth = [6, 10, 26]; // 表格宽度
+    let obj1 = { index: '', name: '', identity_card: '' };
+    let fields = ['index', 'row', 'identity_card'];
+
+    // 计算当前月天数
+    let years = times.split('-')[0];
+    let month = times.split('-')[1];
+    let listLength = new Date(years, month, 0).getDate();
+
+    for (let index = 0; index < listLength; index++) {
+      obj1['day' + index] = '';
+      fields.push('day' + index);
+      header.push(index + 1);
+      columnsWidth.push(4);
+    }
+
+    header.push('合计');
+    fields.push('sum');
+    header.push('是否离场');
+    fields.push('type');
+    header.push('签字');
+    fields.push('sign');
+
+    // 上方共用
+    let data = [];
+    if (!(obj.team && obj.team.length)) return;
+
+    obj.team.forEach((item, index) => {
+      let obj = { row: '', index: '', identity_card: '' };
+
+      for (let key in item.attendance) {
+        let j = parseInt(key.split('-')[2]) - 1;
+        obj['day' + j] = item.attendance[key];
+      }
+
+      obj.row = item.row;
+      obj.index = index + 1;
+      obj.identity_card = item.identity_card;
+
+      let start = ''; // 从表格那一列哪一行开始
+      let end = ''; // 从表格那一列哪一行结束
+      let cols = 5 + index; // 行数
+      start = 'D' + cols;
+
+      // 判断当月天数 获取表格中最后一天的列标识
+      if (listLength == 28) {
+        end = 'AE' + cols;
+      } else if (listLength == 29) {
+        end = 'AF' + cols;
+      } else if (listLength == 30) {
+        end = 'AG' + cols;
+      } else {
+        end = 'AH' + cols;
+      }
+
+      obj.sum = { formula: 'SUM(' + start + ':' + end + ')', result: 0 };
+      obj.sign = '';
+      obj.type = item.type ? '离场' : '未离场';
+      data.push(obj);
+    });
+
+    const merges = [
+      // 单元格合并
+      { row: 0, col: 0, rowspan: 1, colspan: listLength + 5 },
+      { row: 2, col: 0, rowspan: 1, colspan: listLength + 5 },
+      { row: obj.team.length + 5, col: 0, rowspan: 1, colspan: 3 },
+      { row: obj.team.length + 5, col: 3, rowspan: 1, colspan: 10 },
+      { row: obj.team.length + 5, col: 13, rowspan: 1, colspan: 10 },
+      { row: obj.team.length + 5, col: 23, rowspan: 1, colspan: 10 }
+    ];
+
+    data.push({});
+    // 表格尾部标题
+    data.push({
+      index: '制表人:',
+      day0: '班组负责人',
+      day10: '项目负责人',
+      day20: '制表日期'
+    });
+    data.push({
+      index: '注:',
+      row: '1、本考勤表必须按照每日实际工时进行填写；'
+    });
+    data.push({
+      row: '2、本考勤表作为工资计发的重要依据。'
+    });
+
+    const config = {
+      data,
+      fields,
+      headers: [header1, header2, header3, header],
+      merges,
+      attrs: [],
+      view: [],
+      columnsWidth,
+      sheetName: obj.teamName
+    };
+
+    // 设置全表单元格边框，居中布局
+    config.attrs.push({
+      rowStart: 3,
+      rowEnd: config.data.length - 1,
+      colStart: 0,
+      colEnd: config.fields.length - 1,
+      attr: {
+        alignment: { vertical: 'middle', horizontal: 'center' },
+        border: {
+          top: { style: 'thin' },
+          left: { style: 'thin' },
+          bottom: { style: 'thin' },
+          right: { style: 'thin' }
+        }
+      }
+    });
+
+    // 设置表头字体加粗
+    config.attrs.push({
+      rowStart: 0,
+      rowEnd: 0,
+      colStart: 0,
+      colEnd: config.fields.length - 1,
+      attr: {
+        alignment: { vertical: 'middle', horizontal: 'center' },
+        font: {
+          bold: true,
+          size: '16'
+        }
+      }
+    });
+
+    config.attrs.push({
+      rowStart: 2,
+      rowEnd: 2,
+      colStart: 0,
+      colEnd: config.fields.length - 1,
+      attr: {
+        alignment: { vertical: 'middle', horizontal: 'center' }
+      }
+    });
+
+    return config;
+  };
+
+  // 导出函数
+  const exportExcel = async (obj, proxy, name = undefined) => {
+    try {
+      const res = await exportSalary(obj);
+
+      if (res.code === 0 && res.data.AttendanceAllOne) {
+        let config = [];
+        let AttendanceAllOne = res.data.AttendanceAllOne;
+
+        // 处理每个表格
+        AttendanceAllOne.forEach((item) => {
+          let datas = exportConfig(item, proxy, obj.years);
+          if (datas) {
+            config.push(datas);
+          }
+        });
+
+        // 获取项目名
+        let projectName = '';
+        if (name) {
+          projectName = res.data.AttendanceAllOne[0].projectName + '-' + name;
+        } else {
+          projectName = res.data.AttendanceAllOne[0].projectName;
+        }
+
+        let year = obj.years.split('-')[0];
+        let month = obj.years.split('-')[1];
+
+        // 导出Excel
+        exportDataToExcel(config, `${projectName}-${year}年${month}月考勤表.xlsx`);
+      } else if (res.code === 0) {
+        ElMessage({
+          message: '暂无考勤数据',
+          type: 'warning'
+        });
+      } else {
+        ElMessage({
+          message: res.message || '导出失败',
+          type: 'error'
+        });
+      }
+    } catch (error) {
+      ElMessage({
+        message: '导出过程出错',
+        type: 'error'
+      });
+      console.error('Excel导出错误:', error);
+    }
+  };
+
+  return {
+    exportConfig,
+    exportExcel
+  };
+}
diff --git a/src/utils/projectTeam.ts b/src/utils/projectTeam.ts
index c0c8d23..37cf7fb 100644
--- a/src/utils/projectTeam.ts
+++ b/src/utils/projectTeam.ts
@@ -7,18 +7,18 @@ export const getProjectTeam = async () => {
   const isPermission = useUserStore().permissions.some((item) => item == 'project:team:list');
   if (!isPermission && useUserStore().permissions[0] != '*:*:*') return;
 
-  const { id } = $cache.local.getJSON('selectedProject');
+  const { goId } = $cache.local.getJSON('selectedProject');
   const res = await listProjectTeam({
     pageNum: 1,
     pageSize: 20,
     orderByColumn: 'createTime',
     isAsc: 'desc',
-    projectId: id
+    projectId: goId
   });
 
-  const list = res.rows.map((projectTeam: ProjectTeamVO) => ({
+  const list = res.data.list.map((projectTeam: ProjectTeamVO) => ({
     value: projectTeam.id,
-    label: projectTeam.teamName
+    label: projectTeam.name
   }));
   $cache.local.setJSON('ProjectTeamList', list);
 };
diff --git a/src/utils/request-go.ts b/src/utils/request-go.ts
new file mode 100644
index 0000000..2eeaa5a
--- /dev/null
+++ b/src/utils/request-go.ts
@@ -0,0 +1,271 @@
+import $cache from '@/plugins/cache';
+import useUserStore from '@/store/modules/user';
+import request from '@/utils/request';
+import axios from 'axios';
+import sign from '@/utils/sign.js';
+import CryptoJS from 'crypto-js';
+/**
+ * 包装 request 请求，统一使用 Go 服务地址作为 baseURL
+ * @param config 原始请求配置
+ */
+
+const BASE_GO_URL = import.meta.env.VITE_APP_BASE_API_GO;
+
+interface RequestGo extends Function {
+  (config: any): Promise<any>;
+  download?: (url: string, params: any, filename: string) => void;
+}
+
+// 加密密钥
+const corySecretKey = 'happyCoryOrTieHanHan202410151415';
+
+// 配置新建一个 axios 实例
+const service = axios.create({
+  baseURL: BASE_GO_URL as any,
+  timeout: 120000,
+  headers: { 'Content-Type': 'application/json' }
+});
+
+// 不需要修改项目id的接口数组
+const whiteUrl = [
+  '/api/wxApplet/wxApplet/sysProjectTeam/list',
+  '/api/wxApplet/wxApplet/sysProjectTeam/add',
+  '/api/wxApplet/wxApplet/sysProjectTeam/edit',
+  '/api/v1/test/testFollowInfo/add',
+  '/api/wxApplet/wxApplet/busConstructionUser/changePay',
+  // 获取项目资料文件夹
+  '/api/v1/system/documentData/treeStructureData',
+  '/api/v1/system/busConstructionUser/exportSalary',
+  '/api/v1/system/busSalaryDetails/list',
+  '/api/v1/system/ys7Devices/add',
+  '/api/v1/system/ys7Devices/edit',
+  '/api/v1/system/subProject/add',
+  '/api/v1/system/subProject/edit',
+  '/api/v1/system/subProject/list',
+  '/api/v1/system/workStatus/getTree',
+  '/api/v1/system/sysProjectIntroduce/list',
+  '/api/v1/system/sysProjectIntroduce/add',
+  '/api/v1/system/sysProjectIntroduce/edit',
+  '/video/hat/manage/api/v1/video/device/list',
+  '/video/hat/manage/api/v1/video/project/bind',
+  '/api/v1/system/notifications/publish',
+  '/api/v1/system/notifications/list',
+  '/api/v1/system/notifications/edit',
+  '/webodm/api/v1/taskCreate',
+  '/webodm/api/v1/taskProcess',
+  '/webodm/api/v1/download',
+  '/api/v1/system/manageTaskRecord/upDataResource',
+  '/api/v1/system/ys7Devices/list',
+  '/api/v1/system/busFolderFile/add',
+  '/api/v1/system/manageTaskRecordResource/voluntarilyReq',
+  '/api/v1/system/busAttendanceMachine/edit',
+  '/api/v1/system/qianqiFangzhen/add',
+  '/api/v1/system/qianqiNibianqi/add'
+];
+
+const exceptionStr = '/api/v1/test/'; // /api/v1/test/*接口拦截
+
+// 添加请求拦截器
+service.interceptors.request.use(
+  (config: any) => {
+    // 在发送请求之前做些什么 token
+    const token = $cache.local.get('goToken');
+    if (token) {
+      config.headers = config.headers || {};
+      (config.headers as any)['Authorization'] = `Bearer ${token}`;
+    }
+
+    const stores = useUserStore();
+    if (!whiteUrl.includes(config.url) && !config.url.includes(exceptionStr)) {
+      if (config.params && Reflect.has(config.params, 'projectId')) {
+        config.params.projectId = stores.selectedProject.goId;
+      }
+      // 处理FormData中的projectId
+      if (config.data instanceof FormData && config.data.has('projectId')) {
+        config.data.set('projectId', stores.selectedProject.goId);
+      }
+    }
+    let dataInfoReq = {};
+    if (config.method === 'get' || config.method === 'delete') {
+      config.params = config.params || {};
+      dataInfoReq = JSON.parse(JSON.stringify(config.params));
+      const encryptedParam = encryptAES256(JSON.stringify(dataInfoReq), corySecretKey);
+      if ($cache.local.get('i18n') != null) {
+        config.params = { coryKey: encryptedParam, corySimplifiedToTraditional: $cache.local.get('i18n') };
+      } else {
+        config.params = { coryKey: encryptedParam };
+      }
+    } else {
+      // 处理FormData类型
+      if (config.data instanceof FormData) {
+        // 将FormData转换为普通对象
+        dataInfoReq = Object.fromEntries(config.data.entries());
+        // 重新创建一个新的FormData实例
+        const newFormData = new FormData();
+        const encryptedData = encryptAES256(JSON.stringify(dataInfoReq), corySecretKey);
+
+        newFormData.append('coryKey', encryptedData);
+        if ($cache.local.get('i18n') != null) {
+          newFormData.append('corySimplifiedToTraditional', $cache.local.get('i18n'));
+        }
+
+        // 如果有文件，需要重新添加
+        for (let [key, value] of config.data.entries()) {
+          if (value instanceof File) {
+            newFormData.append(key, value);
+          }
+        }
+
+        config.data = newFormData;
+        // 设置Content-Type为undefined，让浏览器自动设置boundary
+        config.headers['Content-Type'] = undefined;
+      } else {
+        dataInfoReq = config.data;
+        const encryptedData = encryptAES256(JSON.stringify(dataInfoReq), corySecretKey);
+        if ($cache.local.get('i18n') != null) {
+          config.data = { coryKey: encryptedData, corySimplifiedToTraditional: $cache.local.get('i18n') };
+        } else {
+          config.data = { coryKey: encryptedData };
+        }
+      }
+    }
+
+    const { timestamp, nonce, sign: signature } = sign(dataInfoReq);
+    config.headers.timestamp = timestamp;
+    config.headers.nonce = nonce;
+    config.headers.sign = signature;
+
+    return config;
+  },
+  (error) => {
+    // 对请求错误做些什么
+    return Promise.reject(error);
+  }
+);
+// 添加响应拦截器
+service.interceptors.response.use(
+  (response) => {
+    // 对响应数据进行解密操作
+    try {
+      // 处理特殊情况：data为空值或不需要解密的情况
+      if (response.data.data === null || response.data.data === '' || response.data.data === undefined) {
+        return response.data;
+      }
+
+      // 检查响应数据格式
+      if (typeof response.data.data !== 'string') {
+        // 尝试将非字符串数据转换为字符串
+        try {
+          response.data.data = JSON.stringify(response.data.data);
+        } catch (convertError) {
+          throw new Error('响应数据格式不正确，无法转换为字符串');
+        }
+      }
+      // 执行解密
+      const decryptedData = decryptAES256(response.data.data, corySecretKey);
+      // 正确处理解密后的数据
+      if (decryptedData && typeof decryptedData === 'object') {
+        // 保持response.data的结构不变，只替换data字段的内容
+        response.data = {
+          ...response.data,
+          data: decryptedData
+        };
+      } else {
+        // 如果解密后的数据不是对象，可能需要特殊处理
+        response.data.data = decryptedData;
+      }
+      if (response.data.code !== 0) {
+        ElMessage.error(response.data.message);
+      }
+      return response.data;
+    } catch (decryptError) {
+      // 提供更友好的错误信息
+      if (decryptError.message.includes('无效的Base64格式')) {
+        ElMessage.error('数据格式错误：接收到无效的加密数据');
+      } else {
+        ElMessage.error('数据解密失败，请联系管理员');
+      }
+
+      return Promise.reject(decryptError);
+    }
+  },
+  (error) => {
+    // 对响应错误做点什么
+    if (error.message.indexOf('timeout') !== -1) {
+      ElMessage.error('网络超时');
+    } else if (error.message === 'Network Error') {
+      ElMessage.error('网络连接错误');
+    } else {
+      console.log(error, '网络错误');
+
+      if (error.response.data) ElMessage.error(error.response.statusText);
+      else {
+        ElMessage.error('接口路径找不到');
+        console.log(error, '接口路径找不到');
+      }
+    }
+    return Promise.reject(error);
+  }
+);
+
+// 加密函数
+function encryptAES256(plainText: string, key: string): string | null {
+  try {
+    const parsedKey = CryptoJS.enc.Utf8.parse(key);
+    const iv = CryptoJS.lib.WordArray.random(16);
+    const plainTextWordArray = CryptoJS.enc.Utf8.parse(plainText);
+    const encrypted = CryptoJS.AES.encrypt(plainTextWordArray, parsedKey, {
+      iv: iv,
+      mode: CryptoJS.mode.CBC,
+      padding: CryptoJS.pad.Pkcs7
+    });
+    const encryptedData = iv.concat(encrypted.ciphertext);
+    return encryptedData.toString(CryptoJS.enc.Base64);
+  } catch (err) {
+    console.error('Encryption error:', err.message);
+    return null;
+  }
+}
+
+// 增强的解密函数，处理各种输入情况
+function decryptAES256(encryptedData: string, key: string): any {
+  // eslint-disable-next-line no-useless-catch
+  try {
+    // 检查输入是否为有效的Base64字符串
+    if (!/^[A-Za-z0-9+/=]+$/.test(encryptedData)) {
+      // 尝试对非标准Base64字符串进行处理
+      // 移除可能的前缀
+      const cleanData = encryptedData.replace(/^data:.*?;base64,/, '').replace(/\s/g, ''); // 移除空格
+
+      if (!/^[A-Za-z0-9+/=]+$/.test(cleanData)) {
+        throw new Error('无效的Base64格式');
+      }
+
+      return decryptAES256(cleanData, key);
+    }
+
+    const decodedData = CryptoJS.enc.Base64.parse(encryptedData);
+    const iv = CryptoJS.lib.WordArray.create(decodedData.words.slice(0, 4));
+    const encryptedText = CryptoJS.lib.WordArray.create(decodedData.words.slice(4));
+    const parsedKey = CryptoJS.enc.Utf8.parse(key);
+
+    const decrypted = CryptoJS.AES.decrypt({ ciphertext: encryptedText }, parsedKey, {
+      iv: iv,
+      mode: CryptoJS.mode.CBC,
+      padding: CryptoJS.pad.Pkcs7
+    });
+
+    const decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
+
+    // 尝试解析为JSON
+    try {
+      return JSON.parse(decryptedStr);
+    } catch (jsonError) {
+      return decryptedStr;
+    }
+  } catch (err) {
+    throw err;
+  }
+}
+// 导出 axios 实例
+export default service;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 66780df..20b51ac 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -45,7 +45,7 @@ service.interceptors.request.use(
     // 是否需要加密
     const isEncrypt = config.headers?.isEncrypt === 'true';
 
-    if (getToken() && !isToken) {
+    if (getToken() && !isToken && !config.headers?.Authorization) {
       config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     // get请求映射params参数
diff --git a/src/utils/sign.js b/src/utils/sign.js
new file mode 100644
index 0000000..13df2cd
--- /dev/null
+++ b/src/utils/sign.js
@@ -0,0 +1,50 @@
+import crypto from 'crypto-js';
+let coyr = 'coyrOrtiehanhan1223202409111457';
+// 生成 nonce（随机生成一个16位的字符串）
+function generateNonce() {
+	const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+	let nonce = '';
+	for (let i = 0; i < 16; i++) {
+		nonce += chars.charAt(Math.floor(Math.random() * chars.length));
+	}
+	return nonce;
+}
+// 生成当前时间戳（格式为 yyyyMMddHHmmss）
+function generateTimestamp() {
+	return new Date().getTime();
+}
+// 生成 MD5 哈希（需要引入第三方库，如 crypto-js）
+function md5Hash(str) {
+	return crypto.MD5(str).toString();
+}
+
+// 生成 SHA-256 哈希（需要引入第三方库，如 crypto-js）
+function sha256Hash(str) {
+	return crypto.SHA256(str).toString();
+}
+// 生成签名
+function generateSignature(params, timestamp, nonce) {
+	// 加密
+	let coyr1 = md5Hash(coyr);
+	// 拼接时间戳、nonce 和 secretKey
+	let signStr = coyr1 + timestamp + nonce;
+	// MD5 加密
+	const md5Str = md5Hash(signStr);
+	// SHA-256 加密
+	let aaaa = sha256Hash(md5Str);
+	return aaaa;
+}
+function sign(data) {
+	// 生成签名
+	const timestamp = generateTimestamp();
+	const nonce = generateNonce();
+	const sign = generateSignature(data, timestamp, nonce);
+	return {
+		timestamp,
+		nonce,
+		sign,
+	};
+}
+// 封装
+
+export default sign;
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
new file mode 100644
index 0000000..a983f80
--- /dev/null
+++ b/src/utils/storage.ts
@@ -0,0 +1,59 @@
+import Cookies from 'js-cookie';
+
+/**
+ * window.localStorage 浏览器永久缓存
+ * @method set 设置永久缓存
+ * @method get 获取永久缓存
+ * @method remove 移除永久缓存
+ * @method clear 移除全部永久缓存
+ */
+export const Local = {
+	// 设置永久缓存
+	set(key: string, val: any) {
+		window.localStorage.setItem(key, JSON.stringify(val));
+	},
+	// 获取永久缓存
+	get(key: string) {
+		let json: any = window.localStorage.getItem(key);
+		return JSON.parse(json);
+	},
+	// 移除永久缓存
+	remove(key: string) {
+		window.localStorage.removeItem(key);
+	},
+	// 移除全部永久缓存
+	clear() {
+		window.localStorage.clear();
+	},
+};
+
+/**
+ * window.sessionStorage 浏览器临时缓存
+ * @method set 设置临时缓存
+ * @method get 获取临时缓存
+ * @method remove 移除临时缓存
+ * @method clear 移除全部临时缓存
+ */
+export const Session = {
+	// 设置临时缓存
+	set(key: string, val: any) {
+		if (key === 'token') return Cookies.set(key, val);
+		window.sessionStorage.setItem(key, JSON.stringify(val));
+	},
+	// 获取临时缓存
+	get(key: string) {
+		if (key === 'token') return Cookies.get(key);
+		let json: any = window.sessionStorage.getItem(key);
+		return JSON.parse(json);
+	},
+	// 移除临时缓存
+	remove(key: string) {
+		if (key === 'token') return Cookies.remove(key);
+		window.sessionStorage.removeItem(key);
+	},
+	// 移除全部临时缓存
+	clear() {
+		Cookies.remove('token');
+		window.sessionStorage.clear();
+	},
+};
diff --git a/src/views/busMachineryDetail/list/component/add.vue b/src/views/busMachineryDetail/list/component/add.vue
new file mode 100644
index 0000000..69d9f21
--- /dev/null
+++ b/src/views/busMachineryDetail/list/component/add.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="system-busMachineryDetail-add">
+    <el-dialog v-model="isShowDialog" width="769px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.system-busMachineryDetail-add .el-dialog', '.system-busMachineryDetail-add .el-dialog__header']">添加机械入场记录</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col :span="12"
+            ><el-form-item label="合格证编号" prop="checkoutNumber">
+              <el-input v-model="formData.checkoutNumber" placeholder="请输入合格证编号" /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="生产厂家" prop="checkoutUnit">
+              <el-input v-model="formData.checkoutUnit" placeholder="请输入生产厂家" /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="生产日期/有效期" prop="checkoutDate">
+              <el-date-picker
+                clearable
+                style="width: 250px"
+                v-model="formData.checkoutDate"
+                type="datetime"
+                placeholder="选择检定日期/有效期"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled-date="disabledDate"
+              >
+              </el-date-picker> </el-form-item
+          ></el-col>
+          <!-- <el-radio v-for="dict in typeOptions" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio> -->
+          <!-- <el-col :span="12"
+						><el-form-item label="出入场" prop="type">
+							<el-radio-group v-model="formData.type">
+								<el-radio label="2">入场</el-radio>
+							</el-radio-group>
+						</el-form-item></el-col
+					> -->
+          <el-col :span="12"
+            ><el-form-item label="施工类型状态" prop="status">
+              <el-radio-group v-model="formData.status">
+                <el-radio v-for="dict in statusOptions" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item></el-col
+          >
+          <el-col :span="12"
+            ><el-form-item label="入场时间" prop="entryTime">
+              <el-date-picker
+                clearable
+                style="width: 250px"
+                v-model="formData.entryTime"
+                type="datetime"
+                placeholder="选择入场时间"
+                format="YYYY年MM月DD日 hh时mm分ss秒"
+                value-format="YYYY-MM-DD hh:mm:ss"
+              >
+              </el-date-picker> </el-form-item
+          ></el-col>
+          <el-col :span="24"
+            ><el-form-item label="备注" prop="remark"> <el-input v-model="formData.remark" placeholder="请输入备注" /> </el-form-item
+          ></el-col>
+          <el-col :span="24">
+            <el-form-item label="图片" prop="picture">
+              <upload-img :action="baseURL + '/zm/api/v1/system/upload/multipleImg'" @uploadImageAuth1="setUpImgListPicture($event)" :limit="4">
+              </upload-img> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessage } from 'element-plus';
+import { addBusMachineryDetail } from '@/api/machinery/machineryDetail';
+import uploadImg from '@/components/uploadImg/index.vue';
+import { BusMachineryDetailEditState } from './model';
+import { stat } from 'fs';
+export default defineComponent({
+  name: 'index',
+  components: {
+    uploadImg
+  },
+  props: {
+    statusOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  setup(props, { emit }) {
+    const baseURL: string | undefined | boolean = import.meta.env.VITE_APP_BASE_API_GO;
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const state = reactive<BusMachineryDetailEditState>({
+      loading: false,
+      isShowDialog: false,
+      typeOptions: [
+        { value: '2', label: '入场' },
+        { value: '1', label: '出场' }
+      ],
+      formData: {
+        id: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        entryTime: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        remark: undefined,
+        picture: [],
+        type: '2'
+      },
+      // 表单校验
+      rules: {
+        checkoutNumber: [{ required: true, message: '检验证编号不能为空', trigger: 'blur' }],
+        checkoutUnit: [{ required: true, message: '检验单位不能为空', trigger: 'blur' }],
+        checkoutDate: [{ required: true, message: '检定日期/有效期不能为空', trigger: 'blur' }],
+        type: [{ required: true, message: '出入场不能为空', trigger: 'blur' }]
+      },
+      imageList: [],
+      propsRow: {}
+    });
+    // 打开弹窗
+    const openDialog = (row: any) => {
+      resetForm();
+      if (row) {
+        state.formData.machinery_id = row.id;
+        state.propsRow = row;
+      }
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 提交
+    const onSubmit = () => {
+      // 去重
+      // state.formData.picture = state.formData.picture.join(',');
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          state.loading = true;
+          //添加
+          state.formData.type = '2';
+          addBusMachineryDetail(state.formData)
+            .then(() => {
+              ElMessage.success('添加成功');
+              closeDialog(); // 关闭弹窗
+              emit('busMachineryDetailList', state.propsRow.children, state.propsRow.id);
+            })
+            .finally(() => {
+              state.loading = false;
+            });
+        }
+      });
+    };
+    const resetForm = () => {
+      state.formData = {
+        id: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        entryTime: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        remark: undefined,
+        picture: []
+      };
+    };
+    const setUpImgListPicture = (val: any) => {
+      // console.log(val);
+      // if (val.length > 0 && val[0].url && !val[0].raw) {
+      // 	let path = '';
+      // 	val.forEach((item) => {
+      // 		// 判断是否存在http
+      // 		if (item.url.indexOf('http') != -1) {
+      // 			path = path + ',' + item.url.slice(item.url.indexOf('/upload_file') + 1);
+      // 		} else {
+      // 			path = path + ',' + item.url;
+      // 		}
+      // 	});
+      // 	path = path.slice(1);
+      state.formData.picture = [];
+      val.forEach((item) => {
+        state.formData.picture.push(item.url);
+      });
+      // }
+    };
+    const disabledDate = (time) => {
+      return time.getTime() >= Date.now(); // 8.64e7 毫秒数代表一天
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      menuRef,
+      formRef,
+      setUpImgListPicture,
+      baseURL,
+      disabledDate,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped>
+.el-col {
+  margin: 10px 0 !important;
+}
+</style>
diff --git a/src/views/busMachineryDetail/list/component/detail.vue b/src/views/busMachineryDetail/list/component/detail.vue
new file mode 100644
index 0000000..88f631f
--- /dev/null
+++ b/src/views/busMachineryDetail/list/component/detail.vue
@@ -0,0 +1,219 @@
+<template>
+  <!-- 机械详情详情抽屉 -->
+  <div class="system-busMachineryDetail-detail">
+    <el-drawer v-model="isShowDialog" class="busMachineryDetail_detail" size="40%" direction="ltr">
+      <template #header>
+        <h4>机械出入场记录详情</h4>
+      </template>
+      <el-form ref="formRef" :model="formData" label-width="130px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合格证编号">{{ formData.checkoutNumber }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产厂家">{{ formData.checkoutUnit }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产日期/有效期">{{ formData.checkoutDate }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出入场">{{ formData.type == 1 ? '出场' : formData.type == 2 ? '入场' : '' }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="施工类型状态">{{ getOptionValue(formData.status, statusOptions, 'value', 'label') }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入场时间">{{ formData.entryTime }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间">{{ formData.createdAt }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注">{{ formData.remark }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="图片">
+              <div class="pic-block" v-if="formData.picture.length" v-for="(img, key) in formData.picture" :key="'picture-' + key">
+                <el-image
+                  style="width: 140px; height: 150px; margin: 0 5px"
+                  v-if="img"
+                  :src="'http://58.17.134.85:8920' + img"
+                  fit="contain"
+                  :preview-src-list="['http://58.17.134.85:8920' + img]"
+                  :zoom-rate="1.2"
+                  preview-teleported="true"
+                ></el-image>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-table v-loading="loading" :data="formData.recordList">
+            <el-table-column label="出入场" align="center" prop="type">
+              <template #default="scope">
+                <span v-if="scope.row.type == 1">出场</span>
+                <span v-if="scope.row.type == 2">入场</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="施工类型状态" align="center" prop="status">
+              <template #default="scope">
+                <span v-if="scope.row.status == 0">正常</span>
+                <span v-if="scope.row.status == 1">停用</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="填报人" align="center" prop="createdBy" min-width="100px" /> -->
+            <el-table-column label="记录时间" align="center" prop="recordTime">
+              <template #default="scope">
+                <span>{{ proxy.parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-row>
+      </el-form>
+    </el-drawer>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, getCurrentInstance } from 'vue';
+import { getBusMachineryDetail } from '@/api/machinery/machineryDetail';
+import { ElLoading } from 'element-plus';
+import uploadImg from '@/components/uploadImg/index.vue';
+import { BusMachineryDetailInfoData, BusMachineryDetailEditState } from './model';
+export default defineComponent({
+  name: 'index',
+  components: {
+    uploadImg
+  },
+  props: {
+    statusOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  setup(props, { emit }) {
+    const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL;
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const state = reactive<BusMachineryDetailEditState>({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        id: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        entryTime: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        remark: undefined,
+        picture: []
+      },
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '施工类型状态不能为空', trigger: 'blur' }]
+      }
+    });
+    // 打开弹窗
+    const openDialog = (row?: BusMachineryDetailInfoData) => {
+      resetForm();
+      if (row) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: '正在加载中……',
+          background: 'rgba(0, 0, 0, 0.7)',
+          target: '.busMachineryDetail_detail'
+        });
+        getBusMachineryDetail(row.id!).then((res: any) => {
+          loading.close();
+          const data = res.data;
+          state.formData = data;
+          if (state.formData.picture && state.formData.picture.includes('[')) {
+            state.formData.picture = state.formData.picture ? JSON.parse(state.formData.picture) : [];
+          } else {
+            state.formData.picture = state.formData.picture ? state.formData.picture.split(',') : [];
+          }
+        });
+      }
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    const resetForm = () => {
+      state.formData = {
+        id: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        entryTime: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        remark: undefined,
+        picture: []
+      };
+    };
+    function getOptionValue(key: any, options: Array<any>, keyName: string, valName: string) {
+      keyName = keyName ?? 'key';
+      valName = valName ?? 'value';
+      const option = options.find((value) => {
+        return key + '' === value[keyName];
+      });
+      if (option !== undefined) {
+        return option[valName];
+      }
+    }
+    const setUpImgListPicture = (data: any) => {
+      state.formData.picture = data;
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      menuRef,
+      getOptionValue,
+      formRef,
+      setUpImgListPicture,
+      baseURL,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped>
+.system-busMachineryDetail-detail :deep(.el-form-item--large .el-form-item__label) {
+  font-weight: bolder;
+}
+.pic-block {
+  margin-right: 8px;
+}
+.file-block {
+  width: 100%;
+  border: 1px solid var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+  margin-bottom: 5px;
+  padding: 3px 6px;
+}
+.ml-2 {
+  margin-right: 5px;
+}
+</style>
diff --git a/src/views/busMachineryDetail/list/component/edit.vue b/src/views/busMachineryDetail/list/component/edit.vue
new file mode 100644
index 0000000..d33816f
--- /dev/null
+++ b/src/views/busMachineryDetail/list/component/edit.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="system-busMachineryDetail-edit">
+    <el-dialog v-model="isShowDialog" width="769px" :close-on-click-modal="false" :destroy-on-close="true" custom-class="busMachineryDetail_edit">
+      <template #header>
+        <div v-drag="['.system-busMachineryDetail-edit .el-dialog', '.system-busMachineryDetail-edit .el-dialog__header']">
+          {{ formData.id ? '修改' : '添加' }}机械出入场记录
+        </div>
+      </template>
+
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合格证编号" prop="checkoutNumber">
+              <el-input v-model="formData.checkoutNumber" placeholder="请输入合格证编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产厂家" prop="checkoutUnit">
+              <el-input v-model="formData.checkoutUnit" placeholder="请输入生产厂家" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产日期/有效期" prop="checkoutDate">
+              <el-date-picker
+                clearable
+                style="width: 250px"
+                v-model="formData.checkoutDate"
+                type="datetime"
+                placeholder="选择检定日期/有效期"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled-date="disabledDate"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出入场" prop="type">
+              <el-radio-group v-model="formData.type">
+                <el-radio v-for="dict in typeOptions" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="施工类型状态" prop="status">
+              <el-radio-group v-model="formData.status">
+                <el-radio v-for="dict in statusOptions" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出入场时间" prop="entryTime">
+              <el-date-picker
+                clearable
+                style="width: 250px"
+                v-model="formData.entryTime"
+                type="datetime"
+                placeholder="选择入场时间"
+                format="YYYY年MM月DD日 hh时mm分ss秒"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="图片" prop="picture">
+              <UploadImg
+                :action="baseURL + '/zm/api/v1/system/upload/multipleImg'"
+                v-model="formData.picture"
+                @uploadData="setUpImgListPicture"
+                :limit="4"
+                ref="uploadRef"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts">
+import { reactive, ref, toRefs, defineComponent, unref } from 'vue';
+import { ElMessage, ElLoading } from 'element-plus';
+import { getBusMachineryDetail, addBusMachineryDetail, updateBusMachineryDetail } from '@/api/machinery/machineryDetail';
+import UploadImg from '@/components/uploadImg/index.vue';
+import { BusMachineryDetailInfoData, BusMachineryDetailEditState } from './model';
+
+export default defineComponent({
+  name: 'editMachineChild',
+  components: { UploadImg },
+  props: {
+    statusOptions: { type: Array, default: () => [] }
+  },
+  setup(props, { emit }) {
+    const baseURL = import.meta.env.VITE_APP_BASE_API_GO;
+    const formRef = ref(null);
+    const uploadRef = ref(null);
+
+    const state = reactive<BusMachineryDetailEditState>({
+      loading: false,
+      isShowDialog: false,
+      typeOptions: [
+        { value: '2', label: '入场' },
+        { value: '1', label: '出场' }
+      ],
+      formData: {
+        id: undefined,
+        checkoutNumber: '',
+        checkoutUnit: '',
+        checkoutDate: undefined,
+        type: '',
+        status: '',
+        entryTime: undefined,
+        remark: '',
+        picture: []
+      },
+      propsRow: {},
+      rules: {
+        checkoutNumber: [{ required: true, message: '检验证编号不能为空', trigger: 'blur' }],
+        checkoutUnit: [{ required: true, message: '检验单位不能为空', trigger: 'blur' }],
+        checkoutDate: [{ required: true, message: '检定日期/有效期不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '施工类型状态不能为空', trigger: 'blur' }]
+      }
+    });
+
+    const resetForm = () => {
+      Object.assign(state.formData, {
+        id: undefined,
+        checkoutNumber: '',
+        checkoutUnit: '',
+        checkoutDate: undefined,
+        type: '',
+        status: '',
+        entryTime: undefined,
+        remark: '',
+        picture: []
+      });
+      if (uploadRef.value) {
+        uploadRef.value.clearFiles && uploadRef.value.clearFiles(); // 清空上传组件历史
+      }
+    };
+
+    const openDialog = (props: any, row?: BusMachineryDetailInfoData) => {
+      resetForm();
+      if (props) state.propsRow = props;
+
+      if (row) {
+        const loadingInstance = ElLoading.service({
+          lock: true,
+          text: '正在加载中……',
+          background: 'rgba(0, 0, 0, 0.7)',
+          target: '.busMachineryDetail_edit'
+        });
+        getBusMachineryDetail(row.id!).then((res: any) => {
+          loadingInstance.close();
+          const data = res.data;
+          let pictureArr: any[] = [];
+
+          if (data.picture) {
+            if (data.picture.includes('[')) {
+              data.picture = JSON.parse(data.picture);
+            } else {
+              data.picture = data.picture.split(',');
+            }
+            pictureArr = data.picture.map((item, index) => ({
+              url: 'http://58.17.134.85:8920' + item,
+              name: `img_${index}`
+            }));
+          }
+
+          Object.assign(state.formData, {
+            ...data,
+            type: data.type ?? '',
+            status: data.status ?? '',
+            picture: pictureArr
+          });
+        });
+      }
+
+      state.isShowDialog = true;
+    };
+
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    const onCancel = () => closeDialog();
+
+    const setUpImgListPicture = (val: any) => {
+      state.formData.picture.splice(0, state.formData.picture.length, ...val);
+    };
+
+    const pictureConvert = () => {
+      if (Array.isArray(state.formData.picture)) {
+        state.formData.picture = state.formData.picture.map((item) => item.url.substring(item.url.indexOf('/file')));
+      }
+    };
+
+    const onSubmit = () => {
+      pictureConvert();
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+
+      formWrap.validate((valid: boolean) => {
+        if (!valid) return;
+
+        state.loading = true;
+        const apiCall = state.formData.id ? updateBusMachineryDetail : addBusMachineryDetail;
+
+        apiCall(state.formData)
+          .then(() => {
+            ElMessage.success(state.formData.id ? '修改成功' : '添加成功');
+            closeDialog();
+            emit('busMachineryDetailList', state.propsRow.children, state.propsRow.id);
+          })
+          .finally(() => {
+            state.loading = false;
+          });
+      });
+    };
+
+    const disabledDate = (time: Date) => time.getTime() >= Date.now();
+
+    return {
+      ...toRefs(state),
+      formRef,
+      uploadRef,
+      baseURL,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      setUpImgListPicture,
+      disabledDate
+    };
+  }
+});
+</script>
+
+<style scoped>
+.el-col {
+  margin: 10px 0 !important;
+}
+</style>
diff --git a/src/views/busMachineryDetail/list/component/model.ts b/src/views/busMachineryDetail/list/component/model.ts
new file mode 100644
index 0000000..fd0c0c0
--- /dev/null
+++ b/src/views/busMachineryDetail/list/component/model.ts
@@ -0,0 +1,55 @@
+export interface BusMachineryDetailTableColumns {    
+    id:number;  // 序号    
+    checkoutNumber:string;  // 检验证编号    
+    checkoutUnit:string;  // 检验单位    
+    checkoutDate:string;  // 检定日期/有效期    
+    status:string;  // 施工类型状态    
+    entryTime:string;  // 入场时间    
+    createdAt:string;  // 创建时间    
+    remark:string;  // 备注    
+    picture:any[];  // 4张图片，逗号分隔    
+}
+
+
+export interface BusMachineryDetailInfoData {    
+    id:number|undefined;        // 序号    
+    checkoutNumber:string|undefined; // 检验证编号    
+    checkoutUnit:string|undefined; // 检验单位    
+    checkoutDate:string|undefined; // 检定日期/有效期    
+    status:string|undefined; // 施工类型状态    
+    entryTime:string|undefined; // 入场时间    
+    createBy:string|undefined; // 创建者    
+    updateBy:string|undefined; // 更新者    
+    createdAt:string|undefined; // 创建时间    
+    updatedAt:string|undefined; // 更新时间    
+    deletedAt:string|undefined; // 删除时间    
+    remark:string|undefined; // 备注    
+    picture:any[]; // 4张图片，逗号分隔    
+    type: undefined, // 出入场
+}
+
+
+export interface BusMachineryDetailTableDataState {
+    ids:any[];
+    tableData: {
+        data: Array<BusMachineryDetailTableColumns>;
+        total: number;
+        loading: boolean;
+        param: {
+            pageNum: number;
+            pageSize: number;            
+            checkoutNumber: string|undefined;            
+            status: string|undefined;            
+            entryTime: string|undefined;            
+            dateRange: string[];
+        };
+    };
+}
+
+
+export interface BusMachineryDetailEditState{
+    loading:boolean;
+    isShowDialog: boolean;
+    formData:BusMachineryDetailInfoData;
+    rules: object;
+}
\ No newline at end of file
diff --git a/src/views/busMachineryDetail/list/index.vue b/src/views/busMachineryDetail/list/index.vue
new file mode 100644
index 0000000..227c975
--- /dev/null
+++ b/src/views/busMachineryDetail/list/index.vue
@@ -0,0 +1,339 @@
+<template>
+  <div class="system-busMachineryDetail-container">
+    <el-card shadow="hover">
+      <div class="system-busMachineryDetail-search mb15">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="8" class="colBlock">
+              <el-form-item label="合格证编号" prop="checkoutNumber">
+                <el-input
+                  v-model="tableData.param.checkoutNumber"
+                  placeholder="请输入合格证编号"
+                  clearable
+                  @keyup.enter.native="busMachineryDetailList"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="colBlock">
+              <el-form-item label="施工类型状态" prop="status">
+                <el-select v-model="tableData.param.status" placeholder="请选择施工类型状态" clearable>
+                  <el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" :class="!showAll ? 'colBlock' : 'colNone'">
+              <el-form-item>
+                <el-button type="primary" @click="busMachineryDetailList"
+                  ><el-icon><Search /></el-icon>搜索</el-button
+                >
+                <el-button @click="resetQuery(queryRef)"
+                  ><el-icon><Refresh /></el-icon>重置</el-button
+                >
+                <el-button type="primary" link @click="toggleSearch">
+                  {{ word }}
+                  <el-icon v-show="showAll"><ArrowUp /></el-icon>
+                  <el-icon v-show="!showAll"><ArrowDown /></el-icon>
+                </el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" :class="showAll ? 'colBlock' : 'colNone'">
+              <el-form-item label="入场时间" prop="entryTime">
+                <el-date-picker
+                  clearable
+                  style="width: 200px"
+                  v-model="tableData.param.entryTime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  type="datetime"
+                  placeholder="选择入场时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" :class="showAll ? 'colBlock' : 'colNone'">
+              <el-form-item>
+                <el-button type="primary" @click="busMachineryDetailList"
+                  ><el-icon><Search /></el-icon>搜索</el-button
+                >
+                <el-button @click="resetQuery(queryRef)"
+                  ><el-icon><Refresh /></el-icon>重置</el-button
+                >
+                <el-button type="primary" link @click="toggleSearch">
+                  {{ word }}
+                  <el-icon v-show="showAll"><ArrowUp /></el-icon>
+                  <el-icon v-show="!showAll"><ArrowDown /></el-icon>
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handleAdd" v-auth="'api/v1/system/busMachineryDetail/add'"
+              ><el-icon><Plus /></el-icon>新增</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" :disabled="single" @click="handleUpdate(null)" v-auth="'api/v1/system/busMachineryDetail/edit'"
+              ><el-icon><Edit /></el-icon>修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" :disabled="multiple" @click="handleDelete(null)" v-auth="'api/v1/system/busMachineryDetail/delete'"
+              ><el-icon><Delete /></el-icon>删除</el-button
+            >
+          </el-col>
+        </el-row>
+      </div>
+      <el-table v-loading="loading" :data="tableData.data" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" :index="indexMethod" width="60" />
+        <el-table-column label="合格证编号" align="center" prop="checkoutNumber" min-width="100px" />
+        <el-table-column label="生产厂家" align="center" prop="checkoutUnit" min-width="100px" />
+        <el-table-column label="检定日期/有效期" align="center" prop="checkoutDate" min-width="100px">
+          <template #default="scope">
+            <span>{{ scope.row.checkoutDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="施工类型状态" align="center" prop="status" :formatter="statusFormat" min-width="100px" />
+        <el-table-column label="入场时间" align="center" prop="entryTime" min-width="100px">
+          <template #default="scope">
+            <span>{{ scope.row.entryTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createdAt" min-width="100px">
+          <template #default="scope">
+            <span>{{ scope.row.createdAt }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" min-width="100px" />
+        <el-table-column label="图片" align="center" prop="picture" min-width="100px">
+          <template #default="scope">
+            <div>
+              <el-image
+                style="width: 100px; height: 50px"
+                :initial-index="1"
+                v-if="scope.row.image"
+                :src="'http://58.17.134.85:8920' + scope.row.image"
+                fit="contain"
+                :preview-src-list="['http://58.17.134.85:8920' + scope.row.picture]"
+                :z-index="999999999"
+              ></el-image>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="160px">
+          <template #default="scope">
+            <el-button type="primary" link @click="handleUpdate(scope.row)"
+              ><el-icon><EditPen /></el-icon>修改</el-button
+            >
+            <el-button type="primary" link @click="handleDelete(scope.row)"
+              ><el-icon><DeleteFilled /></el-icon>删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="tableData.total > 0"
+        :total="tableData.total"
+        v-model:page="tableData.param.pageNum"
+        v-model:limit="tableData.param.pageSize"
+        @pagination="busMachineryDetailList"
+      />
+    </el-card>
+    <apiV1SystemBusMachineryDetailAdd
+      ref="addRef"
+      :statusOptions="account_status"
+      @busMachineryDetailList="busMachineryDetailList"
+    ></apiV1SystemBusMachineryDetailAdd>
+    <apiV1SystemBusMachineryDetailEdit
+      ref="editRef"
+      :statusOptions="account_status"
+      @busMachineryDetailList="busMachineryDetailList"
+    ></apiV1SystemBusMachineryDetailEdit>
+    <apiV1SystemBusMachineryDetailDetail
+      ref="detailRef"
+      :statusOptions="account_status"
+      @busMachineryDetailList="busMachineryDetailList"
+    ></apiV1SystemBusMachineryDetailDetail>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, computed, getCurrentInstance, toRaw } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import { listBusMachineryDetail, delBusMachineryDetail } from '@/api/machinery/machineryDetail';
+import { BusMachineryDetailTableColumns, BusMachineryDetailInfoData, BusMachineryDetailTableDataState } from './component/model';
+import apiV1SystemBusMachineryDetailAdd from './component/add.vue';
+import apiV1SystemBusMachineryDetailEdit from './component/edit.vue';
+import apiV1SystemBusMachineryDetailDetail from './component/detail.vue';
+export default defineComponent({
+  name: 'index',
+  components: {
+    apiV1SystemBusMachineryDetailAdd,
+    apiV1SystemBusMachineryDetailEdit,
+    apiV1SystemBusMachineryDetailDetail
+  },
+  setup() {
+    const { proxy } = <any>getCurrentInstance();
+    const loading = ref(false);
+    const queryRef = ref();
+    const addRef = ref();
+    const editRef = ref();
+    const detailRef = ref();
+    // 是否显示所有搜索选项
+    const showAll = ref(false);
+    // 非单个禁用
+    const single = ref(true);
+    // 非多个禁用
+    const multiple = ref(true);
+    const word = computed(() => {
+      if (showAll.value === false) {
+        //对文字进行处理
+        return '展开搜索';
+      } else {
+        return '收起搜索';
+      }
+    });
+    // 字典选项数据
+    const { account_status } = proxy.useDict('account_status');
+    const state = reactive<BusMachineryDetailTableDataState>({
+      ids: [],
+      tableData: {
+        data: [],
+        total: 0,
+        loading: false,
+        param: {
+          pageNum: 1,
+          pageSize: 10,
+          checkoutNumber: undefined,
+          status: undefined,
+          entryTime: undefined,
+          dateRange: []
+        }
+      }
+    });
+    // 页面加载时
+    onMounted(() => {
+      initTableData();
+    });
+    // 初始化表格数据
+    const initTableData = () => {
+      busMachineryDetailList();
+    };
+    /** 重置按钮操作 */
+    const resetQuery = (formEl: FormInstance | undefined) => {
+      if (!formEl) return;
+      formEl.resetFields();
+      busMachineryDetailList();
+    };
+    // 获取列表数据
+    const busMachineryDetailList = () => {
+      loading.value = true;
+      listBusMachineryDetail(state.tableData.param).then((res: any) => {
+        let list = res.data.list ?? [];
+        state.tableData.data = list;
+        state.tableData.data.forEach((item) => {
+          if (item.picture) {
+            item.image = item.picture.split(',')[0];
+            item.imageList = item.picture.split(',');
+          }
+        });
+        state.tableData.total = res.data.total;
+        loading.value = false;
+      });
+    };
+    const toggleSearch = () => {
+      showAll.value = !showAll.value;
+    };
+    // 施工类型状态字典翻译
+    const statusFormat = (row: BusMachineryDetailTableColumns) => {
+      return proxy.selectDictLabel(account_status.value, row.status);
+    };
+    // 多选框选中数据
+    const handleSelectionChange = (selection: Array<BusMachineryDetailInfoData>) => {
+      state.ids = selection.map((item) => item.id);
+      single.value = selection.length != 1;
+      multiple.value = !selection.length;
+    };
+    const handleAdd = () => {
+      addRef.value.openDialog();
+    };
+    const handleUpdate = (row: BusMachineryDetailTableColumns) => {
+      if (!row) {
+        row = state.tableData.data.find((item: BusMachineryDetailTableColumns) => {
+          return item.id === state.ids[0];
+        }) as BusMachineryDetailTableColumns;
+      }
+      editRef.value.openDialog(toRaw(row));
+    };
+    const handleDelete = (row: BusMachineryDetailTableColumns) => {
+      let msg = '你确定要删除所选数据？';
+      let id: number[] = [];
+      if (row) {
+        msg = `此操作将永久删除数据，是否继续?`;
+        id = [row.id];
+      } else {
+        id = state.ids;
+      }
+      if (id.length === 0) {
+        ElMessage.error('请选择要删除的数据。');
+        return;
+      }
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          delBusMachineryDetail(id).then(() => {
+            ElMessage.success('删除成功');
+            busMachineryDetailList();
+          });
+        })
+        .catch(() => {});
+    };
+    const handleView = (row: BusMachineryDetailTableColumns) => {
+      detailRef.value.openDialog(toRaw(row));
+    };
+    /** 自定义编号 */
+    const indexMethod = (index) => {
+      let pageNum = state.tableData.param.pageNum - 1;
+      if (pageNum !== -1 && pageNum !== 0) {
+        return index + 1 + pageNum * state.tableData.param.pageSize;
+      } else {
+        return index + 1;
+      }
+    };
+    return {
+      proxy,
+      addRef,
+      editRef,
+      detailRef,
+      showAll,
+      loading,
+      single,
+      multiple,
+      word,
+      queryRef,
+      resetQuery,
+      busMachineryDetailList,
+      toggleSearch,
+      statusFormat,
+      account_status,
+      handleSelectionChange,
+      handleAdd,
+      handleUpdate,
+      handleDelete,
+      indexMethod,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss" scoped>
+.colBlock {
+  display: block;
+}
+.colNone {
+  display: none;
+}
+</style>
diff --git a/src/views/cory/workMessage/index.vue b/src/views/cory/workMessage/index.vue
index 805cdc0..314d417 100644
--- a/src/views/cory/workMessage/index.vue
+++ b/src/views/cory/workMessage/index.vue
@@ -111,8 +111,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 import type { FormInstance, FormRules } from 'element-plus';
 import Notice from './components/notice.vue';
 import { listContactTypeformtemplate } from '@/api/cory/contactformtemplate';
-import { addContactnotice, delContactnotice, listContactnotice } from '@/api/cory/contactnotice';
-import { listProjectTeamForeman } from '@/api/project/projectTeam';
+import { addContactnotice, delContactnotice, listContactnotice, listProjectTeamForeman } from '@/api/cory/contactnotice';
 import { foremanQuery, ProjectTeamForemanResp } from '@/api/project/projectTeam/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -265,6 +264,7 @@ const getList = async () => {
   tableData.value = res.rows;
   total.value = res.total || 0;
   // 获取项目班组信息
+  console.log('🚀 ~ getList ~ currentProject.value?.id:', currentProject.value?.id);
   const teamRes = await listProjectTeamForeman(currentProject.value?.id);
   teamList.value = teamRes.data;
   teamOpt.value = teamList.value.map((team: ProjectTeamForemanResp) => ({
diff --git a/src/views/demo/components/qixiang.vue b/src/views/demo/components/qixiang.vue
index 58629bb..966a713 100644
--- a/src/views/demo/components/qixiang.vue
+++ b/src/views/demo/components/qixiang.vue
@@ -1,224 +1,218 @@
 <template>
-    <div class="cardItem">
-        <el-card>
-            <div class="tianqi"
-                style="display: flex;flex-direction: column;align-items: center;background-color: #FAFAFA;border-radius: 10px;padding-bottom: 40px;">
-                <div>
-                    <img src="/assets/demo/Sunny.png" style="display: block; width: 100px;height: 100px;" alt="">
-                </div>
-                <div style="font-family: 'Alibaba-PuHuiTi-Bold';font-size: 24px;">
-                    31℃
-                </div>
-                <div>晴朗</div>
-                <div style="color: rgba(154, 154, 154, 1);font-size: 14px;">
-                    紫外线强度：<span>高</span>
-                </div>
-                <div class="tianqi2">
-                    <div class="item">
-                        <div>
-                            <img src="/assets/demo/shidu.png" alt="">
-                        </div>
-                        <div class="text">相对湿度： <span>45%</span></div>
-                    </div>
-                    <div class="item">
-                        <div>
-                            <img src="/assets/demo/qiangdu.png" alt="">
-                        </div>
-                        <div class="text">光照强度： <span>45%</span></div>
-                    </div>
-                    <div class="item">
-                        <div>
-                            <img src="/assets/demo/fengshu.png" alt="">
-                        </div>
-                        <div class="text">风速： <span>2.3m/s</span></div>
-                    </div>
-                    <div class="item">
-                        <div>
-                            <img src="/assets/demo/riluo.png" alt="">
-                        </div>
-                        <div class="text">日落时间： <span>19.45</span></div>
-                    </div>
-                </div>
+  <div class="cardItem">
+    <el-card>
+      <div
+        class="tianqi"
+        style="display: flex; flex-direction: column; align-items: center; background-color: #fafafa; border-radius: 10px; padding-bottom: 40px"
+      >
+        <div>
+          <img src="/assets/demo/sunnyBig.png" style="display: block; width: 100px; height: 100px" alt="" />
+        </div>
+        <div style="font-family: 'Alibaba-PuHuiTi-Bold'; font-size: 24px">31℃</div>
+        <div>晴朗</div>
+        <div style="color: rgba(154, 154, 154, 1); font-size: 14px">紫外线强度：<span>高</span></div>
+        <div class="tianqi2">
+          <div class="item">
+            <div>
+              <img src="/assets/demo/shidu.png" alt="" />
             </div>
-            <div class="weather-timeline">
-                <div class="time-box">
-                    <div class="time-item">
-                        <div class="time">16:00</div>
-                        <div class="temp">30°C</div>
-                        <div class="img-box">
-                            <img src="/assets/demo/sunny_s.png" alt="">
-                        </div>
-                    </div>
-                    <div class="time-item">
-                        <div class="time">17:00</div>
-                        <div class="temp">29°C</div>
-                        <div class="img-box">
-                            <img src="/assets/demo/sunny_s.png" alt="">
-                        </div>
-                    </div>
-                    <div class="time-item">
-                        <div class="child">
-                            <div class="time">18:00</div>
-                            <div class="temp">25°C</div>
-                            <div class="img-box">
-                                <img src="/assets/demo/rain.png" alt="">
-                            </div>
-                        </div>
-                    </div>
-                    <div class="time-item show">
-                        <div class="time">现在</div>
-                        <div class="temp">25°C</div>
-                        <div class="img-box">
-                            <img src="/assets/demo/rain_show.png" alt="">
-                        </div>
-                    </div>
-                    <div class="time-item">
-                        <div class="time">20:00</div>
-                        <div class="temp">25°C</div>
-                        <div class="img-box">
-                            <img src="/assets/demo/yin.png" alt="">
-                        </div>
-                    </div>
-                    <div class="time-item">
-                        <div class="time">21:00</div>
-                        <div class="temp">20°C</div>
-                        <div class="img-box">
-                            <img src="/assets/demo/yin.png" alt="">
-                        </div>
-                    </div>
-                </div>
+            <div class="text">相对湿度： <span>45%</span></div>
+          </div>
+          <div class="item">
+            <div>
+              <img src="/assets/demo/qiangdu.png" alt="" />
             </div>
-        </el-card>
-    </div>
+            <div class="text">光照强度： <span>45%</span></div>
+          </div>
+          <div class="item">
+            <div>
+              <img src="/assets/demo/fengshu.png" alt="" />
+            </div>
+            <div class="text">风速： <span>2.3m/s</span></div>
+          </div>
+          <div class="item">
+            <div>
+              <img src="/assets/demo/riluo.png" alt="" />
+            </div>
+            <div class="text">日落时间： <span>19.45</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="weather-timeline">
+        <div class="time-box">
+          <div class="time-item">
+            <div class="time">16:00</div>
+            <div class="temp">30°C</div>
+            <div class="img-box">
+              <img src="/assets/demo/sunny_s.png" alt="" />
+            </div>
+          </div>
+          <div class="time-item">
+            <div class="time">17:00</div>
+            <div class="temp">29°C</div>
+            <div class="img-box">
+              <img src="/assets/demo/sunny_s.png" alt="" />
+            </div>
+          </div>
+          <div class="time-item">
+            <div class="child">
+              <div class="time">18:00</div>
+              <div class="temp">25°C</div>
+              <div class="img-box">
+                <img src="/assets/demo/rain.png" alt="" />
+              </div>
+            </div>
+          </div>
+          <div class="time-item show">
+            <div class="time">现在</div>
+            <div class="temp">25°C</div>
+            <div class="img-box">
+              <img src="/assets/demo/rain_show.png" alt="" />
+            </div>
+          </div>
+          <div class="time-item">
+            <div class="time">20:00</div>
+            <div class="temp">25°C</div>
+            <div class="img-box">
+              <img src="/assets/demo/yin.png" alt="" />
+            </div>
+          </div>
+          <div class="time-item">
+            <div class="time">21:00</div>
+            <div class="temp">20°C</div>
+            <div class="img-box">
+              <img src="/assets/demo/yin.png" alt="" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-card>
+  </div>
 </template>
 <style scoped lang="scss">
 .cardItem {
-    padding: -20px !important;
+  padding: -20px !important;
 }
 
 .tianqi2 {
-    width: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: space-around;
+  margin-top: 50px;
+
+  img {
+    width: 40px;
+    height: 40x;
+    display: block;
+  }
+
+  .item {
     display: flex;
-    justify-content: space-around;
-    margin-top: 50px;
-
-    img {
-        width: 40px;
-        height: 40x;
-        display: block;
-    }
-
-    .item {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        font-size: 14px;
+    flex-direction: column;
+    align-items: center;
+    font-size: 14px;
 
-        .text {
-            margin-top: 10px;
-        }
+    .text {
+      margin-top: 10px;
     }
-
+  }
 }
 
 .weather-timeline {
-    text-align: center;
-    color: #fff;
-    font-size: 14px;
-    margin: 15px 0;
-
-    .time {
-        margin: 10px 0;
-    }
-
-    .img-box {
-        width: 40px;
-        height: 40px;
-        margin: 10px 0;
-    }
-
-    img {
-        width: 100%;
-        height: 100%;
-        display: block;
-    }
-
-    // img[src*='Sunny'] {
-    //     width: 50px;
-    //     height: 50px;
-    // }
-
-    // img[src*='rain'] {
-    //     width: 60px;
-    //     height: 60px;
-    // }
-
-
-    padding: 15px;
-    background: linear-gradient(to right, #D6E2FF, #DEEBFF);
-    border-radius: 15px;
-
-    .time-box {
-        background: linear-gradient(to right, #447BFF, #67A3FD);
-        display: flex;
-        justify-content: space-between;
-        border-radius: 10px;
-        padding: 10px 20px;
-        align-items: center;
-    }
-
-    .time-item.show {
-        color: rgba(24, 109, 245, 1);
-        position: relative;
-        // z-index: 888;
-        background-color: #fff;
-        padding: 0 5px;
-
-    }
-
-    .show::after {
-        // color: rgba(24, 109, 245, 1);
-        // position: relative;
-        // z-index: 888;
-        // background-color: #fff;
-        content: '';
-        position: absolute;
-        width: 100%;
-        height: 25px;
-        // background-color: red;
-        background-color: #fff;
-        left: 0;
-        border-radius: 0 0 25px 25px;
-    }
-
-    .show::before {
-        // color: rgba(24, 109, 245, 1);
-        // position: relative;
-        // z-index: 888;
-        // background-color: #fff;
-        content: '';
-        position: absolute;
-        width: 100%;
-        height: 25px;
-        // background-color: red;
-        background-color: #fff;
-        left: 0;
-        top: -25px;
-        border-radius: 25px 25px 0 0;
-    }
-
-    // .show::after {
-    //     content: '';
-    //     position: absolute;
-    //     height: 155px;
-    //     background-color: #fff;
-    //     z-index: 999;
-    //     width: 100%;
-    //     top: -25px;
-    //     left: 0;
-    //     border-radius: 20px;
-    // }
+  text-align: center;
+  color: #fff;
+  font-size: 14px;
+  margin: 15px 0;
+
+  .time {
+    margin: 10px 0;
+  }
+
+  .img-box {
+    width: 40px;
+    height: 40px;
+    margin: 10px 0;
+  }
+
+  img {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+
+  // img[src*='Sunny'] {
+  //     width: 50px;
+  //     height: 50px;
+  // }
+
+  // img[src*='rain'] {
+  //     width: 60px;
+  //     height: 60px;
+  // }
+
+  padding: 15px;
+  background: linear-gradient(to right, #d6e2ff, #deebff);
+  border-radius: 15px;
+
+  .time-box {
+    background: linear-gradient(to right, #447bff, #67a3fd);
+    display: flex;
+    justify-content: space-between;
+    border-radius: 10px;
+    padding: 10px 20px;
+    align-items: center;
+  }
+
+  .time-item.show {
+    color: rgba(24, 109, 245, 1);
+    position: relative;
+    // z-index: 888;
+    background-color: #fff;
+    padding: 0 5px;
+  }
+
+  .show::after {
+    // color: rgba(24, 109, 245, 1);
+    // position: relative;
+    // z-index: 888;
+    // background-color: #fff;
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 25px;
+    // background-color: red;
+    background-color: #fff;
+    left: 0;
+    border-radius: 0 0 25px 25px;
+  }
+
+  .show::before {
+    // color: rgba(24, 109, 245, 1);
+    // position: relative;
+    // z-index: 888;
+    // background-color: #fff;
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 25px;
+    // background-color: red;
+    background-color: #fff;
+    left: 0;
+    top: -25px;
+    border-radius: 25px 25px 0 0;
+  }
+
+  // .show::after {
+  //     content: '';
+  //     position: absolute;
+  //     height: 155px;
+  //     background-color: #fff;
+  //     z-index: 999;
+  //     width: 100%;
+  //     top: -25px;
+  //     left: 0;
+  //     border-radius: 20px;
+  // }
 }
 </style>
-<script setup>
-</script>
+<script setup></script>
diff --git a/src/views/demo3/components/line2.vue b/src/views/demo3/components/line2.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/design/technicalStandard/component/documentsDeails.vue b/src/views/design/technicalStandard/component/documentsDeails.vue
index 99e9705..9fa82db 100644
--- a/src/views/design/technicalStandard/component/documentsDeails.vue
+++ b/src/views/design/technicalStandard/component/documentsDeails.vue
@@ -3,8 +3,8 @@
     <div class="move_pop" id="detial_pop">
       <!-- <span>{{ title }}</span> -->
       <div class="box">
-        <img v-if="type == 2" src="../icon/suo.png" @click="onFull(1)" />
-        <img v-else src="../icon/full.png" @click="onFull(2)" />
+        <img v-if="type == 2" src="/image/suo.png" @click="onFull(1)" />
+        <img v-else src="/image/full.png" @click="onFull(2)" />
         <span class="close" @click="onClose">✖</span>
       </div>
     </div>
diff --git a/src/views/design/technicalStandard/component/documentsEdit.vue b/src/views/design/technicalStandard/component/documentsEdit.vue
index 3a0754b..d282d99 100644
--- a/src/views/design/technicalStandard/component/documentsEdit.vue
+++ b/src/views/design/technicalStandard/component/documentsEdit.vue
@@ -3,8 +3,8 @@
     <div class="move_pop" id="detial_edit">
       <!-- <span>{{ title }}</span> -->
       <div class="box">
-        <img v-if="type == 2" src="../icon/full.png" @click="onFull(1)" />
-        <img v-else src="../icon/suo.png" @click="onFull(2)" />
+        <img v-if="type == 2" src="/image/full.png" @click="onFull(1)" />
+        <img v-else src="/image/suo.png" @click="onFull(2)" />
         <span class="close" @click="onClose">✖</span>
       </div>
     </div>
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
index 6264c41..32112dc 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
@@ -118,21 +118,21 @@ const indicators = ref([
     name: '风电项目',
     value: '288.88',
     unit: '个',
-    iconPath: '/src/assets/images/contract.png'
+    iconPath: '/assets/demo/contract.png'
   },
   {
     id: '3',
     name: '光伏项目总容量',
     value: '158.88',
     unit: 'MW',
-    iconPath: '/src/assets/images/totalCapacity.png'
+    iconPath: '/assets/demo/totalCapacity.png'
   },
   {
     id: '4',
     name: '风电项目总容量',
     value: '18',
     unit: 'MW',
-    iconPath: '/src/assets/images/todayConstruction.png'
+    iconPath: '/assets/demo/todayConstruction.png'
   }
 ]);
 
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
index ad7f90b..f32bc55 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
@@ -107,6 +107,7 @@ const processedDataList = ref([]);
 //获取数据
 const getData = async () => {
   const res = await projectProgress();
+  console.log('🚀 ~ getData ~ res:', res);
   if (res.code == 200) {
     capacityData.value = res.data;
     // processedDataList.value = res.data.projectProgressDetailList;
@@ -143,7 +144,7 @@ const initPieChart = () => {
     };
   });
   pieOption.series.data = data;
-
+  console.log(data);
   // pieOption.graphic[0].style.text = totalPercent.value + '%';
   pieChart = echarts.init(pieChartRef.value, null, {
     renderer: 'canvas',
diff --git a/src/views/enterpriseLarge/digitalizationScreen/index.vue b/src/views/enterpriseLarge/digitalizationScreen/index.vue
index fead15c..f7e3a4e 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/index.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/index.vue
@@ -31,15 +31,15 @@ const isHideOther = ref(false);
  * 切换中心页面全屏
  */
 const handleChangePage = () => {
-  if (isFull.value) {
-    isFull.value = false;
-    setTimeout(() => {
-      isHideOther.value = false;
-    }, 500);
-  } else {
-    isFull.value = true;
-    isHideOther.value = true;
-  }
+  // if (isFull.value) {
+  //   isFull.value = false;
+  //   setTimeout(() => {
+  //     isHideOther.value = false;
+  //   }, 500);
+  // } else {
+  //   isFull.value = true;
+  //   isHideOther.value = true;
+  // }
 };
 </script>
 
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index 1b7bdad..952c7d8 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -95,8 +95,8 @@
 
       <el-table
         v-loading="loading"
-        :table-layout="'auto'"
         :data="formalitiesAreConsolidatedList"
+        table-layout="auto"
         @selection-change="handleSelectionChange"
         row-key="id"
         default-expand-all
diff --git a/src/views/gisHome/component/autoScroller.vue b/src/views/gisHome/component/autoScroller.vue
index 671bd35..a098f64 100644
--- a/src/views/gisHome/component/autoScroller.vue
+++ b/src/views/gisHome/component/autoScroller.vue
@@ -71,7 +71,10 @@ function onMouseEnter() {
 }
 
 function onMouseLeave() {
-  if (!manualControl && props.autoScroll) startScroll();
+  // ✅ 仅在 scrollEnabled 才重新开始滚动
+  if (!manualControl && props.autoScroll && scrollEnabled.value) {
+    startScroll();
+  }
 }
 
 function onWheel(e: WheelEvent) {
diff --git a/src/views/gisHome/component/carousel.vue b/src/views/gisHome/component/carousel.vue
index 718576f..41e1243 100644
--- a/src/views/gisHome/component/carousel.vue
+++ b/src/views/gisHome/component/carousel.vue
@@ -15,23 +15,39 @@
     </div>
     <div class="carousellist flex items-center">
       <div>
-        <img src="@/assets/images/toleft.png" alt="" />
+        <!-- <img src="@/assets/images/toleft.png" alt="" /> -->
       </div>
       <div class="carouselcontainer flex justify-between">
-        <div class="carouselItem flex flex-col justify-between" v-for="item in 5">
-          <img src="@/assets/images/carousel.png" alt="" />
-          <div class="time">03-18 15:00</div>
-          <div class="remark">未佩戴安全帽</div>
+        <div class="carouselItem flex flex-col justify-between" v-for="item in AIImg">
+          <img :src="BASE + item.picture" alt="" />
+          <div class="time">{{ parseTime(item.createdAt, '{m}-{d} {h}:{i}') }}</div>
+          <div class="remark">{{ item.describe }}</div>
         </div>
       </div>
       <div>
-        <img src="@/assets/images/toright.png" alt="" />
+        <!-- <img src="@/assets/images/toright.png" alt="" /> -->
       </div>
     </div>
   </div>
 </template>
 
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+import { useUserStoreHook } from '@/store/modules/user';
+import { getAISafetyInspectionList } from '@/api/gis';
+const AIImg = ref([]);
+const BASE = 'http://58.17.134.85:7363';
+const store = useUserStoreHook();
+const currentProject = computed(() => store.selectedProject);
+const getAIImg = async () => {
+  const res = await getAISafetyInspectionList({
+    projectId: currentProject.value.goId
+  });
+  AIImg.value = res.data.list.slice(0, 5);
+};
+onMounted(() => {
+  getAIImg();
+});
+</script>
 
 <style lang="scss" scoped>
 @import '../css/gis.scss';
diff --git a/src/views/gisHome/component/leftMain.vue b/src/views/gisHome/component/leftMain.vue
index fccd1cd..2771bda 100644
--- a/src/views/gisHome/component/leftMain.vue
+++ b/src/views/gisHome/component/leftMain.vue
@@ -22,7 +22,8 @@
           </div>
           <p>总人数</p>
           <div class="peopleNum">
-            <span>{{ constructionUserData?.peopleCount }}&nbsp;&nbsp;</span>人
+            <span>{{ constructionUserData?.headcount }}</span
+            >人
           </div>
         </div>
         <div class="card">
@@ -31,7 +32,8 @@
           </div>
           <p>出勤人</p>
           <div class="peopleNum">
-            <span>{{ constructionUserData?.attendanceCount }} &nbsp;&nbsp;</span>人
+            <span>{{ constructionUserData?.responseCunt }}</span
+            >人
           </div>
         </div>
         <div class="card">
@@ -40,7 +42,7 @@
           </div>
           <p>出勤率</p>
           <div class="peopleNum">
-            <span>{{ constructionUserData?.attendanceRate }} &nbsp;&nbsp;</span>%
+            <span>{{ constructionUserData?.ratio }} </span>%
           </div>
         </div>
       </div>
@@ -97,35 +99,48 @@ const machineryOption = ref<MachineryrVO[]>([]); //机械
 const orderOption = ref<MaterialsVO[]>([]); //材料
 const stopMachineryScroll = ref(null);
 const stopOrderScroll = ref(null);
-const machineryDataAxis = computed(() => machineryOption.value.map((item) => item.machineryName)); //x轴数据
-const machineryData = computed(() => machineryOption.value.map((item) => item.machineryCount)); //柱状图数据
-const orderDataAxis = computed(() => orderOption.value.map((item) => item.materialsName)); //材料x轴数据
-const orderPutData = computed(() => orderOption.value.map((item) => item.putCount)); //柱状图领用量数据
-const orderOutData = computed(() => orderOption.value.map((item) => item.outCount)); //柱状图出库量数据
+const machineryDataAxis = computed(() => machineryOption.value.map((item) => item.statusName)); //x轴数据
+const machineryData = computed(() => machineryOption.value.map((item) => item.statusNumber)); //柱状图数据
+const orderDataAxis = computed(() => orderOption.value.map((item) => item.equipmentMaterialsName)); //材料x轴数据
+const orderPutData = computed(() => orderOption.value.map((item) => item.inventoryNumber)); //柱状图领用量数据
+const orderOutData = computed(() => orderOption.value.map((item) => item.outboundNumber)); //柱状图出库量数据
 const orderRankingData = computed(() => orderOption.value.map((item) => item.value)); //柱状图库存数据
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 
 //获取施工人员信息
 const getConstructionUserData = async () => {
-  const res = await getConstructionUserList({ projectId: currentProject.value?.id });
-  if (res.code !== 200) return;
+  const res = await getConstructionUserList({ projectId: currentProject.value.goId });
+  if (res.code !== 0) return;
   constructionUserData.value = res.data;
 };
 
 //查询大屏机械列表
 const getMachineryData = async () => {
-  const res = await getMachineryrList({ projectId: currentProject.value?.id });
-  if (res.code !== 200) return;
-  machineryOption.value = res.data;
+  const res = await getMachineryrList({ projectId: currentProject.value.goId });
+  if (res.code !== 0) return;
+  const merged = Object.values(
+    res.data.list.reduce(
+      (acc, item) => {
+        if (!acc[item.statusName]) {
+          acc[item.statusName] = { ...item };
+        } else {
+          acc[item.statusName].statusNumber += item.statusNumber;
+        }
+        return acc;
+      },
+      {} as Record<string, { statusName: string; statusNumber: number }>
+    )
+  );
+  machineryOption.value = merged as any;
   initMachinerycharts();
 };
 
 //查询大屏材料信息
 const getOrderData = async () => {
-  const res = await getMaterialsList({ projectId: currentProject.value?.id });
-  if (res.code !== 200) return;
-  orderOption.value = res.data;
+  const res = await getMaterialsList({ projectId: currentProject.value.goId });
+  if (res.code !== 0) return;
+  orderOption.value = res.data.list;
   initOrderChart();
 };
 
@@ -133,7 +148,7 @@ const initMachinerycharts = () => {
   let chartDom = document.getElementById('machineryMain');
   myMachineryChart.value = markRaw(echarts.init(chartDom));
   let option: EChartsOption;
-
+  const { max, interval, splitNumber } = calcYAxisOptions(machineryData.value);
   option = {
     title: {
       subtext: '单位：台数'
@@ -149,8 +164,17 @@ const initMachinerycharts = () => {
         // inside: true,
         color: 'rgba(202, 218, 226, 1)',
 
-        fontSize: 10,
-        interval: 0
+        fontSize: 13,
+        interval: 0,
+        formatter: function (value: string) {
+          // 每5个字符换行（你可以根据需要改成4或6）
+          const maxLineLength = 5;
+          let result = '';
+          for (let i = 0; i < value.length; i += maxLineLength) {
+            result += value.slice(i, i + maxLineLength) + '\n';
+          }
+          return result;
+        }
       },
       axisTick: {
         show: false
@@ -162,6 +186,9 @@ const initMachinerycharts = () => {
       z: 10
     },
     yAxis: {
+      max,
+      interval,
+      splitNumber,
       axisLine: {
         show: false
       },
@@ -172,8 +199,6 @@ const initMachinerycharts = () => {
         color: '#999',
         fontSize: 12
       },
-      interval: 1,
-      splitNumber: 5,
       splitLine: {
         show: true,
         lineStyle: {
@@ -237,7 +262,7 @@ const initMachinerycharts = () => {
         },
         start: 0,
         // 计算初始结束百分比
-        end: (6 / machineryData.value.length) * 100
+        end: (3 / machineryData.value.length) * 100
       }
     ],
 
@@ -261,6 +286,21 @@ const initMachinerycharts = () => {
   stopMachineryScroll.value = enableEchartsAutoScroll(myMachineryChart.value, machineryDataAxis.value.length, 6, 2000);
 };
 
+const calcYAxisOptions = (data: number[]) => {
+  const maxValue = Math.max(...data);
+  const paddedMax = Math.ceil(maxValue * 1.2); // 给柱子顶部留空间
+
+  // 自动控制 Y 轴分几段：比如让每段差不多 2~5 个单位
+  let interval = Math.ceil(paddedMax / 5);
+  let splitNumber = Math.ceil(paddedMax / interval);
+
+  return {
+    max: paddedMax,
+    interval,
+    splitNumber
+  };
+};
+
 const initOrderChart = () => {
   let chartDom = document.getElementById('orderMain');
 
diff --git a/src/views/gisHome/component/rightMain.vue b/src/views/gisHome/component/rightMain.vue
index bb1dc98..3124415 100644
--- a/src/views/gisHome/component/rightMain.vue
+++ b/src/views/gisHome/component/rightMain.vue
@@ -20,7 +20,7 @@
           <AutoScroller :items="projectNewsData" class="events-list" ref="newsScroller">
             <template #default="{ item, index }">
               <li>
-                <span class="text detail" style="display: inline"> {{ item.title }}</span>
+                <span class="text detail" style="display: inline"> {{ item.headline }}</span>
                 <span class="more" v-if="!item.show" @click="onMore(index, true, item.id)">查看详情</span>
                 <span class="more" style="color: #ffb100eb" v-else @click="onMore(index, false)">关闭详情</span>
               </li>
@@ -46,7 +46,7 @@
       </div>
       <div class="safetyData">
         <div class="head flex justify-around">
-          <div class="safetyData-item flex items-center">
+          <div class="safetyData-item flex items-center" @click="getsafetyInspectionData('1')">
             <div>
               <img src="@/assets/images/danggerNum.png" alt="" />
             </div>
@@ -55,7 +55,7 @@
               <p>{{ safetyInspectionData.teamMeetingCount }}<span> 件</span></p>
             </div>
           </div>
-          <div class="safetyData-item flex items-center">
+          <div class="safetyData-item flex items-center" @click="getsafetyInspectionData('3')">
             <div>
               <img src="@/assets/images/record.png" alt="" />
             </div>
@@ -64,13 +64,13 @@
               <p>{{ safetyInspectionData.safetyInspectionCount }}<span> 件</span></p>
             </div>
           </div>
-          <div class="safetyData-item flex items-center">
+          <div class="safetyData-item flex items-center" @click="getsafetyInspectionData('2')">
             <div>
               <img src="@/assets/images/situation.png" alt="" />
             </div>
             <div>
               <span>整改情况</span>
-              <p>{{ safetyInspectionData.correctSituationCount }}<span> 件</span></p>
+              <p>{{ safetyInspectionData.correctSituationCount }}<span> %</span></p>
             </div>
           </div>
         </div>
@@ -79,15 +79,15 @@
             <span class="teamWidth">班组</span>
             <span class="teamWidth">名称</span>
             <span class="teamWidth">时间</span>
-            <span class="statusWidth">操作</span>
+            <!-- <span class="statusWidth">操作</span> -->
           </div>
           <AutoScroller :items="safetyInspectionData.teamMeetingList" class="tbody" safety>
             <template #default="{ item }">
               <div class="flex">
-                <span class="teamWidth">{{ item.teamName }}</span>
-                <span class="teamWidth">{{ item.name }}</span>
-                <span class="teamWidth time">{{ item.meetingDate }}</span>
-                <span class="statusWidth">查看</span>
+                <span class="teamWidth">{{ item.studyTypeName }}</span>
+                <span class="teamWidth">{{ item.tourTypeName }}</span>
+                <span class="teamWidth time">{{ parseTime(item.createdAt, '{y}-{m}-{d}') }}</span>
+                <!-- <span class="statusWidth">查看</span> -->
               </div>
             </template>
           </AutoScroller>
@@ -112,11 +112,11 @@
           <div>
             <img src="@/assets/images/qualityLogo.png" alt="" />
           </div>
-          <div class="qualityNum">
+          <div class="qualityNum" @click="getQualityData('2')">
             <div>巡检记录 <b></b></div>
             <p>{{ qualityData?.count }}<span> 件</span></p>
           </div>
-          <div class="qualityNum ml-15">
+          <div class="qualityNum ml-15" @click="getQualityData('1')">
             <div>整改情况 <b></b></div>
             <p>{{ qualityData?.correctSituation }}<span> %</span></p>
           </div>
@@ -126,9 +126,9 @@
             <div class="qualityItem flex items-center">
               <div>
                 <img src="@/assets/images/timeIcon.png" alt="" />
-                <span class="text-white qualityTime">{{ item.createTime }}</span>
+                <span class="text-white qualityTime">{{ parseTime(item.createdAt, '{y}-{m}-{d}') }}</span>
               </div>
-              <div class="text-#43E2CB record">{{ item.inspectionTypeLabel }}</div>
+              <div class="text-#43E2CB record">{{ item.dictLabel }}</div>
               <div class="text-#E6F7FF text-truncate">
                 <el-tooltip :content="item.inspectionHeadline" placement="top"> {{ item.inspectionHeadline }}</el-tooltip>
               </div>
@@ -162,8 +162,17 @@ import * as echarts from 'echarts';
 
 import { projectNewsVO, QualityVO, safetyInspectionVO } from '@/api/gis/type';
 import { useUserStoreHook } from '@/store/modules/user';
-import { getQualityList, getprojectNewsDetailList, getprojectNewsList, getsafetyInspectionList } from '@/api/gis';
+import {
+  getProgressList,
+  getQualityList,
+  getQualityMsg,
+  getprojectNewsDetailList,
+  getprojectNewsList,
+  getsafetyInspectionList,
+  getsafetyInspectionMsg
+} from '@/api/gis';
 import AutoScroller from './autoScroller.vue';
+import { formatDate, formatTime } from '@/utils';
 const userStore = useUserStoreHook();
 type EChartsOption = echarts.EChartsOption;
 const option = ref<EChartsOption>(null);
@@ -192,6 +201,10 @@ const currentProject = computed(() => userStore.selectedProject);
 const qualityData = ref<QualityVO>({ list: [], correctSituation: null, count: null });
 const projectNewsData = ref<projectNewsVO[]>([]);
 const NewsDetailMain = ref<string>(null);
+const progressData = ref<any[]>([]); // 进度管理数据
+const progressDataAxis = computed(() => progressData.value.map((item) => item.name)); //材料x轴数据
+const progressPutData = computed(() => progressData.value.map((item) => item.total)); //柱状图领用量数据
+const progressOutData = computed(() => progressData.value.map((item) => item.finished)); //柱状图出库量数据
 const safetyInspectionData = ref<safetyInspectionVO>({
   teamMeetingCount: null,
   safetyInspectionCount: null,
@@ -205,42 +218,49 @@ const classOptions = {
 };
 
 //获取质量信息
-const getQualityData = async () => {
-  const res = await getQualityList({ projectId: currentProject.value?.id });
-  if (res.code !== 200) return;
-  qualityData.value = res.data;
+const getQualityData = async (type: string) => {
+  const res = await getQualityList({ projectId: currentProject.value.goId, type });
+  if (res.code !== 0) return;
+  qualityData.value.list = res.data.list ? res.data.list : [];
+  const resCounts = await getQualityMsg({ projectId: currentProject.value.goId });
+  if (resCounts.code !== 0) return;
+  qualityData.value.count = resCounts.data.inspectionRecord;
+  qualityData.value.correctSituation = resCounts.data.reorganizeTheSituation;
 };
 
 //获取大屏项目新闻列表
 const getProjectNewsData = async () => {
-  const res = await getprojectNewsList({ projectId: currentProject.value?.id });
-  if (res.code !== 200) return;
-  projectNewsData.value = res.data;
+  const res = await getprojectNewsList({ projectId: currentProject.value.goId, pageSize: 100000000, pageNum: 1 });
+  if (res.code !== 0) return;
+  projectNewsData.value = res.data.list;
 };
 
-//查询大屏安全信息
-const getsafetyInspectionData = async () => {
-  const res = await getsafetyInspectionList({ projectId: currentProject.value?.id });
-  if (res.code !== 200) return;
-  safetyInspectionData.value = res.data;
+//进度管理
+const getProgressData = async () => {
+  const res = await getProgressList();
+  if (res.code !== 0) return;
+  progressData.value = res.data.progress;
+  initUserChart();
 };
 
-const safetyData = ref([]);
-new Array(10).fill(0).forEach((item) => {
-  safetyData.value.push({
-    id: 1,
-    name: '站班会',
-    teamName: '测试组',
-    meetingDate: '2024-03-18'
-  });
-});
+//查询大屏安全信息
+const getsafetyInspectionData = async (type: string) => {
+  const res = await getsafetyInspectionList({ projectId: currentProject.value.goId, type });
+  if (res.code !== 0) return;
+  safetyInspectionData.value.teamMeetingList = res.data.list ? res.data.list : [];
+  const resCounts = await getsafetyInspectionMsg({ projectId: currentProject.value.goId });
+  if (resCounts.code !== 0) return;
+  safetyInspectionData.value.teamMeetingCount = resCounts.data.teamMeeting;
+  safetyInspectionData.value.safetyInspectionCount = resCounts.data.inspectionRecord;
+  safetyInspectionData.value.correctSituationCount = resCounts.data.reorganizeTheSituation;
+};
 
 const onMore = async (index, isShow, id?) => {
   if (isShow) {
     newsScroller.value.pause();
     projectNewsData.value[index].show = true;
     const res = await getprojectNewsDetailList(id);
-    NewsDetailMain.value = res.data.content;
+    NewsDetailMain.value = res.data.richText;
     newsDetailDialog.value = true;
   } else {
     newsScroller.value.resume();
@@ -253,7 +273,7 @@ const initUserChart = () => {
   let chartDom = document.getElementById('userMain');
   myMachineryChart.value = echarts.init(chartDom);
   // prettier-ignore
-  let dataAxis = ['桩点浇筑', '支架安装', '组件安装', '箱变安装'];
+  let dataAxis = progressDataAxis.value;
   option.value = {
     tooltip: {
       trigger: 'axis',
@@ -320,7 +340,7 @@ const initUserChart = () => {
         emphasis: {
           focus: 'series'
         },
-        data: [120, 132, 101, 134],
+        data: progressOutData.value,
         showBackground: true,
         barWidth: 8,
         backgroundStyle: {
@@ -353,10 +373,10 @@ const handleResize = () => {
 const debouncedHandleResize = debounce(handleResize, 300);
 
 onMounted(() => {
-  initUserChart();
-  getQualityData();
+  getProgressData();
+  getQualityData('2');
   getProjectNewsData();
-  getsafetyInspectionData();
+  getsafetyInspectionData('1');
   window.addEventListener('resize', debouncedHandleResize);
 });
 
@@ -485,6 +505,7 @@ onUnmounted(() => {
 
     .qualityNum {
       width: vw(99);
+      cursor: pointer;
       height: vh(53);
       text-align: center;
       div {
@@ -577,7 +598,7 @@ onUnmounted(() => {
 
     .safetyData-item {
       height: vh(53);
-
+      cursor: pointer;
       > div {
         > span {
           font-size: vw(14);
@@ -756,7 +777,12 @@ p {
     cursor: pointer;
   }
   .teamWidth {
-    width: vw(114);
+    width: vw(144);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+    text-align: center;
   }
 }
 
diff --git a/src/views/gisHome/index.vue b/src/views/gisHome/index.vue
index 8dbb33e..1e50e96 100644
--- a/src/views/gisHome/index.vue
+++ b/src/views/gisHome/index.vue
@@ -13,24 +13,24 @@
       </div>
       <div class="title">XXX智慧工地管理平台</div>
       <div class="calendar flex items-center">
-        <WeatherListScroll :items="weatherData" class="weatherList" :interval="3500" v-if="weatherData.length">
+        <!-- <WeatherListScroll :items="weatherData" class="weatherList" :interval="3500" v-if="weatherData.length">
           <template #default="{ item, index }">
             <div class="flex items-center">
               <div class="Weather text-white flex items-center">
                 <img :src="`../../../src/assets/images/${weatherimgUrl(item)}.png`" alt="" />
                 <div>
-                  <div class="textBlack">{{ item.dayStatus + ' ' }}&nbsp;</div>
+                  <div class="textBlack">{{ item.textDay + ' ' }}&nbsp;</div>
                   <div class="robotocondensed">{{ item.tempMin }}°/{{ item.tempMax }}°</div>
                 </div>
               </div>
               <div class="weeks">
-                <span class="textBlack">{{ item.week }}&nbsp;(</span>
-                <span class="robotocondensed">{{ item.date }}</span>
+                <span class="textBlack">{{ week(item.fxDate) }}&nbsp;(</span>
+                <span class="robotocondensed">{{ item.fxDate }}</span>
                 <span class="textBlack">)</span>
               </div>
             </div>
           </template>
-        </WeatherListScroll>
+        </WeatherListScroll> -->
         <div class="Segmentation">
           <div class="bg-#43E2CB"></div>
           <div class="bg-#43E2CB"></div>
@@ -72,6 +72,11 @@ const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const weatherData = ref([]);
 const safetyDay = ref(null);
+const week = computed(() => (time: string) => {
+  const date = new Date(time);
+  const days = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+  return days[date.getDay()];
+});
 const goHome = () => {
   let routeUrl = router.resolve({
     path: '/index'
@@ -79,45 +84,52 @@ const goHome = () => {
   window.open(routeUrl.href, 'index');
 };
 //获取天气
-const getweatherData = async () => {
-  const res = await getweatherList(currentProject.value?.id);
-  weatherData.value = res.data;
-};
+// const getweatherData = async () => {
+//   const res = await getweatherList();
+//   weatherData.value = res.data.daily;
+// };
 //获取生产天数
 const getProductionDays = async () => {
-  const res = await getSafetyDay(currentProject.value?.id);
-  safetyDay.value = res.data.safetyDay.toLocaleString();
+  const start = new Date('2024-01-01');
+  const today = new Date();
+
+  // 去除时分秒影响，仅比对日期
+  start.setHours(0, 0, 0, 0);
+  today.setHours(0, 0, 0, 0);
+
+  const diffTime = today.getTime() - start.getTime();
+  safetyDay.value = Math.floor(diffTime / (1000 * 60 * 60 * 24));
 };
 //获取白天或夜晚
-const weatherimgUrl = computed(() => (item) => {
-  let startTime = item.sunRise; // 开始时间
-  let endTime = item.sunSet; // 结束时间
-  // 获取当前时间
-  const now = new Date();
+// const weatherimgUrl = computed(() => (item) => {
+//   let startTime = item.sunrise; // 开始时间
+//   let endTime = item.sunset; // 结束时间
+//   // 获取当前时间
+//   const now = new Date();
 
-  // 解析开始时间和结束时间（格式：HH:MM）
-  const [startHours, startMinutes] = startTime.split(':').map(Number);
-  const [endHours, endMinutes] = endTime.split(':').map(Number);
+//   // 解析开始时间和结束时间（格式：HH:MM）
+//   const [startHours, startMinutes] = startTime.split(':').map(Number);
+//   const [endHours, endMinutes] = endTime.split(':').map(Number);
 
-  // 创建今天的开始时间和结束时间对象
-  const start = new Date(now.getFullYear(), now.getMonth(), now.getDate(), startHours, startMinutes);
-  const end = new Date(now.getFullYear(), now.getMonth(), now.getDate(), endHours, endMinutes);
+//   // 创建今天的开始时间和结束时间对象
+//   const start = new Date(now.getFullYear(), now.getMonth(), now.getDate(), startHours, startMinutes);
+//   const end = new Date(now.getFullYear(), now.getMonth(), now.getDate(), endHours, endMinutes);
 
-  // 如果结束时间早于开始时间，将结束时间设为明天
-  if (end <= start) {
-    end.setDate(end.getDate() + 1);
-  }
+//   // 如果结束时间早于开始时间，将结束时间设为明天
+//   if (end <= start) {
+//     end.setDate(end.getDate() + 1);
+//   }
 
-  // 判断当前时间是否在区间内
-  if (now >= start && now <= end) {
-    return item.dayIcon;
-  } else {
-    return item.nightIcon;
-  }
-});
+//   // 判断当前时间是否在区间内
+//   if (now >= start && now <= end) {
+//     return item.dayIcon;
+//   } else {
+//     return item.nightIcon;
+//   }
+// });
 
 onMounted(() => {
-  getweatherData();
+  // getweatherData();
   getProductionDays();
 });
 </script>
diff --git a/src/views/login.vue b/src/views/login.vue
index cd76bd1..572e9d2 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -79,7 +79,7 @@
 </template>
 
 <script setup lang="ts">
-import { getCodeImg, getTenantList } from '@/api/login';
+import { getCodeImg, getGoToken, getTenantList } from '@/api/login';
 import { authBinding } from '@/api/system/social/auth';
 import { useUserStore } from '@/store/modules/user';
 import { LoginData, TenantVO } from '@/api/types';
@@ -152,6 +152,9 @@ const handleLogin = () => {
       // 调用action的登录方法
       const [err] = await to(userStore.login(loginForm.value));
       if (!err) {
+        //获取Go服务Token保存本地
+        const goToken = await getGoToken();
+        proxy.$cache.local.set('goToken', goToken.data.token);
         const redirectUrl = redirect.value || '/';
         await router.push(redirectUrl);
 
diff --git a/src/views/machinery/component/MachineryDetailAddDialog.vue b/src/views/machinery/component/MachineryDetailAddDialog.vue
deleted file mode 100644
index c848e60..0000000
--- a/src/views/machinery/component/MachineryDetailAddDialog.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog title="添加机械出入场详情" v-model="visible" width="500px" append-to-body>
-    <el-form ref="formRef" :model="form" :rules="rules" label-width="140px">
-      <el-form-item label="出入场" prop="outPut">
-        <el-select v-model="form.type" clearable placeholder="请选择出入场">
-          <el-option v-for="item in machinery_entry_exit_type" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="检验证编号" prop="checkoutNumber">
-        <el-input v-model="form.checkoutNumber" placeholder="请输入检验证编号" />
-      </el-form-item>
-      <el-form-item label="检验单位" prop="checkoutUnit">
-        <el-input v-model="form.checkoutUnit" placeholder="请输入检验单位" />
-      </el-form-item>
-      <el-form-item label="检定日期/有效期" prop="checkoutDate">
-        <el-date-picker clearable v-model="form.checkoutDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择检定日期/有效期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="施工类型状态" prop="outPut">
-        <el-select v-model="form.status" clearable placeholder="请选择施工类型状态">
-          <el-option v-for="item in sys_normal_disable" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="入场时间" prop="checkoutDate">
-        <el-date-picker clearable v-model="form.entryTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入场时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="图片" prop="picture">
-        <image-upload v-model="form.picture" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button :loading="loading" type="primary" @click="submitForm">提 交</el-button>
-        <el-button @click="closeDialog">取 消</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-<script setup lang="ts">
-import { defineExpose, reactive, ref } from 'vue';
-import { ElMessage } from 'element-plus';
-import { MachineryDetailForm } from '@/api/machinery/machineryDetail/types';
-import { addMachineryDetail } from '@/api/machinery/machineryDetail';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { machinery_entry_exit_type, sys_normal_disable } = toRefs<any>(proxy?.useDict('machinery_entry_exit_type', 'sys_normal_disable'));
-
-interface Props {
-  machineryId: string | number;
-}
-
-const props = defineProps<Props>();
-const emit = defineEmits(['submit']);
-const visible = ref<boolean>(false);
-const loading = ref<boolean>(false);
-
-// 定义表单数据，注意结构与校验规则需要与接口对应
-const form = reactive<MachineryDetailForm>({
-  machineryId: props.machineryId,
-  checkoutNumber: '',
-  checkoutUnit: '',
-  checkoutDate: '',
-  status: undefined,
-  type: undefined,
-  entryTime: '',
-  remark: '',
-  picture: ''
-});
-
-// 定义校验规则
-const rules = reactive({
-  checkoutNumber: [{ required: true, message: '请输入检验证编号', trigger: 'blur' }],
-  checkoutUnit: [{ required: true, message: '请输入检验单位', trigger: 'blur' }],
-  checkoutDate: [{ required: true, message: '请选择检定日期', trigger: 'blur' }],
-  entryTime: [{ required: true, message: '请选择进场时间', trigger: 'blur' }]
-});
-
-const formRef = ref();
-const imageValue = ref([]);
-
-const submitForm = () => {
-  formRef.value.validate(async (valid: boolean) => {
-    if (!valid) return;
-    loading.value = true;
-    try {
-      // 调用接口提交数据
-      await addMachineryDetail({ ...form, machineryId: props.machineryId }).finally(() => (loading.value = false));
-      ElMessage.success('提交成功');
-      emit('submit');
-      closeDialog();
-    } catch (error) {
-      ElMessage.error('提交失败');
-    }
-  });
-};
-
-const closeDialog = () => {
-  visible.value = false;
-  // 重置表单数据
-  formRef.value.resetFields();
-};
-
-// 供外部调用的打开方法
-const openDialog = () => {
-  visible.value = true;
-};
-
-defineExpose({
-  openDialog
-});
-</script>
diff --git a/src/views/machinery/component/MachineryDetailTable.vue b/src/views/machinery/component/MachineryDetailTable.vue
deleted file mode 100644
index 7124070..0000000
--- a/src/views/machinery/component/MachineryDetailTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div>
-    <el-table size="small" v-if="machineryDetailList.length !== 0" :data="machineryDetailList">
-      <el-table-column label="出入场" align="center" prop="type">
-        <template #default="scope">
-          <dict-tag :options="machinery_entry_exit_type" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column label="检验证编号" align="center" prop="checkoutNumber" />
-      <el-table-column label="检验单位" align="center" prop="checkoutUnit" />
-      <el-table-column label="检定日期/有效期" align="center" prop="checkoutDate" />
-      <el-table-column label="入场时间" align="center" prop="entryTime" />
-      <el-table-column label="图片" align="center">
-        <template #default="scope">
-          <el-image
-            :z-index="9999"
-            :preview-src-list="imgList(scope.row.pictureList)"
-            preview-teleported
-            :src="scope.row.pictureList ? scope.row.pictureList[0].url : ''"
-            class="w20"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-space wrap>
-            <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['machinery:machineryDetail:edit']">
-              修改
-            </el-button>
-          </el-space>
-          <el-space wrap>
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['machinery:machineryDetail:remove']">
-              删除
-            </el-button>
-          </el-space>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      size="small"
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <el-dialog title="修改机械出入场详情" v-model="dialogRef" width="700px" append-to-body>
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="出入场" prop="type">
-          <el-select v-model="form.type" clearable placeholder="请选择出入场">
-            <el-option v-for="item in machinery_entry_exit_type" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="检验证编号" prop="checkoutNumber">
-          <el-input v-model="form.checkoutNumber" placeholder="请输入检验证编号" />
-        </el-form-item>
-        <el-form-item label="检验单位" prop="checkoutUnit">
-          <el-input v-model="form.checkoutUnit" placeholder="请输入检验单位" />
-        </el-form-item>
-        <el-form-item label="检定日期/有效期" prop="checkoutDate">
-          <el-date-picker
-            clearable
-            v-model="form.checkoutDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择检定日期/有效期"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="施工类型状态" prop="status">
-          <el-select v-model="form.status" clearable placeholder="请选择施工类型状态">
-            <el-option v-for="item in sys_normal_disable" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="入场时间" prop="checkoutDate">
-          <el-date-picker clearable v-model="form.entryTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入场时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="图片" prop="picture">
-          <image-upload v-model="form.picture" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="loading" type="primary" @click="submitForm">提 交</el-button>
-          <el-button @click="closeDialog">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO } from '@/api/machinery/machineryDetail/types';
-import { delMachineryDetail, getMachineryDetail, listMachineryDetail, updateMachineryDetail } from '@/api/machinery/machineryDetail';
-import { ref } from 'vue';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { machinery_entry_exit_type, sys_normal_disable } = toRefs<any>(proxy?.useDict('machinery_entry_exit_type', 'sys_normal_disable'));
-interface Props {
-  machineryId: string | number;
-}
-
-const props = defineProps<Props>();
-const ids = ref<Array<string | number>>([]);
-const formRef = ref();
-const loading = ref(true);
-const total = ref<number>(0);
-const initFormData: MachineryDetailForm = {
-  id: undefined,
-  checkoutNumber: undefined,
-  checkoutUnit: undefined,
-  checkoutDate: undefined,
-  status: undefined,
-  type: undefined,
-  entryTime: undefined,
-  remark: undefined,
-  picture: undefined,
-  machineryId: undefined
-};
-const data = reactive<PageData<MachineryDetailForm, MachineryDetailQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    checkoutNumber: undefined,
-    checkoutUnit: undefined,
-    checkoutDate: undefined,
-    status: undefined,
-    type: undefined,
-    entryTime: undefined,
-    picture: undefined,
-    machineryId: props.machineryId
-  },
-  rules: {
-    checkoutNumber: [{ required: true, message: '请输入检验证编号', trigger: 'blur' }],
-    checkoutUnit: [{ required: true, message: '请输入检验单位', trigger: 'blur' }],
-    checkoutDate: [{ required: true, message: '请选择检定日期', trigger: 'blur' }],
-    entryTime: [{ required: true, message: '请选择进场时间', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-const imgList = computed(() => (list) => {
-  let newList;
-  if (list) {
-    newList = list.map((item) => item.url);
-  } else {
-    newList = [''];
-  }
-  return newList;
-});
-
-const machineryDetailList = ref<MachineryDetailVO[]>([]);
-/** 展开选中数据 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listMachineryDetail(queryParams.value);
-  machineryDetailList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: MachineryDetailVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除机械详情编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delMachineryDetail(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: MachineryDetailVO) => {
-  const _id = row?.id || ids.value[0];
-  const res = await getMachineryDetail(_id);
-  Object.assign(form.value, res.data);
-  dialogRef.value = true;
-};
-
-const dialogRef = ref();
-/** 提交按钮 */
-const submitForm = () => {
-  formRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      loading.value = true;
-      await updateMachineryDetail(form.value).finally(() => (loading.value = false));
-      proxy?.$modal.msgSuccess('操作成功');
-      dialogRef.value = false;
-      await getList();
-    }
-  });
-};
-/** 取消按钮 */
-const closeDialog = () => {
-  dialogRef.value = false;
-};
-onMounted(async () => {
-  getList();
-});
-</script>
diff --git a/src/views/machinery/component/add.vue b/src/views/machinery/component/add.vue
new file mode 100644
index 0000000..dc9eb15
--- /dev/null
+++ b/src/views/machinery/component/add.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="system-busMachinery-add">
+    <!-- 添加或修改机械对话框 -->
+    <el-dialog v-model="isShowDialog" width="600px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.system-busMachinery-add .el-dialog', '.system-busMachinery-add .el-dialog__header']"></div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="机械名称" prop="machineryName">
+              <el-input v-model="formData.machineryName" placeholder="请输入机械名称" /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="型号" prop="machineryNumber">
+              <el-input v-model="formData.machineryNumber" placeholder="请输入型号" /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="负责人" prop="principal">
+              <el-input v-model="formData.principal" :rows="5" placeholder="请输入负责人" /> </el-form-item
+          ></el-col>
+          <el-col :span="24"
+            ><el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" :rows="5" type="textarea" placeholder="请输入备注" /> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessage } from 'element-plus';
+import { addBusMachinery } from '@/api/machinery/machinery';
+import { BusMachineryEditState } from './model';
+export default defineComponent({
+  name: 'index',
+  props: {
+    statusOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const state = reactive<BusMachineryEditState>({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        id: undefined,
+        machineryName: undefined,
+        machineryNumber: undefined,
+        projectId: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        number: undefined,
+        entryTime: undefined,
+        principal: undefined,
+        remark: undefined
+      },
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
+        machineryName: [{ required: true, message: '机械名称不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '施工类型状态不能为空', trigger: 'blur' }],
+        principal: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
+      }
+    });
+    // 打开弹窗
+    const openDialog = () => {
+      resetForm();
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 提交
+    const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          state.loading = true;
+          //添加
+          addBusMachinery(state.formData)
+            .then(() => {
+              ElMessage.success('添加成功');
+              closeDialog(); // 关闭弹窗
+              emit('busMachineryList');
+            })
+            .finally(() => {
+              state.loading = false;
+            });
+        }
+      });
+    };
+    const resetForm = () => {
+      state.formData = {
+        id: undefined,
+        machineryName: undefined,
+        machineryNumber: undefined,
+        projectId: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        entryTime: undefined,
+        principal: undefined,
+        remark: undefined
+      };
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      menuRef,
+      formRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped lang="scss">
+.el-col {
+  margin: 10px 0 !important;
+}
+</style>
diff --git a/src/views/machinery/component/detail.vue b/src/views/machinery/component/detail.vue
new file mode 100644
index 0000000..06e4907
--- /dev/null
+++ b/src/views/machinery/component/detail.vue
@@ -0,0 +1,156 @@
+<template>
+  <!-- 机械详情抽屉 -->
+  <div class="system-busMachinery-detail">
+    <el-drawer v-model="isShowDialog" class="busMachinery_detail" size="30%" direction="ltr">
+      <template #header>
+        <h4>机械详情</h4>
+      </template>
+      <el-form ref="formRef" :model="formData" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="机械名称">{{ formData.machineryName }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="型号">{{ formData.machineryNumber }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="数量">{{ formData.ct }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人">{{ formData.principal }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注">{{ formData.remark }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建者">{{ formData.createBy }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间">{{ formData.createdAt }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-drawer>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, getCurrentInstance } from 'vue';
+import { getBusMachinery } from '@/api/machinery/machinery';
+import { ElLoading } from 'element-plus';
+import { BusMachineryInfoData, BusMachineryEditState } from './model';
+export default defineComponent({
+  name: 'index',
+  props: {
+    statusOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const state = reactive<BusMachineryEditState>({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        id: undefined,
+        machineryName: undefined,
+        machineryNumber: undefined,
+        projectId: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        ct: undefined
+      },
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
+        machineryName: [{ required: true, message: '机械名称不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '施工类型状态不能为空', trigger: 'blur' }]
+      }
+    });
+    // 打开弹窗
+    const openDialog = (row?: BusMachineryInfoData) => {
+      resetForm();
+      if (row) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: '正在加载中……',
+          background: 'rgba(0, 0, 0, 0.7)',
+          target: '.busMachinery_detail'
+        });
+        getBusMachinery(row.id!).then((res: any) => {
+          loading.close();
+          const data = res.data;
+          state.formData = data;
+        });
+      }
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    const resetForm = () => {
+      state.formData = {
+        id: undefined,
+        machineryName: undefined,
+        machineryNumber: undefined,
+        projectId: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        ct: undefined
+      };
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      menuRef,
+      formRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped>
+.system-busMachinery-detail :deep(.el-form-item--large .el-form-item__label) {
+  font-weight: bolder;
+}
+.pic-block {
+  margin-right: 8px;
+}
+.file-block {
+  width: 100%;
+  border: 1px solid var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+  margin-bottom: 5px;
+  padding: 3px 6px;
+}
+.ml-2 {
+  margin-right: 5px;
+}
+</style>
diff --git a/src/views/machinery/component/edit.vue b/src/views/machinery/component/edit.vue
new file mode 100644
index 0000000..9a178d7
--- /dev/null
+++ b/src/views/machinery/component/edit.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="system-busMachinery-edit">
+    <!-- 添加或修改机械对话框 -->
+    <el-dialog v-model="isShowDialog" width="600px" :close-on-click-modal="false" :destroy-on-close="true" custom-class="busMachinery_edit">
+      <template #header>
+        <div v-drag="['.system-busMachinery-edit .el-dialog', '.system-busMachinery-edit .el-dialog__header']">
+          {{ (!formData.id || formData.id == 0 ? '添加' : '修改') + '机械' }}
+        </div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="110px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="机械名称" prop="machineryName">
+              <el-input v-model="formData.machineryName" placeholder="请输入机械名称" /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="型号" prop="machineryNumber">
+              <el-input v-model="formData.machineryNumber" placeholder="请输入型号" /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="负责人" prop="principal">
+              <el-input v-model="formData.principal" :rows="5" placeholder="请输入负责人" /> </el-form-item
+          ></el-col>
+          <el-col :span="24"
+            ><el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" :rows="5" type="textarea" placeholder="请输入备注" /> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessage, ElLoading } from 'element-plus';
+import { getBusMachinery, addBusMachinery, updateBusMachinery } from '@/api/machinery/machinery';
+import { BusMachineryInfoData, BusMachineryEditState } from './model';
+export default defineComponent({
+  name: 'index',
+  props: {
+    statusOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const state = reactive<BusMachineryEditState>({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        id: undefined,
+        machineryName: undefined,
+        machineryNumber: undefined,
+        projectId: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        entryTime: undefined,
+        principal: undefined,
+        remark: undefined
+      },
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
+        machineryName: [{ required: true, message: '机械名称不能为空', trigger: 'blur' }],
+        principal: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '施工类型状态不能为空', trigger: 'blur' }]
+      }
+    });
+    // 打开弹窗
+    const openDialog = (row?: BusMachineryInfoData) => {
+      resetForm();
+      if (row) {
+        nextTick(() => {
+          const loading = ElLoading.service({
+            lock: true,
+            text: '正在加载中……',
+            background: 'rgba(0, 0, 0, 0.7)',
+            target: '.busMachinery_edit'
+          });
+          getBusMachinery(row.id!).then((res: any) => {
+            loading.close();
+            const data = res.data;
+            data.status = '' + data.status;
+            state.formData = data;
+          });
+        });
+      }
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 提交
+    const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          state.loading = true;
+          if (!state.formData.id || state.formData.id === 0) {
+            //添加
+            addBusMachinery(state.formData)
+              .then(() => {
+                ElMessage.success('添加成功');
+                closeDialog(); // 关闭弹窗
+                emit('busMachineryList');
+              })
+              .finally(() => {
+                state.loading = false;
+              });
+          } else {
+            //修改
+            updateBusMachinery(state.formData)
+              .then(() => {
+                ElMessage.success('修改成功');
+                closeDialog(); // 关闭弹窗
+                emit('busMachineryList');
+              })
+              .finally(() => {
+                state.loading = false;
+              });
+          }
+        }
+      });
+    };
+    const resetForm = () => {
+      state.formData = {
+        id: undefined,
+        machineryName: undefined,
+        machineryNumber: undefined,
+        projectId: undefined,
+        checkoutNumber: undefined,
+        checkoutUnit: undefined,
+        checkoutDate: undefined,
+        status: false,
+        createBy: undefined,
+        updateBy: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined,
+        entryTime: undefined,
+        principal: undefined,
+        remark: undefined
+      };
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      menuRef,
+      formRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped>
+.el-col {
+  margin: 10px 0 !important;
+}
+</style>
diff --git a/src/views/machinery/component/model.ts b/src/views/machinery/component/model.ts
new file mode 100644
index 0000000..f8125fb
--- /dev/null
+++ b/src/views/machinery/component/model.ts
@@ -0,0 +1,59 @@
+export interface BusMachineryTableColumns {    
+    id:number;  // 序号    
+    machineryName:string;  // 机械名称    
+    machineryNumber:string;  // 编号    
+    checkoutNumber:string;  // 检验证编号    
+    checkoutUnit:string;  // 检验单位    
+    checkoutDate:string;  // 检定日期/有效期    
+    status:string;  // 施工类型状态    
+    createdAt:string;  // 创建时间    
+}
+
+
+export interface BusMachineryInfoData {    
+    id:number|undefined;        // 序号    
+    machineryName:string|undefined; // 机械名称    
+    machineryNumber:string|undefined; // 编号    
+    projectId:number|undefined; // 项目id    
+    checkoutNumber:string|undefined; // 检验证编号    
+    checkoutUnit:string|undefined; // 检验单位    
+    checkoutDate:string|undefined; // 检定日期/有效期    
+    status:boolean; // 施工类型状态    
+    createBy:string|undefined; // 创建者    
+    updateBy:string|undefined; // 更新者    
+    createdAt:string|undefined; // 创建时间    
+    updatedAt:string|undefined; // 更新时间    
+    deletedAt:string|undefined; // 删除时间    
+    number:number|undefined; //数量
+    entryTime: string|undefined; // 进场时间        
+    principal: string|undefined; //  负责人
+    remark: string|undefined; // 备注 
+}
+
+
+export interface BusMachineryTableDataState {
+    ids:any[];
+    tableData: {
+        data: Array<BusMachineryTableColumns>;
+        total: number;
+        loading: boolean;
+        param: {
+            pageNum: number;
+            pageSize: number;            
+            id: number|undefined;            
+            machineryName: string|undefined;            
+            status: string|undefined;            
+            createdAt: string|undefined;            
+            dateRange: string[];
+            projectId: undefined,
+        };
+    };
+}
+
+
+export interface BusMachineryEditState{
+    loading:boolean;
+    isShowDialog: boolean;
+    formData:BusMachineryInfoData;
+    rules: object;
+}
\ No newline at end of file
diff --git a/src/views/machinery/index.vue b/src/views/machinery/index.vue
index d97b660..20a545b 100644
--- a/src/views/machinery/index.vue
+++ b/src/views/machinery/index.vue
@@ -1,295 +1,532 @@
 <template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="机械名称" prop="machineryName">
-              <el-input v-model="queryParams.machineryName" placeholder="请输入机械名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="负责人" prop="principal">
-              <el-input v-model="queryParams.principal" placeholder="请输入负责人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
+  <div class="system-busMachinery-container">
+    <el-card shadow="hover">
+      <div class="system-busMachinery-search mb15">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="5" class="colBlock">
+              <el-form-item label="机械名称" prop="machineryName">
+                <el-input v-model="tableData.param.machineryName" placeholder="请输入机械名称" clearable @keyup.enter="busMachineryList" />
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="5">
+							<el-form-item label="施工类型状态" prop="status">
+								<el-select v-model="tableData.param.status" placeholder="请选择施工类型状态" clearable>
+									<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+								</el-select>
+							</el-form-item>
+						</el-col> -->
+            <!-- <el-col :span="5">
+							<el-form-item label="创建时间" prop="createdAt">
+								<el-date-picker
+									clearable
+									style="width: 200px"
+									v-model="tableData.param.createdAt"
+									format="YYYY-MM-DD HH:mm:ss"
+									value-format="YYYY-MM-DD HH:mm:ss"
+									type="datetime"
+									placeholder="选择创建时间"
+								></el-date-picker>
+							</el-form-item>
+						</el-col> -->
+            <el-col :span="6">
+              <el-form-item>
+                <el-button type="primary" @click="busMachineryList"
+                  ><el-icon><Search /></el-icon>搜索</el-button
+                >
+                <el-button @click="resetQuery(queryRef)"
+                  ><el-icon><Refresh /></el-icon>重置</el-button
+                >
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['machinery:machinery:add']"> 新增 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['machinery:machinery:edit']">
-              修改
-            </el-button>
+            <el-button type="primary" @click="handleAdd" v-auth="'api/v1/system/busMachinery/add'"
+              ><el-icon><Plus /></el-icon>新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['machinery:machinery:remove']">
-              删除
-            </el-button>
+            <el-button type="success" :disabled="single" @click="handleUpdate(null)" v-auth="'api/v1/system/busMachinery/edit'"
+              ><el-icon><Edit /></el-icon>修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['machinery:machinery:export']">导出 </el-button>
+            <el-button type="danger" :disabled="multiple" @click="handleDelete(null)" v-auth="'api/v1/system/busMachinery/delete'"
+              ><el-icon><Delete /></el-icon>删除</el-button
+            >
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
-        <el-table-column type="expand">
-          <template #default="{ row }">
-            <machinery-detail-table :machinery-id="row.id" />
+      </div>
+      <el-table
+        v-loading="loading"
+        :data="tableData.data"
+        @selection-change="handleSelectionChange"
+        :expand-row-keys="expandKeys"
+        :row-key="getRowKeys"
+        @expand-change="expandChange"
+      >
+        <el-table-column type="expand" width="80vw">
+          <template #default="props">
+            <el-table :data="props.row.children.data" v-loading="props.row.children.loading">
+              <el-table-column
+                prop="checkoutNumber"
+                label="合格证编号"
+                align="center"
+                :filters="props.row.children.filterOptions"
+                :filter-method="filterHandler"
+              ></el-table-column>
+              <el-table-column prop="checkoutUnit" label="生产厂家" align="center"> </el-table-column>
+              <el-table-column prop="checkoutDate" label="生产日期/有效期" align="center"></el-table-column>
+              <el-table-column prop="type" label="出入场" align="center">
+                <template #default="scope">
+                  {{ scope.row.type == 1 ? '出场' : scope.row.type == 2 ? '入场' : '' }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="status" label="施工类型状态" :formatter="statusFormat" align="center"> </el-table-column>
+              <el-table-column prop="entryTime" label="入场时间" align="center"></el-table-column>
+              <el-table-column prop="remark" label="备注" align="center" width="200px"> </el-table-column>
+              <el-table-column prop="picture" label="图片" align="center" width="220px">
+                <template #default="scope">
+                  <div style="display: flex; justify-content: center">
+                    <span v-if="scope.row.picture.length" v-for="item in scope.row.picture">
+                      <el-image
+                        style="width: 100px; height: 50px"
+                        v-if="item"
+                        :src="'http://58.17.134.85:8920' + item"
+                        fit="contain"
+                        :zoom-rate="1.2"
+                        :preview-src-list="['http://58.17.134.85:8920' + item]"
+                        preview-teleported="true"
+                      ></el-image>
+                    </span>
+                    <span v-else>暂无图片</span>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="200px">
+                <template #default="scope">
+                  <el-button type="primary" link @click="childView(scope.row)"
+                    ><el-icon><View /></el-icon>详情</el-button
+                  >
+                  <el-button type="success" link @click="childUpdate(props.row, scope.row)"
+                    ><el-icon><EditPen /></el-icon>修改</el-button
+                  >
+                  <el-button type="danger" link @click="childDelete(props.row, scope.row)"
+                    ><el-icon><DeleteFilled /></el-icon>删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+              v-show="props.row.children.total > 0"
+              :total="props.row.children.total"
+              v-model:page="childrenData.param.pageNum"
+              v-model:limit="childrenData.param.pageSize"
+              @pagination="busMachineryDetailList(props.row.children, props.row.id)"
+            />
           </template>
         </el-table-column>
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="机械名称" align="center" prop="machineryName" />
-        <el-table-column label="机械型号" align="center" prop="machineryNumber" />
-        <el-table-column label="数量" align="center" prop="number" />
-        <el-table-column label="负责人" align="center" prop="principal" />
-        <el-table-column label="负责人电话" align="center" prop="principalPhone" />
-        <el-table-column label="供应商" align="center" prop="provider" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
-        <el-table-column label="操作" align="center" class-name="small-padding" width="300">
+        <el-table-column label="序号" align="center" type="index" :index="indexMethod" width="60" />
+        <el-table-column label="机械名称" align="center" prop="machineryName" min-width="100px" />
+        <el-table-column label="型号" align="center" prop="machineryNumber" min-width="100px" />
+        <el-table-column label="数量" align="center" prop="ct" min-width="50px" />
+        <el-table-column label="负责人" align="center" prop="principal" min-width="100px" />
+        <el-table-column label="备注" align="center" prop="remark" min-width="100px" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" min-width="150px">
           <template #default="scope">
-            <el-space wrap>
-              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['machinery:machinery:edit']">修改 </el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['machinery:machinery:remove']">
-                删除
-              </el-button>
-              <el-button link type="primary" icon="Plus" @click="handleAddMachineryDetail(scope.row)"> 入场</el-button>
-            </el-space>
+            <span>{{ scope.row.createdAt }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="250px" fixed="right">
+          <template #default="scope">
+            <el-button type="primary" link @click="handleView(scope.row)" v-auth="'api/v1/system/busMachinery/get'"
+              ><el-icon><View /></el-icon>详情</el-button
+            >
+            <el-button type="success" link @click="handleUpdate(scope.row)" v-auth="'api/v1/system/busMachinery/edit'"
+              ><el-icon><EditPen /></el-icon>修改</el-button
+            >
+            <el-button type="danger" link @click="handleDelete(scope.row)" v-auth="'api/v1/system/busMachinery/delete'"
+              ><el-icon><DeleteFilled /></el-icon>删除</el-button
+            >
+            <el-button type="primary" link @click="handleaddChild(scope.row)"
+              ><el-icon><Plus /></el-icon>入场</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination
+        v-show="tableData.total > 0"
+        :total="tableData.total"
+        v-model:page="tableData.param.pageNum"
+        v-model:limit="tableData.param.pageSize"
+        @pagination="busMachineryList"
+      />
     </el-card>
-    <!-- 添加或修改机械对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="machineryFormRef" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="机械名称" prop="machineryName">
-          <el-input v-model="form.machineryName" placeholder="请输入机械名称" />
-        </el-form-item>
-        <el-form-item label="机械型号" prop="machineryNumber">
-          <el-input v-model="form.machineryNumber" placeholder="请输入机械型号" />
-        </el-form-item>
-        <el-form-item label="数量" prop="number">
-          <el-input v-model="form.number" placeholder="请输入数量" />
-        </el-form-item>
-        <el-form-item label="负责人" prop="principal">
-          <el-input v-model="form.principal" placeholder="请输入负责人" />
-        </el-form-item>
-        <el-form-item label="负责人电话" prop="principalPhone">
-          <el-input v-model="form.principalPhone" placeholder="请输入负责人电话" type="number" />
-        </el-form-item>
-        <el-form-item label="供应商" prop="provider">
-          <el-input v-model="form.provider" placeholder="请输入供应商" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <machinery-detail-add-dialog :machinery-id="currentMachineryId" ref="dialogRef" @submit="getList" />
+    <apiV1SystemBusMachineryAdd ref="addRef" :statusOptions="account_status" @busMachineryList="busMachineryList"></apiV1SystemBusMachineryAdd>
+    <apiV1SystemBusMachineryEdit ref="editRef" :statusOptions="account_status" @busMachineryList="busMachineryList"></apiV1SystemBusMachineryEdit>
+    <apiV1SystemBusMachineryDetail
+      ref="detailRef"
+      :statusOptions="account_status"
+      @busMachineryList="busMachineryList"
+    ></apiV1SystemBusMachineryDetail>
+    <addMachineChild
+      ref="addChildRef"
+      :typeOptions="typeOption"
+      :statusOptions="account_status"
+      @busMachineryDetailList="busMachineryDetailList"
+    ></addMachineChild>
+    <editMachineChild
+      ref="editChildRef"
+      :typeOptions="typeOption"
+      :statusOptions="account_status"
+      @busMachineryDetailList="busMachineryDetailList"
+    ></editMachineChild>
+    <detailMachineChild
+      ref="deatilChildRef"
+      :typeOptions="typeOption"
+      :statusOptions="account_status"
+      @busMachineryDetailList="busMachineryDetailList"
+    ></detailMachineChild>
   </div>
 </template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, computed, getCurrentInstance, toRaw } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import { listBusMachinery, delBusMachinery } from '@/api/machinery/machinery';
+import { BusMachineryTableColumns, BusMachineryInfoData, BusMachineryTableDataState } from './component/model';
+import apiV1SystemBusMachineryAdd from './component/add.vue';
+import apiV1SystemBusMachineryEdit from './component/edit.vue';
+import apiV1SystemBusMachineryDetail from './component/detail.vue';
+import addMachineChild from '@/views/busMachineryDetail/list/component/add.vue';
+import editMachineChild from '@/views/busMachineryDetail/list/component/edit.vue';
+import detailMachineChild from '@/views/busMachineryDetail/list/component/detail.vue';
 
-<script setup name="Machinery" lang="ts">
-import { addMachinery, delMachinery, getMachinery, listMachinery, updateMachinery } from '@/api/machinery/machinery';
-import { MachineryForm, MachineryQuery, MachineryVO } from '@/api/machinery/machinery/types';
-
-import { useUserStoreHook } from '@/store/modules/user';
-import MachineryDetailTable from '@/views/machinery/component/MachineryDetailTable.vue';
-import MachineryDetailAddDialog from '@/views/machinery/component/MachineryDetailAddDialog.vue';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-// 获取用户 store
-const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
-const currentProject = computed(() => userStore.selectedProject);
-const machineryList = ref<MachineryVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const machineryFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: MachineryForm = {
-  id: undefined,
-  machineryName: undefined,
-  machineryNumber: undefined,
-  projectId: currentProject.value?.id,
-  number: undefined,
-  principal: undefined,
-  remark: undefined,
-  principalPhone: undefined,
-  provider: undefined
-};
-const data = reactive<PageData<MachineryForm, MachineryQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    machineryName: undefined,
-    machineryNumber: undefined,
-    projectId: currentProject.value?.id,
-    number: undefined,
-    principal: undefined,
-    params: {},
-    principalPhone: undefined,
-    provider: undefined
+import { listBusMachineryDetail, delBusMachineryDetail } from '@/api/machinery/machineryDetail';
+import useUserStore from '@/store/modules/user';
+export default defineComponent({
+  name: 'index',
+  components: {
+    apiV1SystemBusMachineryAdd,
+    apiV1SystemBusMachineryEdit,
+    apiV1SystemBusMachineryDetail,
+    addMachineChild,
+    editMachineChild,
+    detailMachineChild
   },
-  rules: {
-    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询机械列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listMachinery(queryParams.value);
-  machineryList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  machineryFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: MachineryVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加机械';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: MachineryVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getMachinery(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改机械';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  machineryFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
-      if (form.value.id) {
-        await updateMachinery(form.value).finally(() => (buttonLoading.value = false));
+  setup() {
+    const { proxy } = <any>getCurrentInstance();
+    const loading = ref(false);
+    const childLoading = ref(false);
+    const queryRef = ref();
+    const addRef = ref();
+    const editRef = ref();
+    const detailRef = ref();
+    const addChildRef = ref();
+    const editChildRef = ref();
+    const deatilChildRef = ref();
+    // 是否显示所有搜索选项
+    const showAll = ref(false);
+    // 非单个禁用
+    const single = ref(true);
+    // 非多个禁用
+    const multiple = ref(true);
+    const word = computed(() => {
+      if (showAll.value === false) {
+        //对文字进行处理
+        return '展开搜索';
       } else {
-        await addMachinery(form.value).finally(() => (buttonLoading.value = false));
+        return '收起搜索';
       }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: MachineryVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除机械编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delMachinery(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
+    });
+    // 字典选项数据
+    const account_status = ref([
+      {
+        label: '正常',
+        value: '0'
+      },
+      {
+        label: '停用',
+        value: '1'
+      }
+    ]);
+    const stores = useUserStore();
+    const state = reactive<BusMachineryTableDataState>({
+      ids: [],
+      tableData: {
+        data: [],
+        total: 0,
+        loading: false,
+        param: {
+          pageNum: 1,
+          pageSize: 10,
+          id: undefined,
+          machineryName: undefined,
+          status: undefined,
+          createdAt: undefined,
+          dateRange: [],
+          projectId: stores.selectedProject.goId
+        }
+      },
+      childrenData: {
+        data: [],
+        total: 0,
+        param: {
+          pageNum: 1,
+          pageSize: 10
+        }
+      },
+      expandKeys: [], // 需要展开行的sourceId数组
+      typeOption: [
+        {
+          label: '入场',
+          value: '2'
+        },
+        {
+          label: '出场',
+          value: '1'
+        }
+      ]
+    });
+    // 页面加载时
+    onMounted(() => {
+      initTableData();
+    });
+    // 初始化表格数据
+    const initTableData = () => {
+      busMachineryList();
+    };
+    /** 重置按钮操作 */
+    const resetQuery = (formEl: FormInstance | undefined) => {
+      if (!formEl) return;
+      formEl.resetFields();
+      busMachineryList();
+    };
+    // 获取列表数据
+    const busMachineryList = () => {
+      loading.value = true;
+      listBusMachinery(state.tableData.param).then((res: any) => {
+        console.log('🚀 ~ busMachineryList ~ res:', res);
+        let list = res.data.list ?? [];
+        state.tableData.data = list.map((item) => {
+          item.children = {};
+          item.children.data = [];
+          item.children.total = 0;
+          item.children.loading = false;
+          return item;
+        });
+        state.tableData.total = res.data.total;
+        loading.value = false;
+      });
+    };
+    // 施工类型状态字典翻译
+    const statusFormat = (row: BusMachineryTableColumns) => {
+      return proxy.selectDictLabel(account_status.value, row.status);
+    };
+    // 多选框选中数据
+    const handleSelectionChange = (selection: Array<BusMachineryInfoData>) => {
+      state.ids = selection.map((item) => item.id);
+      single.value = selection.length != 1;
+      multiple.value = !selection.length;
+    };
+    const handleAdd = () => {
+      addRef.value.openDialog();
+    };
+    const handleUpdate = (row: BusMachineryTableColumns) => {
+      if (!row) {
+        row = state.tableData.data.find((item: BusMachineryTableColumns) => {
+          return item.id === state.ids[0];
+        }) as BusMachineryTableColumns;
+      }
+      editRef.value.openDialog(toRaw(row));
+    };
+    /** 自定义编号 */
+    const indexMethod = (index) => {
+      let pageNum = state.tableData.param.pageNum - 1;
+      if (pageNum !== -1 && pageNum !== 0) {
+        return index + 1 + pageNum * state.tableData.param.pageSize;
+      } else {
+        return index + 1;
+      }
+    };
+    const childDelete = (props, row: BusMachineryTableColumns) => {
+      let msg = '你确定要删除所选数据？';
+      let id: number[] = [];
+      if (row) {
+        msg = `此操作将永久删除数据，是否继续?`;
+        id = [row.id];
+      } else {
+        id = state.ids;
+      }
+      if (id.length === 0) {
+        ElMessage.error('请选择要删除的数据。');
+        return;
+      }
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          delBusMachineryDetail(id).then(() => {
+            ElMessage.success('删除成功');
+            busMachineryDetailList(props.children, props.id);
+          });
+        })
+        .catch(() => {});
+    };
+    const handleView = (row: BusMachineryTableColumns) => {
+      detailRef.value.openDialog(toRaw(row));
+    };
+    // 获取当前行key
+    const getRowKeys = (row: any) => {
+      return row.id;
+    };
+    // 展开行change事件
+    const expandChange = (row: any, expandedRows: any) => {
+      // state.expandKeys = [row.id];
+      //当行展示时调用接口
+      if (expandedRows.length) {
+        // state.expandKeys = [];
+        // if(row) {
+        // 	state.expandKeys.push(row.id)
+        // }
+        busMachineryDetailList(row.children, row.id);
+      } else {
+        // state.expandKeys = [];
+      }
+    };
+    // 获取子级数据
+    const busMachineryDetailList = (row, machinery_id: any) => {
+      row.loading = true;
+      listBusMachineryDetail({ ...state.childrenData.param, machinery_id: machinery_id }).then((res: any) => {
+        let list = res.data.list ?? [];
+        let filterOptions = [];
+        if (list.length) {
+          list = list.map((item) => {
+            if (item.picture && item.picture.includes('[')) {
+              item.picture = item.picture ? JSON.parse(item.picture) : [];
+            } else {
+              item.picture = item.picture ? item.picture.split(',') : [];
+            }
+            filterOptions.push({ text: item.checkoutNumber, value: item.checkoutNumber });
+            return item;
+          });
+        }
+        row.data = list;
+        console.log('🚀 ~ busMachineryDetailList ~ row.data :', row.data);
+        row.total = res.data.total;
+        row.filterOptions = filterOptions;
+        row.loading = false;
+      });
+    };
+    // 添加子级数据
+    const handleaddChild = (row: any) => {
+      addChildRef.value.openDialog(toRaw(row));
+    };
+    const childUpdate = (props, row: any) => {
+      if (!row) {
+        row = state.tableData.data.find((item: any) => {
+          return item.id === state.ids[0];
+        }) as any;
+      }
+      editChildRef.value.openDialog(toRaw(props), toRaw(row));
+    };
+    const childView = (row: any) => {
+      deatilChildRef.value.openDialog(toRaw(row));
+    };
+    const handleDelete = (row: any) => {
+      let msg = '你确定要删除所选数据？';
+      let id: number[] = [];
+      if (row) {
+        msg = `此操作将永久删除数据，是否继续?`;
+        id = [row.id];
+      } else {
+        id = state.ids;
+      }
+      if (id.length === 0) {
+        ElMessage.error('请选择要删除的数据。');
+        return;
+      }
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          delBusMachinery(id).then(() => {
+            ElMessage.success('删除成功');
+            busMachineryList();
+          });
+        })
+        .catch(() => {});
+    };
+    const filterHandler = (value: string, row: any, column: any) => {
+      const property = column['property'];
+      return row[property] === value;
+    };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'machinery/machinery/export',
-    {
-      ...queryParams.value
-    },
-    `machinery_${new Date().getTime()}.xlsx`
-  );
-};
+    /** 监听项目ID变化，刷新数据 */
+    const listeningProject = watch(
+      () => stores.selectedProject.goId,
+      (newId, oldId) => {
+        if (newId !== oldId && newId) {
+          state.tableData.param.projectId = newId;
+          initTableData();
+        }
+      }
+    );
 
-const dialogRef = ref();
-const currentMachineryId = ref<number | string>(0);
-/** 添加机械出入场详情 */
-const handleAddMachineryDetail = (row?: MachineryVO) => {
-  currentMachineryId.value = row.id ?? 0;
-  dialogRef.value.openDialog();
-};
+    /** 页面卸载时清理监听 */
+    onUnmounted(() => {
+      listeningProject();
+    });
 
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    queryParams.value.projectId = nid;
-    form.value.projectId = nid;
-    getList();
+    return {
+      proxy,
+      addRef,
+      editRef,
+      detailRef,
+      showAll,
+      loading,
+      single,
+      multiple,
+      word,
+      queryRef,
+      resetQuery,
+      busMachineryList,
+      statusFormat,
+      account_status,
+      handleSelectionChange,
+      handleAdd,
+      handleUpdate,
+      handleDelete,
+      handleView,
+      indexMethod,
+      getRowKeys,
+      handleaddChild,
+      childView,
+      childUpdate,
+      childDelete,
+      addChildRef,
+      editChildRef,
+      deatilChildRef,
+      busMachineryDetailList,
+      childLoading,
+      expandChange,
+      filterHandler,
+      ...toRefs(state)
+    };
   }
-);
-
-onUnmounted(() => {
-  listeningProject();
-});
-
-onMounted(() => {
-  getList();
 });
 </script>
+<style lang="scss" scoped>
+.colBlock {
+  display: block;
+}
+.colNone {
+  display: none;
+}
+</style>
diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue
index 37cc6b2..1c51d27 100644
--- a/src/views/materials/batchPlan/index.vue
+++ b/src/views/materials/batchPlan/index.vue
@@ -1,796 +1,6 @@
-<!-- <template>
- <div class="p-2">
-    <el-row :gutter="20">
-      <el-col style="" :span="5">
-        <el-card shadow="hover">
-          <template #header>
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" :offset="0">
-                <el-button type="primary" v-hasPermi="['cailiaoshebei:mrpBase:addbatch']" size="default" @click="handleAdd" icon="FolderAdd" plain
-                  >新增</el-button
-                >
-              </el-col>
-              <el-col :span="1.5" :offset="0">
-                <el-button
-                  type="danger"
-                  size="default"
-                  v-hasPermi="['cailiaoshebei:mrpBase:remove']"
-                  @click="handleDeleteBatch"
-                  :disabled="form.mrpBaseBo.status != 'draft'"
-                  icon="FolderDelete"
-                  plain
-                  >删除</el-button
-                >
-              </el-col>
-            </el-row>
-          </template>
-
-          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search" clearable />
-          <el-tree
-            ref="batchTreeRef"
-            class="mt-2"
-            node-key="id"
-            :data="batchOptions"
-            :props="{ label: 'planCode', children: 'children' }"
-            :expand-on-click-node="false"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          >
-            <template #default="{ node, data }">
-              <div class="custom-tree-node">
-                {{ node.label }}
-                <dict-tag :options="wf_business_status" :value="data.status" />
-              </div>
-            </template>
-          </el-tree>
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            v-model:page="queryParams.batchData.pageNum"
-            v-model:limit="queryParams.batchData.pageSize"
-            @pagination="getList"
-            layout="prev, pager, next,jumper"
-          />
-        </el-card>
-      </el-col>
-      <el-col :span="19">
-        <el-card shadow="never">
-          <template #header>
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:mrpBase:addbatch']">修改</el-button>
-              </el-col>
-              <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button plain type="primary" icon="Finished" @click="handleAudit()">审核</el-button>
-              </el-col>
-              <el-col :span="1.5" v-if="form.mrpBaseBo.status != 'draft'">
-                <el-button type="warning" icon="View" @click="handleAudit()">查看流程</el-button>
-              </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-            </el-row>
-          </template>
-
-          <el-table v-loading="loading" :data="cailiaoshebeiList" @selection-change="handleSelectionChange">
-            <el-table-column label="所属上级" align="center" prop="suppliespricePname" />
-            <el-table-column label="物资名称" align="center" prop="name" />
-            <el-table-column label="质量标准" align="center" prop="qs" />
-            <el-table-column label="规格型号" align="center" prop="specification" />
-            <el-table-column label="计量单位" align="center" prop="unit" width="80" />
-            <el-table-column label="需求数量" align="center" prop="demandQuantity" />
-            <el-table-column label="需求到货时间" align="center" prop="arrivalTime" width="250" />
-            <el-table-column label="备注" align="center" prop="remark" />
-          </el-table>
-          <pagination
-            v-show="mainTotal > 0"
-            :total="mainTotal"
-            v-model:page="queryParams.mainData.pageNum"
-            v-model:limit="queryParams.mainData.pageSize"
-            @pagination="getMainList"
-          />
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-dialog :close-on-click-modal="false" draggable :title="dialog.title" v-model="dialog.visible" width="1500px" append-to-body>
-      <el-form :model="form" ref="cailiaoshebeiFormRef" :rules="rules" label-width="80px" :inline="false">
-        <el-divider>基础信息</el-divider>
-        <el-row :gutter="20">
-          <el-col :span="8" :offset="0">
-            <el-form-item label="物资类别" prop="mrpBaseBo.matCat">
-              <el-input v-model="form.mrpBaseBo.matCat" placeholder="请输入物资类别" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" :offset="0">
-            <el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
-              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择编制日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" :offset="0">
-            <el-form-item label="计划编号" prop="mrpBaseBo.planCode">
-              <el-input v-model="form.mrpBaseBo.planCode" placeholder="请输入计划编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-divider>主要信息</el-divider>
-        <el-table :data="form.planList" border>
-          <el-table-column prop="batchNumber" align="center" label="版本号 " width="200">
-            <template #default="scope">
-              <el-select v-model="scope.row.batchNumber" placeholder="请选择" @change="(val) => selectNameVersion(val, scope.row, scope.$index)">
-                <el-option v-for="item in versionList" :key="item.versions" :label="item.versions" :value="item.versions" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column prop="name" align="center" label="物资名称" width="160">
-            <template #default="scope">
-              <el-input v-model="scope.row.name" v-if="scope.row.mrpBaseId" placeholder="请输入物资名称" disabled />
-              <el-cascader
-                v-else
-                :disabled="!scope.row.batchNumber"
-                v-model="scope.row.suppliespriceId"
-                :show-all-levels="false"
-                :options="getAvailableNameList(scope.$index)"
-                placeholder="请选择"
-                @change="(val) => selectName(val, scope.row, scope.$index)"
-                :props="{
-                  label: 'name',
-                  value: 'id',
-                  children: 'children',
-                  emitPath: false
-                }"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="剩余量" width="80">
-            <template #default="scope">
-              <span>{{ scope.row.Remaining }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="specification" align="center" label="规格型号" width="100">
-            <template #default="scope">
-              <span>{{ scope.row.specification }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="unit" align="center" label="单位" width="80">
-            <template #default="scope">
-              <span>{{ scope.row.unit }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="demandQuantity" align="center" label="数量" width="140">
-            <template #default="scope">
-              <el-input
-                v-model.number="scope.row.demandQuantity"
-                @input="validateDemandQuantity(scope.row, scope.$index)"
-                @blur="validateDemandQuantity(scope.row, scope.$index)"
-                :max="scope.row.Remaining"
-                placeholder="请输入数量"
-                type="number"
-                min="0"
-              />
-              <div v-if="scope.row.quantityError" class="text-red-500 text-xs mt-1">{{ scope.row.quantityError }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="qs" align="center" label="质量标准" width="140">
-            <template #header> <span class="text-red-500">*</span> 质量标准 </template>
-            <template #default="scope">
-              <el-input v-model="scope.row.qs" placeholder="请输入质量标准" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="arrivalTime" align="center" label="需求到货时间" width="180">
-            <template #header> <span class="text-red-500">*</span> 需求到货时间 </template>
-            <template #default="scope">
-              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 140px" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="remark" align="center" label="备注">
-            <template #default="scope">
-              <el-input v-model="scope.row.remark" placeholder="请输入备注" disabled />
-            </template>
-          </el-table-column>
-          <el-table-column prop="remark" align="center" label="操作" width="150">
-            <template #default="scope">
-              <el-button @click="addRow" type="primary" icon="Plus" size="small" />
-              <el-button @click="delRow(scope.$index)" type="danger" icon="Delete" size="small" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitTransferForm">确 定</el-button>
-          <el-button @click="cancel">取 消 </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template> -->
-
-<!-- <script setup name="Cailiaoshebei" lang="ts">
-// import {
-//   getCailiaoshebei,
-//   updateCailiaoshebei,
-//   listBatch,
-//   getBatch,
-//   delBatch,
-//   listSelectCailiaoshebei,
-//   obtainTheVersion,
-//   getDictList,
-//   coryEngineeringList,
-//   mrpBaseRemaining
-// } from '@/api/materials/batchPlan';
-// import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
-// import { useUserStoreHook } from '@/store/modules/user';
-// import { getCurrentInstance, ComponentInternalInstance, watch, onMounted, onUnmounted, computed } from 'vue';
-// import type { ElFormInstance } from 'element-plus';
-
-// // 类型定义补充
-// interface DialogOption {
-//   visible: boolean;
-//   title: string;
-// }
-
-// interface PlanListItem {
-//   id?: number | undefined;
-//   name?: string | undefined;
-//   specification?: string | undefined;
-//   unit?: string | undefined;
-//   suppliespriceId?: number | undefined;
-//   demandQuantity?: number | undefined;
-//   qs?: string | undefined;
-//   arrivalTime?: string | undefined;
-//   remark?: string | undefined;
-//   Remaining: number; // 剩余量（必存在）
-//   quantityError: string; // 数量错误提示
-//   batchNumber?: string | undefined; // 版本号
-//   duplicateError: string; // 重复错误提示
-//   mrpBaseId?: number | undefined;
-// }
-
-// interface FormData {
-//   mrpBaseBo: {
-//     id?: number | undefined;
-//     preparedDate?: string | undefined;
-//     planCode?: string | undefined;
-//     matCat?: string | undefined;
-//     status?: string | undefined;
-//     projectId?: number | undefined;
-//   };
-//   planList: PlanListItem[];
-// }
-
-// const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-// // 获取用户 store
-// const userStore = useUserStoreHook();
-// // 从 store 中获取项目列表和当前选中的项目
-// const currentProject = computed(() => userStore.selectedProject);
-// const batchTreeRef = ref<any>(null);
-// const cailiaoshebeiList = ref<CailiaoshebeiVO[]>([]);
-// const buttonLoading = ref(false);
-// const loading = ref(false);
-// const showSearch = ref(true);
-// const ids = ref<Array<string | number>>([]);
-// const single = ref(true);
-// const multiple = ref(true);
-// const total = ref(0);
-// const mainTotal = ref(0);
-// const batchOptions = ref<any[]>([]);
-// const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status') || {});
-// const route = useRoute();
-// const queryFormRef = ref<ElFormInstance>();
-// const cailiaoshebeiFormRef = ref<ElFormInstance>();
-// const dialog = reactive<DialogOption>({
-//   visible: false,
-//   title: ''
-// });
-
-// // 初始化表单数据
-// const initFormData: FormData = {
-//   mrpBaseBo: {
-//     id: undefined,
-//     preparedDate: undefined,
-//     planCode: undefined,
-//     matCat: undefined,
-//     status: undefined,
-//     projectId: currentProject.value?.id
-//   },
-//   planList: [
-//     {
-//       id: undefined,
-//       name: undefined,
-//       specification: undefined,
-//       unit: undefined,
-//       suppliespriceId: undefined,
-//       demandQuantity: undefined,
-//       qs: undefined,
-//       arrivalTime: undefined,
-//       remark: undefined,
-//       Remaining: 0,
-//       quantityError: '',
-//       batchNumber: undefined,
-//       duplicateError: '',
-//       mrpBaseId: undefined
-//     }
-//   ]
-// };
-
-// const data = reactive({
-//   form: { ...initFormData } as FormData,
-//   queryParams: {
-//     batchData: {
-//       pageNum: 1,
-//       pageSize: 10,
-//       planCode: undefined,
-//       projectId: currentProject.value?.id
-//     },
-//     mainData: {
-//       pageNum: 1,
-//       pageSize: 10,
-//       mrpBaseId: undefined,
-//       projectId: currentProject.value?.id
-//     }
-//   },
-//   rules: {
-//     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
-//     'mrpBaseBo.preparedDate': [{ required: true, message: '计划日期不能为空', trigger: 'blur' }],
-//     'mrpBaseBo.planCode': [{ required: true, message: '计划编码不能为空', trigger: 'blur' }],
-//     'mrpBaseBo.matCat': [{ required: true, message: '物资分类不能为空', trigger: 'blur' }]
-//   }
-// });
-
-// const batchNumber = ref('');
-// const { queryParams, form, rules } = toRefs(data);
-// const nameList = ref<any[]>([]);
-// const versionList = ref<any[]>([]);
-
-// /** 查询物资-材料设备列表 */
-// const getList = async (type?: string) => {
-//   loading.value = true;
-//   try {
-//     const res = await listBatch(queryParams.value.batchData);
-//     batchOptions.value = res.rows || [];
-//     // 自动选中第一条数据（如果存在且未选中）
-//     if (batchOptions.value.length > 0 && !queryParams.value.mainData.mrpBaseId) {
-//       batchTreeRef.value?.setCurrentKey(batchOptions.value[0].id);
-//       queryParams.value.mainData.mrpBaseId = batchOptions.value[0].id;
-//       form.value.mrpBaseBo.status = batchOptions.value[0].status;
-//     }
-//     total.value = res.total || 0;
-//   } catch (error) {
-//     proxy?.$modal.msgError('获取批次列表失败');
-//   } finally {
-//     loading.value = false;
-//     // 非搜索场景下同步加载主列表
-//     if (type !== 'search') {
-//       getMainList();
-//     }
-//   }
-// };
-
-// /** 数量校验：必须≤剩余量，且为合法数字 */
-// const validateDemandQuantity = (row: PlanListItem, index: number) => {
-//   // 1. 清除之前的错误信息
-//   row.quantityError = '';
-
-//   // 2. 处理空值
-//   if (row.demandQuantity === null || row.demandQuantity === undefined || row.demandQuantity === '') {
-//     return;
-//   }
-
-//   // 3. 处理非数字
-//   if (typeof row.demandQuantity !== 'number' || isNaN(row.demandQuantity)) {
-//     row.quantityError = '请输入合法数字';
-//     return;
-//   }
-
-//   // 4. 处理负数
-//   if (row.demandQuantity < 0) {
-//     row.quantityError = '数量不能为负数';
-//     return;
-//   }
-
-//   // 5. 核心校验：数量≤剩余量
-//   if (row.demandQuantity > row.Remaining) {
-//     row.quantityError = `数量不能超过剩余量${row.Remaining}`;
-//   }
-// };
-
-// /** 获取剩余量 */
-// const getMrpBaseRemaining = async (suppliespriceId: number, row: PlanListItem) => {
-//   try {
-//     const res = await mrpBaseRemaining({ suppliespriceId });
-//     const selected = res.data;
-//     console.log('🚀 ~ getMrpBaseRemaining ~ selected:', selected);
-//     row.Remaining = selected.remainingQuantity || 0;
-//     row.name = selected.name;
-//     row.specification = selected.specification;
-//     row.unit = selected.unit;
-//     row.qs = selected.qs || '';
-//     row.remark = selected.remark || '';
-//     row.arrivalTime = selected.arrivalTime || '';
-//     // 剩余量更新后，重新校验当前数量
-//     validateDemandQuantity(row, 0);
-//   } catch (error) {
-//     proxy?.$modal.msgError('获取剩余量失败');
-//     row.Remaining = 0;
-//   }
-// };
-
-// /** 获取可用物资列表（过滤已选选项） */
-// const getAvailableNameList = (currentIndex: number) => {
-//   // 收集除当前行外已选中的物资ID
-//   const selectedIds = form.value.planList
-//     .filter((_, index) => index !== currentIndex)
-//     .map((item) => item.suppliespriceId)
-//     .filter((id) => id !== undefined && id !== null);
-
-//   // 过滤掉已选中的物资
-//   return nameList.value.filter((item) => !selectedIds.includes(item.id));
-// };
-
-// /** 选择物资名称触发 */
-// const selectName = (val: number, row: PlanListItem, index: number) => {
-//   // 1. 获取剩余量并更新基础信息
-//   getMrpBaseRemaining(val, row);
-// };
-
-// /** 节点单击事件 */
-// const handleNodeClick = (data: any) => {
-//   queryParams.value.mainData.mrpBaseId = data.id;
-//   form.value.mrpBaseBo.status = data.status;
-//   getMainList();
-// };
-
-// /** 获取主列表数据 */
-// const getMainList = async () => {
-//   if (!queryParams.value.mainData.mrpBaseId) return;
-
-//   loading.value = true;
-//   try {
-//     const res = await getBatch(queryParams.value.mainData);
-//     cailiaoshebeiList.value = res.rows || [];
-//     mainTotal.value = res.total || 0;
-//   } catch (error) {
-//     proxy?.$modal.msgError('获取物资列表失败');
-//   } finally {
-//     loading.value = false;
-//   }
-// };
-
-// /** 搜索批次列表 */
-// const searchBatchList = async () => {
-//   queryParams.value.batchData.planCode = batchNumber.value;
-//   getList('search');
-// };
-
-// /** 删除表格行 */
-// const delRow = (index: number) => {
-//   if (form.value.planList.length <= 1) {
-//     return proxy?.$modal.msgWarning('请至少保留一项物资数据');
-//   }
-//   form.value.planList.splice(index, 1);
-// };
-
-// /** 新增表格行 */
-// const addRow = () => {
-//   const newRow: PlanListItem = {
-//     name: undefined,
-//     specification: undefined,
-//     unit: undefined,
-//     suppliespriceId: undefined,
-//     demandQuantity: undefined,
-//     qs: undefined,
-//     arrivalTime: undefined,
-//     remark: undefined,
-//     Remaining: 0,
-//     quantityError: '',
-//     batchNumber: undefined,
-//     duplicateError: '',
-//     mrpBaseId: undefined
-//   };
-//   form.value.planList.push(newRow);
-// };
-
-// /** 取消按钮 */
-// const cancel = () => {
-//   reset();
-//   dialog.visible = false;
-// };
-
-// /** 表单重置 */
-// const reset = () => {
-//   const status = form.value.mrpBaseBo.status;
-//   // 重置表单（保留状态字段）
-//   form.value = {
-//     ...JSON.parse(JSON.stringify(initFormData)),
-//     mrpBaseBo: { ...initFormData.mrpBaseBo, status }
-//   };
-//   // 重置表单验证状态
-//   cailiaoshebeiFormRef.value?.resetFields();
-//   // 重置项目ID
-//   form.value.mrpBaseBo.projectId = currentProject.value?.id;
-// };
-
-// /** 多选框选中数据 */
-// const handleSelectionChange = (selection: CailiaoshebeiVO[]) => {
-//   ids.value = selection.map((item) => item.id);
-//   single.value = selection.length !== 1;
-//   multiple.value = selection.length === 0;
-// };
-
-// /** 新增按钮操作 */
-// const handleAdd = () => {
-//   reset();
-//   dialog.visible = true;
-//   dialog.title = '新增物资-需求';
-// };
-
-// /** 修改按钮操作 */
-// const handleUpdata = () => {
-//   if (!queryParams.value.mainData.mrpBaseId) {
-//     return proxy?.$modal.msgError('请先选择批次');
-//   }
-//   // 获取对应版本的物资列表
-//   reset();
-//   loading.value = true;
-//   getCailiaoshebei(queryParams.value.mainData.mrpBaseId)
-//     .then((res: any) => {
-//       // 更新基础信息
-//       form.value.mrpBaseBo = res.data.mrpBaseBo || initFormData.mrpBaseBo;
-
-//       // 更新表格数据（补充缺失字段）
-//       form.value.planList = (res.data.planList || []).map((item: any) => ({
-//         id: item.id,
-//         name: item.name,
-//         specification: item.specification,
-//         unit: item.unit,
-//         suppliespriceId: item.suppliespriceId,
-//         demandQuantity: item.demandQuantity,
-//         qs: item.qs,
-//         arrivalTime: item.arrivalTime,
-//         remark: item.remark,
-//         Remaining: Number(item.remaining) || 0,
-//         quantityError: '',
-//         batchNumber: item.batchNumber,
-//         duplicateError: '',
-//         mrpBaseId: item.mrpBaseId
-//       }));
-//       // 打开对话框
-//       dialog.visible = true;
-//       dialog.title = '修改物资-需求';
-//     })
-//     .catch(() => {
-//       proxy?.$modal.msgError('获取详情失败');
-//     })
-//     .finally(() => {
-//       loading.value = false;
-//     });
-// };
-
-// /** 提交数据（整合所有校验） */
-// const submitTransferForm = async () => {
-//   // 1. 校验数量合法性（检查是否有数量错误）
-//   const hasQuantityError = form.value.planList.some((row) => row.quantityError);
-//   if (hasQuantityError) {
-//     return proxy?.$modal.msgError('存在非法数量，请修正后提交');
-//   }
-
-//   // 2. 执行表单基础验证
-//   const result = validateAndClean(form.value.planList);
-//   if (!result.valid) {
-//     return proxy?.$modal.msgError(result.message);
-//   }
-
-//   // 3. 表单组件验证
-//   cailiaoshebeiFormRef.value?.validate(async (valid: boolean) => {
-//     if (!valid) return;
-
-//     buttonLoading.value = true;
-//     try {
-//       // 4. 提交数据
-//       await updateCailiaoshebei({
-//         ...form.value,
-//         planList: result.data // 使用清洗后的数据
-//       });
-//       proxy?.$modal.msgSuccess('操作成功');
-//       dialog.visible = false;
-//       // 5. 刷新列表
-//       await getList();
-//     } catch (error) {
-//       proxy?.$modal.msgError('操作失败，请重试');
-//     } finally {
-//       buttonLoading.value = false;
-//     }
-//   });
-// };
-
-// /** 删除批次 */
-// const handleDeleteBatch = async () => {
-//   const _id = batchTreeRef.value?.getCurrentNode()?.id;
-//   if (!_id) {
-//     return proxy?.$modal.msgError('请先选择批次');
-//   }
-
-//   try {
-//     await proxy?.$modal.confirm('是否确认删除该批次？删除后不可恢复！');
-//     await delBatch(_id);
-//     proxy?.$modal.msgSuccess('删除成功');
-//     // 重置选中状态并刷新列表
-//     queryParams.value.mainData.mrpBaseId = undefined;
-//     form.value.mrpBaseBo.status = undefined;
-//     await getList();
-//   } catch (error) {
-//     // 取消确认时不提示错误
-//     if (error !== 'cancel') {
-//       proxy?.$modal.msgError('删除失败');
-//     }
-//   }
-// };
-
-// /** 数据清洗与基础校验 */
-// function validateAndClean(arr: PlanListItem[]) {
-//   // 1. 过滤掉全空的数据项
-//   const cleanedArr = arr.filter((item) => !Object.values(item).every((v) => v === '' || v == null || v === undefined));
-
-//   let hasFullItem = false; // 是否有至少一条完整数据
-
-//   // 2. 逐行校验必填项
-//   for (let idx = 0; idx < cleanedArr.length; idx++) {
-//     const item = cleanedArr[idx];
-
-//     // 校验版本号
-//     if (!item.batchNumber) {
-//       return { valid: false, message: `第${idx + 1}行：版本号不能为空`, data: cleanedArr };
-//     }
-
-//     // 校验物资选择
-//     if (!item.suppliespriceId) {
-//       return { valid: false, message: `第${idx + 1}行：请选择物资名称`, data: cleanedArr };
-//     }
-
-//     // 校验质量标准
-//     if (!item.qs) {
-//       return { valid: false, message: `第${idx + 1}行：质量标准不能为空`, data: cleanedArr };
-//     }
-
-//     // 校验需求到货时间
-//     if (!item.arrivalTime) {
-//       return { valid: false, message: `第${idx + 1}行：需求到货时间不能为空`, data: cleanedArr };
-//     }
-
-//     // 校验数量（必填且≥0）
-//     if (item.demandQuantity === null || item.demandQuantity === undefined || item.demandQuantity < 0) {
-//       return { valid: false, message: `第${idx + 1}行：请输入合法的需求数量`, data: cleanedArr };
-//     }
-
-//     hasFullItem = true;
-//   }
-
-//   // 3. 检查是否至少有一条完整数据
-//   if (!hasFullItem) {
-//     return { valid: false, message: '至少需要填写一条完整的物资数据', data: cleanedArr };
-//   }
-
-//   return { valid: true, message: '', data: cleanedArr };
-// }
-
-// /** 审核按钮操作 */
-// const handleAudit = async () => {
-//   if (!form.value.mrpBaseBo.status) {
-//     return proxy?.$modal.msgError('请选择批次号');
-//   }
-//   if (!queryParams.value.mainData.mrpBaseId) {
-//     return proxy?.$modal.msgError('请选择批次号');
-//   }
-
-//   // 关闭当前页并打开审核页
-//   proxy?.$tab.closePage(route);
-//   proxy?.$tab.openPage('/approval/batchPlan/indexEdit', '审核物资设备批次需求计划', {
-//     id: queryParams.value.mainData.mrpBaseId,
-//     status: `${form.value.mrpBaseBo.status}_batchRequirements`,
-//     type: 'update'
-//   });
-// };
-
-// /** 获取物资列表（按版本号筛选） */
-// const getNameList = (versions: string) => {
-//   coryEngineeringList({
-//     projectId: currentProject.value?.id,
-//     versions
-//   })
-//     .then((res: any) => {
-//       nameList.value = res.data || [];
-//     })
-//     .catch(() => {
-//       nameList.value = [];
-//       proxy?.$modal.msgError('获取物资列表失败');
-//     });
-// };
-
-// /** 获取版本号列表 */
-// const getVersion = () => {
-//   obtainTheVersion({ projectId: currentProject.value?.id })
-//     .then((res: any) => {
-//       versionList.value = res.data || [];
-//     })
-//     .catch(() => {
-//       versionList.value = [];
-//       proxy?.$modal.msgError('获取版本号失败');
-//     });
-// };
-
-// /** 选择版本号触发 */
-// const selectNameVersion = (val: string, row: PlanListItem, index: number) => {
-//   row.batchNumber = val;
-//   row.suppliespriceId = undefined; // 切换版本号时清空物资选择
-//   row.name = undefined;
-//   row.specification = undefined;
-//   row.unit = undefined;
-//   row.qs = undefined;
-//   row.remark = undefined;
-//   row.arrivalTime = undefined;
-//   row.demandQuantity = undefined;
-//   row.quantityError = '';
-//   row.duplicateError = '';
-//   row.mrpBaseId = '';
-
-//   // 获取对应版本的物资列表
-//   getNameList(val);
-// };
-
-// /** 页面挂载时初始化 */
-// onMounted(() => {
-//   getList();
-//   getVersion();
-// });
-
-// /** 监听项目ID变化，刷新数据 */
-// const listeningProject = watch(
-//   () => currentProject.value?.id,
-//   (newId, oldId) => {
-//     if (newId !== oldId && newId) {
-//       queryParams.value.mainData.projectId = newId;
-//       queryParams.value.batchData.projectId = newId;
-//       form.value.mrpBaseBo.projectId = newId;
-//       getList();
-//       getVersion(); // 重新获取对应项目的版本号
-//     }
-//   }
-// );
-
-// /** 页面卸载时清理监听 */
-// onUnmounted(() => {
-//   listeningProject();
-// });
-// </script>
-
-<style scoped lang="scss">
-.custom-tree-node {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  padding-right: 8px;
-}
-
-/* 错误提示样式补充 */
-.text-red-500 {
-  color: #f56c6c;
-}
-
-.text-xs {
-  font-size: 12px;
-}
-
-.dialog-footer {
-  text-align: right;
-}
-</style> -->
-
 <template>
   <div class="p-2">
     <el-row :gutter="20">
-      <!-- 流程分类树 -->
       <el-col style="" :span="5">
         <el-card shadow="hover">
           <template #header>
@@ -881,8 +91,6 @@
         </el-card>
       </el-col>
     </el-row>
-
-    <!-- 添加或修改物资-材料设备对话框 -->
     <el-dialog :close-on-click-modal="false" draggable :title="dialog.title" v-model="dialog.visible" width="1500px" append-to-body>
       <el-form :model="form" ref="cailiaoshebeiFormRef" :rules="rules" label-width="80px" :inline="false">
         <el-divider>基础信息</el-divider>
@@ -905,9 +113,7 @@
         </el-row>
 
         <el-divider>主要信息</el-divider>
-        <!-- 表格添加border属性，优化视觉体验 -->
         <el-table :data="form.planList" border>
-          <!-- 版本号列 -->
           <el-table-column prop="batchNumber" align="center" label="版本号 " width="200">
             <template #default="scope">
               <el-select v-model="scope.row.batchNumber" placeholder="请选择" @change="(val) => selectNameVersion(val, scope.row, scope.$index)">
@@ -915,7 +121,6 @@
               </el-select>
             </template>
           </el-table-column>
-          <!-- 物资名称列（核心修改：动态过滤已选选项） -->
           <el-table-column prop="name" align="center" label="物资名称" width="160">
             <template #default="scope">
               <el-input v-model="scope.row.name" v-if="scope.row.mrpBaseId" placeholder="请输入物资名称" disabled />
@@ -936,25 +141,21 @@
               />
             </template>
           </el-table-column>
-          <!-- 剩余量列 -->
           <el-table-column align="center" label="剩余量" width="80">
             <template #default="scope">
               <span>{{ scope.row.Remaining }}</span>
             </template>
           </el-table-column>
-          <!-- 规格型号列 -->
           <el-table-column prop="specification" align="center" label="规格型号" width="100">
             <template #default="scope">
               <span>{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
-          <!-- 单位列 -->
           <el-table-column prop="unit" align="center" label="单位" width="80">
             <template #default="scope">
               <span>{{ scope.row.unit }}</span>
             </template>
           </el-table-column>
-          <!-- 数量列 -->
           <el-table-column prop="demandQuantity" align="center" label="数量" width="140">
             <template #default="scope">
               <el-input
@@ -966,31 +167,26 @@
                 type="number"
                 min="0"
               />
-              <!-- 数量错误提示 -->
               <div v-if="scope.row.quantityError" class="text-red-500 text-xs mt-1">{{ scope.row.quantityError }}</div>
             </template>
           </el-table-column>
-          <!-- 质量标准列 -->
           <el-table-column prop="qs" align="center" label="质量标准" width="140">
             <template #header> <span class="text-red-500">*</span> 质量标准 </template>
             <template #default="scope">
               <el-input v-model="scope.row.qs" placeholder="请输入质量标准" />
             </template>
           </el-table-column>
-          <!-- 需求到货时间列 -->
           <el-table-column prop="arrivalTime" align="center" label="需求到货时间" width="180">
             <template #header> <span class="text-red-500">*</span> 需求到货时间 </template>
             <template #default="scope">
               <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 140px" />
             </template>
           </el-table-column>
-          <!-- 备注列 -->
           <el-table-column prop="remark" align="center" label="备注">
             <template #default="scope">
               <el-input v-model="scope.row.remark" placeholder="请输入备注" disabled />
             </template>
           </el-table-column>
-          <!-- 操作列 -->
           <el-table-column prop="remark" align="center" label="操作" width="150">
             <template #default="scope">
               <el-button @click="addRow" type="primary" icon="Plus" size="small" />
diff --git a/src/views/materials/company/index.vue b/src/views/materials/company/index.vue
index bba14ff..649abc3 100644
--- a/src/views/materials/company/index.vue
+++ b/src/views/materials/company/index.vue
@@ -24,7 +24,7 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:company:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
@@ -36,7 +36,7 @@
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['materials:company:remove']"
               >删除
             </el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:company:export']">导出 </el-button>
           </el-col>
@@ -49,24 +49,20 @@
         <!-- <el-table-column label="主键id" align="center" prop="id" v-if="true" /> -->
         <el-table-column label="序号" type="index" width="60" align="center" />
         <el-table-column label="公司名称" align="center" prop="companyName" />
-        <el-table-column label="负责人" align="center" prop="principal" />
-        <el-table-column label="负责人电话" align="center" prop="principalPhone" />
         <el-table-column label="公司状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="资质情况" align="center" prop="qualification" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="创建时间" align="center" prop="createdAt" width="180" />
+        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-space wrap>
               <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:company:edit']">修改 </el-button>
               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:company:remove']">删除 </el-button>
             </el-space>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@@ -134,7 +130,7 @@ const dialog = reactive<DialogOption>({
 const initFormData: CompanyForm = {
   id: undefined,
   companyName: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.goId,
   status: undefined,
   remark: undefined,
   qualification: undefined,
@@ -147,7 +143,7 @@ const data = reactive<PageData<CompanyForm, CompanyQuery>>({
     pageNum: 1,
     pageSize: 10,
     companyName: undefined,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.goId,
     status: undefined,
     qualification: undefined,
     principalPhone: undefined,
@@ -168,8 +164,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listCompany(queryParams.value);
-  companyList.value = res.rows;
-  total.value = res.total;
+  companyList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -261,7 +257,7 @@ const handleExport = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
diff --git a/src/views/materials/materials/index.vue b/src/views/materials/materials/index.vue
index 1cd6bb8..82cef67 100644
--- a/src/views/materials/materials/index.vue
+++ b/src/views/materials/materials/index.vue
@@ -39,8 +39,12 @@
         </el-table-column>
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="材料名称" align="center" prop="materialsName" />
-        <el-table-column label="公司名称" align="center" prop="companyVo.companyName" />
+        <el-table-column label="材料名称" align="center" prop="equipmentMaterialsName" />
+        <el-table-column label="公司名称" align="center" prop="companyId">
+          <template #default="scope">
+            <dict-tag :options="companyOptions" :value="scope.row.companyId" />
+          </template>
+        </el-table-column>
         <el-table-column label="规格型号" align="center" prop="typeSpecificationName" />
         <el-table-column label="使用部位" align="center" prop="usePart" />
         <el-table-column label="计量单位" align="center" prop="weightId" />
@@ -51,8 +55,8 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
-        <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="320">
+        <el-table-column label="创建时间" align="center" prop="createdAt" width="180" />
+        <!-- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="320">
           <template #default="scope">
             <el-space>
               <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['materials:materials:query']">
@@ -73,7 +77,7 @@
               </el-button>
             </el-space>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@@ -181,7 +185,7 @@ const initFormData: MaterialsForm = {
   id: undefined,
   materialsName: undefined,
   companyId: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.goId,
   typeSpecificationName: undefined,
   fileOssIdMap: undefined,
   usePart: undefined,
@@ -197,7 +201,7 @@ const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
     pageSize: 10,
     materialsName: undefined,
     companyId: undefined,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.goId,
     typeSpecificationName: undefined,
     fileOssIdMap: undefined,
     usePart: undefined,
@@ -218,8 +222,8 @@ const companyOptions = ref([]);
 const getList = async () => {
   loading.value = true;
   const res = await listMaterials(queryParams.value);
-  materialsList.value = res.rows;
-  total.value = res.total;
+  materialsList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -235,6 +239,7 @@ const getCompanyList = async () => {
     value: company.id,
     label: company.supplierName
   }));
+  console.log('🚀 ~ getCompanyList ~ companyOptions.value:', companyOptions.value);
   loading.value = false;
 };
 
@@ -272,7 +277,7 @@ const handleSelectionChange = (selection: MaterialsVO[]) => {
 /** 展开材料详情抽屉操作 */
 const showDetailDrawer = ref<boolean>(false);
 const handleShowDrawer = (row?: MaterialsVO) => {
-  currentMaterialsId.value = row.id;
+  currentMaterialsId.value = row.companyId;
   showDetailDrawer.value = true;
 };
 
@@ -358,7 +363,7 @@ const handleOssUpdate = (ossId: string, value: string) => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
diff --git a/src/views/other/ys7DeviceImg/index.vue b/src/views/other/ys7DeviceImg/index.vue
index 3c4c292..fe3d06f 100644
--- a/src/views/other/ys7DeviceImg/index.vue
+++ b/src/views/other/ys7DeviceImg/index.vue
@@ -4,12 +4,12 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="摄像头名称" prop="deviceName" :label-width="100">
-              <el-input v-model="queryParams.deviceName" placeholder="请输入摄像头名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="拍摄时间" prop="createTime">
-              <el-date-picker clearable v-model="queryParams.createTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择拍摄时间" />
+            <el-form-item label="摄像头名称" prop="name" :label-width="100">
+              <el-input v-model="queryParams.name" placeholder="请输入摄像头名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <!-- <el-form-item label="拍摄时间" prop="createdAt">
+              <el-date-picker clearable v-model="queryParams.createdAt" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择拍摄时间" />
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -18,36 +18,36 @@
         </el-card>
       </div>
     </transition>
-
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['other:ys7DeviceImg:remove']"
-              >删除</el-button
-            >
-          </el-col>
+          <el-button type="danger" @click="handleDelete()" plain icon="Delete" :disabled="multiple">删除</el-button>
+
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <el-table v-loading="loading" :data="ys7DeviceImgList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="设备序列号" align="center" prop="deviceSerial" />
-        <el-table-column label="摄像头名称" align="center" prop="deviceName" />
+        <el-table-column label="序号" align="center" type="index" width="100" />
+        <el-table-column label="摄像头名称" align="center" prop="name" />
         <el-table-column label="图片地址" align="center" prop="url">
           <template #default="scope">
-            <el-image :z-index="9999" :preview-src-list="[scope.row.url]" preview-teleported :src="scope.row.url" class="w20" />
+            <el-image
+              :z-index="9999"
+              :preview-src-list="['http://58.17.134.85:8920' + scope.row.path]"
+              preview-teleported
+              :src="'http://58.17.134.85:8920' + scope.row.path"
+              class="w20"
+            />
           </template>
         </el-table-column>
-        <el-table-column label="拍摄时间" align="center" prop="createTime" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="拍摄时间" align="center" prop="createdAt" />
+        <el-table-column label="操作" align="center" width="120">
           <template #default="scope">
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['other:ys7DeviceImg:remove']">删除</el-button>
+            <el-button type="danger" link icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
@@ -106,8 +106,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listYs7DeviceImg(queryParams.value);
-  ys7DeviceImgList.value = res.rows;
-  total.value = res.total;
+  ys7DeviceImgList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
diff --git a/src/views/progress/plan/component/createDailyRate.vue b/src/views/progress/plan/component/createDailyRate.vue
index bbbd05d..47e1abd 100644
--- a/src/views/progress/plan/component/createDailyRate.vue
+++ b/src/views/progress/plan/component/createDailyRate.vue
@@ -3,7 +3,7 @@
     <el-dialog
       v-model="isShowDialog"
       @close="onCancel"
-      width="70vw"
+      width="1350"
       :close-on-click-modal="false"
       :destroy-on-close="true"
       :lock-scroll="false"
@@ -96,6 +96,7 @@
             height="58vh"
             :data="detialList"
             @selection-change="handleSelectionChange"
+            @row-click="onRowClick"
             :row-key="(row) => row.id"
             ref="multipleTableRef"
           >
@@ -136,6 +137,7 @@
             @selection-change="handleSelectionChangeWork"
             :row-key="(row) => row.id"
             ref="multipleTableWorkRef"
+            @row-click="onRowClick"
           >
             <el-table-column label="已完成工作" align="center">
               <el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
@@ -377,6 +379,22 @@ const handleDayAdd = (row: any, obj: any) => {
   state.updateRow = row;
   getPvModuleList();
 };
+const selectedRows = ref([]);
+const onRowClick = (row, column, event) => {
+  // 如果点击来源是复选框本身（或行内其它会触发单独事件的控件），不要再切换
+  if (event && event.target) {
+    // 适配 Element UI / Element Plus 的复选框 DOM 结构
+    const isCheckbox = !!event.target.closest('.el-checkbox');
+    const isLinkOrBtn = !!event.target.closest('button, a, input, .no-row-click');
+    if (isCheckbox || isLinkOrBtn) return;
+  }
+  // 切换选择：如果已选则取消，否则选中
+  const dom = showDayWork.value ? multipleTableRef.value : multipleTableWorkRef.value;
+  // toggleRowSelection 第二个参数可以显式设置选中/取消状态（Element UI 支持）
+  const currentlySelected = selectedRows.value.includes(row);
+  console.log('🚀 ~ onRowClick ~ currentlySelected:', currentlySelected);
+  dom.toggleRowSelection(row, !currentlySelected);
+};
 
 const tableKey = (row: any) => row.id;
 
@@ -391,6 +409,7 @@ const clickOpen = (row: any) => {
 // 多选框处理
 const handleSelectionChange = (selection: any[]) => {
   state.checkedList = selection.map((item: any) => item.id);
+  selectedRows.value = selection;
 };
 
 // 提交日报
@@ -454,6 +473,7 @@ const getDailyBookList = (doneTime: string) => {
 const handleSelectionChangeWork = (selection: any[]) => {
   state.checkList = selection.map((item: any) => item.id);
   state.single = selection.length === 0;
+  selectedRows.value = selection;
 };
 
 // 移除日报
diff --git a/src/views/project/attendance/component/detail.vue b/src/views/project/attendance/component/detail.vue
new file mode 100644
index 0000000..5649888
--- /dev/null
+++ b/src/views/project/attendance/component/detail.vue
@@ -0,0 +1,395 @@
+<template>
+  <div class="wxApplet-busAttendance-Detail">
+    <el-dialog v-model="isShowDialog" width="1300px" :close-on-click-modal="false" :destroy-on-close="true" custom-class="busAttendance_detail">
+      <template #header>
+        <div v-drag="['.wxApplet-busAttendance-Detail .el-dialog', '.wxApplet-busAttendance-Detail .el-dialog__header']"></div>
+      </template>
+      <div class="content">
+        <el-calendar ref="calendarRef" v-model="queryParams.dateStr">
+          <template #header="{ date }">
+            <div class="title">
+              <el-button-group>
+                <el-button type="primary" @click="selectDate('prev-month')">
+                  <el-icon class="el-icon--right"><ArrowLeft /></el-icon>上一月
+                </el-button>
+                <el-button type="primary" @click="selectDate('next-month')">
+                  下一月<el-icon class="el-icon--right"><ArrowRight /></el-icon>
+                </el-button>
+              </el-button-group>
+              <span class="label">{{ date }} — {{ userInfo.UserName }}出勤</span>
+              <div class="status-detail">
+                <div class="dot1">全天考勤正常</div>
+                <div class="dot2">当天存在异常迟到、早退、缺卡</div>
+                <div class="dot3">当天提交过补卡申请</div>
+              </div>
+            </div>
+          </template>
+          <template #date-cell="{ data }">
+            <div class="time-cell" v-if="getTime(data.day, true) || getTime(data.day, false)">
+              <div class="status">
+                <p class="time">{{ data.day.split('-').slice(1).join('-') }}</p>
+                <div class="flex-r">
+                  <div class="circle status1" v-if="setFilterDay(data.day, 1)"></div>
+                  <div class="circle status2" v-if="setFilterDay(data.day, 2)"></div>
+                  <div class="circle status3" v-if="setFilterDay(data.day, 3)"></div>
+                </div>
+              </div>
+              <div class="flex-c">
+                <div class="row normal" v-if="getTime(data.day, true)">
+                  <span>{{ getTime(data.day, true) }}</span>
+                  <span style="padding-left: 5px">上班打卡</span>
+                </div>
+                <div class="row abnormal2" v-if="getTime(data.day, false)">
+                  <span>{{ getTime(data.day, false) }}</span>
+                  <span style="padding-left: 5px">下班打卡</span>
+                </div>
+                <div class="row abnormal3" v-if="getTime(data.day, false, true)">
+                  <span style="padding-left: 5px">下班缺卡</span>
+                </div>
+              </div>
+            </div>
+            <template v-else>
+              <div class="flex-c">
+                <p class="time">{{ data.day.split('-').slice(1).join('-') }}</p>
+                <img src="@/assets/icons/svg/empty-CZvxqguX.png" />
+                <span>暂无打卡记录</span>
+              </div>
+            </template>
+          </template>
+        </el-calendar>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance, nextTick } from 'vue';
+import { ElMessage, ElLoading } from 'element-plus';
+import { listAttendanceMonth } from '@/api/project/attendance';
+export default defineComponent({
+  name: 'index',
+  props: {
+    isPinchOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const calendarRef = ref();
+    const state = reactive({
+      loading: false,
+      isShowDialog: false,
+      isNormal: true,
+      userInfo: {},
+      queryParams: {
+        openid: '',
+        dateStr: ''
+      },
+      Daylist: [] //
+    });
+    // 打开弹窗
+    const openDialog = (row) => {
+      state.isShowDialog = true;
+      if (row) {
+        state.queryParams.openid = row.Openid;
+        state.queryParams.dateStr = proxy.parseTime(new Date(), '{y}-{m}');
+        state.userInfo = row;
+        nextTick(() => {
+          getList();
+        });
+      }
+    };
+    //获取数据
+    const getList = () => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在加载中……',
+        background: 'rgba(0, 0, 0, 0.7)',
+        target: '.busAttendance_detail'
+      });
+      listAttendanceMonth(state.queryParams as any).then((res: any) => {
+        loading.close();
+        let list = res.data.list ?? [];
+        state.Daylist = list;
+      });
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    const selectDate = (val: any) => {
+      if (!calendarRef.value) return;
+      calendarRef.value.selectDate(val);
+      state.queryParams.dateStr = proxy.parseTime(new Date(state.queryParams.dateStr), '{y}-{m}');
+      getList();
+    };
+    const setFilterDay = (day, key) => {
+      let arr = [1, 2, 3, 4, 5]; //1正常,2迟到,3早退,4缺勤,5补卡
+      let flag = false;
+      if (state.Daylist && state.Daylist.length) {
+        let arr = state.Daylist;
+        for (let index = 0; index < arr.length; index++) {
+          const item = arr[index];
+          if (item.PrintingDate == day) {
+            let IsPinch1 = item.threelist[0].IsPinch; //状态
+            let IsPinch2 = 1;
+            if (item.threelist.length > 1) {
+              IsPinch2 = item.threelist[1].IsPinch; //状态
+            }
+            if (key == 1) {
+              // 都是全勤的情况
+              if (IsPinch1 == 1 && IsPinch2 == 1) {
+                flag = true;
+                break;
+              }
+            } else if (key == 2) {
+              // 存在缺卡 迟到 早退
+              if (['2', '3', '4'].includes(IsPinch1) || ['2', '3', '4'].includes(IsPinch2)) {
+                flag = true;
+                break;
+              }
+            } else if (key == 3) {
+              // 出现补卡申请
+              if (IsPinch1 == 5 || IsPinch2 == 5) {
+                flag = true;
+                break;
+              }
+            }
+          }
+        }
+      }
+      return flag;
+    };
+    const getTime = (day, bool, flag = false) => {
+      let time = '';
+      if (state.Daylist && state.Daylist.length) {
+        let arr = state.Daylist;
+        for (let index = 0; index < arr.length; index++) {
+          const item = arr[index];
+          if (item.PrintingDate == day) {
+            if (bool) {
+              time = item.threelist[0].Clock.split(' ')[1];
+              break;
+            } else {
+              if (item.threelist.length > 1) {
+                time = item.threelist[1].Clock.split(' ')[1]; //状态
+              }
+              if (flag) {
+                if (item.threelist.length <= 1) {
+                  time = '1';
+                  break;
+                }
+                if (item.threelist[1] && item.threelist[1].IsPinch == 4) {
+                  //缺卡显示
+                  time = '1';
+                } else {
+                  //不显示
+                  time = '';
+                }
+              }
+              break;
+            }
+          }
+        }
+      }
+      return time;
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      menuRef,
+      getTime,
+      formRef,
+      calendarRef,
+      selectDate,
+      setFilterDay,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss" scoped>
+.wxApplet-busAttendance-Detail {
+  width: 100%;
+
+  .title {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+    .label {
+      font-size: 24px;
+      position: absolute;
+      left: 50%;
+      top: 0;
+      transform: translateX(-50%);
+      color: #000;
+      font-weight: 500;
+    }
+    .btn {
+      display: flex;
+      align-items: center;
+    }
+    .status-detail {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      > div {
+        margin: 0 15px;
+        position: relative;
+        font-size: 12px;
+      }
+      .dot1::before,
+      .dot2::before,
+      .dot3::before {
+        position: absolute;
+        content: '';
+        display: inline-block;
+        left: -15px;
+        top: 30%;
+        width: 8px;
+        height: 8px;
+        border-radius: 50%;
+      }
+      .dot1::before {
+        background: rgba(29, 111, 233, 1);
+      }
+      .dot2::before {
+        background: rgba(245, 95, 78, 1);
+      }
+      .dot3::before {
+        background: rgba(255, 141, 26, 1);
+      }
+    }
+  }
+  .content {
+    width: 100%;
+    height: 700px;
+    .time-cell {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: space-between;
+      position: relative;
+      .status {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        position: absolute;
+        right: 0;
+        top: 0;
+        .flex-r {
+          width: 100%;
+          display: flex;
+          flex-direction: row;
+          justify-content: center;
+          margin-top: -14px;
+        }
+      }
+      .flex-c {
+        top: 40%;
+        height: 60%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        .row {
+          display: flex;
+          flex-direction: row;
+          justify-content: center;
+          align-items: baseline;
+          font-size: 12px;
+          border-radius: 4px;
+          padding: 3px 8px;
+        }
+        .normal {
+          color: rgba(64, 158, 255, 1);
+          background: rgba(236, 245, 255, 1);
+          border: 1px solid rgba(64, 158, 255, 1);
+        }
+        .abnormal1 {
+          color: rgba(255, 141, 26, 1);
+          background: rgba(255, 246, 237, 1);
+          border: 1px solid rgba(64, 158, 255, 1);
+        }
+        .abnormal2 {
+          color: rgba(255, 141, 26, 1);
+          background: rgba(255, 246, 237, 1);
+          border: 1px solid rgba(255, 141, 26, 1);
+        }
+        .abnormal3 {
+          color: rgb(245, 95, 78);
+          background: rgba(255, 246, 237, 1);
+          border: 1px solid rgb(245, 95, 78);
+        }
+      }
+      .circle {
+        width: 7px;
+        height: 7px;
+        border-radius: 50%;
+        margin: 0 2px;
+      }
+      .status1 {
+        background: rgba(29, 111, 233, 1);
+      }
+      .status2 {
+        background: rgba(245, 95, 78, 1);
+      }
+      .status3 {
+        background: rgba(255, 141, 26, 1);
+      }
+    }
+
+    .flex-c {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      position: relative;
+      .time {
+        position: absolute;
+        z-index: 10;
+        right: 0;
+        top: 0;
+      }
+      > img {
+        width: 50%;
+        height: 50%;
+      }
+      > span {
+        font-size: 12px;
+        color: rgba(204, 204, 204, 1);
+        padding-top: 5px;
+      }
+    }
+  }
+
+  :deep(.el-calendar) {
+    --el-calendar-cell-width: 110px;
+  }
+  :deep(.el-calendar__header) {
+    padding: 12px 5px;
+  }
+  :deep(.el-calendar__body) {
+    max-height: 635px;
+    overflow: auto;
+  }
+  :deep(.el-dialog__body) {
+    max-height: calc(90vh - 0px) !important;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+}
+</style>
diff --git a/src/views/project/attendance/index.vue b/src/views/project/attendance/index.vue
index b99239a..afdd998 100644
--- a/src/views/project/attendance/index.vue
+++ b/src/views/project/attendance/index.vue
@@ -4,12 +4,13 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="人员姓名" prop="userName">
-              <el-input v-model="queryParams.userName" placeholder="请输入人员姓名" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="人员姓名" prop="fuzzyQuery">
+              <el-input v-model="queryParams.fuzzyQuery" placeholder="请输入人员姓名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="班组" prop="teamId">
-              <el-select v-model="queryParams.teamId" placeholder="全部" clearable>
-                <el-option v-for="dict in ProjectTeam" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select v-model="queryParams.teamId" clearable placeholder="全部">
+                <el-option label="全部" value="" />
+                <el-option v-for="item in TeamList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
             <el-form-item label="工种" prop="typeOfWork">
@@ -17,17 +18,16 @@
                 <el-option v-for="dict in type_of_work" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="打卡日期" prop="clockDate">
+            <el-form-item label="打卡日期" prop="dateStr">
               <el-date-picker
                 clearable
-                v-model="queryParams.clockDate"
+                v-model="queryParams.dateStr"
                 type="month"
                 value-format="YYYY-MM"
                 placeholder="请选择打卡日期"
                 @change="selectDate"
               />
             </el-form-item>
-
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -37,126 +37,46 @@
         </el-card>
       </div>
     </transition>
-    <el-row :gutter="20">
+    <!-- <el-row :gutter="20">
       <el-col :span="24" :offset="0">
         <el-card shadow="hover">
-          <!-- <template #header>
-            <PieChart style="width: 1em; height: 1em; vertical-align: middle" />
-            <span style="vertical-align: middle">命令统计</span>
-          </template> -->
           <div class="el-table el-table--enable-row-hover el-table--medium">
             <div ref="commandstats" style="height: 200px" />
           </div>
         </el-card>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-card shadow="never">
-      <!-- <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:attendance:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:attendance:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:attendance:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:attendance:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template> -->
-
+      <template #header>
+        <span>
+          <el-button type="primary" icon="MessageBox" @click="onExport">导出考勤列表</el-button>
+        </span>
+      </template>
       <el-table v-loading="loading" :data="attendanceList">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键id" align="center" prop="id" v-if="false" />
-        <el-table-column label="人员姓名" align="center" prop="userName" />
-        <el-table-column label="班组" align="center" prop="teamName" />
+        <el-table-column label="人员姓名" align="center" prop="UserName" />
+        <el-table-column label="班组" align="center" prop="TeamName" />
         <el-table-column label="工种" align="center" prop="typeOfWork">
           <template #default="scope">
-            <dict-tag :options="type_of_work" :value="scope.row.typeOfWork" />
+            <dict-tag :options="type_of_work" :value="scope.row.TypeOfWork" />
           </template>
         </el-table-column>
-        <el-table-column label="出勤(天)" align="center" prop="attendanceDays" />
-        <el-table-column label="迟到(次)" align="center" prop="lateDays" />
-        <el-table-column label="早退(次)" align="center" prop="leaveEarlyDays" />
-        <el-table-column label="缺卡(次)" align="center" prop="unClockDays" />
-        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="出勤(天)" align="center" prop="Attendance" />
+        <el-table-column label="迟到(次)" align="center" prop="BeLate" />
+        <el-table-column label="早退(次)" align="center" prop="LeaveEarly" />
+        <el-table-column label="缺卡(次)" align="center" prop="LackOfCard" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="primary" icon="View" @click="handleDetails(scope.row)" v-hasPermi="['project:attendance:edit']">详情</el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改考勤对话框 -->
-    <!-- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="attendanceFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="人员id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入人员id" />
-        </el-form-item>
-        <el-form-item label="人脸照" prop="facePic">
-          <image-upload v-model="form.facePic" />
-        </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="上班打卡时间" prop="onClockTime">
-          <el-date-picker clearable v-model="form.onClockTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择上班打卡时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="下班打卡时间" prop="offClockTime">
-          <el-date-picker clearable v-model="form.offClockTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择下班打卡时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="打卡日期" prop="clockDate">
-          <el-date-picker clearable v-model="form.clockDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择打卡日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="1正常,2迟到,3早退,4缺勤,5补卡" prop="clockStatus">
-          <el-radio-group v-model="form.clockStatus">
-            <el-radio v-for="dict in clock_status_type" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="代打人员id" prop="pinchUserId">
-          <el-input v-model="form.pinchUserId" placeholder="请输入代打人员id" />
-        </el-form-item>
-        <el-form-item label="多次打卡时间记录" prop="clockRecord">
-          <el-input v-model="form.clockRecord" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="上下班" prop="commuter">
-          <el-input v-model="form.commuter" placeholder="请输入上下班" />
-        </el-form-item>
-        <el-form-item label="日薪" prop="dailyWage">
-          <el-input v-model="form.dailyWage" placeholder="请输入日薪" />
-        </el-form-item>
-        <el-form-item label="经度" prop="lng">
-          <el-input v-model="form.lng" placeholder="请输入经度" />
-        </el-form-item>
-        <el-form-item label="纬度" prop="lat">
-          <el-input v-model="form.lat" placeholder="请输入纬度" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog> -->
     <!-- 考勤详情对话框 -->
-    <el-dialog v-model="dialog.details" width="1300px">
+    <!-- <el-dialog v-model="dialog.details" width="1300px">
       <el-calendar ref="calendar" v-model="calendarDay" class="h170 pos-relative">
         <template #header="{ date }">
           <span>
@@ -184,45 +104,61 @@
           </div>
         </template>
       </el-calendar>
+    </el-dialog> -->
+    <el-dialog title="导出考勤列表" width="30%" v-model="exportDialogVisible">
+      <el-form :model="exportForm" :rules="rules" ref="formRef" label-width="90px">
+        <el-form-item label="导出时间" prop="years">
+          <el-date-picker v-model="exportForm.years" type="month" value-format="YYYY-MM" placeholder="请选择导出时间" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" @click="onSubmit">导出</el-button>
+      </template>
     </el-dialog>
+    <detail ref="detailRef"></detail>
   </div>
 </template>
 
 <script setup name="Attendance" lang="ts">
-import {
-  listAttendance,
-  getAttendance,
-  delAttendance,
-  addAttendance,
-  updateAttendance,
-  listAttendanceTwoWeek,
-  listAttendanceMonth
-} from '@/api/project/attendance';
+import { addAttendance, updateAttendance, listAttendanceMonth } from '@/api/project/attendance';
 import { option } from '@/api/project/attendance/echarts';
 import * as echarts from 'echarts';
 import { AttendanceVO, AttendanceQuery, AttendanceForm, AttendanceTwoWeekVO, AttendanceMonthVO } from '@/api/project/attendance/types';
-import { listProjectTeam } from '@/api/project/projectTeam';
-import { ProjectTeamVO } from '@/api/project/projectTeam/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import { parseTime } from '@/utils/ruoyi';
 const commandstats = ref();
+import { pcSelectBelowProjectOfPersonnel, getSysProjectTeamList, pcCollectDataForTwoWeeks } from '@/api/project/goUser/index';
+import detail from './component/detail.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { clock_status_type, type_of_work } = toRefs<any>(proxy?.useDict('clock_status_type', 'type_of_work'));
-import type { CalendarDateType, CalendarInstance } from 'element-plus';
+const { type_of_work } = toRefs<any>(proxy?.useDict('clock_status_type', 'type_of_work'));
+import type { CalendarInstance } from 'element-plus';
+import { useExcelExport } from '@/utils/exportExcel';
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const ProjectTeam = computed(() => proxy?.$cache.local.getJSON('ProjectTeamList') || []);
+const exportDialogVisible = ref(false);
+const nowMonth = computed(() => {
+  // 获取当前日期
+  const today = new Date();
+
+  // 获取年份
+  const year = today.getFullYear();
+
+  // 获取月份（注意：getMonth()返回0-11，所以需要+1）
+  let month = today.getMonth() + 1;
 
+  // 月份补零处理
+  month = month < 10 ? '0' + month : month;
+
+  // 拼接成"YYYY-MM"格式
+  return `${year}-${month}`;
+});
 const attendanceList = ref<AttendanceVO[]>([]);
 const attendanceTwoWeekList = ref<AttendanceTwoWeekVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const calendarDay = ref<Date | null>(null);
 const monthValue = ref<Date | null>(null);
@@ -247,59 +183,67 @@ const month = now.getMonth() + 1;
 const currentYearMonth = `${year}-${month.toString().padStart(2, '0')}`;
 
 const echartsOption = ref<any>({});
-const initFormData: AttendanceForm = {
+const exportForm = reactive({
+  fuzzyQuery: undefined,
+  typeOfWork: undefined,
+  teamId: undefined,
+  projectId: currentProject.value.goId,
+  years: undefined,
+  dateStr: undefined
+});
+const initFormData: any = {
   id: undefined,
   userId: undefined,
   facePic: undefined,
   onClockTime: undefined,
   offClockTime: undefined,
-  clockDate: undefined,
+  dateStr: undefined,
   clockStatus: undefined,
   pinchUserId: undefined,
   clockRecord: undefined,
   commuter: undefined,
   dailyWage: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.goId,
   lng: undefined,
   lat: undefined,
   remark: undefined,
   typeOfWork: undefined,
   teamId: undefined
 };
-const data = reactive<PageData<AttendanceForm, AttendanceQuery>>({
+const data = reactive<PageData<AttendanceForm, any>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    userName: undefined,
-    clockDate: currentYearMonth,
-    clockStatus: undefined,
-    commuter: undefined,
-    projectId: currentProject.value?.id,
+    dateStr: nowMonth.value,
+    fuzzyQuery: undefined,
+    projectId: currentProject.value.goId,
     typeOfWork: undefined,
-    teamId: undefined,
-    params: {}
+    teamId: undefined
   },
   rules: {
     id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
     userId: [{ required: true, message: '人员id不能为空', trigger: 'blur' }],
     facePic: [{ required: true, message: '人脸照不能为空', trigger: 'blur' }],
     projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
-    clockDate: [{ required: true, message: '打卡日期不能为空', trigger: 'blur' }],
+    years: [{ required: true, message: '导出时间不能为空', trigger: 'blur' }],
     clockStatus: [{ required: true, message: '1正常,2迟到,3早退,4缺勤,5补卡不能为空', trigger: 'change' }]
   }
 });
+const TeamList = ref([]); //班组列表
 
 const day = computed(() => (date) => {
   return date.day.split('-').slice(1).join('-');
 });
 //是否打卡
 const isplayCard = computed(() => (date) => {
-  return calendarList.value.some((item) => item.clockDate == date.day);
+  console.log('🚀 ~ date:', date);
+
+  return calendarList.value.some((item) => item.PrintingDate == date.day);
 });
 //打卡时间下标
 const playCardIdx = computed(() => (date) => {
-  return calendarList.value.findIndex((item) => item.clockDate == date.day);
+  return calendarList.value.findIndex((item) => item.dateStr == date.day);
 });
 //上班时间
 const workTime = computed(() => (date) => {
@@ -313,7 +257,7 @@ const workFromTime = computed(() => (date) => {
 
 //考勤状态
 const attendanceStatus = computed(() => (date) => {
-  return calendarList.value[playCardIdx.value(date)].status;
+  return calendarList.value[playCardIdx.value(date)].Status;
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -336,7 +280,7 @@ const handleCalendarMonth = async (e?) => {
   }
 
   const res = await listAttendanceMonth({ userId: dialog.id, clockMonth });
-  calendarList.value = res.data;
+  calendarList.value = res.data.list || [];
 };
 
 /** 查看打卡记录详情 */
@@ -350,19 +294,20 @@ const handleViewPlayCard = async (data: any) => {
 /** 查询考勤列表 */
 const getList = async () => {
   loading.value = true;
-  try {
-    const res = await listAttendance(queryParams.value);
-    attendanceList.value = res.rows;
-    total.value = res.total;
-  } finally {
-    loading.value = false;
-  }
+  const res = await pcSelectBelowProjectOfPersonnel(queryParams.value);
+  attendanceList.value = res.data.list;
+  total.value = res.data.total;
+  loading.value = false;
+};
+// 获取班组
+const getTeamList = async () => {
+  const res = await getSysProjectTeamList({ pageNum: 1, pageSize: 1000, projectId: currentProject.value.goId });
+  TeamList.value = res.data.list;
 };
-
 /** 查询近两周考勤列表 */
 const getListTwoWeek = async () => {
   loading.value = true;
-  const res = await listAttendanceTwoWeek(queryParams.value);
+  const res = await pcCollectDataForTwoWeeks(queryParams.value);
   attendanceTwoWeekList.value = res.data;
   echartsOption.value = { ...option(attendanceTwoWeekList.value) };
   commandstatsIntance.value.setOption(echartsOption.value);
@@ -384,7 +329,7 @@ const reset = () => {
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-  getListTwoWeek();
+  // getListTwoWeek();
 };
 
 /** 重置按钮操作 */
@@ -413,12 +358,17 @@ const incrementMonth = (dateStr: string, monthsToAdd: number) => {
 };
 
 /** 详情按钮操作 */
+const detailRef = ref<any>();
 const handleDetails = async (row?: AttendanceVO) => {
-  const res = await listAttendanceMonth({ userId: row?.id });
-  calendarList.value = res.data;
-  dialog.details = true;
-  dialog.id = row?.id;
-  dialog.title = row?.userName || '';
+  detailRef.value.openDialog(toRaw(row));
+};
+
+const onExport = () => {
+  exportDialogVisible.value = true;
+  exportForm.teamId = queryParams.value.teamId;
+  exportForm.projectId = queryParams.value.projectId as string;
+  exportForm.typeOfWork = queryParams.value.typeOfWork;
+  exportForm.fuzzyQuery = queryParams.value.fuzzyQuery;
 };
 
 /** 提交按钮 */
@@ -438,51 +388,33 @@ const submitForm = () => {
   });
 };
 
-/** 删除按钮操作 */
-// const handleDelete = async (row?: AttendanceVO) => {
-//   const _ids = row?.id || ids.value;
-//   await proxy?.$modal.confirm('是否确认删除考勤编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-//   await delAttendance(_ids);
-//   proxy?.$modal.msgSuccess('删除成功');
-//   await getList();
-// };
-
-/** 导出按钮操作 */
-// const handleExport = () => {
-//   proxy?.download(
-//     'project/attendance/export',
-//     {
-//       ...queryParams.value
-//     },
-//     `attendance_${new Date().getTime()}.xlsx`
-//   );
-// };
 //初始化图表
 const init = () => {
   commandstatsIntance.value = echarts.init(commandstats.value, 'macarons');
 
   commandstatsIntance.value.on('click', function (params) {
-    queryParams.value.clockDate = params.name;
+    queryParams.value.dateStr = params.name;
     handleQuery();
   });
 };
-const onExport = () => {
-  try {
-    console.log(queryParams.value.clockDate);
-    proxy?.download(
-      'project/attendance/exportList',
-      { projectId: currentProject.value?.id, clockDate: queryParams.value.clockDate },
-      `考勤列表_${queryParams.value.clockDate}.xlsx`
-    );
-  } catch (error) {
-    ElMessage.error('导出失败，请重试');
-    console.error('文件导出错误：', error);
-  }
+const formRef = ref<HTMLElement | null>(null);
+const onSubmit = () => {
+  const formWrap = unref(formRef) as any;
+  if (!formWrap) return;
+  formWrap.validate((valid: boolean) => {
+    if (valid) {
+      exportForm.dateStr = exportForm.years;
+      console.log('🚀 ~ onSubmit ~ exportForm:', exportForm);
+      useExcelExport().exportExcel(exportForm, proxy, '考勤列表');
+    }
+  });
 };
+
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
+    getTeamList();
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
     getList();
@@ -490,13 +422,15 @@ const listeningProject = watch(
 );
 
 onUnmounted(() => {
+  getTeamList();
   listeningProject();
 });
 
 onMounted(() => {
+  getTeamList();
   getList();
-  getListTwoWeek();
-  init();
+  // getListTwoWeek();
+  // init();
 });
 </script>
 
diff --git a/src/views/project/attendanceRecords/index.vue b/src/views/project/attendanceRecords/index.vue
index 51ba004..dc77189 100644
--- a/src/views/project/attendanceRecords/index.vue
+++ b/src/views/project/attendanceRecords/index.vue
@@ -8,18 +8,12 @@
               <el-input v-model="queryParams.userName" placeholder="请输入人员姓名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="班组" prop="teamId">
-              <el-select v-model="queryParams.teamId" placeholder="全部" clearable>
-                <el-option v-for="dict in ProjectTeam" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="打卡日期" prop="clockDate">
-              <el-date-picker clearable v-model="queryParams.clockDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择打卡日期" />
-            </el-form-item>
-            <el-form-item label="考勤状态" prop="clockStatus">
-              <el-select v-model="queryParams.clockStatus" placeholder="全部" clearable>
-                <el-option v-for="dict in clock_status_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select v-model="queryParams.teamId" clearable placeholder="全部">
+                <el-option label="全部" value="" />
+                <el-option v-for="item in TeamList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
+
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -49,9 +43,9 @@
             <dict-tag :options="commuter_type" :value="scope.row.commuter" />
           </template>
         </el-table-column>
-        <el-table-column label="打卡日期" align="center" prop="clockDate">
+        <el-table-column label="打卡日期" align="center" prop="printingDate">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.clockDate, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.printingDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="打卡时间" align="center" prop="clockTime">
@@ -69,29 +63,17 @@
 </template>
 
 <script setup name="Attendance" lang="ts">
-import { listAttendance, getAttendance, delAttendance, addAttendance, updateAttendance } from '@/api/project/attendanceRecords';
 import { AttendanceVO, AttendanceQuery, AttendanceForm } from '@/api/project/attendanceRecords/types';
-import { listProjectTeam } from '@/api/project/projectTeam';
-import { ProjectTeamVO } from '@/api/project/projectTeam/types';
 import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { clock_status_type, commuter_type } = toRefs<any>(proxy?.useDict('clock_status_type', 'commuter_type'));
+import { busAttendancepCList, getSysProjectTeamList } from '@/api/project/goUser/index';
 
 const attendanceList = ref<AttendanceVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
-const attendanceFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -102,7 +84,7 @@ const initFormData: AttendanceForm = {
   id: undefined,
   userId: undefined,
   facePic: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value?.goId,
   onClockTime: undefined,
   offClockTime: undefined,
   clockDate: undefined,
@@ -121,7 +103,7 @@ const data = reactive<PageData<AttendanceForm, AttendanceQuery>>({
     pageNum: 1,
     pageSize: 10,
     userName: undefined,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value?.goId,
     clockDate: undefined,
     clockStatus: undefined,
     commuter: undefined,
@@ -137,18 +119,22 @@ const data = reactive<PageData<AttendanceForm, AttendanceQuery>>({
     clockStatus: [{ required: true, message: '1正常,2迟到,3早退,4缺勤,5补卡不能为空', trigger: 'change' }]
   }
 });
-
+const TeamList = ref([]); //班组列表
 const { queryParams, form, rules } = toRefs(data);
 
 /** 查询考勤列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listAttendance(queryParams.value);
-  attendanceList.value = res.rows;
-  total.value = res.total;
+  const res = await busAttendancepCList(queryParams.value);
+  attendanceList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
-
+// 获取班组
+const getTeamList = async () => {
+  const res = await getSysProjectTeamList({ pageNum: 1, pageSize: 1000, projectId: currentProject.value.goId });
+  TeamList.value = res.data.list;
+};
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -163,10 +149,11 @@ const resetQuery = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
+    getTeamList();
     getList();
   }
 );
@@ -176,6 +163,7 @@ onUnmounted(() => {
 });
 
 onMounted(() => {
+  getTeamList();
   getList();
 });
 </script>
diff --git a/src/views/project/busSalaryDetails/component/add.vue b/src/views/project/busSalaryDetails/component/add.vue
new file mode 100644
index 0000000..eb3be2d
--- /dev/null
+++ b/src/views/project/busSalaryDetails/component/add.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="system-busSalaryDetails-add">
+    <!-- 添加或修改员工工资考核记录对话框 -->
+    <el-dialog v-model="isShowDialog" width="600px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.system-busSalaryDetails-add .el-dialog', '.system-busSalaryDetails-add .el-dialog__header']">添加员工工资考核记录</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="90px">
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="户名" prop="name">
+              <el-input v-model="formData.name" placeholder="请输入户名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="身份证" prop="sfzNumber">
+              <el-input v-model="formData.sfzNumber" placeholder="请输入身份证" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="账户" prop="account">
+              <el-input v-model="formData.account" placeholder="请输入账户" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="当月总时长" prop="sumDuration">
+              <el-input v-model="formData.sumDuration" type="number" placeholder="请输入当月总时长" /> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="薪水（天）" prop="salary"> <el-input v-model="formData.salary" placeholder="请输入薪水（天）" /> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="项目" prop="projectId"> <el-input v-model="formData.projectId" placeholder="请输入项目" /> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="班组" prop="teamId"> <el-input v-model="formData.teamId" placeholder="请输入班组" /> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="发放年月" prop="dateOfIssue"> <el-input v-model="formData.dateOfIssue" placeholder="请输入发放年月" /> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="制表人" prop="lister"> <el-input v-model="formData.lister" placeholder="请输入制表人" /> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance, UploadProps } from 'element-plus';
+import {
+  listBusSalaryDetails,
+  getBusSalaryDetails,
+  delBusSalaryDetails,
+  addBusSalaryDetails,
+  updateBusSalaryDetails
+} from '@/api/project/busSalaryDetails';
+import { BusSalaryDetailsTableColumns, BusSalaryDetailsInfoData, BusSalaryDetailsTableDataState, BusSalaryDetailsEditState } from './model';
+export default defineComponent({
+  name: 'apiV1SystemBusSalaryDetailsEdit',
+  components: {},
+  props: {},
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const state = reactive<BusSalaryDetailsEditState>({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        id: undefined,
+        sfzNumber: undefined,
+        name: undefined,
+        account: undefined,
+        sumDuration: undefined,
+        salary: undefined,
+        projectId: undefined,
+        teamId: undefined,
+        projectName: undefined,
+        teamName: undefined,
+        dateOfIssue: undefined,
+        lister: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined
+      },
+      // 表单校验
+      rules: {}
+    });
+    // 打开弹窗
+    const openDialog = () => {
+      resetForm();
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 提交
+    const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          state.loading = true;
+          //添加
+          addBusSalaryDetails(state.formData)
+            .then(() => {
+              ElMessage.success('添加成功');
+              closeDialog(); // 关闭弹窗
+              emit('busSalaryDetailsList');
+            })
+            .finally(() => {
+              state.loading = false;
+            });
+        }
+      });
+    };
+    const resetForm = () => {
+      state.formData = {
+        id: undefined,
+        sfzNumber: undefined,
+        name: undefined,
+        account: undefined,
+        sumDuration: undefined,
+        salary: undefined,
+        projectId: undefined,
+        teamId: undefined,
+        projectName: undefined,
+        teamName: undefined,
+        dateOfIssue: undefined,
+        lister: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+        deletedAt: undefined
+      };
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      menuRef,
+      formRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped lang="scss">
+//
+.system-busSalaryDetails-add {
+  .el-col {
+    margin: 10px 0 !important;
+  }
+}
+</style>
diff --git a/src/views/project/busSalaryDetails/component/detail.vue b/src/views/project/busSalaryDetails/component/detail.vue
index db5d506..ae82797 100644
--- a/src/views/project/busSalaryDetails/component/detail.vue
+++ b/src/views/project/busSalaryDetails/component/detail.vue
@@ -20,7 +20,7 @@
 </template>
 <script lang="ts">
 import { reactive, toRefs, defineComponent, ref, getCurrentInstance } from 'vue';
-// import { getByIdDetail } from '@/api/project/busSalaryDetails';
+import { getByIdDetail } from '@/api/project/busSalaryDetails';
 import { BusSalaryDetailsEditState } from './model';
 export default defineComponent({
   name: 'index',
@@ -49,13 +49,13 @@ export default defineComponent({
     // 获取列表
     const getList = () => {
       state.loading = true;
-      // getByIdDetail(state.formData).then((res: any) => {
-      //   state.loading = false;
-      //   if (res.code == 0 && res.data.list) {
-      //     state.tableData = res.data.list.reverse();
-      //     state.total = res.data.total;
-      //   }
-      // });
+      getByIdDetail(state.formData).then((res: any) => {
+        state.loading = false;
+        if (res.code == 0 && res.data.list) {
+          state.tableData = res.data.list.reverse();
+          state.total = res.data.total;
+        }
+      });
     };
     // 关闭弹窗
     const closeDialog = () => {
diff --git a/src/views/project/busSalaryDetails/component/model.ts b/src/views/project/busSalaryDetails/component/model.ts
index 5c91f14..3cccb65 100644
--- a/src/views/project/busSalaryDetails/component/model.ts
+++ b/src/views/project/busSalaryDetails/component/model.ts
@@ -39,7 +39,7 @@ export interface BusSalaryDetailsTableDataState {
       pageSize: number;
       id: number | undefined;
       sfzNumber: string | undefined;
-      projectId: string | undefined;
+      projectId: number | undefined;
       teamId: number | undefined;
       dateRange: string[];
     };
diff --git a/src/views/project/busSalaryDetails/index.vue b/src/views/project/busSalaryDetails/index.vue
index 7192689..57b2199 100644
--- a/src/views/project/busSalaryDetails/index.vue
+++ b/src/views/project/busSalaryDetails/index.vue
@@ -3,80 +3,100 @@
     <el-card shadow="hover">
       <div class="system-busSalaryDetails-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
-          <el-form-item label="姓名" prop="userName">
-            <el-input v-model="tableData.param.userName" placeholder="请输入姓名" clearable @keyup.enter.native="busSalaryDetailsList" />
-          </el-form-item>
-
-          <el-form-item label="项目选择" prop="projectId">
-            <el-select v-model="tableData.param.projectId" placeholder="请选择项目" @change="onChangeProject">
-              <el-option v-for="(item, i) in projectList" :key="i" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="班组选择" prop="teamId">
-            <el-select v-model="tableData.param.teamId" @change="onChangeTeam" :disabled="!tableData.param.projectId" placeholder="请选择班组">
-              <el-option v-for="(item, i) in TeamList" :key="i" :label="item.teamName" :value="item.id" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="发放年月" prop="time">
-            <el-date-picker v-model="tableData.param.time" @change="onChangeOfIssue" value-format="YYYY-MM" type="month" placeholder="选择月份" />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="busSalaryDetailsList">
-              <el-icon><Search /></el-icon>搜索
-            </el-button>
-            <el-button @click="resetQuery(queryRef)">
-              <el-icon><Refresh /></el-icon>重置
-            </el-button>
-          </el-form-item>
-
-          <!-- <el-button type="danger" :disabled="multiple" @click="handleDelete(null)" v-auth="'api/v1/system/busSalaryDetails/delete'">
-            <el-icon><Delete /></el-icon>批量删除
-          </el-button> -->
-
-          <el-button type="success" @click="exportSalary(null)">
-            <el-icon><Download /></el-icon>导出员工工资表
-          </el-button>
+          <el-row>
+            <el-col :span="1.5" class="colBlock">
+              <el-form-item label="身份证" prop="sfzNumber">
+                <el-input v-model="tableData.param.sfzNumber" placeholder="请输入身份证" clearable @keyup.enter.native="busSalaryDetailsList" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="项目选择" prop="projectId">
+                <el-select v-model="tableData.param.projectId" placeholder="请选择项目" @change="onChangeProject">
+                  <el-option v-for="(item, i) of projectList" :key="i" :label="item.shortName" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="班组选择" prop="teamId">
+                <el-select v-model="tableData.param.teamId" @change="onChangeTeam" :disabled="!tableData.param.projectId" placeholder="请选择班组">
+                  <el-option v-for="(item, i) of TeamList" :key="i" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="发放年月" prop="dateOfIssue">
+                <el-date-picker
+                  v-model="tableData.param.dateOfIssue"
+                  @change="onChangeOfIssue"
+                  value-format="YYYY-MM"
+                  type="month"
+                  placeholder="选择月份"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item>
+                <el-button type="primary" @click="busSalaryDetailsList"
+                  ><el-icon><Search /></el-icon>搜索</el-button
+                >
+                <el-button @click="resetQuery(queryRef)"
+                  ><el-icon><Refresh /></el-icon>重置</el-button
+                >
+              </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <el-button type="danger" :disabled="multiple" @click="handleDelete(null)" v-auth="'api/v1/system/busSalaryDetails/delete'"
+                ><el-icon><Delete /></el-icon>批量删除</el-button
+              >
+            </el-col>
+            <el-col :span="2">
+              <span>
+                <label for="file" class="input-button" title="选择您的excel表格进行上传">导入考勤表格</label>
+                <input type="file" id="file" placeholder="选择文件2" />
+              </span>
+            </el-col>
+            <el-col :span="2">
+              <el-button type="success" @click="exportSalary(null)"
+                ><el-icon><Download /></el-icon>导出员工工资表</el-button
+              ></el-col
+            >
+          </el-row>
         </el-form>
       </div>
       <el-table v-loading="loading" border height="72vh" :data="tableData.data" @selection-change="handleSelectionChange">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" min-width="50px" />
         <el-table-column label="身份证" align="center" prop="sfzNumber" min-width="120px" />
-        <el-table-column label="户名" align="center" prop="userName" min-width="100px" />
-        <el-table-column label="账户" align="center" prop="yhkNumber" min-width="100px" />
-        <el-table-column label="开户行" align="center" prop="yhkOpeningBank" min-width="100px" />
-        <el-table-column label="当月总天数" align="center" prop="workDay" min-width="100px" />
+        <el-table-column label="户名" align="center" prop="name" min-width="100px" />
+        <el-table-column label="账户" align="center" prop="account" min-width="100px" />
+        <el-table-column label="当月总天数" align="center" prop="sumDuration" min-width="100px" />
         <el-table-column label="薪水（天）" align="center" prop="salary" min-width="100px" />
-        <!-- <el-table-column label="发放年月" align="center" prop="dateOfIssue" min-width="100px" /> -->
-        <el-table-column label="总额（元）" align="center" min-width="100px" prop="totalSalary" />
-        <!-- <template #default="scope">
+        <el-table-column label="发放年月" align="center" prop="dateOfIssue" min-width="100px" />
+        <!-- <el-table-column label="制表人" align="center" prop="lister" min-width="100px" /> -->
+        <el-table-column label="总额（元）" align="center" prop="" min-width="100px">
+          <template #default="scope">
             <span>{{ (Number(scope.row.sumDuration) * Number(scope.row.salary)).toFixed(2) }}</span>
           </template>
-        </el-table-column> -->
-        <el-table-column label="上传时间" align="center" prop="time" min-width="100px">
+        </el-table-column>
+        <el-table-column label="上传时间" align="center" prop="createdAt" min-width="100px">
           <template #default="scope">
-            <span>{{ scope.row.time }}</span>
+            <span>{{ scope.row.createdAt }}</span>
           </template>
         </el-table-column>
-
-        <!-- <el-table-column label="操作" align="center" min-width="200px" fixed="right">
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="200px" fixed="right">
           <template #default="scope">
-            <el-button type="primary" link @click="handleView(scope.row)" v-auth="'api/v1/system/busSalaryDetails/view'">
-              <el-icon><View /></el-icon>详情
-            </el-button>
-            <el-button type="success" link @click="exportSalary(scope.row)">
-              <el-icon><Download /></el-icon>导出工资表
-            </el-button>
-            <el-button type="danger" link @click="handleDelete(scope.row)" v-auth="'api/v1/system/busSalaryDetails/delete'">
-              <el-icon><DeleteFilled /></el-icon>删除
-            </el-button>
+            <el-button type="primary" link @click="handleView(scope.row)" v-auth="'api/v1/system/busSalaryDetails/view'"
+              ><el-icon><View /></el-icon>详情</el-button
+            >
+            <el-button type="success" link @click="exportSalary(scope.row)"
+              ><el-icon><Download /></el-icon>导出工资表</el-button
+            >
+            <el-button type="danger" link @click="handleDelete(scope.row)" v-auth="'api/v1/system/busSalaryDetails/delete'"
+              ><el-icon><DeleteFilled /></el-icon>删除</el-button
+            >
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
-
       <pagination
         v-show="tableData.total > 0"
         :total="tableData.total"
@@ -85,183 +105,467 @@
         @pagination="busSalaryDetailsList"
       />
     </el-card>
-
-    <apiV1SystemBusSalaryDetailsDetail ref="detailRef" @busSalaryDetailsList="busSalaryDetailsList" />
+    <apiV1SystemBusSalaryDetailsAdd ref="addRef" @busSalaryDetailsList="busSalaryDetailsList"></apiV1SystemBusSalaryDetailsAdd>
+    <apiV1SystemBusSalaryDetailsEdit ref="editRef" @busSalaryDetailsList="busSalaryDetailsList"></apiV1SystemBusSalaryDetailsEdit>
+    <apiV1SystemBusSalaryDetailsDetail ref="detailRef" @busSalaryDetailsList="busSalaryDetailsList"></apiV1SystemBusSalaryDetailsDetail>
   </div>
 </template>
-
-<script setup lang="ts">
-import { ref, reactive, computed, onMounted, getCurrentInstance } from 'vue';
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, computed, getCurrentInstance, toRaw } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance, ElLoading } from 'element-plus';
+import { listBusSalaryDetails, delBusSalaryDetails, addBusSalaryDetails, salarySheet } from '@/api/project/busSalaryDetails';
+import { BusSalaryDetailsTableColumns, BusSalaryDetailsTableDataState } from './component/model';
+import apiV1SystemBusSalaryDetailsAdd from './component/add.vue';
+import apiV1SystemBusSalaryDetailsEdit from './component/edit.vue';
 import apiV1SystemBusSalaryDetailsDetail from './component/detail.vue';
 import * as xlsx from 'xlsx';
+
+import { exportDataToExcel } from '@/utils/exportDataToExcel.js';
 import { useUserStoreHook } from '@/store/modules/user';
 import { listProjectTeam } from '@/api/project/projectTeam';
-import { listBusSalaryDetails } from '@/api/project/busSalaryDetails';
-import { downloadGet } from '@/utils/request';
-// import { listProjectTeam } from '@/api/project/projectTeam'
-// import { exportDataToExcel } from '@/utils/exportDataToExcel.js'
-
-const stores = useUserStoreHook();
-const { proxy }: any = getCurrentInstance();
-
-const loading = ref(false);
-const queryRef = ref<FormInstance>();
-const detailRef = ref();
-
-// 状态变量
-const showAll = ref(false);
-const single = ref(true);
-const multiple = ref(true);
-
-const word = computed(() => (showAll.value ? '收起搜索' : '展开搜索'));
-
-// 数据源
-const projectList = computed(() => stores.projects);
-const projectListMap = new Map();
-const TeamList = ref([]);
-
-const tableData = reactive({
-  data: [] as any[],
-  total: 0,
-  loading: false,
-  param: {
-    pageNum: 1,
-    pageSize: 10,
-    userName: undefined,
-    projectId: stores.selectedProject.id,
-    teamId: undefined,
-    dateRange: [] as any[],
-    time: proxy.parseTime(new Date(), '{y}-{m}')
-  }
-});
-
-// 页面初始化
-onMounted(() => {
-  busSalaryDetailsList();
-  sysListSysProjectTeam(tableData.param.projectId);
-});
-
-// ---------------- 事件方法 ----------------
-const onChangeProject = (val: string) => {
-  sysListSysProjectTeam(val);
-  tableData.param.teamId = '';
-  busSalaryDetailsList();
-};
-
-const onChangeTeam = () => {
-  busSalaryDetailsList();
-};
-
-const onChangeOfIssue = () => {
-  busSalaryDetailsList();
-};
-
-// 获取班组列表
-const sysListSysProjectTeam = (projectId: string) => {
-  listProjectTeam({ pageNum: 1, pageSize: 1000, projectId }).then((res: any) => {
-    const list = res.rows ?? [];
-    TeamList.value = list;
-    // if (list.length) {
-    //   tableData.param.teamId = list[0].id;
-    //   busSalaryDetailsList();
-    // }
-  });
-};
-
-// 上传excel解析
-const onChange = async (file: File) => {
-  const dataBinary: any = await new Promise((resolve) => {
-    const reader = new FileReader();
-    reader.readAsBinaryString(file);
-    reader.onload = (ev) => resolve(ev.target?.result);
-  });
-
-  const workBook = xlsx.read(dataBinary, { type: 'binary', cellDates: true });
-  const arr: any[] = [];
-
-  workBook.SheetNames.forEach((name) => {
-    const sheet = workBook.Sheets[name];
-    arr.push(xlsx.utils.sheet_to_json(sheet));
-  });
-
-  const dataList: any[] = [];
-  arr.forEach((item) => {
-    // 解析逻辑保持不变...
-  });
-
-  const loadingInstance = ElLoading.service({ lock: true, text: '正在上传中……', background: 'rgba(0,0,0,0.7)' });
-  if (dataList.length) {
-    // addBusSalaryDetails({ dataList }).then(...)
-  } else {
-    ElMessage.warning('表格数据为空');
-  }
-  loadingInstance.close();
-};
-
-const resetQuery = (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  formEl.resetFields();
-  busSalaryDetailsList();
-  sysListSysProjectTeam(tableData.param.projectId);
-};
-
-const busSalaryDetailsList = () => {
-  loading.value = true;
-  try {
-    listBusSalaryDetails(tableData.param).then((res: any) => {
-      tableData.data = res.rows ?? [];
-      tableData.total = res.total;
+import { listProject, listProjectGo } from '@/api/project/project';
+export default defineComponent({
+  name: 'index',
+  components: {
+    apiV1SystemBusSalaryDetailsAdd,
+    apiV1SystemBusSalaryDetailsEdit,
+    apiV1SystemBusSalaryDetailsDetail
+  },
+  setup() {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const loading = ref(false);
+    const queryRef = ref();
+    const addRef = ref();
+    const editRef = ref();
+    const detailRef = ref();
+    // 是否显示所有搜索选项
+    const showAll = ref(false);
+    // 非单个禁用
+    const single = ref(true);
+    // 非多个禁用
+    const multiple = ref(true);
+    const word = computed(() => {
+      if (showAll.value === false) {
+        //对文字进行处理
+        return '展开搜索';
+      } else {
+        return '收起搜索';
+      }
     });
-  } finally {
-    loading.value = false;
-  }
-};
-
-const toggleSearch = () => {
-  showAll.value = !showAll.value;
-};
-
-const handleDelete = (row: any) => {
-  let msg = row ? '此操作将永久删除数据，是否继续?' : '你确定要删除所选数据？';
-  const id = row ? [row.id] : (tableData.data.filter((d) => d.checked).map((d) => d.id) as number[]);
-
-  if (!id.length) {
-    ElMessage.error('请选择要删除的数据。');
-    return;
-  }
-
-  ElMessageBox.confirm(msg, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' })
-    .then(() => {
-      // delBusSalaryDetails(id).then(...)
-    })
-    .catch(() => {});
-};
-
-const handleView = (row: any) => {
-  detailRef.value.openDialog(row);
-};
-
-const exportSalary = (row: any) => {
-  if (!tableData.data.length) {
-    proxy?.$modal.msgError('当前不存在员工工资数据');
-    return;
+    // 字典选项数据
+    const {} = proxy.useDict();
+    const state = reactive<BusSalaryDetailsTableDataState>({
+      ids: [],
+      projectList: [], //项目列表
+      projectListMap: new Map(),
+      TeamList: [], //班组列表
+      TeamListMap: new Map(), //班组列表
+      tableData: {
+        data: [],
+        total: 0,
+        loading: false,
+        param: {
+          pageNum: 1,
+          pageSize: 10,
+          sfzNumber: undefined,
+          projectId: stores.selectedProject.goId,
+          teamId: undefined,
+          dateRange: [],
+          dateOfIssue: proxy.parseTime(new Date(), '{y}-{m}') //默认当前工作年月
+        }
+      }
+    });
+    // 页面加载时
+    onMounted(() => {
+      initTableData();
+      sysProjectList();
+      document.querySelector('#file').addEventListener('change', function () {
+        //获取到选中的文件
+        var file = document.querySelector('#file').files[0];
+        onChange(file);
+      });
+      sysListSysProjectTeam(state.tableData.param.projectId); //默认项目
+    });
+    const onChangeProject = (val) => {
+      sysListSysProjectTeam(val);
+      // 切换项目后 班组默认未空
+      state.tableData.param.teamId = '';
+      // 获取数据
+      busSalaryDetailsList();
+    };
+    // 班组切换
+    const onChangeTeam = (val) => {
+      busSalaryDetailsList();
+    };
+    const onChangeOfIssue = () => {
+      busSalaryDetailsList();
+    };
+    // 获取项目列表数据
+    const sysProjectList = () => {
+      listProjectGo({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
+        let list = res.data.list ?? [];
+        if (list.length) {
+          state.projectList = list;
+          list.forEach((item) => {
+            state.projectListMap.set(item.id, item.shortName);
+          });
+        }
+      });
+    };
+    // 获取班组列表
+    const sysListSysProjectTeam = (projectId) => {
+      listProjectTeam({ pageNum: 1, pageSize: 1000, projectId }).then((res: any) => {
+        let list = res.data.list ?? [];
+        if (list.length) {
+          state.TeamList = list;
+          list.forEach((item) => {
+            state.TeamListMap.set(item.id, item.name);
+          });
+        }
+      });
+    };
+    const onChange = async (file) => {
+      /**
+       * 1. 使用原生api去读取好的文件
+       * */
+      // console.log("原始上传的文件", file);
+      // 读取文件不是立马能够读取到的，所以是异步的，使用Promise
+      let dataBinary = await new Promise((resolve) => {
+        // Web API构造函数FileReader，可实例化对象，去调用其身上方法，去读取解析文件信息
+        let reader = new FileReader(); // https://developer.mozilla.org/zh-CN/docs/Web/API/FileReader
+        // console.log("实例化对象有各种方法", reader);
+        reader.readAsBinaryString(file); // 读取raw的File文件
+        reader.onload = (ev) => {
+          // console.log("文件解析流程进度事件", ev);
+          resolve(ev.target.result); // 将解析好的结果扔出去，以供使用
+        };
+      });
+      // console.log("读取出的流文件", dataBinary);
+      /**
+       * 2. 使用xlsx插件去解析已经读取好的二进制excel流文件
+       * */
+      let workBook = xlsx.read(dataBinary, { type: 'binary', cellDates: true });
+      // excel中有很多的sheet，这里取了第一个sheet：workBook.SheetNames[0]
+      let arr = [];
+      workBook.SheetNames.forEach((item) => {
+        let firstWorkSheet = workBook.Sheets[item];
+        const data = xlsx.utils.sheet_to_json(firstWorkSheet);
+        arr.push(data);
+      });
+      let dataList = []; //需提交数据
+      arr.forEach((item, i) => {
+        //截取数据
+        // 获取制表人
+        let detailObj = {};
+        let lister = ''; //制表人 单独读取
+        let listerObj = item[item.length - 3];
+        let year = 0; //年
+        let month = 0; //月
+        for (let key in listerObj) {
+          if (key.indexOf('建筑施工') != -1) {
+            //是否包含
+            lister = listerObj[key].substring(4).trim();
+            // 获取年月
+            let index = key.indexOf('年');
+            let index1 = key.indexOf('（');
+            month = parseInt(key.substring(index + 1, index + 10));
+            year = parseInt(key.substring(index1 + 1, index));
+          }
+        }
+        // 获取人员信息
+        let arr1 = item.slice(2, -3);
+        month = month < 10 ? '0' + month : month;
+        if (arr1.length) {
+          arr1.forEach((item) => {
+            let dates = []; //用户信息
+            let name = item.__EMPTY; //用户名
+            let sfzNumber = item.__EMPTY_1; //身份证
+            let sumDuration = 0; //工作总时长
+            let dateOfIssue = year + '-' + month; //发放年月
+            let days = new Date(year, month, 0).getDate();
+            for (let key in item) {
+              let ind = key.split('_')[3];
+              if (ind > 1 && ind <= days + 1) {
+                //后面数据
+                let working_date = ind - 1 < 10 ? '0' + (ind - 1) : ind - 1;
+                let obj = { working_date: working_date.toString(), duration: item[key] };
+                dates.push(obj);
+                sumDuration += item[key];
+              }
+            }
+            detailObj = {
+              //用户
+              lister,
+              dates,
+              name,
+              sfzNumber,
+              dateOfIssue,
+              sumDuration
+            };
+            dataList.push(detailObj);
+          });
+        }
+      });
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在上传中……',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      if (dataList.length) {
+        addBusSalaryDetails({ dataList }).then((res: any) => {
+          loading.close();
+          if (res.code == 0) {
+            ElMessage.success('上传成功');
+            busSalaryDetailsList();
+          } else {
+            ElMessage.error(res.message);
+          }
+        });
+      } else {
+        ElMessage.warning('表格数据为空');
+      }
+      event.target.value = '';
+    };
+    // 初始化表格数据
+    const initTableData = () => {
+      busSalaryDetailsList();
+    };
+    /** 重置按钮操作 */
+    const resetQuery = (formEl: FormInstance | undefined) => {
+      if (!formEl) return;
+      formEl.resetFields();
+      busSalaryDetailsList();
+    };
+    // 获取列表数据
+    const busSalaryDetailsList = () => {
+      loading.value = true;
+      listBusSalaryDetails(state.tableData.param).then((res: any) => {
+        let list = res.data.list ?? [];
+        state.tableData.data = list;
+        state.tableData.total = res.data.total;
+        loading.value = false;
+      });
+    };
+    const toggleSearch = () => {
+      showAll.value = !showAll.value;
+    };
+    const handleDelete = (row: BusSalaryDetailsTableColumns) => {
+      let msg = '你确定要删除所选数据？';
+      let id: number[] = [];
+      if (row) {
+        msg = `此操作将永久删除数据，是否继续?`;
+        id = [row.id];
+      } else {
+        id = state.ids;
+      }
+      if (id.length === 0) {
+        ElMessage.error('请选择要删除的数据。');
+        return;
+      }
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          delBusSalaryDetails(id).then(() => {
+            ElMessage.success('删除成功');
+            busSalaryDetailsList();
+          });
+        })
+        .catch(() => {});
+    };
+    const handleView = (row: BusSalaryDetailsTableColumns) => {
+      detailRef.value.openDialog(toRaw(row));
+    };
+    const exportSalary = (row) => {
+      // 导出工资表
+      let obj = {};
+      let fileName = '';
+      let year = '';
+      let month = '';
+      let porjectName = '';
+      if (row) {
+        //个人
+        obj = {
+          project: state.tableData.param.projectId, //项目id
+          dateOfIssue: row.dateOfIssue, //工作年月
+          team: '', //班组id
+          sfzNumber: row.sfzNumber //施工人员身份证
+        };
+        year = obj.dateOfIssue.split('-')[0];
+        month = obj.dateOfIssue.split('-')[1];
+        fileName = row.name + '-' + year + '年' + month + '月工资表.xlsx';
+      } else {
+        // 导出工资表
+        obj = {
+          project: state.tableData.param.projectId,
+          dateOfIssue: state.tableData.param.dateOfIssue,
+          team: state.tableData.param.teamId,
+          sfzNumber: '' //施工人员身份证
+        };
+        porjectName = state.projectListMap.get(state.tableData.param.projectId);
+        year = obj.dateOfIssue.split('-')[0];
+        month = obj.dateOfIssue.split('-')[1];
+        if (state.tableData.param.teamId) {
+          let TeamName = state.TeamListMap.get(state.tableData.param.teamId);
+          fileName = porjectName + '-' + TeamName + '-' + year + '年' + month + '月员工工资表.xlsx';
+        } else {
+          fileName = porjectName + '-' + year + '年' + month + '月员工工资表.xlsx';
+        }
+      }
+      let time = year + '年' + month + '月';
+      getSalarySheet(obj, fileName, time);
+    };
+    const getSalarySheet = (obj, fileName, time) => {
+      salarySheet(obj).then((res: any) => {
+        if (res.code == 0) {
+          // 先根据
+          let array = setTeamList(res.data.list);
+          // 设置项目名称及班组
+          let excelList = [];
+          array.forEach((item) => {
+            let obj = item[0];
+            let excelName = obj.teamName; //班组
+            if (!obj.teamName) {
+              excelName = '暂未分组人员';
+            }
+            let config = exportConfig(item, excelName, time);
+            excelList.push(config);
+          });
+          exportDataToExcel(excelList, fileName);
+        }
+      });
+    };
+    // 把施工人员分组
+    const setTeamList = (list) => {
+      let team = new Map();
+      list.forEach((item) => {
+        // 判断班组id是否存在
+        if (!item.teamName) {
+          item.teamName = '暂无班组';
+        }
+        if (team.has(item.teamName)) {
+          let arr = team.get(item.teamName);
+          arr.push(item);
+          team.set(item.teamName, arr);
+        } else {
+          team.set(item.teamName, [item]);
+        }
+      });
+      return Array.from(team.values());
+    };
+    // excel表格样式设置
+    const exportConfig = (arr, sheetName, time) => {
+      let header = ['建筑施工企业现场人员工资表（' + time + '）'];
+      const header1 = [];
+      let obj = arr[0];
+      let projectName = '项目部名称:' + obj.projectName;
+      let teamName = '班组类别:' + obj.teamName;
+      const header2 = [projectName + '                       ' + teamName];
+      const header3 = ['序号', '账号', '户名', '金额', '开户行', '签字'];
+      let columnsWidth = [8, 24, 12, 10, 35, 10]; //表格宽度
+      let fields = ['index', 'yhkNumber', 'userName', 'money', 'bankingHouse', ''];
+      arr.map((item, index) => {
+        item.index = index + 1;
+        return;
+      });
+      // 单元格合并
+      const merges = [
+        { row: 0, col: 0, rowspan: 1, colspan: 6 },
+        { row: 2, col: 0, rowspan: 1, colspan: 6 },
+        { row: arr.length + 5, col: 0, rowspan: 1, colspan: 3 },
+        { row: arr.length + 5, col: 3, rowspan: 1, colspan: 3 }
+      ];
+      arr.push({});
+      arr.push({
+        index: '班组长：',
+        money: '劳资员：'
+      });
+      const config = {
+        data: arr,
+        fields,
+        headers: [header, header1, header2, header3],
+        merges,
+        attrs: [],
+        view: [],
+        columnsWidth,
+        sheetName
+      };
+      // 设置表头字体加粗
+      config.attrs.push({
+        rowStart: 0,
+        rowEnd: 0,
+        colStart: 0,
+        colEnd: config.fields.length - 1,
+        attr: {
+          alignment: { vertical: 'middle', horizontal: 'center' },
+          font: {
+            bold: true,
+            size: '16'
+          }
+        }
+      });
+      config.attrs.push({
+        rowStart: 2,
+        rowEnd: 2,
+        colStart: 0,
+        colEnd: config.fields.length - 1,
+        attr: {
+          alignment: { vertical: 'middle', horizontal: 'center' }
+        }
+      });
+      // 设置全表单元格边框，居中布局
+      config.attrs.push({
+        rowStart: 3,
+        rowEnd: config.data.length + 1,
+        colStart: 0,
+        colEnd: config.fields.length - 1,
+        attr: {
+          alignment: { vertical: 'middle', horizontal: 'center' },
+          border: {
+            top: { style: 'thin' },
+            left: { style: 'thin' },
+            bottom: { style: 'thin' },
+            right: { style: 'thin' }
+          }
+        }
+      });
+      return config;
+    };
+    // 多选框选中数据
+    const handleSelectionChange = (selection) => {
+      state.ids = selection.map((item) => item.id);
+      single.value = selection.length != 1;
+      multiple.value = !selection.length;
+    };
+    return {
+      proxy,
+      addRef,
+      editRef,
+      detailRef,
+      showAll,
+      loading,
+      single,
+      onChangeProject,
+      onChangeTeam,
+      multiple,
+      handleSelectionChange,
+      word,
+      onChangeOfIssue,
+      queryRef,
+      resetQuery,
+      busSalaryDetailsList,
+      exportSalary,
+      toggleSearch,
+      handleDelete,
+      handleView,
+      ...toRefs(state)
+    };
   }
-  // 导出工资表逻辑...
-  downloadGet(
-    '/contractor/userSalaryDetail/export',
-    { projectId: tableData.param.projectId, teamId: tableData.param.teamId, time: tableData.param.time },
-    `${tableData.param.time}员工工资表.xlsx`,
-    true
-  );
-};
-
-const handleSelectionChange = (selection: any[]) => {
-  single.value = selection.length !== 1;
-  multiple.value = !selection.length;
-};
+});
 </script>
-
 <style lang="scss" scoped>
 .colBlock {
   display: block;
@@ -275,11 +579,11 @@ const handleSelectionChange = (selection: any[]) => {
   }
   label {
     display: inline-block;
-    background-color: #007bff;
-    color: #fff;
-    padding: 3px 10px;
-    border-radius: 5px;
-    cursor: pointer;
+    background-color: #007bff; /*设置背景色*/
+    color: #fff; /*设置字体颜色*/
+    padding: 3px 10px; /*设置内边距*/
+    border-radius: 5px; /*设置圆角*/
+    cursor: pointer; /*将鼠标光标设置为手型*/
     font-size: 13px;
   }
 }
diff --git a/src/views/project/constructionUser/component/ConstructionUserDetail.vue b/src/views/project/constructionUser/component/ConstructionUserDetail.vue
index 69ddba5..80f837a 100644
--- a/src/views/project/constructionUser/component/ConstructionUserDetail.vue
+++ b/src/views/project/constructionUser/component/ConstructionUserDetail.vue
@@ -6,7 +6,11 @@
         <el-row :gutter="20" justify="space-around">
           <el-col :span="12">
             <el-form-item label="人脸照">
-              <el-image :src="userDetail?.facePicUrl" style="width: 150px; height: 150px" />
+              <el-image
+                :src="'http://58.17.134.85:8920' + userDetail?.pacePhoto"
+                :preview-src-list="['http://58.17.134.85:8920' + userDetail?.pacePhoto]"
+                style="width: 150px; height: 150px"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -31,7 +35,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="民族">
-              {{ userDetail?.nation }}
+              {{ userDetail?.sfzNation }}
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -95,7 +99,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="施工单位">
-              {{ userDetail?.contractorVo?.name }}
+              {{ userDetail?.lwName }}
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -112,7 +116,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="班组">
-              {{ userDetail?.teamVo?.teamName }}
+              {{ userDetail?.bzName }}
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -154,7 +158,8 @@ const userDetail = ref<ConstructionUserVO>();
 const getUserDetail = async () => {
   loading.value = true;
   const res = await getConstructionUser(props.userId);
-  if (res.data && res.code === 200) {
+  console.log('🚀 ~ getUserDetail ~ res:', res);
+  if (res.data && res.code === 0) {
     userDetail.value = res.data;
   }
   loading.value = false;
diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue
index 6b8953b..ef8635b 100644
--- a/src/views/project/contractor/index.vue
+++ b/src/views/project/contractor/index.vue
@@ -7,11 +7,6 @@
             <el-form-item label="公司名称" prop="name">
               <el-input v-model="queryParams.name" placeholder="请输入公司名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="分包类型" prop="contractorType">
-              <el-select v-model="queryParams.contractorType" filterable placeholder="请选择类型">
-                <el-option v-for="(item, i) of dictList" :key="i" :label="item.dictLabel" :value="item.dictValue"> </el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -48,17 +43,12 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
         <el-table-column label="公司名称" align="center" prop="name" />
-        <el-table-column label="分包类型" align="center">
-          <template #default="scope">
-            <span>{{ filterType(scope.row.contractorType) }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="负责人" align="center" prop="principal" />
-        <el-table-column label="负责人联系电话" align="center" prop="principalPhone" />
+        <el-table-column label="负责人联系电话" align="center" prop="phone" />
         <el-table-column label="管理人" align="center" prop="custodian" />
         <el-table-column label="管理人联系电话" align="center" prop="custodianPhone" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" width="180" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-space wrap>
@@ -81,16 +71,11 @@
         <el-form-item label="公司名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入公司名称" />
         </el-form-item>
-        <el-form-item label="供应商" prop="supplier">
-          <el-select v-model="form.supplierId" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
-            <el-option v-for="item in supplierOptions" :key="item.id" :label="item.supplierName" :value="item.id"> </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="负责人" prop="principal">
           <el-input v-model="form.principal" placeholder="请输入负责人" />
         </el-form-item>
-        <el-form-item label="负责人联系电话" prop="principalPhone">
-          <el-input v-model="form.principalPhone" placeholder="请输入负责人联系电话" />
+        <el-form-item label="负责人联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入负责人联系电话" />
         </el-form-item>
         <el-form-item label="管理人" prop="custodian">
           <el-input v-model="form.custodian" placeholder="请输入管理人" />
@@ -98,11 +83,6 @@
         <el-form-item label="管理人联系电话" prop="custodianPhone">
           <el-input v-model="form.custodianPhone" placeholder="请输入管理人联系电话" />
         </el-form-item>
-        <el-form-item label="分包类型" prop="contractorType">
-          <el-select v-model="form.contractorType" filterable placeholder="请选择类型">
-            <el-option v-for="(item, i) of dictList" :key="i" :label="item.dictLabel" :value="item.dictValue"> </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -125,8 +105,7 @@ import { addContractor, delContractor, getContractor, listContractor, updateCont
 import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
 import ContractorFileDialog from '@/views/project/contractor/component/ContractorFileDialog.vue';
 import { useUserStoreHook } from '@/store/modules/user';
-import { getDicts, listData } from '@/api/system/dict/data';
-import { listSupplierInput } from '@/api/supplierInput/supplierInput';
+import { getDicts } from '@/api/system/dict/data';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -155,7 +134,7 @@ const initFormData: ContractorForm = {
   id: undefined,
   name: undefined,
   principal: undefined,
-  principalPhone: undefined,
+  phone: undefined,
   custodian: undefined,
   custodianPhone: undefined,
   supplierId: undefined,
@@ -163,7 +142,7 @@ const initFormData: ContractorForm = {
   contractorType: undefined,
   fileMap: undefined,
   remark: undefined,
-  projectId: currentProject.value?.id
+  projectId: currentProject.value?.goId
 };
 const data = reactive<PageData<ContractorForm, ContractorQuery>>({
   form: { ...initFormData },
@@ -178,7 +157,7 @@ const data = reactive<PageData<ContractorForm, ContractorQuery>>({
     custodian: undefined,
     custodianPhone: undefined,
     contractorType: undefined,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value?.goId,
     params: {}
   },
   rules: {
@@ -206,8 +185,8 @@ const filterType = (val) => {
 const getList = async () => {
   loading.value = true;
   const res = await listContractor(queryParams.value);
-  contractorList.value = res.rows;
-  total.value = res.total;
+  contractorList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -263,10 +242,8 @@ const handleUpdate = async (row?: ContractorVO) => {
 const submitForm = () => {
   contractorFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
-      form.value.projectId = currentProject.value?.id;
+      form.value.projectId = currentProject.value?.goId;
       buttonLoading.value = true;
-      form.value.supplier = supplierOptions.value.find((item) => item.id == form.value.supplierId)?.supplierName;
-
       if (form.value.id) {
         await updateContractor(form.value).finally(() => (buttonLoading.value = false));
       } else {
@@ -288,18 +265,6 @@ const handleDelete = async (row?: ContractorVO) => {
   await getList();
 };
 
-/** 获取供应商 */
-const supplierOptions = ref([]);
-const getSupplierList = async () => {
-  const res = await listSupplierInput({
-    projectId: currentProject.value?.id,
-    pageNum: 1,
-    state: 'finish',
-    pageSize: 10000
-  });
-  supplierOptions.value = res.rows;
-};
-
 /** 文件操作 **/
 const visible = ref();
 const currentContractorId = ref<number | string>(0);
@@ -310,12 +275,11 @@ const handleContractorFile = (row?: ContractorVO) => {
 };
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value?.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
     console.log('监听项目id', queryParams.value.projectId, form.value.projectId);
-    getSupplierList();
     getList();
   }
 );
@@ -326,6 +290,5 @@ onUnmounted(() => {
 onMounted(() => {
   getDictList();
   getList();
-  getSupplierList();
 });
 </script>
diff --git a/src/views/project/contractorMaterial/index.vue b/src/views/project/contractorMaterial/index.vue
index d7ef9ae..2c06a3a 100644
--- a/src/views/project/contractorMaterial/index.vue
+++ b/src/views/project/contractorMaterial/index.vue
@@ -153,6 +153,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { listContractor } from '@/api/project/contractor';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { contractor_material_type } = toRefs<any>(proxy?.useDict('contractor_material_type'));
+console.log('🚀 ~ contractor_material_type:', contractor_material_type);
 // 获取用户 store
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
diff --git a/src/views/project/landTransfer/BasicData/enterRoad/index.vue b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
index 10a765e..82f6e0f 100644
--- a/src/views/project/landTransfer/BasicData/enterRoad/index.vue
+++ b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
@@ -4,6 +4,9 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
+            <el-form-item label="道路编号" prop="roadCode">
+              <el-input v-model="queryParams.roadCode" placeholder="请输入道路编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item label="道路名称" prop="roadName">
               <el-input v-model="queryParams.roadName" placeholder="请输入道路名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -37,14 +40,7 @@
               class="upload-demo"
               :http-request="handleImport"
               :show-file-list="false"
-            >
-              <template #trigger>
-                <el-button plain type="primary" icon="upload">导入excel</el-button>
-              </template>
-            </el-upload>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Download" @click="exportFile">导出模版</el-button>
+            />
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -53,10 +49,10 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="道路编号" align="center" prop="roadCode" />
         <el-table-column label="道路名称" align="center" prop="roadName" />
-        <el-table-column label="设计新建道路长度(米)" align="center" prop="designCreateLength" />
-        <el-table-column label="设计改扩建长度(米)" align="center" prop="designUpdateLength" />
-        <el-table-column label="需流转总长度(米)" align="center" prop="changeLength" />
-        <el-table-column label="需要流转总面积(亩)" align="center" prop="changeArea" />
+        <el-table-column label="设计新建道路长度" align="center" prop="designCreateLength" />
+        <el-table-column label="设计改扩建长度" align="center" prop="designUpdateLength" />
+        <el-table-column label="需流转总长度" align="center" prop="changeLength" />
+        <el-table-column label="需要流转总面积" align="center" prop="changeArea" />
         <el-table-column label="对应地块" align="center" prop="landName" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -73,21 +69,24 @@
     </el-card>
     <!-- 添加或修改进场道路信息对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="enterRoadFormRef" :model="form" :rules="rules" label-width="150px">
+      <el-form ref="enterRoadFormRef" :model="form" :rules="rules" label-width="130px">
+        <el-form-item label="道路编号" prop="roadCode">
+          <el-input v-model="form.roadCode" placeholder="请输入道路编号" />
+        </el-form-item>
         <el-form-item label="道路名称" prop="roadName">
           <el-input v-model="form.roadName" placeholder="请输入道路名称" />
         </el-form-item>
-        <el-form-item label="设计新建道路长度(米)" prop="designCreateLength">
-          <el-input v-model="form.designCreateLength" type="number" placeholder="请输入设计新建道路长度" />
+        <el-form-item label="设计新建道路长度" prop="designCreateLength">
+          <el-input v-model="form.designCreateLength" placeholder="请输入设计新建道路长度" />
         </el-form-item>
-        <el-form-item label="设计改扩建长度(米)" prop="designUpdateLength">
-          <el-input v-model="form.designUpdateLength" type="number" placeholder="请输入设计改扩建长度" />
+        <el-form-item label="设计改扩建长度" prop="designUpdateLength">
+          <el-input v-model="form.designUpdateLength" placeholder="请输入设计改扩建长度" />
         </el-form-item>
-        <el-form-item label="需流转总长度(米)" prop="changeLength">
-          <el-input v-model="form.changeLength" type="number" placeholder="请输入需流转总长度" />
+        <el-form-item label="需流转总长度" prop="changeLength">
+          <el-input v-model="form.changeLength" placeholder="请输入需流转总长度" />
         </el-form-item>
-        <el-form-item label="需要流转总面积(亩)" prop="changeArea">
-          <el-input v-model="form.changeArea" type="number" placeholder="请输入需要流转总面积" />
+        <el-form-item label="需要流转总面积" prop="changeArea">
+          <el-input v-model="form.changeArea" placeholder="请输入需要流转总面积" />
         </el-form-item>
         <el-form-item label="对应地块" prop="landBlockId">
           <el-select v-model="form.landBlockId" clearable placeholder="请选择对应地块">
@@ -97,7 +96,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" v-hasPermi="['land:enterRoad:add']" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -106,7 +105,7 @@
 </template>
 
 <script setup name="EnterRoad" lang="ts">
-import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad, importEnterRoad } from '@/api/system/landTransfer/enterRoad';
+import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad } from '@/api/system/landTransfer/enterRoad';
 import { EnterRoadVO, EnterRoadQuery, EnterRoadForm } from '@/api/system/landTransfer/enterRoad/types';
 import { listLandBlock } from '@/api/system/landTransfer/landBlock';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -134,7 +133,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: EnterRoadForm = {
   id: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.id,
   roadCode: undefined,
   roadName: undefined,
   designCreateLength: undefined,
@@ -148,7 +147,7 @@ const data = reactive<PageData<EnterRoadForm, EnterRoadQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.id,
     roadCode: undefined,
     roadName: undefined,
     designCreateLength: undefined,
@@ -181,7 +180,7 @@ const getListLand = async () => {
   const res = await listLandBlock({
     pageNum: 1,
     pageSize: 10000,
-    projectId: currentProject.value?.id
+    projectId: currentProject.value.id
   });
   landBlockList.value = res.rows;
 };
@@ -208,24 +207,6 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
 };
-const exportFile = () => {
-  // 导出模版文件
-  try {
-    // 创建a标签
-    const link = document.createElement('a');
-    // 设置PDF文件路径 - 相对于public目录
-    link.href = '/daolu.xlsx';
-    // 设置下载后的文件名
-    link.download = '道路信息导入模版.xlsx';
-    // 触发点击
-    document.body.appendChild(link);
-    link.click();
-    // 清理
-    document.body.removeChild(link);
-  } catch (error) {
-    alert('下载失败，请重试');
-  }
-};
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: EnterRoadVO[]) => {
   ids.value = selection.map((item) => item.id);
@@ -278,7 +259,7 @@ const handleDelete = async (row?: EnterRoadVO) => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.id,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     getListLand();
@@ -286,46 +267,6 @@ const listeningProject = watch(
   }
 );
 
-// 导入文件
-const handleImport = (options: any) => {
-  loading.value = true;
-  let formData = new FormData();
-  formData.append('file', options.file);
-  importEnterRoad(currentProject.value?.id, formData)
-    .then((res) => {
-      if (res.code == 200) {
-        proxy.$modal.msgSuccess(res.msg || '导入成功');
-        getListLand();
-        getList();
-      }
-    })
-    .catch((err) => {
-      proxy.$modal.msgError(err.msg || '导入失败');
-    })
-    .finally(() => {
-      loading.value = false;
-    });
-};
-// 下载模板
-const downloadTemplate = () => {
-  // 导出模版文件
-  try {
-    // 创建a标签
-    const link = document.createElement('a');
-    // 设置PDF文件路径 - 相对于public目录
-    link.href = '/enterRoad.xlsx';
-    // 设置下载后的文件名
-    link.download = '道路信息导入模板.xlsx';
-    // 触发点击
-    document.body.appendChild(link);
-    link.click();
-    // 清理
-    document.body.removeChild(link);
-  } catch (error) {
-    alert('下载失败，请重试');
-  }
-};
-
 onUnmounted(() => {
   listeningProject();
 });
diff --git a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
index cae05e3..3a84b24 100644
--- a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
@@ -3,14 +3,14 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="对应地块" prop="landBlockId">
               <el-select v-model="queryParams.landBlockId" clearable placeholder="请选择对应地块">
                 <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
               </el-select>
             </el-form-item>
-            <el-form-item label="责任人" prop="responsiblePerson">
-              <el-input v-model="queryParams.responsiblePerson" placeholder="请输入责任人" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="设计面积" prop="designArea">
+              <el-input v-model="queryParams.designArea" placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,15 +20,25 @@
         </el-card>
       </div>
     </transition>
+
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['land:nonTransferLedger:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['land:nonTransferLedger:remove']"
+              >删除</el-button
+            >
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-      <el-table v-loading="loading" :data="landTransferLedgerList" @selection-change="handleSelectionChange">
+
+      <el-table v-loading="loading" :data="nonTransferLedgerList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="土地类型" align="center" prop="landTypeName" />
+        <el-table-column label="土地类型" align="center" prop="landType" />
         <el-table-column label="地块" align="center" prop="landName" />
         <el-table-column label="进场道路" align="center" prop="roadName" />
         <el-table-column label="设计面积" align="center" prop="designArea" />
@@ -36,21 +46,29 @@
         <el-table-column label="不签合同原因" align="center" prop="noContractReason" />
         <el-table-column label="不测量面积" align="center" prop="noSurveyArea" />
         <el-table-column label="不流转原因" align="center" prop="nonTransferReason" />
-        <el-table-column label="操作" align="center" fixed="right" width="200">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['land:landTransferLedger:query']">查看</el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['land:nonTransferLedger:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['land:landTransferLedger:remove']">删除</el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['land:nonTransferLedger:remove']"
+              ></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
+
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <el-dialog draggable title="查看信息" v-model="dialog.visible" width="900px" append-to-body>
-      <el-form disabled ref="landTransferLedgerFormRef" :model="form" :rules="rules" label-width="120px">
+    <!-- 添加或修改不流转台账对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
+      <el-form ref="nonTransferLedgerFormRef" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="对应地块" prop="landBlockId">
@@ -58,7 +76,7 @@
                 <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
               </el-select> </el-form-item
           ></el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="enterRoadList.length">
             <el-form-item label="进场道路" prop="enterRoadId">
               <el-select v-model="form.enterRoadId" clearable placeholder="请选择对应地块">
                 <el-option v-for="item in enterRoadList" :key="item.id" :label="item.roadName" :value="item.id" />
@@ -70,82 +88,29 @@
                 <el-option v-for="dict in land_type" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select></el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="流转台账状态" prop="transferStatus">
-              <el-select v-model="form.transferStatus" :disabled="!form.id" placeholder="请选择流转台账状态" clearable>
-                <el-option
-                  v-for="dict in land_transfer_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                /> </el-select></el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="设计面积(亩)" prop="designArea">
-              <el-input type="number" v-model="form.designArea" placeholder="请输入设计面积" /> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="责任人" prop="responsiblePerson">
-              <el-input v-model="form.responsiblePerson" placeholder="请输入责任人" /> </el-form-item
+            <el-form-item label="设计面积" prop="designArea"> <el-input v-model="form.designArea" placeholder="请输入设计面积" /> </el-form-item
           ></el-col>
           <el-col :span="12"
-            ><el-form-item label="预计完成日期" prop="expectedFinishDate">
-              <el-date-picker clearable v-model="form.expectedFinishDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择预计完成时间">
-              </el-date-picker> </el-form-item
-          ></el-col>
-
-          <el-col v-if="form.transferStatus == '1'" :span="12"
-            ><el-form-item label="已流转面积(亩)" prop="transferAea">
-              <el-input v-model="form.transferAea" type="number" placeholder="请输入已流转面积" /> </el-form-item
+            ><el-form-item label="不签合同面积" prop="noContractArea">
+              <el-input v-model="form.noContractArea" placeholder="请输入不签合同面积" /> </el-form-item
           ></el-col>
-          <el-col v-if="form.transferStatus == '1'" :span="12"
-            ><el-form-item label="流转比例(%)" prop="transferRatio">
-              <el-input v-model="form.transferRatio" type="number" placeholder="请输入流转比例" /> </el-form-item
-          ></el-col>
-          <el-col v-if="form.transferStatus == '1'" :span="12">
-            <el-form-item label="土地租金(元)" prop="landRent">
-              <el-input type="number" v-model="form.landRent" placeholder="请输入土地租金" /> </el-form-item
-          ></el-col>
-          <el-col v-if="form.transferStatus == '1'" :span="12">
-            <el-form-item label="青苗赔偿(元)" prop="seedlingCompensation">
-              <el-input v-model="form.seedlingCompensation" type="number" placeholder="请输入青苗赔偿" /> </el-form-item
-          ></el-col>
-          <el-col v-if="form.transferStatus == '1'" :span="12">
-            <el-form-item label="总金额(元)" prop="totalAmount">
-              <el-input type="number" v-model="form.totalAmount" placeholder="请输入总金额" /> </el-form-item
-          ></el-col>
-          <el-col v-if="form.transferStatus == '2'" :span="12"
-            ><el-form-item label="不签合同面积(亩)" prop="noContractArea">
-              <el-input v-model="form.noContractArea" type="number" placeholder="请输入不签合同面积" /> </el-form-item
-          ></el-col>
-          <el-col v-if="form.transferStatus == '2'" :span="12">
-            <el-form-item label="不测量面积(亩)" prop="noSurveyArea">
-              <el-input v-model="form.noSurveyArea" type="number" placeholder="请输入不测量面积" /> </el-form-item
+          <el-col :span="12">
+            <el-form-item label="不测量面积" prop="noSurveyArea">
+              <el-input v-model="form.noSurveyArea" placeholder="请输入不测量面积" /> </el-form-item
           ></el-col>
-          <el-col v-if="form.transferStatus == '2'" :span="24"
+          <el-col :span="24"
             ><el-form-item label="不签合同原因" prop="noContractReason">
               <el-input v-model="form.noContractReason" type="textarea" placeholder="请输入内容" /> </el-form-item
           ></el-col>
-          <el-col v-if="form.transferStatus == '2'" :span="24"
+          <el-col :span="24"
             ><el-form-item label="不流转原因" prop="nonTransferReason">
               <el-input v-model="form.nonTransferReason" type="textarea" placeholder="请输入内容" /> </el-form-item
           ></el-col>
-          <el-col v-if="form.transferStatus == '1'" :span="24"
-            ><el-form-item label="状态说明" prop="statusDescription">
-              <el-input v-model="form.statusDescription" type="textarea" placeholder="请输入内容" /> </el-form-item
-          ></el-col>
-          <el-col v-if="form.transferStatus == '1'" :span="24"
-            ><el-form-item label="问题总结" prop="issueSummary">
-              <el-input v-model="form.issueSummary" type="textarea" placeholder="请输入内容" /> </el-form-item
-          ></el-col>
-          <el-col v-if="form.transferStatus == '1'" :span="24">
-            <el-form-item label="下一步策略" prop="nextStrategy">
-              <el-input v-model="form.nextStrategy" type="textarea" placeholder="请输入内容" /> </el-form-item
-          ></el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" v-hasPermi="['land:landTransferLedger:add']" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -153,24 +118,24 @@
   </div>
 </template>
 
-<script setup name="LandTransferLedger" lang="ts">
+<script setup name="NonTransferLedger" lang="ts">
 import {
-  listLandTransferLedger,
-  getLandTransferLedger,
-  delLandTransferLedger,
-  addLandTransferLedger,
-  updateLandTransferLedger
-} from '@/api/system/landTransfer/landTransferLedger';
+  listNonTransferLedger,
+  getNonTransferLedger,
+  delNonTransferLedger,
+  addNonTransferLedger,
+  updateNonTransferLedger
+} from '@/api/system/landTransfer/nonTransferLedger';
+import { NonTransferLedgerVO, NonTransferLedgerQuery, NonTransferLedgerForm } from '@/api/system/landTransfer/nonTransferLedger/types';
 import { listEnterRoad } from '@/api/system/landTransfer/enterRoad';
-import { LandTransferLedgerVO, LandTransferLedgerQuery, LandTransferLedgerForm } from '@/api/system/landTransfer/landTransferLedger/types';
-import { useUserStoreHook } from '@/store/modules/user';
 import { listLandBlock } from '@/api/system/landTransfer/landBlock';
+import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const landTransferLedgerList = ref<LandTransferLedgerVO[]>([]);
+const nonTransferLedgerList = ref<NonTransferLedgerVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -179,62 +144,43 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const landBlockList = ref([]);
-const queryFormRef = ref<ElFormInstance>();
-const landTransferLedgerFormRef = ref<ElFormInstance>();
 const enterRoadList = ref([]);
-const { land_type, land_transfer_status } = toRefs<any>(proxy?.useDict('land_type', 'land_transfer_status'));
+const queryFormRef = ref<ElFormInstance>();
+const nonTransferLedgerFormRef = ref<ElFormInstance>();
+const { land_type } = toRefs<any>(proxy?.useDict('land_type', 'transfer_status'));
 
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
-const initFormData = {
+const initFormData: NonTransferLedgerForm = {
   id: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.id,
   landType: undefined,
   landBlockId: undefined,
   enterRoadId: undefined,
   designArea: undefined,
-  responsiblePerson: undefined,
-  expectedFinishDate: undefined,
-  transferAea: undefined,
-  transferRatio: undefined,
-  landRent: undefined,
-  seedlingCompensation: undefined,
-  totalAmount: undefined,
-  transferStatus: undefined,
-  statusDescription: undefined,
-  issueSummary: undefined,
-  nextStrategy: undefined,
   noContractArea: undefined,
   noContractReason: undefined,
   noSurveyArea: undefined,
   nonTransferReason: undefined
 };
-const data = reactive<PageData<LandTransferLedgerForm, LandTransferLedgerQuery>>({
+const data = reactive<PageData<NonTransferLedgerForm, NonTransferLedgerQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.id,
     landType: undefined,
     landBlockId: undefined,
     enterRoadId: undefined,
     designArea: undefined,
-    responsiblePerson: undefined,
-    expectedFinishDate: undefined,
-    transferAea: undefined,
-    transferRatio: undefined,
-    landRent: undefined,
-    seedlingCompensation: undefined,
-    totalAmount: undefined,
-    transferStatus: undefined,
-    statusDescription: undefined,
-    issueSummary: undefined,
-    nextStrategy: undefined,
-    params: {},
-    listType: 2
+    noContractArea: undefined,
+    noContractReason: undefined,
+    noSurveyArea: undefined,
+    nonTransferReason: undefined,
+    params: {}
   },
   rules: {
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
@@ -245,25 +191,25 @@ const data = reactive<PageData<LandTransferLedgerForm, LandTransferLedgerQuery>>
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询项目土地流转台账列表 */
+/** 查询不流转台账列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listLandTransferLedger(queryParams.value);
-  landTransferLedgerList.value = res.rows;
+  const res = await listNonTransferLedger(queryParams.value);
+  nonTransferLedgerList.value = res.rows;
   total.value = res.total;
   loading.value = false;
 };
 
 /** 取消按钮 */
 const cancel = () => {
-  dialog.visible = false;
   reset();
+  dialog.visible = false;
 };
 
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
-  landTransferLedgerFormRef.value?.resetFields();
+  nonTransferLedgerFormRef.value?.resetFields();
 };
 
 /** 搜索按钮操作 */
@@ -279,7 +225,7 @@ const resetQuery = () => {
 };
 
 /** 多选框选中数据 */
-const handleSelectionChange = (selection: LandTransferLedgerVO[]) => {
+const handleSelectionChange = (selection: NonTransferLedgerVO[]) => {
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
@@ -288,35 +234,29 @@ const handleSelectionChange = (selection: LandTransferLedgerVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
-  form.value.transferStatus = '0';
   dialog.visible = true;
-  enterRoadList.value = [];
-  dialog.title = '添加项目土地流转台账';
+  dialog.title = '添加不流转台账';
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: LandTransferLedgerVO) => {
+const handleUpdate = async (row?: NonTransferLedgerVO) => {
   reset();
-  form.value.landBlockId = row?.landBlockId;
-  getListRoad();
   const _id = row?.id || ids.value[0];
-  const res = await getLandTransferLedger(_id);
+  const res = await getNonTransferLedger(_id);
   Object.assign(form.value, res.data);
-  console.log(form.value);
-
   dialog.visible = true;
-  dialog.title = '修改项目土地流转台账';
+  dialog.title = '修改不流转台账';
 };
 
 /** 提交按钮 */
 const submitForm = () => {
-  landTransferLedgerFormRef.value?.validate(async (valid: boolean) => {
+  nonTransferLedgerFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateLandTransferLedger(form.value).finally(() => (buttonLoading.value = false));
+        await updateNonTransferLedger(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addLandTransferLedger(form.value).finally(() => (buttonLoading.value = false));
+        await addNonTransferLedger(form.value).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
@@ -324,35 +264,37 @@ const submitForm = () => {
     }
   });
 };
+
 /** 删除按钮操作 */
-const handleDelete = async (row?: LandTransferLedgerVO) => {
+const handleDelete = async (row?: NonTransferLedgerVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除项目土地流转台账编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delLandTransferLedger(_ids);
+  await proxy?.$modal.confirm('是否确认删除不流转台账编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delNonTransferLedger(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };
-// 选择地块
-const handleLandBlockChange = (val) => {
-  getListRoad();
-};
 /** 查询地块信息列表 */
 const getListLand = async () => {
   const res = await listLandBlock({
     pageNum: 1,
     pageSize: 10000,
-    projectId: currentProject.value?.id
+    projectId: currentProject.value.id
   });
   landBlockList.value = res.rows;
 };
 /** 查询进场道路信息列表 */
 const getListRoad = async () => {
-  const res = await listEnterRoad({ pageNum: 1, pageSize: 10000, projectId: currentProject.value?.id, landBlockId: form.value.landBlockId });
+  const res = await listEnterRoad({ pageNum: 1, pageSize: 10000, projectId: currentProject.value.id, landBlockId: form.value.landBlockId });
   enterRoadList.value = res.rows;
 };
+// 选择地块
+const handleLandBlockChange = (val) => {
+  console.log(val);
+  getListRoad();
+};
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.id,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     getListLand();
@@ -364,7 +306,7 @@ onUnmounted(() => {
   listeningProject();
 });
 onMounted(() => {
-  getList();
   getListLand();
+  getList();
 });
 </script>
diff --git a/src/views/project/leave/index.vue b/src/views/project/leave/index.vue
index a3e5f48..76189da 100644
--- a/src/views/project/leave/index.vue
+++ b/src/views/project/leave/index.vue
@@ -4,27 +4,13 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
-            <el-form-item label="申请人" prop="userName">
-              <el-input v-model="queryParams.userName" placeholder="请输入申请人" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="申请人" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入申请人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="所属班组" prop="leaveType">
-              <el-select v-model="queryParams.teamId" placeholder="全部" clearable>
-                <el-option v-for="dict in ProjectTeam" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-            <!-- <el-form-item label="请假类型" prop="leaveType">
-              <el-select v-model="queryParams.leaveType" placeholder="请选择请假类型" clearable>
-                <el-option v-for="dict in user_leave_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item> -->
-            <el-form-item label="班组长意见" prop="gangerOpinion">
-              <el-select v-model="queryParams.gangerOpinion" placeholder="全部" clearable>
-                <el-option v-for="dict in user_opinion_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="管理员意见" prop="managerOpinion">
-              <el-select v-model="queryParams.managerOpinion" placeholder="全部" clearable>
-                <el-option v-for="dict in user_opinion_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select v-model="queryParams.teamId" clearable placeholder="全部">
+                <el-option label="全部" value="" />
+                <el-option v-for="item in TeamList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -37,70 +23,22 @@
     </transition>
 
     <el-card shadow="never">
-      <!-- <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:leave:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:leave:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:leave:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:leave:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template> -->
-
       <el-table v-loading="loading" :data="leaveList">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" width="50" />
         <el-table-column label="申请人" align="center" prop="userName" />
-        <el-table-column label="申请请假说明" align="center" prop="userExplain" />
-        <!-- <el-table-column label="请假申请时间" align="center" prop="userTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.userTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column> -->
+        <el-table-column label="申请请假说明" align="center" prop="argument" />
+        <el-table-column label="请假申请时间" align="center" prop="createdAt" width="180"> </el-table-column>
         <el-table-column label="所属班组" align="center" prop="teamName">
           <template #default="scope">
             <dict-tag :options="user_leave_type" :value="scope.row.teamName" />
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="user_review_status_type" :value="scope.row.status" />
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="班组长意见" align="center" prop="gangerOpinion">
-          <template #default="scope">
-            <dict-tag :options="user_opinion_type" :value="scope.row.gangerOpinion" />
-          </template>
-        </el-table-column>
-        <el-table-column label="班组长说明" align="center" prop="gangerExplain" />
-        <el-table-column label="班组长操作时间" align="center" prop="gangerTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.gangerTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="管理员意见" align="center" prop="managerOpinion">
+        <el-table-column label="状态" align="center" prop="cardNumber">
           <template #default="scope">
-            <dict-tag :options="user_opinion_type" :value="scope.row.managerOpinion" />
+            <dict-tag :options="user_review_status_type" :value="scope.row.cardNumber" />
           </template>
         </el-table-column>
-        <el-table-column label="管理员说明" align="center" prop="managerExplain" />
-        <el-table-column label="请假申请时间" align="center" prop="userTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.userTime) }}</span>
-          </template>
-        </el-table-column> -->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="success" icon="View" @click="handleDetail(scope.row)">详情</el-button>
@@ -189,7 +127,7 @@
           </el-step>
           <el-step title="结果" :status="resultsStatus">
             <template #description>
-              <div>{{ user_review_status_type[parseInt(detailObj.status) - 1].label }}</div>
+              <div>{{ user_review_status_type[parseInt(detailObj.cardNumber) - 1].label }}</div>
             </template>
           </el-step>
         </el-steps>
@@ -199,16 +137,13 @@
 </template>
 
 <script setup name="Leave" lang="ts">
-import { listLeave, getLeave, delLeave, addLeave, updateLeave, AuditReissueCard } from '@/api/project/leave';
+import { listLeave, AuditReissueCard } from '@/api/project/leave';
 import { LeaveVO, LeaveQuery, LeaveForm } from '@/api/project/leave/types';
-import { listProjectTeam } from '@/api/project/projectTeam';
-import { ProjectTeamVO } from '@/api/project/projectTeam/types';
 import { AuditReissueCardForm, ReissueCardVO } from '@/api/project/reissueCard/types';
 import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { user_leave_type, user_opinion_type, user_review_status_type } = toRefs<any>(
-  proxy?.useDict('user_leave_type', 'user_opinion_type', 'user_review_status_type')
-);
+const { user_leave_type, user_review_status_type } = toRefs<any>(proxy?.useDict('user_leave_type', 'user_opinion_type', 'user_review_status_type'));
+import { getSysProjectTeamList } from '@/api/project/goUser/index';
 const detailObj = ref<ReissueCardVO>({
   userName: undefined,
   id: undefined,
@@ -225,18 +160,15 @@ const detailObj = ref<ReissueCardVO>({
   status: undefined,
   managerName: undefined
 });
-
+const TeamList = ref([]); //班组列表
 const leaveList = ref<LeaveVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const leaveFormRef = ref<ElFormInstance>();
 const dialog = reactive<DialogOption>({
   visible: false,
   title: '',
@@ -246,8 +178,6 @@ const dialog = reactive<DialogOption>({
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const ProjectTeam = computed(() => proxy?.$cache.local.getJSON('ProjectTeamList') || []);
-
 const initFormData: LeaveForm = {
   id: undefined,
   userId: undefined,
@@ -346,11 +276,15 @@ const resultsStatus = computed(() => {
 const getList = async () => {
   loading.value = true;
   const res = await listLeave(queryParams.value);
-  leaveList.value = res.rows;
-  total.value = res.total;
+  leaveList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
-
+// 获取班组
+const getTeamList = async () => {
+  const res = await getSysProjectTeamList({ pageNum: 1, pageSize: 1000, projectId: currentProject.value.goId });
+  TeamList.value = res.data.list;
+};
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -410,10 +344,11 @@ const handleExport = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
+    getTeamList();
     getList();
   }
 );
@@ -423,6 +358,7 @@ onUnmounted(() => {
 });
 
 onMounted(() => {
+  getTeamList();
   getList();
 });
 </script>
diff --git a/src/views/project/project/index.vue b/src/views/project/project/index.vue
index a6b0007..7e3e3c1 100644
--- a/src/views/project/project/index.vue
+++ b/src/views/project/project/index.vue
@@ -22,7 +22,7 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:project:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
@@ -37,13 +37,13 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:project:export']">导出 </el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
       <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
-        <el-table-column type="expand" width="50">
+        <!-- <el-table-column type="expand" width="50">
           <template #default="{ row }">
             <div class="w212.25 ml-12.5">
               <el-button class="mb" type="primary" size="small" v-hasPermi="['project:project:add']" @click="handleOpenSetChild(row.id)" icon="plus"
@@ -94,34 +94,24 @@
               </el-table>
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="项目名称" align="center" prop="projectName">
-          <!-- <template #default="scope">
-            <el-link
-              :type="scope.row.designId ? 'primary' : 'default'"
-              :disabled="!scope.row.designId"
-              @click="handleOpenLayer(scope.row)"
-              v-loading.fullscreen.lock="fullscreenLoading"
-              >{{ scope.row.projectName }}</el-link
-            >
-          </template> -->
-        </el-table-column>
+        <!-- <el-table-column label="项目名称" align="center" prop="projectName"/> -->
         <el-table-column label="项目简称" align="center" prop="shortName" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="项目类型" align="center" prop="projectType" width="120">
+        <el-table-column label="项目类型" align="center" prop="type" width="120">
           <template #default="scope">
-            <dict-tag :options="project_type" :value="scope.row.projectType" />
+            <dict-tag :options="project_type" :value="scope.row.type" />
           </template>
         </el-table-column>
-        <el-table-column label="项目类别" align="center" prop="projectCategory">
+        <el-table-column label="项目类别" align="center" prop="isType">
           <template #default="scope">
-            <dict-tag :options="project_category_type" :value="scope.row.projectCategory" />
+            <dict-tag :options="project_category_type" :value="scope.row.isType" />
           </template>
         </el-table-column>
         <el-table-column label="负责人" align="center" prop="principal" />
@@ -130,7 +120,7 @@
         <el-table-column label="计划容量(M)" align="center" prop="plan" width="100" />
         <el-table-column label="开工时间" align="center" prop="onStreamTime" width="120" />
         <el-table-column label="打卡范围" align="center" prop="punchRange" />
-        <el-table-column label="设计总量" align="center" prop="designTotal" />
+        <!-- <el-table-column label="设计总量" align="center" prop="designTotal" /> -->
         <!-- <el-table-column label="是否上传DXF" align="center" prop="designId" width="140">
           <template #default="scope">
             <el-link
@@ -142,8 +132,9 @@
             >
           </template>
         </el-table-column> -->
-        <el-table-column label="备注" align="center" prop="remark" />
+        <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+        <!-- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="400">
         <el-table-column fixed="right" label="操作" align="center" width="500">
           <template #default="scope">
             <el-space>
@@ -161,7 +152,7 @@
               </el-button>
             </el-space>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
@@ -304,91 +295,6 @@
         </div>
       </template>
     </el-dialog>
-    <el-dialog draggable title="打卡规则" v-model="ruleFlag" width="800">
-      <template #footer>
-        <el-form ref="projectFormRef" :model="form" :rules="rules" label-width="100px">
-          <el-row :gutter="20">
-            <el-col :span="12" :offset="0">
-              <el-form-item label="上班时间" prop="clockInTime">
-                <el-time-select
-                  v-model="form.clockInTime"
-                  style="width: 100%"
-                  class="mr-4"
-                  placeholder="请输入打卡开始时间"
-                  value-format="HH:mm"
-                  start="00:00"
-                  step="00:15"
-                  end="23:59"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" :offset="0">
-              <el-form-item label="下班时间" prop="clockOutTime">
-                <el-time-select
-                  v-model="form.clockOutTime"
-                  style="width: 100%"
-                  :min-time="form.clockInTime"
-                  class="mr-4"
-                  placeholder="请输入打卡结束时间"
-                  value-format="HH:mm"
-                  start="00:00"
-                  step="00:15"
-                  end="23:59"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" :offset="0">
-              <el-form-item label="打卡类型" prop="type">
-                <el-radio-group v-model="form.type">
-                  <el-radio value="1" size="large">无限制</el-radio>
-                  <el-radio value="2" size="large">范围内打卡</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="打卡类型" prop="weekday">
-                <el-checkbox-group v-model="form.weekday" size="small">
-                  <el-checkbox label="星期一" value="1" />
-                  <el-checkbox label="星期二" value="2" />
-                  <el-checkbox label="星期三" value="3" />
-                  <el-checkbox label="星期四" value="4" />
-                  <el-checkbox label="星期五" value="5" />
-                  <el-checkbox label="星期六" value="6" />
-                  <el-checkbox label="星期日" value="7" />
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col> </el-row
-        ></el-form>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="ruleSubmit"> 提交</el-button>
-          <el-button @click="ruleFlag = false">取消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <el-dialog draggable title="打卡范围" v-model="ScopeFlag" width="600">
-      <div v-for="(item, i) of punchRangeList" :key="i" class="options_item">
-        <el-row style="margin-bottom: 10px;">
-          <el-col :span="1"> <el-color-picker v-model="item.punchColor" show-alpha /></el-col>
-          <el-col :span="12"> <el-input v-model="item.punchName" placeholder="请输入打卡范围名称" class="ml-8" /></el-col>
-          <el-col :span="10" style="text-align: right; margin-top: 5px">
-            <el-button v-if="item.id" link type="primary" icon="view" @click="previewPunchRange(item)">预览</el-button>
-            <el-button v-if="item.id" link type="primary" icon="delete" @click="handleScopeDel(item)">移除</el-button>
-            <el-button v-if="!item.id" link type="primary" icon="plus" @click="addPunchRange(item)">添加</el-button>
-            <el-button v-if="item.id" link type="primary" icon="download" @click="handleScopeEdit(item)">保存</el-button>
-          </el-col>
-        </el-row>
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="scopeSubmit">确定</el-button>
-          <el-button @click="ScopeFlag = false">取消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <CesiumEarthDialog ref="earthDialog"  @send-data="handleEarthData"
-    :position="position"
-    :data="earthData"
-    @close="handleEarthClose"></CesiumEarthDialog>
   </div>
 </template>
 
@@ -399,7 +305,7 @@ import {
   delProject,
   uploadProjectFile,
   getProject,
-  listProject,
+  listProjectGo,
   updateProject,
   attendanceRuleAdd,
   attendanceRuleEdit,
@@ -410,10 +316,6 @@ import {
 } from '@/api/project/project';
 import { ProjectForm, ProjectQuery, ProjectVO, childProjectQuery, locationType } from '@/api/project/project/types';
 import amap from '@/components/amap/index.vue';
-import CesiumEarthDialog from "./map.vue"
-import { useUserStoreHook } from '@/store/modules/user';
-const userStore = useUserStoreHook();
-const currentProject = computed(() => userStore.selectedProject);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable, project_category_type, project_type, project_stage } = toRefs<any>(
   proxy?.useDict('sys_normal_disable', 'project_category_type', 'project_type', 'project_stage')
@@ -434,22 +336,6 @@ const polygonStatus = ref(false);
 const dxfFile = ref(null);
 const projectId = ref<string>('');
 const designId = ref<string>('');
-const ruleFlag = ref(false);
-const ScopeFlag = ref(false);
-const earthDialog = ref(null);
-const position = ref(''); //预览
-let earthData = reactive({
-    projectId: '',
-    punchName: '',
-    punchColor: '#1983ff',
-    punchRange: '',
-}); //传值给地图组件
-const punchRangeList = ref<any>([
-  {
-    punchName: '',
-    punchColor: '#1983ff'
-  }
-]);
 const childProjectForm = reactive<childProjectQuery>({
   projectName: '',
   pid: '',
@@ -548,9 +434,9 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询项目列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listProject(queryParams.value);
-  projectList.value = res.rows;
-  total.value = res.total;
+  const res = await listProjectGo(queryParams.value);
+  projectList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 /** 取消按钮 */
@@ -729,48 +615,6 @@ const handleSetChild = async () => {
     }
   }
 };
-const handleScope = (row) => {
-  console.log('row',row);
-  // 打卡范围
-  ScopeFlag.value = true;
-  projectId.value = row.id;
-  // 获取打卡范围列表
-  getListScope(row.id);
-};
-// 获取打卡范围列表
-const getListScope = (id) => {
-  punchRangeList.value = [{
-    punchName: '',
-    punchColor: '#1983ff'
-  }];
-  getAttendanceRangeList({ projectId: id, }).then((res) => {
-    if (res.code === 200) {
-      punchRangeList.value.unshift(...res.rows);
-    }
-  });
-}
-// 修改打卡范围
-const handleScopeEdit = (row) => {
-  updateAttendanceRange(row).then((res) => {
-    if (res.code === 200) {
-      proxy.$modal.msgSuccess('修改成功');
-      // ScopeFlag.value = false;
-      getListScope(projectId.value);
-    }
-  });
-}
-// 删除打卡范围
-const handleScopeDel = (row) => {
-  proxy.$modal.confirm('是否确认删除打卡范围？').then(() => {
-    delAttendanceRange(row.id).then((res) => {
-      if (res.code === 200) {
-        proxy.$modal.msgSuccess('删除成功');  
-        getListScope(projectId.value);
-      }
-    });
-  }).catch(() => {});
-}
-
 
 const scopeSubmit = () => {
   // 提交打卡范围
@@ -820,36 +664,7 @@ const handleExport = () => {
     `project_${new Date().getTime()}.xlsx`
   );
 };
-// 打开绘制范围
-const addPunchRange = (item) => {
-  earthData.punchName = item.punchName
-  earthData.punchColor = item.punchColor
-  earthData.projectId = projectId.value
-  earthData.id = ''
-  earthData.punchRange = ''
-  if (earthData.punchName=='') {
-    proxy.$modal.msgError('请先填写打卡范围名称');
-    return
-  }
-  earthDialog.value.show()
-}
-// 接受绘制范围
-const handleEarthData = (data) => { 
-  ScopeFlag.value = false;
-}
-// 关闭绘制范围
-const handleEarthClose = () => {
-  earthDialog.value.show = false
-}
-// 预览范围
-const previewPunchRange  = (item)=>{
-  earthData.id = item.id
-  earthData.projectId = item.projectId
-  earthData.punchName = item.punchName
-  earthData.punchColor = item.punchColor
-  earthData.punchRange = item.punchRange
-  earthDialog.value.show()
-}
+
 onMounted(() => {
   getList();
 });
diff --git a/src/views/project/projectTeam/component/UserListDialog.vue b/src/views/project/projectTeam/component/UserListDialog.vue
index 398634f..1af09e5 100644
--- a/src/views/project/projectTeam/component/UserListDialog.vue
+++ b/src/views/project/projectTeam/component/UserListDialog.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-      <el-form-item label="施工人员" prop="memberName">
-        <el-input v-model="queryParams.memberName" placeholder="请输入施工人员" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="施工人员" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入施工人员" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="岗位" prop="postId">
         <el-select v-model="queryParams.postId" clearable placeholder="请选择岗位">
@@ -14,7 +14,7 @@
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <!-- <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button size="small" type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:projectTeamMember:add']"> 新增 </el-button>
       </el-col>
@@ -45,21 +45,28 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button size="small" type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectTeamMember:export']">
+        <el-button
+          size="small"
+          type="warning"
+          plain
+          icon="Download"
+          @click="openExport"
+          v-hasPermi="['project:projectTeamMember:export']"
+          :disabled="multiple"
+        >
           导出
         </el-button>
       </el-col>
-    </el-row> -->
+    </el-row>
     <el-table size="small" v-loading="loading" :data="projectTeamMemberList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="60" align="center" />
-      <el-table-column label="施工人员" align="center" prop="memberName" />
+      <el-table-column label="施工人员" align="center" prop="userName" />
       <el-table-column label="岗位" align="center" prop="postId">
         <template #default="scope">
           <dict-tag :options="user_post_type" :value="scope.row.postId" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-space wrap>
@@ -86,7 +93,7 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="projectTeamMemberFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="施工人员" prop="memberId" v-if="!form.id">
-          <el-select v-model="form.memberId" clearable placeholder="请选择人员" filterable>
+          <el-select v-model="form.memberId" clearable placeholder="请选择人员" remote :remote-method="getUserListNotInTeam" filterable>
             <el-option v-for="item in userNotInTeamOpt" :key="item.value" :label="item.label" :value="item.value" />
             <pagination
               size="small"
@@ -100,12 +107,10 @@
         </el-form-item>
         <el-form-item label="岗位" prop="postId">
           <el-select v-model="form.postId" clearable placeholder="请选择岗位">
-            <el-option v-for="item in user_post_type" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option :key="4" label="普通员工" :value="4" />
+            <el-option :key="10" label="班组长" :value="10" />
           </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -120,11 +125,20 @@
         <el-form-item label="用户名">
           <el-input v-model="memberForm.userName" disabled></el-input>
         </el-form-item>
-        <el-form-item label="工资发放凭证">
-          <file-upload v-model="memberForm.salaryVoucherFile" :limit="10" :is-show-tip="false" :file-size="50" />
-        </el-form-item>
-        <el-form-item label="工资结算确认书">
-          <file-upload v-model="memberForm.salaryConfirmationFile" :limit="10" :is-show-tip="false" :file-size="50" />
+        <el-form-item label="退场文件">
+          <file-upload
+            ref="uploadRef"
+            v-model="memberForm.filePath"
+            uploadUrl="/zm/api/v1/system/busConstructionUser/departure"
+            :accept="['png', 'jpg', 'jpeg', 'pdf']"
+            :data="memberForm"
+            :auto-upload="false"
+            isGo
+            :limit="10"
+            :is-show-tip="false"
+            show-file-list
+            :file-size="50"
+          />
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="memberForm.remark" placeholder="请输入备注" type="textarea"></el-input>
@@ -138,6 +152,18 @@
         </span>
       </template>
     </el-dialog>
+    <el-dialog title="选择时间" v-model="visible" width="30%">
+      <el-form-item label="时间">
+        <el-date-picker v-model="exportDate" type="month" value-format="YYYY-MM" placeholder="选择日期" />
+      </el-form-item>
+
+      <template #footer>
+        <span>
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="handleExport">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -155,13 +181,23 @@ import { computed, reactive, ref } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
 import { listConstructionUser, delConstructionUserMember } from '@/api/project/constructionUser';
 import { ConstructionUserQuery, ConstructionUserVO, ConstructionUserMembeForm } from '@/api/project/constructionUser/types';
-
+import request from '@/utils/request-go';
+const uploadRef = ref(null);
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { user_post_type } = toRefs<any>(proxy?.useDict('user_post_type'));
+const user_post_type = ref([
+  {
+    label: '普通员工',
+    value: '4'
+  },
+  {
+    label: '班组长',
+    value: '10'
+  }
+]);
 const memberStatus = ref(false);
 interface Props {
   projectTeamVo: ProjectTeamVO;
@@ -171,14 +207,17 @@ const memberForm = reactive<any>({
   salaryConfirmationFile: undefined,
   salaryVoucherFile: undefined,
   remark: undefined,
-  userName: undefined
+  userName: undefined,
+  wxOrPc: 1
 });
 
 const props = defineProps<Props>();
 // 是否可见
 const visible = ref(false);
-const initFormData: ProjectTeamMemberForm = {
-  projectId: currentProject.value?.id
+const exportDate = ref('');
+const initFormData: any = {
+  projectId: currentProject.value.goId,
+  openid: undefined
 };
 const data = reactive<PageData<ProjectTeamMemberForm, ProjectTeamMemberQuery>>({
   form: { ...initFormData },
@@ -187,7 +226,7 @@ const data = reactive<PageData<ProjectTeamMemberForm, ProjectTeamMemberQuery>>({
     pageSize: 10,
     orderByColumn: 'createTime',
     isAsc: 'desc',
-    projectId: currentProject.value?.id
+    projectId: currentProject.value.goId
   },
   rules: {
     id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
@@ -214,10 +253,12 @@ const { queryParams, form, rules, memberRules } = toRefs(data);
 const projectTeamMemberList = ref<ProjectTeamMemberVO[]>([]);
 /** 查询项目班组下的成员列表 */
 const getList = async () => {
+  console.log(111);
+
   loading.value = true;
   const res = await listProjectTeamMember({ ...queryParams.value, teamId: props.projectTeamVo.id });
-  projectTeamMemberList.value = res.rows;
-  total.value = res.total;
+  projectTeamMemberList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -231,6 +272,7 @@ const cancel = () => {
 const reset = () => {
   form.value = { ...initFormData };
   projectTeamMemberFormRef.value?.resetFields();
+  userQueryParams.value.userName = '';
 };
 
 /** 搜索按钮操作 */
@@ -267,18 +309,23 @@ const userQueryParams = ref<ConstructionUserQuery>({
   pageSize: 10,
   orderByColumn: 'createTime',
   isAsc: 'desc',
-  projectId: currentProject.value?.id
+  projectId: currentProject.value.goId,
+  userName: ''
 });
 
 // 获取不在当前班组的成员
-const getUserListNotInTeam = async () => {
+const getUserListNotInTeam = async (query?: string) => {
   loading.value = true;
+  console.log('query', query, userQueryParams.value);
+  if (query && !query.page) userQueryParams.value.userName = query;
+
   const res = await listConstructionUser({ ...userQueryParams.value, notTeamId: props.projectTeamVo.id });
-  userNotInTeamOpt.value = res.rows.map((user: ConstructionUserVO) => ({
+  userNotInTeamOpt.value = res.data.list.map((user: ConstructionUserVO) => ({
     value: user.id,
-    label: user.userName
+    label: user.userName,
+    openid: user.openid
   }));
-  userNotInTeamTotal.value = res.total;
+  userNotInTeamTotal.value = res.data.total;
   loading.value = false;
 };
 
@@ -300,9 +347,12 @@ const submitForm = () => {
       if (form.value.id) {
         await updateProjectTeamMember(form.value).finally(() => (buttonLoading.value = false));
       } else {
+        const openid = userNotInTeamOpt.value.find((item: any) => item.value == form.value.memberId).openid;
+
         await addProjectTeamMember({
           ...form.value,
-          teamId: props.projectTeamVo.id
+          teamId: props.projectTeamVo.id,
+          openid
         }).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('操作成功');
@@ -317,21 +367,30 @@ const submitMemberForm = async () => {
   memberFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      await delConstructionUserMember(memberForm).finally(() => (buttonLoading.value = false));
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-      memberForm.filePath = undefined;
-      memberForm.remark = undefined;
+      uploadRef.value
+        .submitUpload()
+        .then(async (res) => {
+          if (res == 'nofile') {
+            proxy?.$modal.msgError('请上传退场文件');
+          } else {
+            proxy?.$modal.msgSuccess('操作成功');
+            dialog.visible = false;
+            await getList();
+            memberForm.filePath = undefined;
+            memberForm.remark = undefined;
+            memberStatus.value = false;
+          }
+        })
+        .finally(() => (buttonLoading.value = false));
     }
   });
-  memberStatus.value = false;
 };
 
 /** 退场按钮操作 */
 const handleExit = async (row?: ProjectTeamMemberVO) => {
   const _ids = row?.id || ids.value;
-  memberForm.userName = row?.memberName;
+  memberForm.userName = row?.userName;
+  console.log('🚀 ~ handleDelete ~ row:', row);
   memberForm.id = row?.id;
   memberForm.salaryVoucherFile = '';
   memberForm.salaryConfirmationFile = '';
@@ -349,15 +408,26 @@ const handleDelete = async (row?: ProjectTeamMemberVO) => {
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
-    'project/projectTeamMember/export',
+  request.download(
+    'zm/api/v1/system/busConstructionUser/exportSalary',
     {
-      ...queryParams.value
+      projectId: currentProject.value.goId,
+      dateStr: exportDate.value,
+      fuzzyQuery: '',
+      teamId: '',
+      typeOfWork: '',
+      years: exportDate.value
     },
     `projectTeamMember_${new Date().getTime()}.xlsx`
   );
 };
 
+const openExport = () => {
+  exportDate.value = '';
+  visible.value = true;
+  return;
+};
+
 watch(
   () => props.projectTeamVo,
   (newId, oldId) => {
diff --git a/src/views/project/projectTeam/index.vue b/src/views/project/projectTeam/index.vue
index d061a06..0d15f55 100644
--- a/src/views/project/projectTeam/index.vue
+++ b/src/views/project/projectTeam/index.vue
@@ -4,8 +4,8 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="班组名称" prop="teamName">
-              <el-input v-model="queryParams.teamName" placeholder="请输入班组名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="班组名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入班组名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -42,18 +42,17 @@
       <el-table v-loading="loading" :data="projectTeamList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="班组名称" align="center" prop="teamName" />
-        <el-table-column label="班组人数" align="center" prop="peopleNumber">
+        <el-table-column label="班组名称" align="center" prop="name" />
+        <!-- <el-table-column label="班组人数" align="center" prop="peopleNumber">
           <template #default="scope">
             <el-link type="primary" :underline="false" @click="handleUserList(scope.row)"> {{ scope.row.peopleNumber }}</el-link>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="打卡范围" align="center" prop="isClockIn">
           <template #default="scope">
             <dict-tag :options="team_clock_type" :value="scope.row.isClockIn" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -72,22 +71,14 @@
     <!-- 添加或修改项目班组对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="projectTeamFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="班组名称" prop="teamName">
-          <el-input v-model="form.teamName" placeholder="请输入班组名称" />
+        <el-form-item label="班组名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入班组名称" />
         </el-form-item>
         <el-form-item label="打卡范围" prop="isClockIn">
           <el-select v-model="form.isClockIn" clearable placeholder="请选择打卡范围">
             <el-option v-for="item in team_clock_type" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="打卡范围" prop="punchRangeList" v-if="form.isClockIn == 1">
-          <el-select v-model="form.punchRangeList" multiple clearable placeholder="请选择打卡范围">
-            <el-option v-for="item in projectTeamRangeList" :key="item.id" :label="item.punchName" :value="item.id" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -96,14 +87,14 @@
         </div>
       </template>
     </el-dialog>
-    <el-dialog :title="currentRow.teamName" v-model="visible" width="1000px">
+    <el-dialog :title="currentRow.name" v-model="visible" width="1000px">
       <user-list-dialog :projectTeamVo="currentRow" />
     </el-dialog>
   </div>
 </template>
 
 <script setup name="ProjectTeam" lang="ts">
-import { addProjectTeam, delProjectTeam, getProjectTeam, listProjectTeam, updateProjectTeam, getProjectTeamClockIn } from '@/api/project/projectTeam';
+import { addProjectTeam, delProjectTeam, getProjectTeam, listProjectTeam, updateProjectTeam } from '@/api/project/projectTeam';
 import { ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import UserListDialog from '@/views/project/projectTeam/component/UserListDialog.vue';
@@ -128,7 +119,7 @@ const projectTeamRangeList = ref([]);
 const currentRow = ref<ProjectTeamVO>({
   id: undefined,
   projectId: undefined,
-  teamName: undefined,
+  name: undefined,
   isClockIn: undefined,
   remark: undefined,
   createTime: undefined
@@ -144,8 +135,8 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: ProjectTeamForm = {
   id: undefined,
-  projectId: currentProject.value?.id,
-  teamName: undefined,
+  projectId: currentProject.value.goId,
+  name: undefined,
   isClockIn: undefined,
   remark: undefined,
   peopleNumber: undefined,
@@ -158,8 +149,8 @@ const data = reactive<PageData<ProjectTeamForm, ProjectTeamQuery>>({
     pageSize: 10,
     orderByColumn: 'createTime',
     isAsc: 'desc',
-    projectId: currentProject.value?.id,
-    teamName: undefined,
+    projectId: currentProject.value.goId,
+    name: undefined,
     isClockIn: undefined,
     params: {},
     peopleNumber: undefined
@@ -176,17 +167,10 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listProjectTeam(queryParams.value);
-  projectTeamList.value = res.rows;
-  total.value = res.total;
+  projectTeamList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
-/** 获取该项目的打开范围 "*/
-const getClockIn = async () => {
-  if (currentProject.value?.id) {
-    const res = await getProjectTeamClockIn({ projectId: currentProject.value?.id });
-    projectTeamRangeList.value = res.rows;
-  }
-};
 
 /** 取消按钮 */
 const cancel = () => {
@@ -248,7 +232,7 @@ const submitForm = () => {
   projectTeamFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
+      form.value.projectId = currentProject.value.goId;
       if (form.value.id) {
         await updateProjectTeam(form.value).finally(() => (buttonLoading.value = false));
       } else {
@@ -282,7 +266,7 @@ const handleExport = () => {
 };
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
@@ -297,6 +281,5 @@ onUnmounted(() => {
 
 onMounted(() => {
   getList();
-  getClockIn();
 });
 </script>
diff --git a/src/views/project/projectUser/component/ConstructionUserDetail.vue b/src/views/project/projectUser/component/ConstructionUserDetail.vue
index ca1c4e2..6dce3c5 100644
--- a/src/views/project/projectUser/component/ConstructionUserDetail.vue
+++ b/src/views/project/projectUser/component/ConstructionUserDetail.vue
@@ -6,7 +6,11 @@
         <el-row :gutter="20" justify="space-around">
           <el-col :span="12">
             <el-form-item label="人脸照">
-              <el-image :src="userDetail?.facePicUrl" style="width: 150px; height: 150px" />
+              <el-image
+                :src="'http://58.17.134.85:8920' + userDetail?.pacePhoto"
+                :preview-src-list="['http://58.17.134.85:8920' + userDetail?.pacePhoto]"
+                style="width: 150px; height: 150px"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -137,9 +141,9 @@
 </template>
 
 <script setup lang="ts">
-import { getConstructionUser } from '@/api/project/constructionUser';
 import { ConstructionUserVO } from '@/api/project/constructionUser/types';
 import { dayjs } from 'element-plus';
+import { getDetails } from '@/api/project/goUser/index';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { type_of_work, user_sex_type, user_clock_type } = toRefs<any>(proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type'));
@@ -153,10 +157,12 @@ const loading = ref<boolean>(false);
 const userDetail = ref<ConstructionUserVO>();
 const getUserDetail = async () => {
   loading.value = true;
-  const res = await getConstructionUser(props.userId);
-  if (res.data && res.code === 200) {
+  const res = await getDetails(props.userId);
+  console.log('🚀 ~ getUserDetail ~ res:', res);
+  if (res.data && res.code === 0) {
     userDetail.value = res.data;
   }
+
   loading.value = false;
 };
 
diff --git a/src/views/project/projectUser/index.vue b/src/views/project/projectUser/index.vue
index 14142e8..1dab176 100644
--- a/src/views/project/projectUser/index.vue
+++ b/src/views/project/projectUser/index.vue
@@ -4,16 +4,11 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="项目名称" prop="projectId">
-              <el-select v-model="queryParams.projectId" clearable placeholder="全部">
-                <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.id" />
-              </el-select>
-            </el-form-item>
             <el-form-item label="人员姓名" prop="userName">
               <el-input v-model="queryParams.userName" placeholder="请输入人员姓名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="分包公司" prop="contractorId">
-              <el-select v-model="queryParams.contractorId" clearable placeholder="全部">
+            <el-form-item label="分包公司" prop="labourserviceId" v-hasPermi="['contractor:contractor:list']">
+              <el-select v-model="queryParams.labourserviceId" clearable placeholder="全部">
                 <el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -47,6 +42,7 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
           </el-col>
+
           <el-col :span="1.5">
             <el-button
               type="danger"
@@ -59,11 +55,11 @@
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
               >导出
             </el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
           </el-col>
@@ -88,25 +84,25 @@
                 >下载资料模板
               </el-button>
             </el-col>
-            <el-col :span="1.5" v-show="informationStatus">
+            <!-- <el-col :span="1.5" v-show="informationStatus">
               <file-upload
                 v-model="filePath"
                 isImportInfo
                 :isShowTip="false"
-                uploadUrl="/project/constructionUserFile/upload/zip"
+                uploadUrl="/contractor/constructionUserFile/upload/zip"
                 :limit="1"
                 :file-size="50"
               >
                 <el-button type="warning" plain icon="Edit" v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
               </file-upload>
-            </el-col>
+            </el-col> -->
           </el-row>
 
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="constructionUserList" @selection-change="handleSelectionChange" v-cloak>
+      <el-table v-loading="loading" :data="constructionUserList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
         <el-table-column label="姓名" align="center" prop="userName">
@@ -114,7 +110,7 @@
             <el-link type="primary" @click="handleUpdate(scope.row)">{{ scope.row.userName }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column label="分包公司" align="center" prop="contractorVo.name" />
+        <el-table-column label="分包公司" align="center" prop="lwName" width="100" />
         <el-table-column label="班组" align="center" prop="teamId">
           <template #default="scope">
             {{ getTeamName(scope.row.teamId) }}
@@ -126,7 +122,7 @@
             <dict-tag :options="user_sex_type" :value="scope.row.sex" />
           </template>
         </el-table-column>
-        <el-table-column label="民族" align="center" prop="nation" />
+        <el-table-column label="民族" align="center" prop="sfzNation" />
         <el-table-column label="身份证号码" align="center" prop="sfzNumber" min-width="180" />
         <el-table-column label="工种" align="center" prop="typeOfWork" min-width="120">
           <template #default="scope">
@@ -143,8 +139,8 @@
               active-text="开启"
               inactive-text="禁用"
               :loading="playCardLoding"
-              active-value="0"
-              inactive-value="1"
+              active-value="1"
+              inactive-value="2"
               @change="handleClockStatus(scope.row)"
             />
           </template>
@@ -152,10 +148,12 @@
         <el-table-column label="薪水" align="center" min-width="180">
           <template #default="scope">
             <span class="flex justify-center">
-              {{ proxy.formatPrice(scope.row.salary ? scope.row.salary : scope.row.standardSalary) }}
-              (<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>)
+              {{ scope.row.salary == '0' ? scope.row.original : scope.row.salary }}
+              <!-- (<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>) -->
             </span>
-            <div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ? '取消变更' : '变更' }}</div>
+            <div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">
+              {{ scope.row.salary != '0' ? '取消变更' : '变更' }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="入场时间" align="center" prop="entryDate" min-width="180" />
@@ -176,6 +174,9 @@
                 修改
               </el-button>
               <el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
+              <el-button link type="primary" icon="Switch" @click="handleChange(scope.row)" v-hasPermi="['contractor:constructionUser:migration']">
+                人员迁移
+              </el-button>
               <el-button
                 link
                 type="danger"
@@ -183,17 +184,16 @@
                 @click="handleJoinBlacklist(scope.row)"
                 v-hasPermi="['contractor:constructionBlacklist:add']"
               >
-                黑名单
+                {{ scope.row.blackOpenid ? '移除黑名单' : '加入黑名单' }}
               </el-button>
               <!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </el-button> -->
-              <el-button link type="primary" icon="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
-              <el-button link type="primary" icon="Switch" @click="handleAssign(scope.row)"> 分配班组 </el-button>
+
               <el-button link type="primary" icon="ChatLineSquare" @click="handleExit(scope.row)"> 入退场记录 </el-button>
               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
                 删除
               </el-button>
               <el-tooltip content="红点：部分上传，绿点：已上传，无点：未上传" placement="right" effect="dark">
-                <el-badge :is-dot="scope.row.fileUploadStatus != '1'" :type="uploadStatusColor(scope.row.fileUploadStatus)">
+                <el-badge :is-dot="scope.row.fileStatus != '1'" :type="uploadStatusColor(scope.row.fileStatus)">
                   <el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button>
                 </el-badge>
               </el-tooltip>
@@ -210,19 +210,19 @@
         <div class="block_box">
           <div class="msg">用户信息</div>
           <div class="el-row">
-            <div class="el-col el-col-24">
+            <div class="el-col el-col-24" v-if="!form.id">
               <el-form-item label="人脸照" prop="facePic">
                 <image-upload v-model="form.facePic" :limit="1" :is-show-tip="false" />
               </el-form-item>
             </div>
-            <div class="el-col el-col-12">
+            <div class="el-col el-col-12" v-if="!form.id">
               <el-form-item label="身份证正面图片" prop="sfzFrontPic">
-                <image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" :idCardType="'front'" @success="handleUploadSuccess" />
+                <image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" />
               </el-form-item>
             </div>
-            <div class="el-col el-col-12">
+            <div class="el-col el-col-12" v-if="!form.id">
               <el-form-item label="身份证背面图片" prop="sfzBackPic">
-                <image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" :idCardType="'back'" @success="handleUploadSuccessBack" />
+                <image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
@@ -231,8 +231,8 @@
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
-              <el-form-item label="分包公司" prop="contractorId">
-                <el-select v-model="form.contractorId" clearable placeholder="请选择分包公司">
+              <el-form-item label="分包公司" prop="labourserviceId">
+                <el-select v-model="form.labourserviceId" clearable placeholder="请选择分包公司">
                   <el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -243,8 +243,8 @@
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
-              <el-form-item label="民族" prop="nation">
-                <el-input v-model="form.nation" placeholder="请输入民族" />
+              <el-form-item label="民族" prop="sfzNation">
+                <el-input v-model="form.sfzNation" placeholder="请输入民族" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
@@ -272,19 +272,26 @@
                 <el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
               </el-form-item>
             </div>
-            <div class="el-col el-col-12">
+            <div class="el-col el-col-12" v-if="!form.id">
               <el-form-item label="籍贯" prop="nativePlace">
                 <el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
               </el-form-item>
             </div>
+            <div class="el-col el-col-12">
+              <el-form-item label="性别" prop="sex">
+                <el-select v-model="form.sex" clearable placeholder="请选择性别">
+                  <el-option v-for="item in [user_sex_type[1], user_sex_type[2]]" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </div>
           </div>
         </div>
         <div class="block_box">
           <div class="msg">银行卡</div>
           <div class="el-row">
-            <div class="el-col el-col-24">
+            <div class="el-col el-col-24" v-if="!form.id">
               <el-form-item label="银行图片" prop="yhkPic">
-                <image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" :idCardType="'bank'" @success="handleUploadSuccessBank" />
+                <image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
@@ -297,7 +304,7 @@
                 <el-input v-model="form.yhkOpeningBank" placeholder="请输入开户行" />
               </el-form-item>
             </div>
-            <div class="el-col el-col-12">
+            <div class="el-col el-col-12" v-if="!form.id">
               <el-form-item label="持卡人" prop="yhkCardholder">
                 <el-input v-model="form.yhkCardholder" placeholder="请输入持卡人" />
               </el-form-item>
@@ -307,7 +314,7 @@
         <div class="block_box">
           <div class="msg">单位信息</div>
           <div class="el-row">
-            <div class="el-col el-col-24">
+            <div class="el-col el-col-24" v-if="!form.id">
               <el-form-item label="特种作业证图片" prop="specialWorkPic">
                 <image-upload v-model="form.specialWorkPic" :limit="1" :is-show-tip="false" />
               </el-form-item>
@@ -326,18 +333,18 @@
                 </el-select>
               </el-form-item>
             </div>
-            <div class="el-col el-col-12">
+            <!-- <div class="el-col el-col-12">
               <el-form-item label="结算方式" prop="wageMeasureUnit">
                 <el-select v-model="form.wageMeasureUnit" clearable placeholder="请选择结算方式">
                   <el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
+            </div> -->
+            <!-- <div class="el-col el-col-12">
               <el-form-item label="备注" prop="remark">
                 <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 240px" />
               </el-form-item>
-            </div>
+            </div> -->
           </div>
         </div>
       </el-form>
@@ -357,11 +364,11 @@
           <el-option v-for="item in skipOptions" :key="item.id" :label="item.projectName" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="分包单位" label-width="130px">
-        <el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" style="width: 240px">
+      <!-- <el-form-item label="分包单位" label-width="130px">
+        <el-select v-model="skipObject.labourserviceId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" style="width: 240px">
           <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="setUnits">确认</el-button>
@@ -371,9 +378,39 @@
     </el-dialog>
     <el-dialog draggable title="上传文件" v-model="fileStatus" width="770px">
       <div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value">
-        <div class="title">{{ item.label }}</div>
-        <div class="file_upload_all" v-if="item.value != 7">
-          <file-upload v-model="item.path" isConstruction show-file-list :isShowTip="false" :limit="10" :file-type="['pdf']" :file-size="50" />
+        <div class="title">{{ item.dictLabel }}</div>
+        <div class="file_upload_all">
+          <div class="pdf" v-for="(itm, idx) in item.path">
+            <img src="@/assets/icons/svg/pdf.png" alt="" />
+            <el-text class="w-148px text-center" truncated>
+              <span>{{ itm.name }}</span>
+            </el-text>
+            <div class="Shadow">
+              <a :href="BASE + itm.path" target="_blank">
+                <el-icon class="mr">
+                  <View />
+                </el-icon>
+              </a>
+              <a href="#">
+                <el-icon @click="delFile(index, idx)">
+                  <Delete />
+                </el-icon>
+              </a>
+            </div>
+          </div>
+          <file-upload
+            v-model="path"
+            isConstruction
+            :isShowTip="false"
+            :limit="10"
+            :file-type="['pdf']"
+            :file-size="50"
+            isGo
+            upload-url="/zm/api/v1/system/upload/singleFile"
+            @handleChange="(file, list) => change(file, list, index)"
+            :data="uploadData"
+            :onUploadSuccess="handleUploadSuccess"
+          />
         </div>
       </div>
       <template #footer>
@@ -428,16 +465,10 @@
             {{ '入场时间：' + item.entryDate }}
           </el-timeline-item>
           <el-timeline-item color="rgb(255, 73, 73)">
-            <div class="mb">{{ '退场时间：' + item.entryDate }}</div>
+            <div class="mb">{{ '退场时间：' + item.leaveDate }}</div>
             <div class="pl-xl">
               <span class="text-coolgray font-bold"
-                >退场文件：<el-link
-                  v-for="itm in [...item.salaryConfirmationFileUrl, ...item.salaryVoucherFileUrl]"
-                  :href="itm"
-                  target="_blank"
-                  type="primary"
-                  >{{ itm }}</el-link
-                ></span
+                >退场文件：<image-preview :src="'http://58.17.134.85:8920' + item.path" width="100px" class="mr" /></span
               ><br />
               <p class="mt text-coolgray">
                 备注：<span class="text-blue">{{ item.remark }}</span>
@@ -477,34 +508,6 @@
         </template>
       </el-calendar>
     </el-dialog>
-    <el-dialog draggable :title="skipName + '-人员分配'" v-model="personnelAllocation" width="500px">
-      <el-form-item label="所属项目" label-width="130px">
-        <el-select v-model="personnelAllocationObject.projectId" @change="selectProject1" placeholder="请选择所属项目" style="width: 240px">
-          <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="岗位" label-width="130px">
-        <el-select v-model="personnelAllocationObject.postId" placeholder="请选择岗位" style="width: 240px">
-          <el-option v-for="item in user_post_type" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="班组" label-width="130px">
-        <el-select
-          v-model="personnelAllocationObject.teamId"
-          :disabled="!personnelAllocationObject.projectId"
-          placeholder="请选择班组"
-          style="width: 240px"
-        >
-          <el-option v-for="item in teamList" :key="item.id" :label="item.teamName" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="handlePersonnelAllocation">确认</el-button>
-          <el-button @click="personnelAllocation = false"> 取消 </el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -525,9 +528,7 @@ import {
   dowloadConstructionUserTemplate,
   importConstructionUserInfo,
   listConstructionMonth,
-  ProjectList,
-  TeamList,
-  TeamDistribution
+  listConstructionUserInTeam
 } from '@/api/project/constructionUser';
 import {
   ConstructionUserForm,
@@ -543,7 +544,7 @@ import { listProjectTeam } from '@/api/project/projectTeam';
 import { ContractorVO } from '@/api/project/contractor/types';
 import { ProjectTeamVO } from '@/api/project/projectTeam/types';
 import ConstructionUserDetail from '@/views/project/constructionUser/component/ConstructionUserDetail.vue';
-import { addConstructionBlacklist } from '@/api/project/constructionBlacklist';
+import { addConstructionBlacklist, delConstructionBlacklist } from '@/api/project/constructionBlacklist';
 import { listConstructionUserFile, setConstructionUserFile } from '@/api/project/constructionUserFile';
 import {
   ConstructionUserFileVO,
@@ -551,22 +552,22 @@ import {
   ConstructionUserFileForm,
   ConstructionUserFileQuery
 } from '@/api/project/constructionUserFile/types';
-
-import { ElLoadingService } from 'element-plus';
+import { dayjs, ElLoadingService } from 'element-plus';
 import type { CalendarDateType, CalendarInstance } from 'element-plus';
 import { AttendanceMonthVO } from '@/api/project/attendance/types';
 import { parseTime } from '@/utils/ruoyi';
 
 const calendar = ref<CalendarInstance>();
-const { proxy } = getCurrentInstance() as any;
-const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type, user_post_type } = toRefs<any>(
-  proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type', 'user_post_type')
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type } = toRefs<any>(
+  proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type')
 );
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const ProjectTeam = computed(() => proxy?.$cache.local.getJSON('ProjectTeamList') || []);
+
 const constructionUserList = ref<ConstructionUserVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -576,7 +577,6 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const skip = ref(false);
-const personnelAllocation = ref(false);
 const fileStatus = ref(false);
 const showFaceDrawer = ref(false);
 const statusDialog = ref(false);
@@ -597,10 +597,6 @@ const queryFormRef = ref<ElFormInstance>();
 const constructionUserFormRef = ref<ElFormInstance>();
 const skipName = ref('');
 const calendarList = ref<Array<AttendanceMonthVO>>([]);
-// 项目列表
-const projectList = ref([]);
-// 班组列表
-const teamList = ref([]);
 const dialog = reactive<DialogOption>({
   visible: false,
   title: '',
@@ -611,16 +607,8 @@ const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const skipObject: skipType = reactive({
   id: '',
   projectId: '',
-  contractorId: ''
+  labourserviceId: ''
 });
-// 人员分配
-const personnelAllocationObject = reactive({
-  memberId: null,
-  projectId: '',
-  teamId: '',
-  postId: ''
-});
-
 const contractorList = ref<Array<skipTeamType>>([]);
 //项目列表
 const skipOptions = ref<Array<skipOptionType>>([]);
@@ -631,14 +619,14 @@ const initFormData: ConstructionUserForm = {
   nickName: undefined,
   facePic: undefined,
   userName: undefined,
-  projectId: currentProject.value?.id,
-  contractorId: undefined,
+  projectId: currentProject.value?.goId,
+  labourserviceId: undefined,
   teamId: undefined,
   status: undefined,
   isPinch: undefined,
   phone: undefined,
   sex: undefined,
-  nation: undefined,
+  sfzNation: undefined,
   sfzFrontPic: undefined,
   sfzBackPic: undefined,
   sfzNumber: undefined,
@@ -660,7 +648,7 @@ const initFormData: ConstructionUserForm = {
   salary: undefined,
   remark: undefined
 };
-const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
+const data = reactive({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
@@ -668,14 +656,15 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
     openid: undefined,
     nickName: undefined,
     userName: undefined,
-    projectId: currentProject.value?.id,
-    contractorId: undefined,
+    projectId: currentProject.value?.goId,
+    notUserRole: 1,
+    labourserviceId: undefined,
     teamId: undefined,
     status: undefined,
     isPinch: undefined,
     phone: undefined,
     sex: undefined,
-    nation: undefined,
+    sfzNation: undefined,
     sfzNumber: undefined,
     sfzStart: undefined,
     sfzEnd: undefined,
@@ -697,10 +686,10 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
     facePic: [{ required: true, message: '人脸照不能为空', trigger: 'blur' }],
     userName: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
     projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
-    contractorId: [{ required: true, message: '分包公司id不能为空', trigger: 'blur' }],
+    labourserviceId: [{ required: true, message: '分包公司id不能为空', trigger: 'blur' }],
     teamId: [{ required: true, message: '班组id不能为空', trigger: 'blur' }],
     phone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
-    nation: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
+    sfzNation: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
     sfzFrontPic: [{ required: true, message: '身份证正面图片不能为空', trigger: 'blur' }],
     sfzBackPic: [{ required: true, message: '身份证背面图片不能为空', trigger: 'blur' }],
     sfzNumber: [{ required: true, message: '身份证号码不能为空', trigger: 'blur' }],
@@ -717,62 +706,38 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
     userRole: [{ required: true, message: '用户角色(1=普通用户,2=管理员)不能为空', trigger: 'blur' }]
   }
 });
+const BASE = import.meta.env.VITE_APP_BASE_API_GO;
+
+const uploadData = ref({
+  token: proxy.$cache.local.get('goToken'),
+  showDocumentDetail: false
+});
+const uploadIndex = ref(null);
+const uploadIdx = ref(null);
 
 /** 返回遍历文件对象 */
 const uploadPath = computed(() => {
-  const list = JSON.parse(JSON.stringify(user_file_type.value));
-  for (const item of fileList.value) {
-    const targetType = item.fileType;
-    for (let i = 0; i < list.length; i++) {
-      if (list[i].value == targetType) {
-        list[i] = { ...list[i], ...item }; // 合并对象
-        break;
-      }
-    }
-  }
-  for (let i = 0; i < list.length; i++) {
-    if (!list[i].hasOwnProperty('fileType')) {
-      list[i].fileType = list[i].value;
-    }
-  }
-  console.log(list);
+  const list = fileList.value.map((item) => ({
+    ...item,
+    path: item.path
+      ? item.path
+          .split(',')
+          .filter((p) => p.trim() !== '') // ✅ 去掉空字符串
+          .map((p) => {
+            const fullPath = p;
+            const fileName = p.split('/').pop() || '';
+            return {
+              path: fullPath,
+              userImgType: item.userImgType,
+              name: fileName
+            };
+          })
+      : []
+  }));
+
+  console.log('🚀 ~ list:', list, fileList.value);
   return list;
 });
-//身份证正面上传成功
-const handleUploadSuccess = (data: any) => {
-  console.log('上传成功返回的数据:', data);
-  // 这里可以处理返回的数据
-  form.value.userName = data.name;
-  form.value.sex = data.gender == '男' ? 2 : 3;
-  form.value.nation = data.nation;
-  form.value.sfzNumber = data.citizenIdentification;
-  form.value.sfzSite = data.address;
-  form.value.sfzBirth = formatDate(data.birth);
-};
-//身份证反面面上传成功
-const handleUploadSuccessBack = (data: any) => {
-  console.log('上传成功返回的数据:', data);
-  form.value.sfzStart = formatDate(data.issuingDate);
-  form.value.sfzEnd = formatDate(data.expiryDate);
-};
-//银行卡上传成功
-const handleUploadSuccessBank = (data: any) => {
-  console.log('上传成功返回的数据:', data);
-  form.value.yhkNumber = data.bankCardNumber;
-};
-//格式化时间
-const formatDate = (date: any) => {
-  const year = date.substring(0, 4);
-  const month = date.substring(4, 6);
-  const day = date.substring(6, 8);
-  return `${year}-${month}-${day}`;
-};
-// 获取项目列表
-const getProjectList = async () => {
-  const res = await ProjectList({});
-  projectList.value = res.rows;
-  projectList.value.unshift({ id: '', projectName: '全部' });
-};
 
 /** 返回文件上传状态 */
 const uploadStatusColor = computed(() => (str: string) => {
@@ -790,12 +755,12 @@ const { queryParams, form, rules } = toRefs(data);
 
 //打卡时间下标
 const playCardIdx = computed(() => (date) => {
-  return calendarList.value.findIndex((item) => item.clockDate == date.day);
+  return calendarList.value.findIndex((item) => item.printingDate == date.day);
 });
 
 //打卡状态颜色
 const playCardColor = computed(() => (date) => {
-  const idx = calendarList.value[playCardIdx.value(date)]?.status;
+  const idx = calendarList.value[playCardIdx.value(date)]?.type;
   switch (idx) {
     case '1':
       return 'green';
@@ -813,9 +778,9 @@ const playCardColor = computed(() => (date) => {
 /** 查询施工人员列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listConstructionUser(queryParams.value);
-  constructionUserList.value = res.rows;
-  total.value = res.total;
+  const res = await listConstructionUserInTeam(queryParams.value);
+  constructionUserList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -851,13 +816,13 @@ const handleViewPlayCard = async (idx: number, data: any) => {
 const selectProject = (e: any) => {
   //选中项目筛选出项目下的分包单位并清空分包单位value
   contractorList.value = skipOptions.value.filter((item) => item.id == e)[0].contractorList;
-  skipObject.contractorId = '';
+  skipObject.labourserviceId = '';
 };
 
 const setUnits = async () => {
   //人员迁移
   let res = await transferConstructionUser(skipObject);
-  if (res.code == 200) {
+  if (res.code == 0) {
     ElMessage.success(res.msg);
     skip.value = false;
     getList();
@@ -871,10 +836,10 @@ const getContractorList = async () => {
   const res = await listContractor({
     pageNum: 1,
     pageSize: 20,
-    projectId: currentProject.value?.id
+    projectId: currentProject.value?.goId
   });
-  contractorOpt.value = res.rows.map((contractor: ContractorVO) => ({
-    value: contractor.id,
+  contractorOpt.value = res.data.list.map((contractor: ContractorVO) => ({
+    value: contractor.id.toString(),
     label: contractor.name
   }));
   loading.value = false;
@@ -890,37 +855,54 @@ const handleCalendarMonth = async (e?) => {
   let clockMonth;
   if (e) {
     clockMonth = parseTime(e, '{y}-{m}');
+  } else {
+    clockMonth = parseTime(dayjs().format('YYYY-MM'), '{y}-{m}');
   }
 
-  const res = await listConstructionMonth({ userId: dialog.id, clockMonth });
-  calendarList.value = res.data;
+  const res = await listConstructionMonth({ openid: dialog.id, years: clockMonth });
+  console.log('🚀 ~ handleCalendarMonth ~ res:', res.data.list);
+  calendarList.value = res.data.list;
+};
+
+const path = ref(null);
+const handleUploadSuccess = (list, res) => {
+  if (res.code == 0) {
+    fileList.value[uploadIndex.value].path += (fileList.value[uploadIndex.value].path ? ',' : '') + res.data.path;
+  }
+};
+
+const delFile = (index, idx) => {
+  const paths = fileList.value[index].path.split(',');
+  paths.splice(idx, 1); // 删除 idx 对应的一个元素
+  fileList.value[index].path = paths.join(',');
+  console.log(fileList.value[index].path.split(','), idx);
+};
+
+const change = (file, list, index) => {
+  uploadIndex.value = index;
 };
 
 /** 上传安全协议书按钮操作 */
 
 const updateProjectFile = async () => {
   buttonLoading.value = true;
-  let fileList = uploadPath.value.map((item) => {
+  form.value.filesListReq = JSON.parse(JSON.stringify(form.value.ImgFileList)).map((item) => {
     return {
-      fileId: item.path,
-      fileType: item.fileType
+      ...item,
+      userId: form.value.id
     };
   });
-  const data = {
-    userId: currentUserId.value,
-    fileList
-  };
-  console.log('🚀 ~ updateProjectFile ~ data:', data);
-  await setConstructionUserFile(data);
+  console.log(form.value);
+
+  await updateConstructionUser(form.value).finally(() => (buttonLoading.value = false));
   proxy?.$modal.msgSuccess('上传成功');
-  buttonLoading.value = false;
   fileStatus.value = false;
   await getList();
 };
 
 const getTeamName = computed(() => (teamId: string | number) => {
   const team = Array.isArray(ProjectTeam.value) ? ProjectTeam.value.find((item: any) => item.value === teamId) : null;
-  return team ? team.label : teamId;
+  return team ? team.label : '';
 });
 
 /** 取消按钮 */
@@ -938,7 +920,7 @@ const reset = () => {
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
-  // if (contractorOpt.value.length == 1) queryParams.value.contractorId = contractorOpt.value[0].value;
+  if (contractorOpt.value.length == 1) queryParams.value.labourserviceId = contractorOpt.value[0].value;
   getList();
 };
 
@@ -982,7 +964,7 @@ const handleShowDrawer = (row?: ConstructionUserVO) => {
 
 //打卡按钮
 const handlePlayCard = async (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
+  const _id = row?.openid || ids.value[0];
   skipName.value = row?.userName;
   dialog.id = _id;
   await handleCalendarMonth();
@@ -997,7 +979,10 @@ const downloadTemplate = async () => {
     text: 'Loading',
     background: 'rgba(0, 0, 0, 0.7)'
   });
-  const res = await dowloadConstructionUserTemplate({ projectId: currentProject.value?.id });
+  const res = await dowloadConstructionUserTemplate({ projectId: currentProject.value?.goId });
+  if (res.code == 0) {
+    window.open(BASE + res.data.Path);
+  }
   loadingInstance.close();
 };
 
@@ -1006,11 +991,13 @@ const importInformation = async () => {};
 
 /** 人员迁移 */
 const handleChange = async (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
+  const _id = row?.openid;
   skipName.value = row?.userName;
-  skipObject.id = _id;
+  skipObject.openid = _id;
+  skipObject.projectId = '';
+
   const res = await getProjectContractorList();
-  skipOptions.value = res.data;
+  skipOptions.value = res.data.list;
   skip.value = true;
 };
 
@@ -1025,19 +1012,22 @@ const handleChange = async (row: ConstructionUserVO) => {
 // };
 
 const handleExit = async (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
+  const _id = row?.sfzNumber || ids.value[0];
   currentUserId.value = _id;
-  const res = await getConstructionUserExit({ userId: _id });
-  exitList.value = res.rows;
+  const res = await getConstructionUserExit({ sfzNumber: _id });
+  exitList.value = res.data.List || [];
   exitStatus.value = true;
 };
 
 //上传按钮
 const handleUpload = async (row: ConstructionUserVO) => {
-  const _id = row?.sysUserId;
-  currentUserId.value = _id;
-  const res = await listConstructionUserFile({ userId: _id });
-  fileList.value = res.data;
+  // currentUserId.value = _id;
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await listConstructionUserFile({ id: _id });
+
+  Object.assign(form.value, res.data);
+  fileList.value = res.data.ImgFileList || [];
   fileStatus.value = true;
 };
 
@@ -1047,7 +1037,7 @@ const submitForm = () => {
     console.log(valid);
     if (valid) {
       buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
+      form.value.projectId = currentProject.value?.goId;
       if (form.value.id) {
         await updateConstructionUser(form.value).finally(() => (buttonLoading.value = false));
       } else {
@@ -1065,12 +1055,20 @@ const submitForm = () => {
 
 /** 加入黑名单按钮操作 */
 const handleJoinBlacklist = async (row?: ConstructionUserVO) => {
-  await proxy?.$modal.confirm('确认要将该员工加入黑名单吗？').finally(() => (loading.value = false));
-  await addConstructionBlacklist({
-    userId: row.sysUserId,
-    projectId: currentProject.value?.id
-  });
-  proxy?.$modal.msgSuccess('加入成功');
+  if (row.blackOpenid) {
+    await proxy?.$modal.confirm('确定要将该职工从黑名单中移除吗？').finally(() => (loading.value = false));
+    await delConstructionBlacklist(row.blackOpenid);
+    proxy?.$modal.msgSuccess('移除成功');
+  } else {
+    await proxy?.$modal.confirm('确认要将该员工加入黑名单吗？').finally(() => (loading.value = false));
+    await addConstructionBlacklist({
+      name: row.userName,
+      openid: row.openid,
+      sfzNumber: row.sfzNumber
+    });
+    proxy?.$modal.msgSuccess('加入成功');
+  }
+
   await getList();
 };
 
@@ -1078,7 +1076,7 @@ const handleJoinBlacklist = async (row?: ConstructionUserVO) => {
 const handleDelete = async (row?: ConstructionUserVO) => {
   const _ids = row?.id || ids.value;
   await proxy?.$modal.confirm('是否确认删除施工人员编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delConstructionUser(_ids);
+  await delConstructionUser({ ids: _ids });
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };
@@ -1100,22 +1098,24 @@ const handleEdit = async () => {
     return;
   }
   const data = {
-    idList: ids.value,
+    ids: ids.value,
     status: vocationalStatus.value
   };
   await updateConstructionUserStatus(data);
   proxy?.$modal.msgSuccess('修改成功');
   getList();
   ids.value = [];
+  vocationalStatus.value = '';
   statusDialog.value = false;
 };
 
 //打开修改日薪
 const openSalaryDialog = (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
+  const _id = row?.openid || ids.value[0];
   currentUserId.value = _id;
-  if (row.salary) {
-    setSalary();
+  if (row.salary != '0') {
+    changeSalary.value = '';
+    setSalary(2);
     return;
   }
   console.log(row);
@@ -1128,10 +1128,10 @@ const handleSalary = async () => {
     proxy?.$modal.msgError('请输入薪资');
     return;
   }
-  setSalary();
+  setSalary(1);
 };
-const setSalary = async () => {
-  await updateConstructionUserSalary({ id: currentUserId.value, salary: changeSalary.value });
+const setSalary = async (typeStr: number) => {
+  await updateConstructionUserSalary({ openid: currentUserId.value, salary: changeSalary.value, typeStr });
   proxy?.$modal.msgSuccess('修改成功');
   getList();
   changeSalary.value = '';
@@ -1141,8 +1141,8 @@ const setSalary = async () => {
 // 批量切换在职状态
 const handlePlayCardStatus = async (e) => {
   playCardLoding.value = true;
-  const clock = e ? 1 : 0;
-  await updateConstructionUserPlayCardStatus({ projectId: currentProject.value?.id, clock });
+  const type = e ? 2 : 1;
+  await updateConstructionUserPlayCardStatus({ projectId: currentProject.value?.goId, type });
   proxy?.$modal.msgSuccess('修改成功');
   getList();
   playCardLoding.value = false;
@@ -1151,7 +1151,7 @@ const handlePlayCardStatus = async (e) => {
 // 切换在职状态
 const handleClockStatus = async (row: ConstructionUserVO) => {
   playCardLoding.value = true;
-  await updateConstructionUserPlayCardOneStatus({ id: row.id, clock: row.clock });
+  await updateConstructionUserPlayCardOneStatus({ id: row.id, type: row.clock });
   proxy?.$modal.msgSuccess('修改成功');
   getList();
   playCardLoding.value = false;
@@ -1159,46 +1159,13 @@ const handleClockStatus = async (row: ConstructionUserVO) => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value?.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
     getContractorList();
   }
 );
-// 分配班组
-const handleAssign = async (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
-  currentUserId.value = _id;
-  personnelAllocationObject.projectId = '';
-  personnelAllocationObject.postId = '';
-  personnelAllocationObject.teamId = '';
-  personnelAllocationObject.memberId = row?.sysUserId;
-  skipName.value = row?.userName;
-  personnelAllocation.value = true;
-};
-// 选择项目1
-const selectProject1 = (e: any) => {
-  // 请求班组
-  getTeamList(personnelAllocationObject.projectId);
-};
-const getTeamList = async (projectId) => {
-  const res = await TeamList({
-    projectId,
-    pageNum: 1,
-    pageSize: 100
-  });
-  teamList.value = res.rows;
-};
-// 人员分配
-const handlePersonnelAllocation = async () => {
-  let res = await TeamDistribution(personnelAllocationObject);
-  if (res.code == 200) {
-    ElMessage.success(res.msg);
-    personnelAllocation.value = false;
-    getList();
-  }
-};
 
 onUnmounted(() => {
   listeningProject();
@@ -1206,7 +1173,6 @@ onUnmounted(() => {
 
 onMounted(() => {
   getContractorList();
-  getProjectList();
 });
 </script>
 <style scoped lang="scss">
@@ -1214,12 +1180,10 @@ onMounted(() => {
   margin: 0 15px;
   position: relative;
   font-size: 12px;
-
   > div {
     margin: 0 15px;
     position: relative;
     font-size: 12px;
-
     &::before {
       position: absolute;
       content: '';
@@ -1231,35 +1195,29 @@ onMounted(() => {
       border-radius: 50%;
     }
   }
-
   .red {
     &::before {
       background-color: red;
     }
   }
-
   .gray {
     &::before {
       background-color: gray;
     }
   }
-
   .orange {
     &::before {
       background-color: orange;
     }
   }
-
   .green {
     &::before {
       background-color: green;
     }
   }
 }
-
 .monthDay {
   padding: 8px;
-
   > div {
     position: absolute;
     width: 20px;
@@ -1270,16 +1228,13 @@ onMounted(() => {
     right: 0;
     margin: auto;
   }
-
   .type2 {
     background: rgb(255, 0, 0);
   }
-
   .type3 {
     background: rgb(0, 128, 0);
   }
 }
-
 .block_box {
   border: 1px solid #9eccfa;
   border-radius: 6px;
@@ -1293,12 +1248,10 @@ onMounted(() => {
   font-size: 14px;
   margin-bottom: 10px;
 }
-
 .image_upload {
   border-bottom: 1px solid #e3e3d7;
   padding-bottom: 4px;
 }
-
 .title {
   font-size: 18px;
   font-weight: 700;
@@ -1307,18 +1260,65 @@ onMounted(() => {
   width: 100%;
   font-family: cursive;
 }
-
 .information {
   display: none;
 }
-
 .informationStatus:hover .information {
   display: block;
 }
-
 ::v-deep(.el-calendar) {
   .el-calendar-day {
     padding: 0;
   }
 }
+
+.file_upload_all {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  padding-bottom: 8px;
+}
+.pdf {
+  display: flex;
+  justify-content: center;
+  border-radius: 6px;
+  overflow: hidden;
+  align-items: center;
+  flex-direction: column;
+  border-radius: 6px;
+  position: relative;
+  margin-right: 8px;
+  width: 148px;
+  height: 148px;
+  img {
+    width: 40%;
+  }
+
+  &:hover {
+    .Shadow {
+      opacity: 1;
+    }
+  }
+
+  > span {
+    width: 100%;
+  }
+}
+.Shadow {
+  align-items: center;
+  background-color: rgba(0, 0, 0, 0.5);
+  color: #fff;
+  cursor: default;
+  display: inline-flex;
+  font-size: 20px;
+  height: 100%;
+  justify-content: center;
+  left: 0;
+  opacity: 0;
+  position: absolute;
+  top: 0;
+  transition: opacity 0.3s;
+  width: 100%;
+  z-index: 1;
+}
 </style>
diff --git a/src/views/project/reissueCard/index.vue b/src/views/project/reissueCard/index.vue
index 73081b0..dc5c70d 100644
--- a/src/views/project/reissueCard/index.vue
+++ b/src/views/project/reissueCard/index.vue
@@ -4,30 +4,15 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="申请人" prop="userName">
-              <el-input v-model="queryParams.userName" placeholder="请输入申请人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="补卡类型" prop="reissueCardType">
-              <el-select v-model="queryParams.reissueCardType" placeholder="全部" clearable>
-                <el-option v-for="dict in commuter_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
+            <el-form-item label="申请人" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入申请人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="所属班组" prop="reissueCardType">
-              <el-select v-model="queryParams.teamId" placeholder="全部" clearable>
-                <el-option v-for="dict in ProjectTeam" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select v-model="queryParams.teamId" clearable placeholder="全部">
+                <el-option label="全部" value="" />
+                <el-option v-for="item in TeamList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
-            <el-form-item label="班组长意见" prop="gangerOpinion" label-width="100px">
-              <el-select v-model="queryParams.gangerOpinion" placeholder="全部" clearable>
-                <el-option v-for="dict in user_opinion_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="管理员意见" prop="managerOpinion" label-width="100px">
-              <el-select v-model="queryParams.managerOpinion" placeholder="全部" clearable>
-                <el-option v-for="dict in user_opinion_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -38,75 +23,41 @@
     </transition>
 
     <el-card shadow="never">
-      <el-table v-loading="loading" :data="reissueCardList">
+      <el-table v-loading="loading" :data="reissueCardList" height="60vh">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" width="55" type="index" />
         <el-table-column label="申请人" align="center" prop="userName" />
-        <el-table-column label="申请补卡说明" align="center" prop="userExplain" />
+        <el-table-column label="申请补卡说明" align="center" prop="explain" />
         <el-table-column label="所属班组" align="center" prop="teamName" />
-        <el-table-column label="状态" align="center" prop="status">
+        <!-- <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="user_review_status_type" :value="scope.row.status" />
           </template>
-        </el-table-column>
-        <!-- <el-table-column label="班组长意见" align="center" prop="gangerOpinion">
+        </el-table-column> -->
+        <el-table-column label="班组长意见" align="center" prop="gangerOpinion" min-width="100px">
           <template #default="scope">
-            <dict-tag :options="user_opinion_type" :value="scope.row.gangerOpinion" />
+            <el-tag :type="typeList[scope.row.gangerOpinion - 1]">{{ filterStatus(scope.row.gangerOpinion) }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="班组长说明" align="center" prop="gangerExplain" />
-        <el-table-column label="班组长操作时间" align="center" prop="gangerTime" width="180">
+        <el-table-column label="班组长操作时间" align="center" prop="gangerTime" width="180"> </el-table-column>
+        <el-table-column label="管理员意见" align="center" prop="managerOpinion" min-width="100px">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.gangerTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="管理员意见" align="center" prop="managerOpinion">
-          <template #default="scope">
-            <dict-tag :options="user_opinion_type" :value="scope.row.managerOpinion" />
+            <el-tag :type="typeList[scope.row.managerOpinion - 1]">{{ filterStatus(scope.row.managerOpinion) }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="管理员说明" align="center" prop="managerExplain" />
-        <el-table-column label="补卡申请时间" align="center" prop="userTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.userTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="管理员操作时间" align="center" prop="managerTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="补卡申请时间" align="center" prop="createdAt" width="180"> </el-table-column>
+        <el-table-column label="状态" align="center" prop="status" min-width="100px">
           <template #default="scope">
-            <el-button link type="success" icon="View" @click="handleDetail(scope.row)">详情</el-button>
+            <!-- <div v-for="item in statusOptions" :key="item.value"> -->
+            <el-tag :type="typeList2[Number(scope.row.cardNumber)]">{{ scope.row.cardMode }}</el-tag>
+            <!-- </div> -->
           </template>
         </el-table-column>
       </el-table>
-
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <el-dialog title="修改施工人员补卡申请" v-model="dialog.visible" width="400px">
-      <div class="pl-xl">
-        <el-form-item label="是否同意">
-          <el-radio-group v-model="auditForm.managerOpinion">
-            <el-radio value="2" size="small">同意</el-radio>
-            <el-radio value="3" size="small">拒绝</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="拒绝说明" v-if="auditForm.managerOpinion == '3'">
-          <el-input v-model="auditForm.managerExplain" placeholder="请输入拒绝说明" type="textarea" clearable></el-input>
-        </el-form-item>
-      </div>
-
-      <template #footer>
-        <span>
-          <el-button type="primary" @click="submitAudit">确定</el-button>
-          <el-button @click="dialog.visible = false">取消</el-button>
-        </span>
-      </template>
-    </el-dialog>
     <el-dialog :title="detailObj.userName + '补卡申请详情'" v-model="dialog.details" width="700px" append-to-body>
       <div class="block_box">
         <span>补卡申请</span>
@@ -173,15 +124,13 @@
 </template>
 
 <script setup name="ReissueCard" lang="ts">
-import { listProjectTeam } from '@/api/project/projectTeam';
-import { ProjectTeamVO } from '@/api/project/projectTeam/types';
-import { listReissueCard, getReissueCard, delReissueCard, addReissueCard, updateReissueCard, AuditReissueCard } from '@/api/project/reissueCard';
+import { AuditReissueCard } from '@/api/project/reissueCard';
 import { ReissueCardVO, ReissueCardQuery, ReissueCardForm, AuditReissueCardForm } from '@/api/project/reissueCard/types';
 import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { commuter_type, user_opinion_type, user_review_status_type } = toRefs<any>(
-  proxy?.useDict('commuter_type', 'user_opinion_type', 'user_review_status_type')
-);
+const { user_opinion_type, user_review_status_type } = toRefs<any>(proxy?.useDict('commuter_type', 'user_opinion_type', 'user_review_status_type'));
+import { busReissueACardList, getSysProjectTeamList } from '@/api/project/goUser/index';
+
 const detailObj = ref<ReissueCardVO>({
   userName: undefined,
   id: undefined,
@@ -199,15 +148,12 @@ const detailObj = ref<ReissueCardVO>({
   managerName: undefined
 });
 const reissueCardList = ref<ReissueCardVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
-const reissueCardFormRef = ref<ElFormInstance>();
+const typeList = ref(['warning', 'success', 'danger']);
+const typeList2 = ref(['info', 'warning', 'success', 'danger']);
 const auditForm = reactive<AuditReissueCardForm>({
   id: undefined,
   managerOpinion: '2',
@@ -222,7 +168,6 @@ const dialog = reactive<DialogOption>({
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const ProjectTeam = computed(() => proxy?.$cache.local.getJSON('ProjectTeamList') || []);
 
 const initFormData: ReissueCardForm = {
   id: undefined,
@@ -233,7 +178,7 @@ const initFormData: ReissueCardForm = {
   gangerExplain: undefined,
   managerOpinion: undefined,
   managerExplain: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value?.goId,
   attendanceId: undefined,
   remark: undefined
 };
@@ -242,10 +187,10 @@ const data = reactive<PageData<ReissueCardForm, ReissueCardQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    userName: undefined,
+    name: undefined,
     gangerOpinion: undefined,
     managerOpinion: undefined,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value?.goId,
     teamId: undefined,
     reissueCardType: undefined,
     params: {}
@@ -260,7 +205,7 @@ const data = reactive<PageData<ReissueCardForm, ReissueCardQuery>>({
     attendanceId: [{ required: true, message: '考勤表主键id不能为空', trigger: 'blur' }]
   }
 });
-
+const TeamList = ref([]); //班组列表
 const { queryParams, form, rules } = toRefs(data);
 
 //审核进度
@@ -276,6 +221,7 @@ const auditStatus = computed(() => {
   return false;
 });
 //管理员审核状态
+// eslint-disable-next-line vue/return-in-computed-property
 const managerStatus = computed(() => {
   switch (detailObj.value.managerOpinion) {
     case '1':
@@ -286,7 +232,17 @@ const managerStatus = computed(() => {
       return 'error';
   }
 });
+const filterStatus = (val) => {
+  if (val == 1) {
+    return '未读';
+  } else if (val == 2) {
+    return '同意';
+  } else {
+    return '拒绝';
+  }
+};
 //班组审核状态
+// eslint-disable-next-line vue/return-in-computed-property
 const teamStatus = computed(() => {
   switch (detailObj.value.gangerOpinion) {
     case '1':
@@ -307,12 +263,16 @@ const resultsStatus = computed(() => {
 /** 查询施工人员补卡申请列表 */
 async function getList() {
   loading.value = true;
-  const res = await listReissueCard(queryParams.value);
-  reissueCardList.value = res.rows;
-  total.value = res.total;
+  const res = await busReissueACardList(queryParams.value);
+  reissueCardList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 }
-
+// 获取班组
+const getTeamList = async () => {
+  const res = await getSysProjectTeamList({ pageNum: 1, pageSize: 1000, projectId: currentProject.value.goId });
+  TeamList.value = res.data.list;
+};
 /** 表单重置 */
 const reset = () => {
   auditForm.managerExplain = '';
@@ -331,22 +291,6 @@ const resetQuery = () => {
   handleQuery();
 };
 
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加施工人员补卡申请';
-};
-
-/** 审批按钮操作 */
-const handleUpdate = async (row?: ReissueCardVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  auditForm.id = _id;
-  dialog.visible = true;
-  dialog.title = '修改施工人员补卡申请';
-};
-
 const handleDetail = (row: ReissueCardVO) => {
   detailObj.value = row;
   dialog.details = true;
@@ -364,11 +308,12 @@ const submitAudit = async () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
     getList();
+    getTeamList();
   }
 );
 
@@ -377,6 +322,7 @@ onUnmounted(() => {
 });
 
 onMounted(() => {
+  getTeamList();
   getList();
 });
 </script>
diff --git a/src/views/project/salaryExcel/component/detail.vue b/src/views/project/salaryExcel/component/detail.vue
new file mode 100644
index 0000000..02388d2
--- /dev/null
+++ b/src/views/project/salaryExcel/component/detail.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="Salary_detail">
+    <el-dialog v-model="isShowDialog" width="100vw" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.Salary_detail', '.Salary_detail ']">详情</div>
+      </template>
+      <div class="content" style="margin-bottom: 20px; display: flex; font-size: 22px; color: rgb(255 99 5); justify-content: space-between">
+        <div style="width: 80vw">
+          <el-form ref="queryRef" :model="param" label-width="80px">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="劳务" prop="labourService">
+                  <el-select filterable v-model="param.labourService" placeholder="请选择劳务" clearable>
+                    <el-option v-for="dict in laowuList" :key="dict.id" :label="dict.name" :value="dict.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="班组" prop="groupID">
+                  <el-select filterable v-model="param.groupID" placeholder="请选择班组" clearable>
+                    <el-option v-for="dict in teamList" :key="dict.id" :label="dict.name" :value="dict.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6" class="colBlock">
+                <el-form-item>
+                  <el-button type="primary" @click="getbusPayrollList"
+                    ><el-icon><Search /></el-icon>搜索</el-button
+                  >
+                  <el-button @click="resetQuery(queryRef)"
+                    ><el-icon><Refresh /></el-icon>重置</el-button
+                  >
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <div>
+          <el-popover placement="top-start" title="" :width="200" trigger="hover" :content="DetailMoney + '元'">
+            <template #reference>
+              <el-tag class="m-2" size="large" style="cursor: pointer">金额:{{ money }}元</el-tag>
+            </template>
+          </el-popover>
+        </div>
+      </div>
+      <div>
+        <el-table height="83vh" v-loading="loading" :data="tableList">
+          <el-table-column label="序号" align="center" type="index" min-width="50px" />
+          <el-table-column label="姓名" align="center" prop="name" min-width="120px" />
+          <el-table-column label="身份证号码" align="center" prop="identityCard" min-width="100px" />
+          <el-table-column label="联系方式" align="center" prop="contactWay" min-width="100px" />
+          <el-table-column label="班组" align="center" prop="teamOrGroup" min-width="100px" />
+          <el-table-column label="工种" align="center" prop="typeOfWork" min-width="100px" />
+          <el-table-column label="考勤时间" align="center" prop="attendanceTime" min-width="100px" />
+          <el-table-column label="实际工作量" align="center" prop="actualWorkload" min-width="100px" />
+          <el-table-column label="工资待遇" align="center">
+            <el-table-column label="元/量" align="center" prop="quantity" min-width="100px" />
+            <el-table-column label="元/天" align="center" prop="xDay" min-width="100px" />
+            <el-table-column label="元/月" align="center" prop="xMonth" min-width="100px" />
+          </el-table-column>
+          <el-table-column label="工资金额（元）" align="center">
+            <el-table-column label="加班工资" align="center" prop="overtimeWage" min-width="100px" />
+            <el-table-column label="应发" align="center" prop="salary" min-width="100px" />
+            <el-table-column label="代扣金额" align="center" prop="amountWithheld" min-width="100px" />
+            <el-table-column label="代缴金额" align="center" prop="amountPaid" min-width="100px" />
+            <el-table-column label="扣除金额" align="center" prop="deductOther" min-width="100px" />
+            <el-table-column label="实发金额" align="center" prop="amountPaidOut" min-width="100px" />
+            <el-table-column label="发放方式" align="center" prop="releaseMode" min-width="100px" />
+          </el-table-column>
+          <el-table-column label="银行卡信息" align="center">
+            <el-table-column label="银行卡号" align="center" prop="creditCardNumbers" min-width="100px" />
+            <el-table-column label="开户行" align="center" prop="openingBank" min-width="100px" />
+          </el-table-column>
+        </el-table>
+        <!-- <pagination
+					v-show="total > 0"
+					:total="total"
+					v-model:page="param.pageNum"
+					v-model:limit="param.pageSize"
+					@pagination="getbusPayrollList"
+				/> -->
+      </div>
+      <!-- <template #footer>
+				<div class="dialog-footer">
+					<el-button @click="onCancel">关 闭</el-button>
+				</div>
+			</template> -->
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { busPayrollList, listBusLabourservice } from '@/api/project/salaryExcel'; //项目列表接口数据
+import useUserStore from '@/store/modules/user';
+import { listProjectTeam } from '@/api/project/projectTeam';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const stores = useUserStore();
+    const queryRef = ref();
+    const state = reactive({
+      loading: false,
+      isShowDialog: false,
+      teamList: [], //班组列表
+      tableList: [],
+      laowuList: [], //劳务
+      total: 0,
+      money: 0,
+      DetailMoney: 0,
+      param: {
+        pageNum: 1,
+        pageSize: 20,
+        labourService: 0,
+        groupID: ''
+      },
+      updateRow: null
+    });
+    // 打开弹窗
+    const openDialog = (row?: any) => {
+      state.isShowDialog = true;
+      state.updateRow = row;
+      state.param.pageNum = 1;
+      state.param.labourService = 0;
+      state.param.groupID = '';
+      sysProjectTeamList();
+      busLabourserviceList();
+    };
+    const getbusPayrollList = () => {
+      busPayrollList({ id: state.updateRow.id, ...state.param }).then((res: any) => {
+        if (res.code == 0) {
+          state.tableList = res.data.list;
+          state.total = res.data.total;
+          state.DetailMoney = res.data.money;
+          if (res.data.money >= 10000) {
+            state.money = (parseInt(res.data.money) / 10000).toFixed(3) + '万';
+          } else {
+            state.money = res.data.money;
+          }
+          // 判断那些班组或劳务有数据
+          if (res.data.bz) {
+            let arr = [];
+            state.teamList.forEach((item) => {
+              if (res.data.bz.includes(item.id)) {
+                arr.push(item);
+              }
+            });
+            state.teamList = arr;
+          }
+          if (res.data.lw) {
+            let arr1 = [];
+            state.laowuList.forEach((item) => {
+              if (res.data.lw.includes(item.id)) {
+                arr1.push(item);
+              }
+            });
+            state.laowuList = arr1;
+          }
+        }
+      });
+    };
+    /** 重置按钮操作 */
+    const resetQuery = (formEl) => {
+      if (!formEl) return;
+      formEl.resetFields();
+      state.param.groupID = state.teamList[0].id;
+      getbusPayrollList();
+    };
+    // 获取班组列表数据
+    const sysProjectTeamList = () => {
+      listProjectTeam({ pageNum: 1, pageSize: 1000, projectId: stores.selectedProject.goId }).then((res: any) => {
+        let list = res.data.list ?? [];
+        state.teamList = res.data.list;
+        if (state.teamList.length > 0) {
+          state.param.groupID = state.teamList[0].id;
+        }
+        getbusPayrollList();
+      });
+    };
+
+    // 获取列表数据
+    const busLabourserviceList = () => {
+      listBusLabourservice({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
+        let list = res.data.list ?? [];
+        res.data.list.unshift({ name: '全部', id: 0 });
+        state.laowuList = list;
+      });
+    };
+    const getQuestRecordList = () => {};
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    return {
+      proxy,
+      openDialog,
+      getQuestRecordList,
+      closeDialog,
+      onCancel,
+      resetQuery,
+      queryRef,
+      getbusPayrollList,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.Salary_detail {
+  .el-tag__content {
+    font-size: 20px;
+    font-weight: 600;
+  }
+  .pagination-container {
+    padding: 10px !important;
+  }
+  .el-dialog {
+    // height: 100vh;
+  }
+  .el-dialog__body {
+    height: 93vh !important;
+    max-height: 100vh !important;
+  }
+  .el-dialog__headerbtn .el-dialog__close {
+    color: #2a2b2d;
+    font-size: 30px !important;
+  }
+}
+</style>
diff --git a/src/views/project/salaryExcel/component/documentsDetail/index.vue b/src/views/project/salaryExcel/component/documentsDetail/index.vue
new file mode 100644
index 0000000..3a64ee2
--- /dev/null
+++ b/src/views/project/salaryExcel/component/documentsDetail/index.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="document_detail" id="document_detail">
+    <div class="move_pop" id="detial_pop">
+      <!-- <span>{{ title }}</span> -->
+      <div class="box">
+        <img v-if="type == 2" src="/image/suo.png" @click="onFull(1)" />
+        <img v-else src="/image/full.png" @click="onFull(2)" />
+        <span class="close" @click="onClose">✖</span>
+      </div>
+    </div>
+    <div class="box_app" id="box_app"></div>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, defineComponent, getCurrentInstance } from 'vue';
+import { setMove } from '@/utils/moveDiv';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const state = reactive({
+      title: '',
+      type: 2
+    });
+    onMounted(() => {
+      setMove('detial_pop', 'document_detail');
+    });
+    // 打开弹窗
+    const openDialog = (obj) => {
+      state.title = obj.name;
+      init(obj);
+    };
+    const onError = function (event) {
+      //举例，强制保存后，判断文档内容是否保存成功
+      if (event.data) {
+        if (event.data.errorCode == 'forcesave') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //保存成功
+          } else {
+            //保存失败或异常
+          }
+        } else if (event.data.errorCode == 'setallcellvalue') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //填充成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //填充异常
+          }
+        } else if (event.data.errorCode == 'clearsheet') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //清除成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //清除异常
+          }
+        }
+      }
+    };
+    const onDocumentReady = function () {
+      // console.log('文档加载完成');
+    };
+    const init = (obj) => {
+      let documentKey = obj.id.toString() + new Date().getTime();
+      let baseURL = window['$HOSTSRC'].replace('ws:', 'http:').replace('/ws', '');
+      let url = baseURL + obj.filenPathCoding.replaceAll('+', ' ');
+      let type = obj.suffix;
+      if (obj.suffix.includes('.')) {
+        type = obj.suffix.substring(1);
+      }
+      let documentType = 'word'; // docx doc
+      if (type == 'xlsx' || type == 'xls') {
+        documentType = 'cell'; //电子表格
+      } else if (type == 'ppt' || type == 'pptx') {
+        documentType = 'slide'; //演示文档文件
+      }
+      new CXO_API.CXEditor('box_app', {
+        document: {
+          fileType: type,
+          key: documentKey,
+          title: obj.name,
+          url
+        },
+        documentType,
+        editorConfig: {
+          mode: 'view',
+          callbackUrl: ''
+        },
+        height: '100%',
+        events: {
+          onDocumentReady: onDocumentReady,
+          onError: onError
+        },
+        zoom: -1
+      });
+    };
+    const onClose = () => {
+      emit('onClose', false);
+    };
+    const onFull = (type) => {
+      // 全屏
+      let document_detail = document.getElementById('document_detail');
+      state.type = type;
+      if (type == 2) {
+        document_detail.style.width = '100%';
+        document_detail.style.height = '100%';
+      } else {
+        document_detail.style.width = '1200px';
+        document_detail.style.height = '80vh';
+      }
+    };
+    return {
+      proxy,
+      openDialog,
+      onClose,
+      onFull,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.document_detail {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 999999;
+  width: 100%;
+  height: 100%;
+  border: 1px solid #9f9f9f;
+  .box_app {
+    // width: 1300px !important;
+    // height: 80vh !important;
+    background-color: #f1f1f1;
+  }
+  .move_pop {
+    width: 100%;
+    // position: absolute;
+    // top: 0;
+    // right: 0%;
+    height: 24px;
+    // background: linear-gradient(#2a5095, #213f7b, #111e48);
+    background-color: #f4f5f6;
+    display: grid;
+    place-items: center;
+    > span {
+      color: #000000;
+      font-weight: bold;
+      font-size: 20px;
+      letter-spacing: 2px;
+    }
+    .box {
+      display: flex;
+      width: 60px;
+      position: absolute;
+      top: 0;
+      right: 10px;
+      // height: 100%;
+      align-items: center;
+      img {
+        width: 22px;
+        margin-top: 6px;
+        cursor: pointer;
+      }
+      .close {
+        position: absolute;
+        right: 2px;
+        /* top: -8px; */
+        color: #8d8d8d;
+        width: 24px;
+        height: 24px;
+        font-size: 20px;
+        //border: 2px solid #0ff;
+        border-radius: 50%;
+        display: grid;
+        place-items: center;
+        cursor: pointer;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/project/salaryExcel/component/uploadSalary.vue b/src/views/project/salaryExcel/component/uploadSalary.vue
new file mode 100644
index 0000000..695d8e7
--- /dev/null
+++ b/src/views/project/salaryExcel/component/uploadSalary.vue
@@ -0,0 +1,167 @@
+<template>
+  <div class="system-busSalaryDetails-add">
+    <el-dialog v-model="isShowDialog" width="600px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.system-busSalaryDetails-add .el-dialog', '.system-busSalaryDetails-add .el-dialog__header']">上传工资表</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="110px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="日期" prop="yearToDate">
+              <el-date-picker v-model="formData.yearToDate" type="month" value-format="YYYY-MM" placeholder="请选择月份" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+						<el-form-item  prop="yearToDate">
+							<el-input v-model="" placeholder=""></el-input>
+						</el-form-item>
+					</el-col> -->
+          <el-col :span="16">
+            {{ BASE_URL }}
+            111
+            <el-form-item label="上传excel文件" prop="excelPath">
+              <el-upload
+                ref="upload"
+                class="upload-demo"
+                :action="`${BASE_URL}/zm/api/v1/system/upload/singleFile`"
+                :limit="1"
+                :on-exceed="handleExceed"
+                :auto-upload="true"
+                accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                :headers="headers"
+                :on-success="onSuccess"
+              >
+                <template #trigger>
+                  <el-button type="primary">选择表格</el-button>
+                </template>
+                <template #tip>
+                  <div class="el-upload__tip text-red">限制1个文件，新文件将覆盖旧文件</div>
+                </template>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { UploadInstance, UploadProps, UploadRawFile, genFileId, ElMessage } from 'element-plus';
+import { Session } from '@/utils/storage';
+import { importExcelPaySheet } from '@/api/project/salaryExcel'; //项目列表接口数据
+import sign from '@/utils/sign.js';
+import { getToken } from '@/utils/auth';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+    const formRef = ref<HTMLElement | null>(null);
+    const upload = ref<UploadInstance>();
+    const state = reactive({
+      fileList: [],
+      loading: false,
+      isShowDialog: false,
+      BASE_URL: import.meta.env.VITE_APP_BASE_API_GO,
+      formData: {
+        excelPath: '', //文件路径
+        yearToDate: '', //日期
+        name: '', //文件名
+        suffix: '' //后缀
+      },
+      // 表单校验
+      rules: {
+        yearToDate: [{ required: true, message: '请选择日期', trigger: 'blur' }],
+        excelPath: [{ required: true, message: '请选择表格', trigger: 'blur' }]
+      },
+      token: `Bearer ${proxy.$cache.local.get('goToken')}`
+    });
+    const headers = reactive({
+      Authorization: state.token,
+      ...sign({})
+    });
+    // 打开弹窗
+    const openDialog = () => {
+      resetForm();
+      console.log(state.BASE_URL);
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    const handleExceed: UploadProps['onExceed'] = (files) => {
+      upload.value!.clearFiles();
+      const file = files[0] as UploadRawFile;
+      file.uid = genFileId();
+      upload.value!.handleStart(file);
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    const onSuccess = (res) => {
+      if (res.code == 0) {
+        state.formData.excelPath = res.data.path;
+        state.formData.name = res.data.name;
+        let lastIndex = res.data.name.lastIndexOf('.');
+        state.formData.suffix = res.data.name.substring(lastIndex + 1);
+      } else {
+        proxy.$message.error(res.message);
+      }
+    };
+    // 提交
+    const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          importExcelPaySheet({ ...state.formData, yearToDate: state.formData.yearToDate + '-民工工资表' }).then((res: any) => {
+            if (res.code == 0) {
+              ElMessage.success('上传成功');
+              closeDialog();
+              emit('busSalaryDetailsList');
+            } else {
+              ElMessage.error(res.message);
+            }
+          });
+        }
+      });
+    };
+    const resetForm = () => {
+      state.formData = {
+        excelPath: '', //文件路径
+        yearToDate: '' //日期
+      };
+    };
+    return {
+      proxy,
+      handleExceed,
+      openDialog,
+      upload,
+      closeDialog,
+      onCancel,
+      onSuccess,
+      onSubmit,
+      formRef,
+      BASE_URL: state.BASE_URL,
+      headers,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped lang="scss">
+//
+.system-busSalaryDetails-add {
+  .el-col {
+    margin: 10px 0 !important;
+  }
+}
+</style>
diff --git a/src/views/project/salaryExcel/index.vue b/src/views/project/salaryExcel/index.vue
index 3bc4c76..7f784ed 100644
--- a/src/views/project/salaryExcel/index.vue
+++ b/src/views/project/salaryExcel/index.vue
@@ -43,23 +43,23 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <!-- <uploadSalary ref="uploadSalaryRef" @busSalaryDetailsList="busSalaryDetailsList"></uploadSalary>
+    <uploadSalaryVue ref="uploadSalaryRef" @busSalaryDetailsList="busSalaryDetailsList"></uploadSalaryVue>
     <detail ref="detailRef" @busSalaryDetailsList="busSalaryDetailsList"></detail>
-    <documentDetail ref="documentDetailRef" v-if="showDocumentDetail" @onClose="showDocumentDetail = false"></documentDetail> -->
+    <documentDetail ref="documentDetailRef" v-if="showDocumentDetail" @onClose="showDocumentDetail = false"></documentDetail>
   </div>
 </template>
 <script setup lang="ts">
 import { ref, reactive, onMounted, getCurrentInstance, nextTick, toRaw } from 'vue';
-// import uploadSalary from '/@/views/system/salaryExcel/component/uploadSalary.vue';
-// import detail from '/@/views/system/salaryExcel/component/detail.vue';
-// import { readAllImportedListData, getTheSourceExcelAccordingToTheIdOfThePayroll, deletePayroll } from '/@/api/system/salaryExcel';
-// import documentDetail from '/@/views/OnlineEngineering/comm/documentsDetail/index.vue';
+import uploadSalaryVue from './component/uploadSalary.vue';
+import detail from './component/detail.vue';
+import { readAllImportedListData, getTheSourceExcelAccordingToTheIdOfThePayroll, deletePayroll } from '@/api/project/salaryExcel';
+import documentDetail from './component/documentsDetail/index.vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { useUserStoreHook } from '@/store/modules/user';
 
 const stores = useUserStoreHook();
 const { proxy } = <any>getCurrentInstance();
-
+const BASE_URL = import.meta.env.VITE_APP_BASE_API_GO;
 const loading = ref(false);
 const uploadSalaryRef = ref();
 const editRef = ref();
@@ -132,7 +132,7 @@ const DownloadSalary = (row: any) => {
 };
 
 const DownloadSalaryMOdel = () => {
-  window.open('http://zmkg.cqet.top:8899/file/masterMask/coryStorageTemplate/工资表模板.xlsx', '_blank');
+  window.open(BASE_URL + '/file/masterMask/coryStorageTemplate/工资表模板.xlsx', '_blank');
 };
 
 const delSalary = () => {
@@ -155,7 +155,7 @@ const handleSelectionChange = (selection: any[]) => {
 };
 
 onMounted(() => {
-  // initTableData();
+  initTableData();
 });
 </script>
 
diff --git a/src/views/project/subManagementUser/component/ConstructionUserDetail.vue b/src/views/project/subManagementUser/component/ConstructionUserDetail.vue
index 73907f6..596718e 100644
--- a/src/views/project/subManagementUser/component/ConstructionUserDetail.vue
+++ b/src/views/project/subManagementUser/component/ConstructionUserDetail.vue
@@ -6,7 +6,11 @@
         <el-row :gutter="20" justify="space-around">
           <el-col :span="12">
             <el-form-item label="人脸照">
-              <el-image :src="userDetail?.facePicUrl" style="width: 150px; height: 150px" />
+              <el-image
+                :src="'http://58.17.134.85:8920' + userDetail?.facePicUrl"
+                :preview-src-list="['http://58.17.134.85:8920' + userDetail?.facePicUrl]"
+                style="width: 150px; height: 150px"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/project/subManagementUser/index.vue b/src/views/project/subManagementUser/index.vue
index ddc5af4..aa34d46 100644
--- a/src/views/project/subManagementUser/index.vue
+++ b/src/views/project/subManagementUser/index.vue
@@ -517,6 +517,7 @@ const { proxy } = getCurrentInstance() as any;
 const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type } = toRefs<any>(
   proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type')
 );
+console.log('🚀 ~ user_sex_type:', user_sex_type);
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -573,7 +574,7 @@ const initFormData: ConstructionUserForm = {
   nickName: undefined,
   facePic: undefined,
   userName: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.id,
   contractorId: undefined,
   teamId: undefined,
   status: undefined,
@@ -610,7 +611,7 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
     openid: undefined,
     nickName: undefined,
     userName: undefined,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.id,
     contractorId: undefined,
     teamId: undefined,
     status: undefined,
@@ -778,7 +779,7 @@ const getContractorList = async () => {
   const res = await listContractor({
     pageNum: 1,
     pageSize: 20,
-    projectId: currentProject.value?.id
+    projectId: currentProject.value.id
   });
   contractorOpt.value = res.rows.map((contractor: ContractorVO) => ({
     value: contractor.id,
@@ -904,7 +905,7 @@ const downloadTemplate = async () => {
     text: 'Loading',
     background: 'rgba(0, 0, 0, 0.7)'
   });
-  const res = await dowloadConstructionUserTemplate({ projectId: currentProject.value?.id });
+  const res = await dowloadConstructionUserTemplate({ projectId: currentProject.value.id });
   loadingInstance.close();
 };
 
@@ -954,7 +955,7 @@ const submitForm = () => {
     console.log(valid);
     if (valid) {
       buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
+      form.value.projectId = currentProject.value.id;
       if (form.value.id) {
         await updateConstructionUser(form.value).finally(() => (buttonLoading.value = false));
       } else {
@@ -975,7 +976,7 @@ const handleJoinBlacklist = async (row?: ConstructionUserVO) => {
   await proxy?.$modal.confirm('确认要将该员工加入黑名单吗？').finally(() => (loading.value = false));
   await addConstructionBlacklist({
     userId: row.id,
-    projectId: currentProject.value?.id
+    projectId: currentProject.value.id
   });
   proxy?.$modal.msgSuccess('加入成功');
   await getList();
@@ -1049,7 +1050,7 @@ const setSalary = async () => {
 const handlePlayCardStatus = async (e) => {
   playCardLoding.value = true;
   const clock = e ? 1 : 0;
-  await updateConstructionUserPlayCardStatus({ projectId: currentProject.value?.id, clock });
+  await updateConstructionUserPlayCardStatus({ projectId: currentProject.value.id, clock });
   proxy?.$modal.msgSuccess('修改成功');
   getList();
   playCardLoding.value = false;
@@ -1066,7 +1067,7 @@ const handleClockStatus = async (row: ConstructionUserVO) => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.id,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
diff --git a/src/views/project/subcontract/index.vue b/src/views/project/subcontract/index.vue
index 28a9c25..292ff57 100644
--- a/src/views/project/subcontract/index.vue
+++ b/src/views/project/subcontract/index.vue
@@ -231,7 +231,8 @@ const reset = () => {
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
-  if (contractorList.value.length == 1) queryParams.value.contractorId = contractorList.value[0].id;
+  console.log('🚀 ~ handleQuery ~ contractorList.value:', contractorList.value);
+  if (contractorList.value?.length == 1) queryParams.value.contractorId = contractorList.value[0].id;
   getList();
 };
 
diff --git a/src/views/project/workWage/index.vue b/src/views/project/workWage/index.vue
index caecbf2..38ccf87 100644
--- a/src/views/project/workWage/index.vue
+++ b/src/views/project/workWage/index.vue
@@ -4,16 +4,16 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="工种" prop="workType">
-              <el-select v-model="queryParams.workType" placeholder="全部" clearable>
+            <el-form-item label="工种" prop="typeOfWork">
+              <el-select v-model="queryParams.typeOfWork" placeholder="全部" clearable>
                 <el-option v-for="dict in type_of_work" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="工资计算方式" prop="wageCalculationType" label-width="100px">
+            <!-- <el-form-item label="工资计算方式" prop="wageCalculationType" label-width="100px">
               <el-select v-model="queryParams.wageCalculationType" placeholder="全部" clearable>
                 <el-option v-for="dict in wageCalculationTypeList" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="工资计量单位" prop="wageMeasureUnit" label-width="100px">
               <el-select v-model="queryParams.wageMeasureUnit" placeholder="请选择工资计量单位" clearable>
                 <el-option v-for="dict in wage_measure_unit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -44,9 +44,6 @@
               >删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:workWage:export']">导出 </el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -56,33 +53,13 @@
         <el-table-column label="序号" align="center" type="index" width="60px" />
         <!-- <el-table-column label="主键id" align="center" prop="id" v-if="true" /> -->
         <!-- <el-table-column label="项目id" align="center" prop="projectId" /> -->
-        <el-table-column label="工种" align="center" prop="workType">
-          <template #default="scope">
-            <dict-tag :options="type_of_work" :value="scope.row.workType" />
-          </template>
-        </el-table-column>
-        <el-table-column label="是否是特种兵" align="center" prop="isSpecialType">
-          <template #default="scope">
-            {{ scope.row.isSpecialType == 1 ? '是' : '否' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工资计算方式" align="center" prop="wageCalculationType">
+        <el-table-column label="工种" align="center" prop="typeOfWork">
           <template #default="scope">
-            {{ scope.row.wageCalculationType == 1 ? '计时' : '计件' }}
+            <dict-tag :options="type_of_work" :value="scope.row.typeOfWork" />
           </template>
         </el-table-column>
-        <el-table-column label="工资标准" align="center" prop="wage">
-          <template #default="scope">
-            {{ proxy.formatPrice(scope.row.wage) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工资计量单位" align="center" prop="wageMeasureUnit">
-          <template #default="scope">
-            <dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit" />
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="工资标准" align="center" prop="standard" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -103,32 +80,19 @@
         <!-- <el-form-item label="项目id" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目id" />
         </el-form-item> -->
-        <el-form-item label="工种" prop="workType">
-          <el-select v-model="form.workType" placeholder="请选择工种" :disabled="!form.id ? false : true">
+        <el-form-item label="工种" prop="typeOfWork">
+          <el-select v-model="form.typeOfWork" placeholder="请选择工种" :disabled="!form.id ? false : true">
             <el-option v-for="dict in type_of_work" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否是特种兵 " prop="isSpecialType">
-          <el-select v-model="form.isSpecialType" placeholder="请选择是否是特种兵">
-            <el-option v-for="dict in isSpecialTypeList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工资计算方式" prop="wageCalculationType">
-          <el-select v-model="form.wageCalculationType" placeholder="请选择工资计算方式" :disabled="!form.id ? false : true">
-            <el-option v-for="dict in wageCalculationTypeList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工资标准" prop="wage">
-          <el-input v-model="form.wage" placeholder="请输入工资标准" />
+        <el-form-item label="工资标准" prop="standard">
+          <el-input v-model="form.standard" placeholder="请输入工资标准" />
         </el-form-item>
         <!-- <el-form-item label="工资计量单位" prop="wageMeasureUnit">
           <el-select v-model="form.wageMeasureUnit" placeholder="请选择工资计量单位">
             <el-option v-for="dict in wage_measure_unit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -141,13 +105,11 @@
 </template>
 
 <script setup name="WorkWage" lang="ts">
-import { listWorkWage, getWorkWage, delWorkWage, addWorkWage, updateWorkWage } from '@/api/project/workWage';
+import { listWorkWage, getWorkWage, delWorkWage, addWorkWage, updateWorkWage, getTypeOfWork } from '@/api/project/workWage';
 import { WorkWageVO, WorkWageQuery, WorkWageForm, SpecialType } from '@/api/project/workWage/types';
 import { useUserStoreHook } from '@/store/modules/user';
 
-const { proxy } = getCurrentInstance() as any;
-const { type_of_work, wage_measure_unit_type } = toRefs<any>(proxy?.useDict('type_of_work', 'wage_measure_unit_type'));
-console.log(type_of_work);
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -180,11 +142,11 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: WorkWageForm = {
   id: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value?.goId,
   workType: undefined,
   isSpecialType: undefined,
   wageCalculationType: undefined,
-  wage: undefined,
+  standard: undefined,
   wageMeasureUnit: undefined,
   remark: undefined
 };
@@ -193,7 +155,7 @@ const data = reactive<PageData<WorkWageForm, WorkWageQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value?.goId,
     workType: undefined,
     isSpecialType: undefined,
     wageCalculationType: undefined,
@@ -212,8 +174,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listWorkWage(queryParams.value);
-  workWageList.value = res.rows;
-  total.value = res.total;
+  workWageList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -270,7 +232,7 @@ const submitForm = () => {
   workWageFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
+      form.value.projectId = currentProject.value?.goId;
       if (form.value.id) {
         await updateWorkWage(form.value).finally(() => (buttonLoading.value = false));
       } else {
@@ -291,21 +253,25 @@ const handleDelete = async (row?: WorkWageVO) => {
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'project/workWage/export',
-    {
-      ...queryParams.value
-    },
-    `workWage_${new Date().getTime()}.xlsx`
-  );
+const type_of_work = ref([]);
+const { wage_measure_unit_type } = toRefs<any>(proxy?.useDict('wage_measure_unit_type'));
+console.log(wage_measure_unit_type);
+const getWorkType = async () => {
+  const res = await getTypeOfWork();
+  type_of_work.value = res.data.values.map((item) => {
+    return {
+      label: item.value,
+      value: item.key,
+      elTagClass: '',
+      elTagType: 'default'
+    };
+  });
+  console.log('🚀 ~ getWorkType ~ type_of_work.value:', type_of_work.value);
 };
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value?.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
@@ -319,5 +285,6 @@ onUnmounted(() => {
 
 onMounted(() => {
   getList();
+  getWorkType();
 });
 </script>
diff --git a/src/views/projectLarge/ProjectScreen/components/newmap.vue b/src/views/projectLarge/ProjectScreen/components/newmap.vue
index 4766f70..ccb16bd 100644
--- a/src/views/projectLarge/ProjectScreen/components/newmap.vue
+++ b/src/views/projectLarge/ProjectScreen/components/newmap.vue
@@ -15,9 +15,9 @@ const videoDialogRef = ref(null);
 const token = getToken();
 const urlParams = new URLSearchParams(new URL(window.location.href).search);
 const projectIdTwo = urlParams.get('projectId');
-let ws = new ReconnectingWebSocket(
-  import.meta.env.VITE_APP_BASE_WS_API + '?Authorization=' + token + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID + '&projectId=' + projectIdTwo
-);
+// let ws = new ReconnectingWebSocket(
+//   import.meta.env.VITE_APP_BASE_WS_API + '?Authorization=' + token + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID + '&projectId=' + projectIdTwo
+// );
 // 连接ws
 const connectWs = () => {
   ws.onopen = (e) => {
@@ -139,7 +139,7 @@ function entityClickHandler(entity, item) {
 }
 // 初始化地球
 async function initEarth() {
-  let earth = new YJ.YJEarth('earth');
+  let earth = new YJ.YJEarth('earthqqqq');
 
   window.Earth1 = earth;
   // 加载底图
@@ -166,7 +166,7 @@ async function initEarth() {
   window.roamingController = roamingController;
 }
 async function loadTiltData(item) {
-  let tileset = new YJ.Obj.Tileset(window.Earth1, { id: item.source_id });
+  let tileset = new YJ.Obj.Tileset(window.Earth1, { id: item.source_id, host: import.meta.env.VITE_APP_BASE_EARTH_API });
   ModelList.set(item.source_id, tileset);
   await tileset.on();
   tileset.flyTo();
@@ -259,7 +259,7 @@ function stopRoaming() {
 
 onMounted(async () => {
   // 连接ws
-  connectWs();
+  // connectWs();
   // 获取选中节点
   getCheckedNode();
   // 获取GPS数据
@@ -268,7 +268,7 @@ onMounted(async () => {
   await YJ.on({
     username: 'admin',
     password: md5('admin_admin123'),
-    host: 'http://192.168.110.2:8895/'
+    host: 'http://xny.yj-3d.com:8895'
   }).then((res) => {
     initEarth();
     modelList.value.forEach((item) => {
@@ -287,7 +287,7 @@ onUnmounted(() => {
 </script>
 <template>
   <div class="earth-container-big">
-    <div class="earth" id="earth"></div>
+    <div class="earth" id="earthqqqq"></div>
     <!-- <div v-show="isHide" class="left">
             <div style="width: 100%;height: 100%;">
                 <el-button type="primary" @click="startRoaming">开始漫游</el-button>
diff --git a/src/views/quality/documentQualityMeeting/RecyclingStation/index.vue b/src/views/quality/documentQualityMeeting/RecyclingStation/index.vue
new file mode 100644
index 0000000..ca4541f
--- /dev/null
+++ b/src/views/quality/documentQualityMeeting/RecyclingStation/index.vue
@@ -0,0 +1,141 @@
+<template>
+  <div class="system-document-container">
+    <el-card shadow="hover">
+      <div class="system-document-search mb15">
+        <el-form :model="param" ref="queryRef" :inline="true" label-width="100px">
+          <el-row>
+            <el-col>
+              <el-button
+                type="success"
+                v-auth="'api/v1/system/documentQualityMeeting/qualityDataRecyclingStation'"
+                :disabled="multiple"
+                @click="onRecyclingStation(null, true)"
+                ><el-icon><RefreshRight /></el-icon>批量恢复</el-button
+              >
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" min-width="30px" />
+        <el-table-column label="文件名称" align="center" prop="name" min-width="100px" />
+        <el-table-column label="文件类型" align="center" prop="type" min-width="100px">
+          <template #default="scope">
+            <span>{{ scope.row.type == 1 ? '文件' : '文件夹' }}</span>
+          </template> </el-table-column
+        ><el-table-column label="文件路径" align="center" min-width="100px">
+          <template #default="scope">
+            <span>{{ scope.row.filenPath }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="删除时间" align="center" prop="deletedAt" min-width="100px"> </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="100px" fixed="right">
+          <template #default="scope">
+            <el-button
+              type="success"
+              v-auth="'api/v1/system/documentQualityMeeting/qualityDataRecyclingStation'"
+              link
+              @click="onRecyclingStation(scope.row)"
+              ><el-icon><RefreshRight /></el-icon>恢复</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" v-model:page="param.pageNum" v-model:limit="param.pageSize" @pagination="documentList" />
+    </el-card>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, ref, defineComponent, getCurrentInstance } from 'vue';
+import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
+
+import { qualityRecycleBinList, qualityDataRecyclingStation } from '@/api/quality/documentQualityMeeting';
+import { useUserStoreHook } from '@/store/modules/user';
+export default defineComponent({
+  name: 'index',
+  setup() {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const loading = ref(false);
+    const queryRef = ref();
+    // 非多个禁用
+    const multiple = ref(true);
+    const state = reactive({
+      tableData: [],
+      param: {
+        type: 2,
+        projectId: stores.selectedProject.goId
+      },
+      total: 0,
+      ids: [] //所选择的文件
+    });
+    // 获取资料删除的列表数据
+    const getDocumentDataList = () => {
+      loading.value = true;
+      qualityRecycleBinList(state.param).then((res: any) => {
+        let list = res.data.list ?? [];
+        state.tableData = list;
+        state.total = res.data.total;
+        loading.value = false;
+      });
+    };
+    // 多选框选中数据
+    const handleSelectionChange = (selection) => {
+      state.ids = selection.map((item) => item.id);
+      multiple.value = !selection.length;
+    };
+    const onRecyclingStation = (row) => {
+      let ids = [];
+      if (row) {
+        ids = [row.id];
+      } else {
+        // 批量
+        ids = state.ids;
+      }
+      ElMessageBox.confirm('你确定要恢复所选文件或文件夹？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const loading = ElLoading.service({
+            lock: true,
+            text: '正在恢复中……',
+            background: 'rgba(0, 0, 0, 0.7)'
+          });
+          qualityDataRecyclingStation({
+            ids,
+            type: 1
+          }).then((res) => {
+            loading.close();
+            if (res.code == 0) {
+              getDocumentDataList();
+              ElMessage.success('操作成功');
+            } else {
+              ElMessage.error(res.message);
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    return {
+      proxy,
+      multiple,
+      loading,
+      onRecyclingStation,
+      handleSelectionChange,
+      getDocumentDataList,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss" scoped>
+.colBlock {
+  display: block;
+}
+.colNone {
+  display: none;
+}
+</style>
diff --git a/src/views/quality/documentQualityMeeting/index.vue b/src/views/quality/documentQualityMeeting/index.vue
new file mode 100644
index 0000000..19bf0e0
--- /dev/null
+++ b/src/views/quality/documentQualityMeeting/index.vue
@@ -0,0 +1,552 @@
+<template>
+  <div class="documentCompletion-data">
+    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <el-tab-pane label="文件夹" name="first">
+        <el-card>
+          <el-row>
+            <el-col :span="2" class="colBlock">
+              <el-button
+                type="success"
+                v-auth="'api/v1/system/documentQualityMeeting/qualityNewFolderData'"
+                :disabled="toolStart"
+                @click="handleFile(3)"
+                ><el-icon><Plus /></el-icon>新建文件夹</el-button
+              >
+            </el-col>
+            <el-col :span="2" class="colBlock">
+              <el-button type="primary" v-auth="'api/v1/system/documentQualityMeeting/add'" :disabled="toolStart" @click="handleFile(2)"
+                ><el-icon><Upload /></el-icon>上传文件</el-button
+              >
+            </el-col>
+          </el-row>
+        </el-card>
+        <el-card style="margin-top: 10px">
+          <div class="breadcrumb-img">
+            <el-breadcrumb>
+              <el-breadcrumb-item @click="onBreadcrumb(item)" v-for="(item, i) of breadcrumbList" :key="i">
+                <span title="点击打开文件夹" style="cursor: pointer">{{ item.name }}</span>
+              </el-breadcrumb-item>
+            </el-breadcrumb>
+            <div class="tool-All">
+              <div v-if="!toolStart">
+                <el-button type="primary" v-auth="'api/v1/system/documentQualityMeeting/delete'" @click="onBatchAll">
+                  <el-icon><Menu /></el-icon>批量操作</el-button
+                >
+              </div>
+              <div v-if="toolStart">
+                <el-button type="warning" @click="onBatchAll">
+                  <el-icon><Tools /></el-icon>取消操作</el-button
+                >
+                <el-button type="danger" @click="onDeleteAll">
+                  <el-icon><Delete /></el-icon>删除</el-button
+                >
+              </div>
+            </div>
+          </div>
+        </el-card>
+        <el-card style="margin-top: 10px">
+          <div class="file_detail" id="file_detail1">
+            <el-row class="row-bg" v-if="fileList.length">
+              <el-col :span="2" v-for="(item, i) of fileList" :key="i">
+                <div :class="{ file_style: true }">
+                  <div @click="onNav(item)" title="点击打开文件" @contextmenu="onContextmenu($event, item, i)">
+                    <img src="@/assets/icons/file1.png" v-if="item.suffix == 'folder'" alt="" />
+                    <img src="@/assets/icons/file.png" v-else-if="item.suffix == 'file'" alt="" />
+                    <el-image
+                      v-else-if="item.suffix == 'image'"
+                      style="width: 100%; height: 100%"
+                      :src="'http://58.17.134.85:8920' + item.filenPathCoding"
+                      :zoom-rate="1.2"
+                      :max-scale="7"
+                      :min-scale="0.2"
+                      :initial-index="4"
+                      :preview-src-list="['http://58.17.134.85:8920' + item.filenPathCoding]"
+                      fit="cover"
+                    />
+                    <img :src="'/image/' + item.suffix.replace('.', '').toUpperCase() + '.png'" v-else />
+                  </div>
+                  <span @click="onFileName(item)" title="点击重命名">{{ item.name }}</span>
+                  <div :class="{ fileActive: toolStart }" v-if="toolStart" @click="onToolAll(item)"></div>
+                  <div class="checkbox-box" v-if="toolStart">
+                    <el-checkbox v-model="item.checkbox" size="large" />
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+            <el-empty :image-size="200" description="暂无文件" v-else />
+            <div class="right_box" id="right_box">
+              <div v-for="(item, i) of list" :key="i" v-auth="item.auth" @click="item.callback($event)">
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </el-tab-pane>
+      <el-tab-pane label="回收站" name="second">
+        <RecyclingStation ref="RecyclingStationRef"></RecyclingStation>
+      </el-tab-pane>
+    </el-tabs>
+    <bigUploader></bigUploader>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, computed, getCurrentInstance, toRaw, nextTick, onBeforeUnmount } from 'vue';
+import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
+import {
+  documentQualityMeetingTreeStructure,
+  documentQualityMeetingDelete,
+  documentQualityMeetingAdd,
+  documentQualityMeetingEdit,
+  documentQualityMeetingNewFolder,
+  documentQualityMeetingDownload
+} from '@/api/quality/documentQualityMeeting/index';
+// 回收站
+import RecyclingStation from '@/views/quality/documentQualityMeeting/RecyclingStation/index.vue';
+import { useUserStoreHook } from '@/store/modules/user';
+const stores = useUserStoreHook();
+export default defineComponent({
+  name: 'index',
+  components: {
+    RecyclingStation
+  },
+  setup() {
+    const { proxy } = <any>getCurrentInstance();
+    const RecyclingStationRef = ref();
+    // 字典选项数据
+    const {} = proxy.useDict();
+    // 文件下载
+    const onExport = (event) => {
+      event.stopPropagation();
+      // 文件下载 state.typeFile: 1、文件夹 2、文件
+      if (state.typeFile == 1) {
+        window.open(state.relativePath, '_black');
+      } else {
+        documentQualityMeetingDownload({ relativePath: state.relativePath, type: state.typeFile }).then((res) => {
+          if (res.code == 0) {
+            window.open(res.data.Path, '_black');
+          }
+        });
+      }
+    };
+    // 文件删除
+    const onDeleteFile = (event, item) => {
+      event.stopPropagation();
+      setDel([state.delId]);
+    };
+    const state = reactive({
+      fileList: [],
+      activeName: 'first',
+      breadcrumbList: [{ id: 0, name: '目录' }], //菜单列表
+      projectId: stores.selectedProject.goId,
+      parentPid: '0', //父级的id 默认为0
+      fileType: 0, //文件 或压缩文件
+      list: [
+        // { id: 3, name: '文件详情', callback: onExport, auth: 'zm/api/v1/system/documentProductionDrawing/get' },
+        // { id: 1, name: '文件下载', callback: onExport, auth: 'zm/api/v1/system/documentQualityMeeting/qualityDataUniFileDownload' },
+        { id: 2, name: '文件删除', callback: onDeleteFile, auth: 'zm/api/v1/system/documentCompletion/delete' }
+      ],
+      relativePath: '', //文件下载需要相对路径
+      delId: '', //删除需要的id
+      toolStart: false,
+      imageType: ['jpg', 'png', 'jpeg'],
+      wordType: ['docx', 'doc', 'pdf', 'xls', 'xlsx', 'pptx', 'ppt']
+    });
+    onMounted(() => {
+      // 全局设置阻止右键点击
+      document.addEventListener('contextmenu', function (event) {
+        event.preventDefault();
+      });
+      let file_detail_box = document.getElementById('file_detail1');
+      // 监听当前元素点击事件  并关闭弹框
+      file_detail_box.addEventListener('click', () => {
+        let box = document.getElementById('right_box');
+        box.style.display = 'none';
+      });
+      // 默认第一级 父级pid为0
+      getdocumentQualityMeetingTreeStructure();
+      // 压缩文件上传
+      console.log(proxy.mittBus, proxy);
+
+      proxy.mittBus.on('bigUploader.uploadFileSuccess' + 1008, (res: any) => {
+        const { filename, totalSize, url, identifier, fileType } = res;
+        let arr = filename.split('.');
+        let fileType1 = arr[arr.length - 1];
+        if (fileType1 == 'zip' || fileType1 == 'rar') {
+          state.fileType = 1;
+        } else {
+          //除了压缩 其他文件
+          state.fileType = 2;
+        }
+        let obj = {
+          filePath: {
+            url: '/file/' + url,
+            name: filename,
+            size: totalSize,
+            fileType: '.' + fileType1 //后缀名
+          },
+          fileType: state.fileType,
+          pid: state.parentPid == 0 ? '' : state.parentPid,
+          projectId: state.projectId
+        };
+        documentQualityMeetingAdd(obj).then((res: any) => {
+          if (res.code == 0) {
+            ElMessage({
+              type: 'success',
+              message: '上传成功'
+            });
+            getdocumentQualityMeetingTreeStructure(); //获取当前当前文件夹的文件数据
+          } else {
+            ElMessage({
+              type: 'error',
+              message: res.message
+            });
+          }
+        });
+      });
+    });
+    onBeforeUnmount(() => {
+      // 取消订阅特定事件
+      proxy.mittBus.off('bigUploader.uploadFileSuccess' + 1008);
+    });
+    const getdocumentQualityMeetingTreeStructure = () => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在查询文件……',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      documentQualityMeetingTreeStructure({ projectId: state.projectId, pid: state.parentPid }).then((res: any) => {
+        loading.close();
+        if (res.code == 0) {
+          state.fileList = res.data.list || [];
+          if (state.fileList.length) {
+            // suffix
+            state.fileList.map((item) => {
+              item.checkbox = false;
+              item.name = item.name + item.suffix;
+              item.suffix = item.suffix.slice(1).toUpperCase();
+              // 截取后缀
+              if (item.filenPathCoding.indexOf('.') != -1) {
+                let str = item.filenPathCoding.slice(item.filenPathCoding.indexOf('.') + 1);
+                if (state.imageType.includes(str)) {
+                  // 图片文件格式
+                  item.suffix = 'image';
+                } else {
+                  if (!window['$ICONLIST'].includes(item.suffix)) {
+                    item.suffix = 'file';
+                  }
+                }
+              } else {
+                // 当没得后缀的时候 默认未文件夹
+                item.suffix = 'folder';
+              }
+              return item;
+            });
+          }
+        }
+      });
+    };
+    const handleFile = (type) => {
+      state.fileType = type;
+      if (type == 3) {
+        // 新建文件夹
+        ElMessageBox.prompt('填写文件夹名', '新建文件夹', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        })
+          .then(({ value }) => {
+            // pid 父级
+            documentQualityMeetingNewFolder({ fileName: value, pid: state.parentPid == 0 ? '' : state.parentPid, projectId: state.projectId }).then(
+              (res: any) => {
+                if (res.code == 0) {
+                  getdocumentQualityMeetingTreeStructure();
+                  ElMessage({
+                    type: 'success',
+                    message: '添加成功'
+                  });
+                } else {
+                  ElMessage({
+                    type: 'error',
+                    message: res.message
+                  });
+                }
+              }
+            );
+          })
+          .catch(() => {});
+      } else {
+        // 竣工图
+        proxy.mittBus.emit('bigUploader.uploadFile', { type: 100, types: 1008, accept: [] });
+      }
+      return;
+    };
+    // 页面跳转
+    const onNav = (item) => {
+      // 通过后缀判断该文件是什么类型
+      // 图片格式 jpg、png、jpeg、
+      // word文档格式:docx、doc、pdf、xls、xlsx、pptx、ppt
+      // 其他全文件夹
+      if (item.suffix == 'image') {
+        // 可以预览图片
+        return;
+      } else if (item.suffix == 'folder') {
+        // 打开文件夹
+        state.parentPid = item.idStr;
+        state.breadcrumbList.push(item); //路径设置
+        state.fileList = [];
+        // 获取对应文件夹的数据
+        getdocumentQualityMeetingTreeStructure();
+      } else {
+        window.open(item.filenPathCoding, '_black');
+        return;
+      }
+    };
+    const onFileName = (item) => {
+      // 修改文件名称
+      ElMessageBox.prompt('文件名称修改', '重命名', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: item.name
+      })
+        .then(({ value }) => {
+          // 确定
+          documentQualityMeetingEdit({ id: item.id, name: value, type: item.type }).then((res: any) => {
+            if (res.code == 0) {
+              item.name = value;
+              getdocumentQualityMeetingTreeStructure();
+              ElMessage({
+                type: 'success',
+                message: '修改成功'
+              });
+            } else {
+              ElMessage({
+                type: 'error',
+                message: res.message
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    const handleClick = (val) => {
+      if (state.activeName == 'second') {
+        getdocumentQualityMeetingTreeStructure();
+      } else {
+        RecyclingStationRef.value.getDocumentDataList();
+      }
+    };
+    const onBreadcrumb = (item) => {
+      if (item.name == '目录') {
+        state.parentPid = '0';
+        state.breadcrumbList = [{ id: 0, name: '目录' }]; //菜单列表
+        // 最初目录
+        getdocumentQualityMeetingTreeStructure();
+      } else {
+        let arr = [];
+        let array = state.breadcrumbList;
+        for (let index = 0; index < array.length; index++) {
+          arr.push(array[index]);
+          if (array[index].name == item.name) {
+            break;
+          }
+        }
+        state.breadcrumbList = arr;
+        // 通过 当前点击的文件进行获取数据
+        // 重复点击不用再次获取
+        if (item.idStr == state.parentPid) return;
+        state.parentPid = item.idStr;
+        getdocumentQualityMeetingTreeStructure();
+      }
+    };
+    // 批量操作数据
+    const onBatchAll = () => {
+      state.toolStart = !state.toolStart;
+    };
+    const setDel = (ids) => {
+      let msg = '你确定要删除所选数据？';
+      if (ids.length === 0) {
+        ElMessage.error('请选择要删除的数据。');
+        return;
+      }
+      ElMessageBox.confirm(msg, '温馨提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          documentQualityMeetingDelete({ ids }).then((res) => {
+            if (res.code == 0) {
+              let box = document.getElementById('right_box');
+              box.style.display = 'none'; //显示div盒子
+              ElMessage.success('删除成功');
+              getdocumentQualityMeetingTreeStructure();
+            } else {
+              ElMessage.error(res.message);
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    // 批量删除
+    const onDeleteAll = () => {
+      //获取所有已经选中的数据
+      let selectList = [];
+      if (state.fileList.length) {
+        state.fileList.map((item) => {
+          if (item.checkbox) {
+            selectList.push(item.id);
+          }
+        });
+        if (!selectList.length) {
+          ElMessage.warning('请选择需要删除的文件');
+          return;
+        }
+        setDel(selectList);
+      }
+    };
+    // 批量选择
+    const onToolAll = (row) => {
+      row.checkbox = !row.checkbox;
+    };
+    const onContextmenu = (event, item, i) => {
+      state.typeFile = item.type;
+      state.relativePath = item.filenPath;
+      state.delId = item.id;
+      let len = (100 / 12) * (i % 12) + 4 + '%';
+      let box = document.getElementById('right_box');
+      console.log(event);
+      box.style.top = event.clientY - 250 + 'px'; //鼠标点击时给div定位Y轴
+      box.style.left = len; //鼠标点击时给div定位X轴
+      box.style.display = 'block'; //显示div盒子
+    };
+    return {
+      proxy,
+      handleFile,
+      onFileName,
+      onNav,
+      handleClick,
+      RecyclingStationRef,
+      onBreadcrumb,
+      onBatchAll,
+      onDeleteAll,
+      onExport,
+      onDeleteFile,
+      onToolAll,
+      onContextmenu,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.documentCompletion-data {
+  .el-card__body {
+    padding: 10px !important;
+  }
+
+  .breadcrumb-img {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    padding-right: 10px;
+    .tool-All {
+      display: flex;
+      align-items: center;
+      > div {
+        display: flex;
+        align-items: center;
+      }
+    }
+    .batch {
+      width: 24px;
+    }
+  }
+  .file_detail {
+    position: relative;
+    width: 100%;
+    height: 66vh;
+    overflow: auto;
+    .right_box {
+      position: absolute;
+      z-index: 999;
+      background-color: rgb(0 0 0 / 56%);
+      // width: 100px;
+      // height: 100px;
+      top: 0;
+      left: 0;
+      display: none;
+      border-radius: 6px;
+      padding: 4px 0;
+      > div {
+        font-size: 16px;
+        font-weight: bold;
+        color: #fff;
+        padding: 8px 20px;
+        cursor: pointer;
+        font-family: revert;
+      }
+      > div:hover {
+        background-color: rgb(0 0 0 / 80%);
+      }
+    }
+    .file_style {
+      // height: 100px;
+      width: 90px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding: 10px;
+      box-sizing: border-box;
+      animation: 0.5s ease;
+      position: relative;
+      margin-bottom: 10px;
+      > div {
+        width: 100%;
+        // height: 70%;
+        height: 80px;
+        > img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .checkbox-box {
+        position: absolute;
+        top: -8px;
+        left: 60px;
+        z-index: 1000;
+      }
+      > span {
+        font-size: 12px;
+        width: 100%;
+        display: block;
+        text-align: center;
+        // display: flex;
+        // align-items: center;
+        // justify-content: center;
+        word-wrap: break-word;
+      }
+    }
+    .file_style:hover {
+      background-color: rgba(189, 189, 189, 0.322);
+      border-radius: 5px;
+    }
+    .fileActive {
+      display: block;
+      top: 0;
+      position: absolute;
+      z-index: 999;
+      left: 0;
+      width: 100%;
+      height: 100% !important;
+      border-radius: 5px;
+      background-color: rgba(189, 189, 189, 0.322);
+    }
+  }
+}
+.colBlock {
+  display: block;
+}
+.colNone {
+  display: none;
+}
+</style>
diff --git a/src/views/quality/knowledgeDocument/index.vue b/src/views/quality/knowledgeDocument/index.vue
index 595db09..06a357f 100644
--- a/src/views/quality/knowledgeDocument/index.vue
+++ b/src/views/quality/knowledgeDocument/index.vue
@@ -5,34 +5,52 @@
         <div class="box_info">
           <div class="tree_left1" id="tree_left1">
             <div class="file_upload check_select">
-              <div class="box_btn" v-auth="'/zm/api/v1/system/documentData/add'"
-                v-hasPermi="['quality:knowledgeDocument:file']">
-
-                <file-upload v-model="state.paramsQuery.file" :limit="100" :uploadUrl="uploadUrl" :params="uploadParams"
-                  :on-upload-success="uploadFile">
+              <div class="box_btn" v-auth="'/zm/api/v1/system/documentData/add'" v-hasPermi="['quality:knowledgeDocument:file']">
+                <file-upload
+                  v-model="state.paramsQuery.file"
+                  :limit="100"
+                  :uploadUrl="uploadUrl"
+                  :params="uploadParams"
+                  :on-upload-success="uploadFile"
+                >
                   <el-button type="primary" style="float: left" :disabled="!state.parentPid">
                     <el-icon size="small">
-                      <Plus />
-                    </el-icon>上传文件
+                      <Plus /> </el-icon
+                    >上传文件
                   </el-button>
                 </file-upload>
               </div>
-              <el-button type="primary" v-auth="'/zm/api/v1/system/documentProject/dataCompressedDownload'"
-                v-hasPermi="['quality:knowledgeDocument:fileList']" :disabled="!state.parentPid"
-                @click="onExport"><el-icon>
-                  <Download />
-                </el-icon>下载</el-button>
-              <el-button type="primary" @click="onBook"
-                v-auth="'/zm/api/v1/system/documentData/dataFileQuery'"><el-icon>
-                  <View />
-                </el-icon>查看全项目文件</el-button>
+              <el-button
+                type="primary"
+                v-auth="'/zm/api/v1/system/documentProject/dataCompressedDownload'"
+                v-hasPermi="['quality:knowledgeDocument:fileList']"
+                :disabled="!state.parentPid"
+                @click="onExport"
+                ><el-icon>
+                  <Download /> </el-icon
+                >下载</el-button
+              >
+              <el-button type="primary" @click="onBook" v-auth="'/zm/api/v1/system/documentData/dataFileQuery'"
+                ><el-icon>
+                  <View /> </el-icon
+                >查看全项目文件</el-button
+              >
             </div>
             <div class="file_upload check_select">
               <el-input class="input_left" v-model="filterText" size="small" placeholder="请输入文件名称" />
             </div>
-            <el-tree ref="treeRef" highlight-current :default-expand-all="state.checked"
-              :filter-node-method="filterFolder" :data="state.treeList" node-key="id" accordion
-              :expand-on-click-node="false" @node-click="handleNodeClick" :current-node-key="state.selectedNodeId">
+            <el-tree
+              ref="treeRef"
+              highlight-current
+              :default-expand-all="state.checked"
+              :filter-node-method="filterFolder"
+              :data="state.treeList"
+              node-key="id"
+              accordion
+              :expand-on-click-node="false"
+              @node-click="handleNodeClick"
+              :current-node-key="state.selectedNodeId"
+            >
               <template #default="{ node, data }">
                 <span class="custom-tree-node">
                   <el-icon color="#f1a81a">
@@ -50,18 +68,26 @@
                 <el-row>
                   <el-col :span="7" class="colBlock">
                     <el-form-item label="文件名称" prop="fileName">
-                      <el-input v-model="state.paramsQuery.fileName" placeholder="请输入文件名称" clearable
-                        @keyup.enter.native="getdocumentDataList" />
+                      <el-input
+                        v-model="state.paramsQuery.fileName"
+                        placeholder="请输入文件名称"
+                        clearable
+                        @keyup.enter.native="getdocumentDataList"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="6" class="m-l10">
                     <el-form-item>
-                      <el-button type="primary" @click="searchInfo"><el-icon>
-                          <Search />
-                        </el-icon>搜索</el-button>
-                      <el-button @click="resetQuery"><el-icon>
-                          <Refresh />
-                        </el-icon>重置</el-button>
+                      <el-button type="primary" @click="searchInfo"
+                        ><el-icon>
+                          <Search /> </el-icon
+                        >搜索</el-button
+                      >
+                      <el-button @click="resetQuery"
+                        ><el-icon>
+                          <Refresh /> </el-icon
+                        >重置</el-button
+                      >
                     </el-form-item>
                   </el-col>
                   <!-- <el-col :span="4">
@@ -84,38 +110,65 @@
               <el-table-column label="上传时间" align="center" prop="createTime"> </el-table-column>
               <el-table-column label="操作" align="center" width="300">
                 <template #default="scope">
-                  <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/get'"
-                    v-if="acceptType.includes(scope.row.fileSuffix)" link @click="handleView(scope.row)"><el-icon>
-                      <View />
-                    </el-icon>查看</el-button>
-                  <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/complaintBoxAdd'"
-                    v-hasPermi="['quality:knowledgeDocument:file']" v-if="state.wordType.includes(scope.row.fileSuffix)"
-                    link @click="updataView(scope.row)"><el-icon>
-                      <EditPen />
-                    </el-icon>修改文件</el-button>
-                  <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/uniFolderDownload'" link
-                    v-hasPermi="['quality:knowledgeDocument:file']" @click="onExportView(scope.row)"><el-icon>
-                      <Download />
-                    </el-icon>下载</el-button>
-                  <el-button type="success" v-auth="'/zm/api/v1/system/documentData/edit'" link
-                    @click="updateName(scope.row)" v-hasPermi="['quality:knowledgeDocument:file']"><el-icon>
-                      <EditPen />
-                    </el-icon>修改名称</el-button>
-                  <el-button type="danger" v-auth="'/zm/api/v1/system/documentData/delete'" link
-                    @click="handleDelete(scope.row)"><el-icon>
-                      <DeleteFilled />
-                    </el-icon>删除</el-button>
+                  <el-button
+                    type="primary"
+                    v-auth="'/zm/api/v1/system/documentData/get'"
+                    v-if="acceptType.includes(scope.row.fileSuffix)"
+                    link
+                    @click="handleView(scope.row)"
+                    ><el-icon>
+                      <View /> </el-icon
+                    >查看</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    v-auth="'/zm/api/v1/system/documentData/complaintBoxAdd'"
+                    v-hasPermi="['quality:knowledgeDocument:file']"
+                    v-if="state.wordType.includes(scope.row.fileSuffix)"
+                    link
+                    @click="updataView(scope.row)"
+                    ><el-icon>
+                      <EditPen /> </el-icon
+                    >修改文件</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    v-auth="'/zm/api/v1/system/documentData/uniFolderDownload'"
+                    link
+                    v-hasPermi="['quality:knowledgeDocument:file']"
+                    @click="onExportView(scope.row)"
+                    ><el-icon>
+                      <Download /> </el-icon
+                    >下载</el-button
+                  >
+                  <el-button
+                    type="success"
+                    v-auth="'/zm/api/v1/system/documentData/edit'"
+                    link
+                    @click="updateName(scope.row)"
+                    v-hasPermi="['quality:knowledgeDocument:file']"
+                    ><el-icon>
+                      <EditPen /> </el-icon
+                    >修改名称</el-button
+                  >
+                  <el-button type="danger" v-auth="'/zm/api/v1/system/documentData/delete'" link @click="handleDelete(scope.row)"
+                    ><el-icon>
+                      <DeleteFilled /> </el-icon
+                    >删除</el-button
+                  >
                 </template>
               </el-table-column>
             </el-table>
-            <pagination :total="state.total" v-model:page="state.paramsQuery.pageNum"
-              v-model:limit="state.paramsQuery.pageSize" @pagination="getdocumentDataList" />
+            <pagination
+              :total="state.total"
+              v-model:page="state.paramsQuery.pageNum"
+              v-model:limit="state.paramsQuery.pageSize"
+              @pagination="getdocumentDataList"
+            />
           </div>
         </div>
-        <documentsDeailsVue ref="documentDetailRef" v-if="state.showDocumentDetail" @onClose="onClose">
-        </documentsDeailsVue>
-        <documentsEdit ref="documentDataEditRef" v-if="state.showdocumentDataEdit" @onClose="onCloseEdit">
-        </documentsEdit>
+        <documentsDeailsVue ref="documentDetailRef" v-if="state.showDocumentDetail" @onClose="onClose"> </documentsDeailsVue>
+        <documentsEdit ref="documentDataEditRef" v-if="state.showdocumentDataEdit" @onClose="onCloseEdit"> </documentsEdit>
         <!-- <uploadFileder
       ref="uploadFilederRef"
       v-if="state.showUploadFileder"
@@ -135,8 +188,15 @@
           </template>
         </el-dialog>
       </div>
-      <el-image-viewer ref="imageRef" style="width: 100%; height: 100%" :url-list="[imgUrl]" v-if="imgUrl" show-progress
-        fit="cover" @close="imgUrl = ''" />
+      <el-image-viewer
+        ref="imageRef"
+        style="width: 100%; height: 100%"
+        :url-list="['http://58.17.134.85:8920' + imgUrl]"
+        v-if="imgUrl"
+        show-progress
+        fit="cover"
+        @close="imgUrl = ''"
+      />
     </el-tab-pane>
     <el-tab-pane label="回收站" name="second">
       <RecyclingStation ref="recylingRef"></RecyclingStation>
@@ -446,7 +506,7 @@ const delFile = (msg, data, cb) => {
         }
       });
     })
-    .catch(() => { });
+    .catch(() => {});
 };
 const editName = (data, title, type) => {
   ElMessageBox.prompt(title, '温馨提示', {
@@ -476,7 +536,7 @@ const editName = (data, title, type) => {
         }
       });
     })
-    .catch(() => { });
+    .catch(() => {});
 };
 const onExport = () => {
   getUniFolderDownloadList(state.paramsQuery.folderId).then((res: any) => {
@@ -521,7 +581,7 @@ onMounted(() => {
     }
   }
 
-  .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
     background-color: #354e67 !important;
     color: #fff;
   }
@@ -535,7 +595,7 @@ onMounted(() => {
     padding: 10px 0 !important;
   }
 
-  >div {
+  > div {
     height: 100%;
     width: 100%;
   }
@@ -573,7 +633,7 @@ onMounted(() => {
         margin: 0 10px 0 20px;
         position: relative;
 
-        >span {
+        > span {
           padding: 4px 10px;
           background: #67c23a;
           color: #fff;
diff --git a/src/views/quality/onlineListquality/comm/bookFile/index.vue b/src/views/quality/onlineListquality/comm/bookFile/index.vue
new file mode 100644
index 0000000..903b712
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/bookFile/index.vue
@@ -0,0 +1,414 @@
+<template>
+  <div class="book_file">
+    <!-- 添加或修改公司对话框 -->
+    <el-dialog v-model="isShowDialog" width="80vw" custom-class="book_file_loading" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.book_file .el-dialog', '.book_file .el-dialog__header']">查看资料文件</div>
+      </template>
+      <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
+        <el-row>
+          <el-col :span="8" class="colBlock">
+            <el-form-item label="项目名称" prop="project">
+              <el-select v-model="formData.project" :filter-method="filterMethod" filterable placeholder="请选择项目" clearable>
+                <el-option v-for="item of projectList" :key="item.id" :label="item.projectName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" class="colBlock">
+            <el-form-item label="文件名称" prop="fileName">
+              <el-input v-model="formData.fileName" placeholder="请输入文件名称搜索" clearable @keyup.enter.native="getDataFileQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button type="primary" @click="getDataFileQuery"
+                ><el-icon><Search /></el-icon>搜索</el-button
+              >
+              <el-button @click="resetQuery" type="danger"
+                ><el-icon><Refresh /></el-icon>清空</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="content">
+        <div class="left_box" :style="treeList.length ? 'width: 70%' : 'width: 100%'">
+          <el-table v-loading="loading" :data="tableData" border height="63vh" :empty-text="emptyText">
+            <el-table-column label="序号" align="center" type="index" max-width="30px" />
+            <el-table-column label="所属项目" align="center" prop="projectName" min-width="100px" />
+            <el-table-column label="文件名称" align="center" prop="name" min-width="100px" />
+            <el-table-column label="文件路径" align="center" min-width="100px">
+              <template #default="scope">
+                <span>{{ filterfilenPath(scope.row.filenPath) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding" width="220px" fixed="right">
+              <template #default="scope">
+                <!-- <el-button type="success" link @click="onExport(scope.row)"
+                  ><el-icon><Download /></el-icon>下载</el-button
+                > -->
+                <el-button type="primary" link @click="onBook(scope.row)"
+                  ><el-icon><View /></el-icon>查看</el-button
+                >
+                <el-button type="primary" link @click="getAllTreeData(scope.row)"
+                  ><el-icon><View /></el-icon>项目资料</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="tableData.length > 0"
+            :total="tableData.length"
+            v-model:page="pageNum"
+            v-model:limit="pageSize"
+            @pagination="getDataFileQuery"
+          />
+        </div>
+        <div class="right_box" :style="treeList.length ? 'width: 30%' : 'width: 0'">
+          <el-tree
+            v-if="treeList.length"
+            ref="allTreeRef"
+            highlight-current
+            :filter-node-method="filterFolder"
+            :data="treeList"
+            :props="Props"
+            node-key="id"
+            accordion
+            :expand-on-click-node="false"
+            @node-click="onAllTreeNode"
+          >
+            <template #default="{ node, data }">
+              <span class="custom-tree-node">
+                <el-icon color="#f1a81a" v-if="data.type == '2'"><FolderOpened /></el-icon>
+                <el-icon color="#409eff" v-if="data.type == '1'"><Files /></el-icon>
+                <el-tooltip class="box-item" effect="dark" :content="node.label" placement="bottom" v-if="node.label.length > 20">
+                  <span>{{ node.label.substring(0, 20) }}…</span>
+                </el-tooltip>
+                <span v-else>{{ node.label }}</span>
+                <span style="margin-left: 15px" class="set-tool">
+                  <!-- <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/onlineImport'" link @click.stop="onExportFile(node, data)"
+                    >下载</el-button
+                  > -->
+                  <el-button
+                    type="success"
+                    v-auth="'/zm/api/v1/system/documentData/get'"
+                    link
+                    @click.stop="onViewFile(node, data)"
+                    v-if="data.type == '1'"
+                    >查看</el-button
+                  >
+                </span>
+              </span>
+            </template>
+          </el-tree>
+        </div>
+      </div>
+    </el-dialog>
+    <documentDetail ref="documentDetailRef" v-if="showDocumentDetail" @onClose="showDocumentDetail = false"></documentDetail>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance, nextTick } from 'vue';
+import { ElMessage, ElLoading } from 'element-plus';
+// 接口引入
+import {
+  dataFileQuery,
+  treeStructureData,
+  documentDataListUnPage,
+  getProfileDetail,
+  listSysProjectAll
+} from '@/api/quality/onlineListquality/profileData';
+import { uniFolderDownload, uniFileDownload } from '@/api/quality/onlineListquality/Online';
+import documentDetail from '../documentsDetail/index.vue';
+import axios from 'axios';
+import sign from '@/utils/sign.js';
+import { Session } from '@/utils/storage';
+import { useUserStoreHook } from '@/store/modules/user';
+
+export default defineComponent({
+  name: 'index',
+  components: { documentDetail },
+  setup(props, { emit }) {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const documentDetailRef = ref(); //详情在线dom
+    const allTreeRef = ref();
+    const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL;
+    const state = reactive({
+      loading: false,
+      tableData: [],
+      isShowDialog: false,
+      formData: {
+        fileName: '',
+        project: null
+      },
+      projectList: [],
+      projectQuery: {
+        name: ''
+      },
+      pageNum: 1,
+      pageSize: 10,
+      total: 0,
+      userName: stores.nickname + '' + stores.selectedProject.goId, // 当前用户名
+      showDocumentDetail: false, //详情弹框
+      emptyText: '暂无数据',
+      treeList: [] as any, //树形结构数据
+      arrayList: [] as any, //树形结构处理成一维数组
+      infoMap: new Map(), //用idstr 存储pid
+      infoList: [] as any, //文档列表数据
+      Props: {
+        children: 'treeStructureDataRes',
+        label: 'name'
+      },
+      paramsQuery: { idStr: '', project: '' } //请求参数
+    });
+    // 打开弹窗
+    const openDialog = () => {
+      state.isShowDialog = true;
+      getAllProject();
+      // 获取数据
+      state.emptyText = '请输入文件名称进行搜索！';
+      resetForm();
+    };
+    const resetForm = () => {
+      state.tableData = [];
+      state.formData.fileName = '';
+      state.treeList = [];
+      state.emptyText = '暂无数据';
+    };
+    // 获取项目列表
+    const getAllProject = () => {
+      listSysProjectAll(state.projectQuery).then((res: any) => {
+        if (res.code == 0) {
+          let list = res.data.list ?? [];
+          state.projectList = list;
+          if (res.data.list.length && !state.projectQuery.name) {
+            state.projectList.unshift({ id: 0, projectName: '全部' });
+            // 第一次
+            state.formData.project = 0;
+            getDataFileQuery();
+          }
+        }
+      });
+    };
+    const filterMethod = (val) => {
+      state.projectQuery.name = val;
+      listSysProjectAll(state.projectQuery).then((res: any) => {
+        if (res.code == 0) {
+          let list = res.data.list ?? [];
+          state.projectList = list;
+          if (!state.projectQuery.name) {
+            state.projectList.unshift({ id: 0, projectName: '全部' });
+          }
+        }
+      });
+    };
+    const getDataFileQuery = () => {
+      state.loading = true;
+      state.emptyText = '数据加载中……';
+      dataFileQuery(state.formData).then((res: any) => {
+        if (res.code == 0) {
+          state.loading = false;
+          state.tableData = [];
+          if (res.data.list && res.data.list.length) {
+            state.tableData = res.data.list;
+            state.total = res.data.list.length;
+          } else {
+            state.emptyText = '没有查询到数据，请重新输入搜索';
+            // ElMessage.warning('没有查询到数据，请重新输入搜索');
+          }
+        }
+      });
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 查看资料文档
+    const onBook = (row) => {
+      getProfileDetail(row.id).then((res: any) => {
+        if (res.code == 0) {
+          // 查看文档
+          state.showDocumentDetail = true;
+          nextTick(() => {
+            documentDetailRef.value.openDialog(res.data);
+          });
+        }
+      });
+    };
+    // 下载
+    const onExport = (row) => {
+      axios({
+        method: 'get',
+        url: baseURL + '/zm' + '/api/v1/system/documentData/uniFileDownload',
+        responseType: 'blob',
+        params: {
+          relativePath: row.filenPath
+        },
+        headers: {
+          Authorization: 'Bearer ' + `${Session.get('token')}`,
+          ...sign({
+            relativePath: row.filenPath
+          })
+        }
+      }).then((res) => {
+        let blob = new Blob([res.data], { type: res.headers['content-type'] });
+        const blobURL = window.URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = blobURL;
+        link.setAttribute('download', row.name + row.suffix);
+        if (typeof link.download === 'undefined') {
+          link.setAttribute('target', '_blank');
+        }
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        window.URL.revokeObjectURL(blobURL);
+      });
+    };
+    const resetQuery = () => {
+      // 清空
+      state.tableData = [];
+      state.formData.fileName = '';
+      state.formData.project = null;
+      state.loading = false;
+      state.emptyText = '暂无数据';
+    };
+    const filterfilenPath = (val) => {
+      return val.substring(val.lastIndexOf(state.userName) + state.userName.length);
+    };
+    // 获取树形结构文件夹目录
+    const getAllTreeData = (row: any) => {
+      treeStructureData({ projectId: row.projectId }).then((res: any) => {
+        if (res.code == 0 && res.data && res.data.list) {
+          state.treeList = res.data.list;
+          state.paramsQuery.project = row.projectId;
+          setInfo(res.data.list);
+        }
+      });
+    };
+    // 处理数据
+    const setInfo = (arr) => {
+      arr.forEach((element) => {
+        state.arrayList.push(element);
+        state.infoMap.set(element.idStr, element.id);
+        if (element.treeStructureDataRes && element.treeStructureDataRes.length) {
+          setInfo(element.treeStructureDataRes);
+        }
+      });
+    };
+    // 选择目录文件
+    const onAllTreeNode = (row) => {
+      state.paramsQuery.idStr = row.idStr;
+      if (!state.paramsQuery.idStr) {
+        return;
+      }
+      state.loading = true;
+      // 获取文档列表数据
+      documentDataListUnPage(state.paramsQuery).then((res: any) => {
+        state.loading = false;
+        state.tableData = [];
+        state.emptyText = '暂无数据';
+        if (res.code == 0 && res.data.list && res.data.list.length) {
+          // if (row.treeStructureDataRes && row.treeStructureDataRes.length) {
+          // 	// 未存在的数据
+          // 	let different = res.data.list.filter((item: any) => !row.treeStructureDataRes.some((v: any) => v.id === item.id));
+          // 	if (different.length) {
+          // 		different.forEach((item) => {
+          // 			allTreeRef.value?.append(item, row.id);
+          // 		});
+          // 	}
+          // } else {
+          // 	res.data.list.forEach((item) => {
+          // 		allTreeRef.value?.append(item, row.id);
+          // 	});
+          // }
+          state.tableData = res.data.list;
+        }
+      });
+    };
+    // 下载文件
+    const onExportFile = (node, data) => {
+      // 文件夹
+      if (data.type == '2') {
+        uniFolderDownload(data.filenPath).then((res: any) => {
+          if (res.code == 0) {
+            let fileUrl = res.data.RelativePath;
+            window.open(fileUrl, '_self');
+          }
+        });
+      }
+      // 文件
+      if (data.type == '1') {
+        axios({
+          method: 'get',
+          url: baseURL + '/zm' + '/api/v1/system/documentData/uniFileDownload',
+          responseType: 'blob',
+          params: {
+            relativePath: data.filenPath
+          },
+          headers: { Authorization: 'Bearer ' + `${Session.get('token')}` }
+        }).then((res) => {
+          let blob = new Blob([res.data], { type: res.headers['content-type'] });
+          const blobURL = window.URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.style.display = 'none';
+          link.href = blobURL;
+          link.setAttribute('download', data.name + data.suffix);
+          if (typeof link.download === 'undefined') {
+            link.setAttribute('target', '_blank');
+          }
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+          window.URL.revokeObjectURL(blobURL);
+        });
+      }
+    };
+    // 树形中的查看
+    const onViewFile = (node, data) => {
+      onBook(data);
+    };
+
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onExport,
+      onBook,
+      resetQuery,
+      getDataFileQuery,
+      filterfilenPath,
+      documentDetailRef,
+      resetForm,
+      getAllTreeData,
+      setInfo,
+      onAllTreeNode,
+      allTreeRef,
+      onExportFile,
+      onViewFile,
+      getAllProject,
+      filterMethod,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+
+<style scoped lang="scss">
+.book_file {
+  .content {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/documentsDetail/index.vue b/src/views/quality/onlineListquality/comm/documentsDetail/index.vue
new file mode 100644
index 0000000..3a64ee2
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/documentsDetail/index.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="document_detail" id="document_detail">
+    <div class="move_pop" id="detial_pop">
+      <!-- <span>{{ title }}</span> -->
+      <div class="box">
+        <img v-if="type == 2" src="/image/suo.png" @click="onFull(1)" />
+        <img v-else src="/image/full.png" @click="onFull(2)" />
+        <span class="close" @click="onClose">✖</span>
+      </div>
+    </div>
+    <div class="box_app" id="box_app"></div>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, defineComponent, getCurrentInstance } from 'vue';
+import { setMove } from '@/utils/moveDiv';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const state = reactive({
+      title: '',
+      type: 2
+    });
+    onMounted(() => {
+      setMove('detial_pop', 'document_detail');
+    });
+    // 打开弹窗
+    const openDialog = (obj) => {
+      state.title = obj.name;
+      init(obj);
+    };
+    const onError = function (event) {
+      //举例，强制保存后，判断文档内容是否保存成功
+      if (event.data) {
+        if (event.data.errorCode == 'forcesave') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //保存成功
+          } else {
+            //保存失败或异常
+          }
+        } else if (event.data.errorCode == 'setallcellvalue') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //填充成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //填充异常
+          }
+        } else if (event.data.errorCode == 'clearsheet') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //清除成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //清除异常
+          }
+        }
+      }
+    };
+    const onDocumentReady = function () {
+      // console.log('文档加载完成');
+    };
+    const init = (obj) => {
+      let documentKey = obj.id.toString() + new Date().getTime();
+      let baseURL = window['$HOSTSRC'].replace('ws:', 'http:').replace('/ws', '');
+      let url = baseURL + obj.filenPathCoding.replaceAll('+', ' ');
+      let type = obj.suffix;
+      if (obj.suffix.includes('.')) {
+        type = obj.suffix.substring(1);
+      }
+      let documentType = 'word'; // docx doc
+      if (type == 'xlsx' || type == 'xls') {
+        documentType = 'cell'; //电子表格
+      } else if (type == 'ppt' || type == 'pptx') {
+        documentType = 'slide'; //演示文档文件
+      }
+      new CXO_API.CXEditor('box_app', {
+        document: {
+          fileType: type,
+          key: documentKey,
+          title: obj.name,
+          url
+        },
+        documentType,
+        editorConfig: {
+          mode: 'view',
+          callbackUrl: ''
+        },
+        height: '100%',
+        events: {
+          onDocumentReady: onDocumentReady,
+          onError: onError
+        },
+        zoom: -1
+      });
+    };
+    const onClose = () => {
+      emit('onClose', false);
+    };
+    const onFull = (type) => {
+      // 全屏
+      let document_detail = document.getElementById('document_detail');
+      state.type = type;
+      if (type == 2) {
+        document_detail.style.width = '100%';
+        document_detail.style.height = '100%';
+      } else {
+        document_detail.style.width = '1200px';
+        document_detail.style.height = '80vh';
+      }
+    };
+    return {
+      proxy,
+      openDialog,
+      onClose,
+      onFull,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.document_detail {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 999999;
+  width: 100%;
+  height: 100%;
+  border: 1px solid #9f9f9f;
+  .box_app {
+    // width: 1300px !important;
+    // height: 80vh !important;
+    background-color: #f1f1f1;
+  }
+  .move_pop {
+    width: 100%;
+    // position: absolute;
+    // top: 0;
+    // right: 0%;
+    height: 24px;
+    // background: linear-gradient(#2a5095, #213f7b, #111e48);
+    background-color: #f4f5f6;
+    display: grid;
+    place-items: center;
+    > span {
+      color: #000000;
+      font-weight: bold;
+      font-size: 20px;
+      letter-spacing: 2px;
+    }
+    .box {
+      display: flex;
+      width: 60px;
+      position: absolute;
+      top: 0;
+      right: 10px;
+      // height: 100%;
+      align-items: center;
+      img {
+        width: 22px;
+        margin-top: 6px;
+        cursor: pointer;
+      }
+      .close {
+        position: absolute;
+        right: 2px;
+        /* top: -8px; */
+        color: #8d8d8d;
+        width: 24px;
+        height: 24px;
+        font-size: 20px;
+        //border: 2px solid #0ff;
+        border-radius: 50%;
+        display: grid;
+        place-items: center;
+        cursor: pointer;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/documentsEdit/index.vue b/src/views/quality/onlineListquality/comm/documentsEdit/index.vue
new file mode 100644
index 0000000..e25b9b8
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/documentsEdit/index.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="document_detail_eidt" id="document_detail_eidt">
+    <div class="move_pop" id="detial_edit">
+      <!-- <span>{{ title }}</span> -->
+      <div class="box">
+        <img v-if="type == 2" src="/image/full.png" @click="onFull(1)" />
+        <img v-else src="/image/suo.png" @click="onFull(2)" />
+        <span class="close" @click="onClose">✖</span>
+      </div>
+    </div>
+    <div class="box_app" id="box_app_edit"></div>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance } from 'vue';
+import { setMove } from '@/utils/moveDiv';
+import { useUserStoreHook } from '@/store/modules/user';
+
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const state = reactive({
+      title: '',
+      projectId: stores.selectedProject.goId,
+      type: 2,
+      postUrl: ''
+    });
+    onMounted(() => {
+      setMove('detial_edit', 'document_detail_eidt');
+    });
+    // 打开弹窗
+    const openDialog = (obj, url) => {
+      state.postUrl = url;
+
+      state.title = obj.name;
+      init(obj);
+    };
+    const onError = function (event) {
+      console.log('编辑器错误: code ' + event.data.errorCode + ', 描述' + event.data.errorDescription);
+      //举例，强制保存后，判断文档内容是否保存成功
+      if (event.data) {
+        if (event.data.errorCode == 'forcesave') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //保存成功
+          } else {
+            //保存失败或异常
+          }
+        } else if (event.data.errorCode == 'setallcellvalue') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //填充成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //填充异常
+          }
+        } else if (event.data.errorCode == 'clearsheet') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //清除成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //清除异常
+          }
+        }
+      }
+    };
+    const onDocumentReady = function () {
+      // console.log('文档加载完成');
+    };
+    const init = (obj) => {
+      let documentKey = obj.id.toString() + new Date().getTime();
+      let baseURL = window['$HOSTSRC'].replace('ws:', 'http:').replace('/ws', '');
+      let url = baseURL + obj.filenPathCoding.replaceAll('+', ' ');
+      let type = obj.suffix;
+      if (obj.suffix.includes('.')) {
+        type = obj.suffix.substring(1);
+      }
+      let documentType = 'word'; // docx doc
+      if (type == 'xlsx' || type == 'xls') {
+        documentType = 'cell'; //电子表格
+      } else if (type == 'ppt' || type == 'pptx') {
+        documentType = 'slide'; //演示文档文件
+      }
+      new CXO_API.CXEditor('box_app_edit', {
+        document: {
+          fileType: obj.suffix.substring(1),
+          key: documentKey,
+          title: obj.name,
+          url
+        },
+        documentType,
+        editorConfig: {
+          callbackUrl: baseURL + state.postUrl + '?path=' + obj.filenPathCoding
+        },
+        events: {
+          onDocumentReady: onDocumentReady,
+          onError: onError
+        }
+      });
+    };
+    const onClose = () => {
+      emit('onClose', false);
+    };
+    const onFull = (type) => {
+      // 全屏
+      let document_detail = document.getElementById('document_detail_eidt');
+      state.type = type;
+      if (type == 2) {
+        // 弹框放大
+        document_detail.style.width = '100%';
+        document_detail.style.height = '100%';
+      } else {
+        // 弹框缩小
+        document_detail.style.width = '1200px';
+        document_detail.style.height = '80vh';
+      }
+    };
+    return {
+      proxy,
+      onFull,
+      openDialog,
+      onClose,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.document_detail_eidt {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 999999;
+  width: 100%;
+  height: 100%;
+  border: 1px solid #9f9f9f;
+  .box_app {
+    width: 1200px !important;
+    height: 80vh !important;
+    background-color: #f1f1f1;
+    margin-top: 100px;
+  }
+  .move_pop {
+    width: 100%;
+    // position: absolute;
+    // top: 0;
+    // right: 0%;
+    height: 24px;
+    // background: linear-gradient(#2a5095, #213f7b, #111e48);
+    background-color: #f4f5f6;
+    display: grid;
+    place-items: center;
+    > span {
+      color: #000000;
+      font-weight: bold;
+      font-size: 20px;
+      letter-spacing: 2px;
+    }
+    .box {
+      display: flex;
+      width: 60px;
+      position: absolute;
+      top: 0;
+      right: 10px;
+      // height: 100%;
+      align-items: center;
+      img {
+        width: 22px;
+        margin-top: 6px;
+        cursor: pointer;
+      }
+      .close {
+        position: absolute;
+        right: 2px;
+        /* top: -8px; */
+        color: #8d8d8d;
+        width: 24px;
+        height: 24px;
+        font-size: 20px;
+        //border: 2px solid #0ff;
+        border-radius: 50%;
+        display: grid;
+        place-items: center;
+        cursor: pointer;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/profileData/commp/addProfile/index.vue b/src/views/quality/onlineListquality/comm/profileData/commp/addProfile/index.vue
new file mode 100644
index 0000000..f862375
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileData/commp/addProfile/index.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="add_profile">
+    <el-dialog v-model="isShowDialog" width="400px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.add_profile .el-dialog', '.add_profile .el-dialog__header']">添加工程资料</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="110px">
+        <el-form-item label="工程资料名称" prop="dataName">
+          <el-input v-model="formData.dataName" placeholder="请输入工程资料名称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="dataType">
+          <el-radio-group v-model="formData.dataType">
+            <el-radio label="1">编写</el-radio>
+            <el-radio label="2">存储</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessage } from 'element-plus';
+import { useUserStoreHook } from '@/store/modules/user';
+// 接口文档
+import { templateDataAdd } from '@/api/quality/onlineListquality/profile';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const stores = useUserStoreHook();
+    const state = reactive({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        dataName: '',
+        dataType: '1'
+      },
+      // 表单校验
+      rules: {
+        dataName: [{ required: true, message: '工程资料名称不能为空', trigger: 'blur' }]
+      }
+    });
+    // 打开弹窗
+    const openDialog = () => {
+      resetForm();
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 提交
+    const onSubmit = () => {
+      state.formData.projectId = stores.selectedProject.goId;
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          state.loading = true;
+          templateDataAdd(state.formData)
+            .then(() => {
+              ElMessage.success('添加成功');
+              emit('profileDataList');
+              closeDialog(); // 关闭弹窗
+            })
+            .finally(() => {
+              state.loading = false;
+            });
+        }
+      });
+    };
+    const resetForm = () => {
+      state.formData = {
+        dataName: '',
+        dataType: '1'
+      };
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      formRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped></style>
diff --git a/src/views/quality/onlineListquality/comm/profileData/commp/eidtProfile/index.vue b/src/views/quality/onlineListquality/comm/profileData/commp/eidtProfile/index.vue
new file mode 100644
index 0000000..f7c0d98
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileData/commp/eidtProfile/index.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="edit_profile">
+    <el-dialog v-model="isShowDialog" width="400px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.edit_profile .el-dialog', '.edit_profile .el-dialog__header']">修改工程资料</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="110px">
+        <el-form-item label="工程资料名称" prop="dataName">
+          <el-input v-model="formData.dataName" placeholder="请输入工程资料名称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="dataType">
+          <el-radio-group v-model="formData.dataType">
+            <el-radio label="1">编写</el-radio>
+            <el-radio label="2">存储</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessage } from 'element-plus';
+import { useUserStoreHook } from '@/store/modules/user';
+// 接口文档
+import { templateDataEdit } from '@/api/quality/onlineListquality/profile';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const stores = useUserStoreHook();
+    const state = reactive({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        dataName: '',
+        dataType: '1'
+      },
+      // 表单校验
+      rules: {
+        dataName: [{ required: true, message: '工程资料名称不能为空', trigger: 'blur' }]
+      }
+    });
+    // 打开弹窗
+    const openDialog = (row: any) => {
+      state.formData = row;
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 提交
+    const onSubmit = () => {
+      state.formData.projectId = stores.selectedProject.goId;
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          state.loading = true;
+          templateDataEdit(state.formData)
+            .then(() => {
+              ElMessage.success('修改成功');
+              closeDialog();
+              emit('profileDataList');
+            })
+            .finally(() => {
+              state.loading = false;
+            });
+        }
+      });
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      formRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped></style>
diff --git a/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/detailComm/add.vue b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/detailComm/add.vue
new file mode 100644
index 0000000..a37079c
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/detailComm/add.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="add_profile">
+    <el-dialog v-model="isShowDialog" width="400px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.add_profile .el-dialog', '.add_profile .el-dialog__header']">添加工程资料</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="80px">
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入模板名称" />
+        </el-form-item>
+        <el-form-item label="文件上传">
+          <el-upload
+            ref="uploadRef"
+            class="upload-demo"
+            action="/zm/api/v1/system/templateDataJunior/add"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :auto-upload="false"
+            :data="formData"
+            :headers="headers"
+            style="width: 300px"
+            :on-success="onSuccess"
+            name="File"
+          >
+            <template #trigger>
+              <el-button type="primary">点击选择文件</el-button>
+            </template>
+            <template #tip>
+              <div class="el-upload__tip text-red">请上传文件</div>
+            </template>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessage, genFileId } from 'element-plus';
+
+import { Session } from '@/utils/storage';
+
+import sign from '@/utils/sign.js';
+import { useUserStoreHook } from '@/store/modules/user';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+    const formRef = ref<HTMLElement | null>(null);
+    const stores = useUserStoreHook();
+    const token = proxy.$cache.local.get('goToken');
+    const uploadRef = ref(); //文件dom
+    const state = reactive({
+      isShowDialog: false,
+      formData: {
+        name: '',
+        projectId: stores.selectedProject.goId
+      },
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }]
+      },
+      token: `Bearer ${Session.get('token')}`
+    });
+    const headers = reactive({
+      Authorization: 'Bearer ' + token,
+      ...sign({ ...state.formData })
+    });
+    // 打开弹窗
+    const openDialog = () => {
+      resetForm();
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    const handleExceed = (files) => {
+      uploadRef.value!.clearFiles();
+      const file = files[0];
+      file.uid = genFileId();
+      uploadRef.value!.handleStart(file);
+    };
+    // 提交
+    const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          uploadRef.value!.submit();
+        }
+      });
+    };
+    const onSuccess = (res) => {
+      if (res.code == 0) {
+        ElMessage.success('上传成功');
+      } else {
+        ElMessage.error(res.message);
+      }
+    };
+    const resetForm = () => {
+      state.formData.name = '';
+    };
+    return {
+      proxy,
+      uploadRef,
+      openDialog,
+      closeDialog,
+      onCancel,
+      token,
+      onSubmit,
+      handleExceed,
+      formRef,
+      headers,
+      onSuccess,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped></style>
diff --git a/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/detailComm/edit.vue b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/detailComm/edit.vue
new file mode 100644
index 0000000..2002503
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/detailComm/edit.vue
@@ -0,0 +1,133 @@
+<template>
+  <div class="add_profile">
+    <el-dialog v-model="isShowDialog" width="400px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.add_profile .el-dialog', '.add_profile .el-dialog__header']">添加工程资料</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="80px">
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入模板名称" />
+        </el-form-item>
+        <el-form-item label="文件上传">
+          <el-upload
+            ref="uploadEditRef"
+            class="upload-demo"
+            action="/zm/api/v1/system/templateDataJunior/edit"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :auto-upload="false"
+            :data="formData"
+            :headers="headers"
+            style="width: 300px"
+            :on-success="onSuccess"
+            name="File"
+            :file-list="fileList"
+          >
+            <template #trigger>
+              <el-button type="primary">点击选择文件</el-button>
+            </template>
+            <template #tip>
+              <div class="el-upload__tip text-red">请上传文件</div>
+            </template>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessage, genFileId } from 'element-plus';
+
+import sign from '@/utils/sign.js';
+import { useUserStoreHook } from '@/store/modules/user';
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const token = proxy.$cache.local.get('goToken');
+    const formRef = ref<HTMLElement | null>(null);
+    const stores = useUserStoreHook();
+    const uploadEditRef = ref(); //文件dom
+    const state = reactive({
+      isShowDialog: false,
+      formData: {
+        name: '',
+        projectId: stores.selectedProject.goId
+      },
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }]
+      },
+      token: `Bearer ${token}`,
+      fileList: [] as any //已经上传的文件列表
+    });
+    var headers = reactive({
+      Authorization: 'Bearer ' + token,
+      ...sign({ ...state.formData })
+    });
+    // 打开弹窗
+    const openDialog = (row) => {
+      state.fileList = [
+        {
+          src: row.filenPath,
+          name: row.name
+        }
+      ];
+      state.formData.name = row.name;
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    const handleExceed = (files) => {
+      uploadEditRef.value!.clearFiles();
+      const file = files[0];
+      file.uid = genFileId();
+      uploadEditRef.value!.handleStart(file);
+    };
+    // 提交
+    const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          uploadEditRef.value!.submit();
+        }
+      });
+    };
+    const onSuccess = (res) => {
+      if (res.code == 0) {
+        ElMessage.success('上传成功');
+      } else {
+        ElMessage.error(res.message);
+      }
+    };
+    return {
+      proxy,
+      uploadEditRef,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      handleExceed,
+      headers,
+      formRef,
+      onSuccess,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped></style>
diff --git a/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/index.vue b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/index.vue
new file mode 100644
index 0000000..4d60d54
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/index.vue
@@ -0,0 +1,274 @@
+<template>
+  <div class="pro_file_list">
+    <div class="back" @click="onClose">关闭页面</div>
+    <div>
+      <el-form :model="paramsQuery" ref="queryRef" :inline="true" label-width="80px">
+        <el-row>
+          <el-col :span="2">
+            <el-button type="primary" @click="handleAdd"
+              ><el-icon><Plus /></el-icon>新增</el-button
+            >
+          </el-col>
+          <el-col :span="2">
+            <el-button type="danger" :disabled="multiple" @click="handleDelete(null)"
+              ><el-icon><Delete /></el-icon>批量删除</el-button
+            >
+          </el-col>
+          <el-col :span="6" class="colBlock">
+            <el-form-item label="模板名称" prop="name">
+              <el-input v-model="paramsQuery.name" placeholder="请输入模板名称" clearable @keyup.enter.native="getDocumentList" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" @click="searchInfo"
+                ><el-icon><Search /></el-icon>搜索</el-button
+              >
+              <el-button @click="resetQuery(queryRef)"
+                ><el-icon><Refresh /></el-icon>重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading" :data="profileList" border @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" min-width="50px" />
+        <el-table-column label="模板名称" align="center" prop="name" min-width="100px" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" min-width="100px"> </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="200px" fixed="right">
+          <template #default="scope">
+            <el-button type="primary" link @click="handleViewSource(scope.row)"
+              ><el-icon><View /></el-icon>查看数据源</el-button
+            >
+            <el-button type="primary" link @click="handleView(scope.row)"
+              ><el-icon><View /></el-icon>预览模板</el-button
+            >
+            <el-button type="primary" link @click="handleDownload(scope.row)"
+              ><el-icon><Download /></el-icon>下载</el-button
+            >
+            <el-button type="success" link @click="handleUpdate(scope.row)"
+              ><el-icon><EditPen /></el-icon>修改</el-button
+            >
+            <el-button type="danger" link @click="handleDelete(scope.row)"
+              ><el-icon><DeleteFilled /></el-icon>删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="paramsQuery.pageNum"
+        v-model:limit="paramsQuery.pageSize"
+        @pagination="getTemplateDataJuniorList"
+      />
+    </div>
+    <add ref="addRef" @getTemplateDataJuniorList="getTemplateDataJuniorList"></add>
+    <edit ref="editRef" @getTemplateDataJuniorList="getTemplateDataJuniorList"></edit>
+    <documentDetail ref="documentDetailRef" v-if="showDocumentDetail" @onClose="onCloseDetail"></documentDetail>
+    <sourceData ref="sourceDataRef" v-if="showSourceData" @closelist="showSourceData = false"></sourceData>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance, nextTick } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { useUserStoreHook } from '@/store/modules/user';
+// 接口文档
+import { templateDataJuniorDel, templateDataJuniorList } from '@/api/quality/onlineListquality/profile';
+// 添加和编辑弹框
+import add from './detailComm/add.vue';
+import edit from './detailComm/edit.vue';
+// 预览
+import documentDetail from '../../../../comm/documentsDetail/index.vue';
+// 查看数据源页面
+import sourceData from './sourceData/index.vue';
+
+import axios from 'axios';
+import sign from '@/utils/sign.js';
+const baseURL = import.meta.env.VITE_API_URL;
+export default defineComponent({
+  name: 'index',
+  components: { add, documentDetail, edit, sourceData },
+  setup(props, { emit }) {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const addRef = ref(); //添加模板资料dom
+    const editRef = ref(); //编辑工程资料dom
+    const documentDetailRef = ref(); //预览模板资料dom
+    const queryRef = ref(); //搜索表单dom
+    const sourceDataRef = ref(); //数据源列表dom
+    // 非多个禁用
+    const multiple = ref(true);
+    const state = reactive({
+      paramsQuery: {
+        //搜索参数
+        projectId: stores.selectedProject.goId,
+        name: '',
+        createdAt: '', //
+        suffix: '',
+        pageNum: 1,
+        pageSize: 20
+      },
+      profileList: [], //工程资料列表数据
+      loading: false,
+      ids: [], //选中的列表数据
+      total: 0, //列表数量
+      showDocumentDetail: false, //查看详情
+      showSourceData: false //数据源列表数据弹框
+    });
+    onMounted(() => {
+      getTemplateDataJuniorList();
+    });
+    // 添加模板资料
+    const handleAdd = () => {
+      addRef.value.openDialog();
+    };
+    // 删除工程资料
+    const handleDelete = (row) => {
+      let msg = '你确定要删除所选数据？';
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          let ids = [];
+          if (row) {
+            ids = [row.id];
+          } else {
+            ids = state.ids;
+          }
+          templateDataJuniorDel({ ids }).then(() => {
+            ElMessage.success('删除成功');
+            getTemplateDataJuniorList();
+          });
+        })
+        .catch(() => {});
+    };
+    // 修改工程资料数据
+    const handleUpdate = (row: any) => {
+      editRef.value.openDialog(row);
+    };
+    // 搜索
+    const searchInfo = () => {
+      getTemplateDataJuniorList();
+    };
+    // 重置
+    const resetQuery = (formEl) => {
+      if (!formEl) return;
+      formEl.resetFields();
+      getTemplateDataJuniorList();
+    };
+    // 获取工程资料列表数据
+    const getTemplateDataJuniorList = () => {
+      state.loading = true;
+      templateDataJuniorList(state.paramsQuery).then((res) => {
+        state.loading = false;
+        if (res.code == 0) {
+          state.profileList = res.data.list;
+          state.total = res.data.total;
+        }
+      });
+    };
+    // 选中列表数据
+    const handleSelectionChange = (selection: any) => {
+      state.ids = selection.map((item) => item.id);
+      multiple.value = !selection.length;
+    };
+    const onClose = () => {
+      // 关闭页面
+      emit('closePage', false);
+    };
+    // 查看数据源
+    const handleViewSource = (row: any) => {
+      state.showSourceData = true;
+      nextTick(() => {
+        sourceDataRef.value.openDialog(row);
+      });
+    };
+    // 预览
+    const handleView = (row) => {
+      // 查看文档
+      state.showDocumentDetail = true;
+      nextTick(() => {
+        documentDetailRef.value.openDialog(row);
+      });
+    };
+    // 关闭预览
+    const onCloseDetail = () => {
+      state.showDocumentDetail = false;
+    };
+    //下载
+    const handleDownload = (row) => {
+      if (row.filenPath) {
+        const fileUrl = row.filenPath; // 文件的URL地址
+        let name = row.name + '.' + row.suffix;
+        axios.get(fileUrl, { responseType: 'blob', headers: { ...sign({}) } }).then((res: any) => {
+          load(res.data, name);
+        });
+      }
+    };
+    const load = (res, name) => {
+      let blob = new Blob([res]);
+      const blobURL = window.URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = blobURL;
+      link.setAttribute('download', name);
+      if (typeof link.download === 'undefined') {
+        link.setAttribute('target', '_blank');
+      }
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(blobURL);
+    };
+    return {
+      proxy,
+      addRef,
+      editRef,
+      documentDetailRef,
+      queryRef,
+      sourceDataRef,
+      multiple,
+      onClose,
+      getTemplateDataJuniorList,
+      onCloseDetail,
+      handleView,
+      handleViewSource,
+      handleDownload,
+      handleUpdate,
+      resetQuery,
+      searchInfo,
+      handleDelete,
+      handleAdd,
+      handleSelectionChange,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss" scoped>
+.pro_file_list {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  z-index: 999;
+  background-color: #fff;
+  padding: 10px;
+  box-sizing: border-box;
+  top: 0;
+  left: 0;
+  .back {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    font-size: 18px;
+    color: #fb1d1d;
+    z-index: 999;
+    cursor: pointer;
+    font-weight: bold;
+  }
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/sourceData/index.vue b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/sourceData/index.vue
new file mode 100644
index 0000000..15c829d
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileData/commp/proFileList/sourceData/index.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="source_data">
+    <div class="back" @click="onClose">关闭页面</div>
+    <div>
+      <el-form :model="paramsQuery" ref="queryRef" :inline="true" label-width="80px">
+        <el-row>
+          <el-col :span="2">
+            <el-button type="primary" @click="handleAdd"
+              ><el-icon><Plus /></el-icon>新增</el-button
+            >
+          </el-col>
+          <el-col :span="2">
+            <el-button type="danger" :disabled="multiple" @click="handleDelete(null)"
+              ><el-icon><Delete /></el-icon>批量删除</el-button
+            >
+          </el-col>
+          <el-col :span="6" class="colBlock">
+            <el-form-item label="数据源名称" prop="sourceName">
+              <el-input v-model="paramsQuery.sourceName" placeholder="请输入数据源名称" clearable @keyup.enter.native="getTemplateDataJuniorList" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" @click="searchInfo"
+                ><el-icon><Search /></el-icon>搜索</el-button
+              >
+              <el-button @click="resetQuery(queryRef)"
+                ><el-icon><Refresh /></el-icon>重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading" :data="profileList" border @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" min-width="50px" />
+        <el-table-column label="数据源名称" align="center" prop="sourceName" min-width="100px" />
+        <el-table-column label="类型" align="center" prop="typeId" min-width="100px" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" min-width="100px"> </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="200px" fixed="right">
+          <template #default="scope">
+            <el-button type="primary" link @click="handleView(scope.row)"
+              ><el-icon><View /></el-icon>预览模板</el-button
+            >
+            <el-button type="primary" link @click="handleDownload(scope.row)"
+              ><el-icon><Download /></el-icon>下载</el-button
+            >
+            <el-button type="success" link @click="handleUpdate(scope.row)"
+              ><el-icon><EditPen /></el-icon>修改</el-button
+            >
+            <el-button type="danger" link @click="handleDelete(scope.row)"
+              ><el-icon><DeleteFilled /></el-icon>删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="paramsQuery.pageNum"
+        v-model:limit="paramsQuery.pageSize"
+        @pagination="getTemplateDataJuniorList"
+      />
+    </div>
+    <documentDetail ref="documentDetailRef" v-if="showDocumentDetail" @onClose="onCloseDetail"></documentDetail>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance, nextTick } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+
+// 接口文档
+import { templateDataSourceDataDel, templateDataSourceDataList } from '@/api/quality/onlineListquality/profile';
+// 预览
+import documentDetail from '../../../../documentsDetail/index.vue';
+import axios from 'axios';
+import sign from '@/utils/sign.js';
+import { useUserStoreHook } from '@/store/modules/user';
+const baseURL = import.meta.env.VITE_API_URL;
+export default defineComponent({
+  name: 'index',
+  components: { documentDetail },
+  setup(props, { emit }) {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const addRef = ref(); //添加模板资料dom
+    const editRef = ref(); //编辑工程资料dom
+    const documentDetailRef = ref(); //预览模板资料dom
+    const queryRef = ref(); //搜索表单dom
+    // 非多个禁用
+    const multiple = ref(true);
+    const state = reactive({
+      paramsQuery: {
+        //搜索参数
+        projectId: stores.selectedProject.goId,
+        sourceName: '',
+        pageNum: 1,
+        pageSize: 20
+      },
+      profileList: [], //工程资料列表数据
+      loading: false,
+      ids: [], //选中的列表数据
+      total: 0, //列表数量
+      showDocumentDetail: false
+    });
+    const openDialog = (row: any) => {
+      console.log(row);
+      getTemplateDataJuniorList();
+    };
+    // 添加模板资料
+    const handleAdd = () => {
+      addRef.value.openDialog();
+    };
+    // 删除工程资料
+    const handleDelete = (row) => {
+      let msg = '你确定要删除所选数据？';
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          let ids = [];
+          if (row) {
+            ids = [row.id];
+          } else {
+            ids = state.ids;
+          }
+          templateDataSourceDataDel({ ids }).then(() => {
+            ElMessage.success('删除成功');
+            getTemplateDataJuniorList();
+          });
+        })
+        .catch(() => {});
+    };
+    // 修改工程资料数据
+    const handleUpdate = (row: any) => {
+      editRef.value.openDialog(row);
+    };
+    // 搜索
+    const searchInfo = () => {
+      getTemplateDataJuniorList();
+    };
+    // 重置
+    const resetQuery = (formEl) => {
+      if (!formEl) return;
+      formEl.resetFields();
+      getTemplateDataJuniorList();
+    };
+    // 获取工程资料列表数据
+    const getTemplateDataJuniorList = () => {
+      state.loading = true;
+      templateDataSourceDataList(state.paramsQuery).then((res: any) => {
+        state.loading = false;
+        if (res.code == 0) {
+          state.profileList = res.data.list;
+          state.total = res.data.total;
+        }
+      });
+    };
+    // 选中列表数据
+    const handleSelectionChange = (selection: any) => {
+      state.ids = selection.map((item) => item.id);
+      multiple.value = !selection.length;
+    };
+    const onClose = () => {
+      // 关闭页面
+      emit('closelist', false);
+    };
+    // 预览
+    const handleView = (row) => {
+      // 查看文档
+      state.showDocumentDetail = true;
+      nextTick(() => {
+        documentDetailRef.value.openDialog(row);
+      });
+    };
+    // 关闭预览
+    const onCloseDetail = () => {
+      state.showDocumentDetail = false;
+    };
+    //下载
+    const handleDownload = (row) => {
+      if (row.filenPath) {
+        const fileUrl = row.filenPath; // 文件的URL地址
+        let name = row.name + '.' + row.suffix;
+        axios.get(fileUrl, { responseType: 'blob', ...sign({}) }).then((res: any) => {
+          load(res.data, name);
+        });
+      }
+    };
+    const load = (res, name) => {
+      let blob = new Blob([res]);
+      const blobURL = window.URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = blobURL;
+      link.setAttribute('download', name);
+      if (typeof link.download === 'undefined') {
+        link.setAttribute('target', '_blank');
+      }
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(blobURL);
+    };
+    return {
+      proxy,
+      addRef,
+      editRef,
+      documentDetailRef,
+      queryRef,
+      multiple,
+      onClose,
+      getTemplateDataJuniorList,
+      onCloseDetail,
+      handleView,
+      handleDownload,
+      handleUpdate,
+      resetQuery,
+      searchInfo,
+      handleDelete,
+      handleAdd,
+      handleSelectionChange,
+      openDialog,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.source_data {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  z-index: 989999;
+  background-color: #fff;
+  padding: 10px;
+  box-sizing: border-box;
+  top: 0;
+  left: 0;
+  .back {
+    position: absolute !important;
+    right: 10px !important;
+    top: 10px !important;
+    font-size: 18px !important;
+    color: #1d76fb !important;
+    z-index: 999 !important;
+    cursor: pointer !important;
+    font-weight: bold !important;
+  }
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/profileData/index.vue b/src/views/quality/onlineListquality/comm/profileData/index.vue
new file mode 100644
index 0000000..1ab0d01
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileData/index.vue
@@ -0,0 +1,205 @@
+<template>
+  <div class="profile_data">
+    <div>
+      <el-form :model="paramsQuery" ref="queryRef" :inline="true" label-width="80px">
+        <el-row>
+          <el-col :span="2">
+            <el-button type="primary" @click="handleAdd"
+              ><el-icon><Plus /></el-icon>新增</el-button
+            >
+          </el-col>
+          <el-col :span="2">
+            <el-button type="danger" :disabled="multiple" @click="handleDelete(null)"
+              ><el-icon><Delete /></el-icon>删除</el-button
+            >
+          </el-col>
+          <el-col :span="6" class="colBlock">
+            <el-form-item label="文件名称" prop="name">
+              <el-input v-model="paramsQuery.name" placeholder="请输入文件名称" clearable @keyup.enter.native="getDocumentList" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" @click="searchInfo"
+                ><el-icon><Search /></el-icon>搜索</el-button
+              >
+              <el-button @click="resetQuery(queryRef)"
+                ><el-icon><Refresh /></el-icon>重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading" :data="profileList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" min-width="50px" />
+        <el-table-column label="资料名称" align="center" prop="dataName" min-width="100px" />
+        <el-table-column label="类型" align="center" min-width="100px">
+          <template #default="scope">
+            <span>{{ scope.row.dataType == 1 ? '编写' : '存储' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createdAt" min-width="100px"> </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="200px" fixed="right">
+          <template #default="scope">
+            <el-button type="primary" link @click="handleFile(scope.row)"
+              ><el-icon><Notebook /></el-icon>文件列表</el-button
+            >
+            <el-button type="success" link @click="handleUpdate(scope.row)"
+              ><el-icon><EditPen /></el-icon>修改</el-button
+            >
+            <el-button type="danger" link @click="handleDelete(scope.row)"
+              ><el-icon><DeleteFilled /></el-icon>删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="paramsQuery.pageNum"
+        v-model:limit="paramsQuery.pageSize"
+        @pagination="getProfileDataList"
+      />
+    </div>
+    <addProfile ref="addProfileRef" @profileDataList="getProfileDataList"></addProfile>
+    <editProfile ref="editProfileRef" @profileDataList="getProfileDataList"></editProfile>
+    <proFileList ref="proFileListRef" v-if="showproFileList" @closePage="closePage" @profileDataList="getProfileDataList"></proFileList>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance, nextTick } from 'vue';
+import { ElLoading, ElMessageBox, ElMessage } from 'element-plus';
+
+import { treeStructureList, documentList, documentEdit, documentDelete } from '@/api/quality/onlineListquality/Online';
+// 引入添加工程资料弹框
+import addProfile from './commp/addProfile/index.vue';
+// 修改工程資料弹框
+import editProfile from './commp/eidtProfile/index.vue';
+// 文件列表数据
+import proFileList from './commp/proFileList/index.vue';
+// 接口文档
+import { templateDataList, templateDataDel } from '@/api/quality/onlineListquality/profile';
+import { useUserStoreHook } from '@/store/modules/user';
+export default defineComponent({
+  name: 'index',
+  components: { addProfile, editProfile, proFileList },
+  setup() {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const addProfileRef = ref(); //添加工程资料dom
+    const editProfileRef = ref(); //编辑工程资料dom
+    const proFileListRef = ref(); //文件列表dom
+    const queryRef = ref(); //搜索表单dom
+    // 非多个禁用
+    const multiple = ref(true);
+    const state = reactive({
+      paramsQuery: {
+        //搜索参数
+        projectId: stores.selectedProject.goId,
+        dataName: '',
+        dataType: '', //
+        pageNum: 1,
+        pageSize: 20
+      },
+      profileList: [], //工程资料列表数据
+      loading: false,
+      ids: [], //选中的列表数据
+      total: 0, //列表数量
+      showproFileList: false //文件列表展示
+    });
+    onMounted(() => {
+      getProfileDataList();
+    });
+    // 添加工程资料
+    const handleAdd = () => {
+      addProfileRef.value.openDialog();
+    };
+    // 删除工程资料
+    const handleDelete = (row) => {
+      let msg = '你确定要删除所选数据？';
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          let ids = [];
+          if (row) {
+            ids = [row.id];
+          } else {
+            ids = state.ids;
+          }
+          templateDataDel({ ids }).then(() => {
+            ElMessage.success('删除成功');
+            getProfileDataList();
+          });
+        })
+        .catch(() => {});
+    };
+    // 修改工程资料数据
+    const handleUpdate = (row: any) => {
+      editProfileRef.value.openDialog(row);
+    };
+    // 搜索
+    const searchInfo = () => {
+      getProfileDataList();
+    };
+    // 重置
+    const resetQuery = (formEl) => {
+      if (!formEl) return;
+      formEl.resetFields();
+      getProfileDataList();
+    };
+    // 获取工程资料列表数据
+    const getProfileDataList = () => {
+      state.loading = true;
+      templateDataList(state.paramsQuery).then((res) => {
+        state.loading = false;
+        if (res.code == 0) {
+          state.profileList = res.data.list;
+          state.total = res.data.total;
+        }
+      });
+    };
+    // 选中列表数据
+    const handleSelectionChange = (selection: any) => {
+      state.ids = selection.map((item) => item.id);
+      multiple.value = !selection.length;
+    };
+    // 文件列表
+    const handleFile = (row) => {
+      // 打开弹框
+      state.showproFileList = true;
+      // proFileListRef.vaue.openDialog(row);
+    };
+    const closePage = () => {
+      state.showproFileList = false;
+    };
+    return {
+      proxy,
+      addProfileRef,
+      editProfileRef,
+      proFileListRef,
+      multiple,
+      queryRef,
+      getProfileDataList,
+      handleUpdate,
+      handleFile,
+      closePage,
+      resetQuery,
+      searchInfo,
+      handleDelete,
+      handleAdd,
+      handleSelectionChange,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.profile_data {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/profileEngineering/fileOnline/index.vue b/src/views/quality/onlineListquality/comm/profileEngineering/fileOnline/index.vue
new file mode 100644
index 0000000..11e8d7b
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileEngineering/fileOnline/index.vue
@@ -0,0 +1,226 @@
+<template>
+  <div class="file_online">
+    <!-- 添加或修改题库_题库类别对话框 -->
+    <el-dialog v-model="isShowDialog" custom-class="file_online_box" width="800px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.file_online .el-dialog', '.file_online .el-dialog__header']">在线模板复制</div>
+      </template>
+      <div class="file_upload check_select">
+        <el-row>
+          <el-col :span="10">
+            <el-input class="input_left" v-model="filterText" size="small" placeholder="请输入文件名称" />
+          </el-col>
+          <el-col :span="10" style="margin-left: 20px">
+            <span>类型：</span>
+            <el-select v-model="value" class="m-2" placeholder="请选择类型" @change="onChange">
+              <el-option label="文件夹" value="2" />
+              <el-option label="文件" value="1" />
+            </el-select>
+          </el-col>
+        </el-row>
+      </div>
+      <el-form ref="formRef" :model="formData" style="margin-top: 10px" label-width="90px">
+        <el-tree
+          ref="treeRef"
+          :default-expand-all="checked"
+          :filter-node-method="filterFolder"
+          :data="treeList"
+          :props="Props"
+          check-strictly
+          show-checkbox
+          node-key="id"
+          accordion
+          :expand-on-click-node="false"
+          @check-change="handleCheckChange"
+        >
+          <template #default="{ node, data }">
+            <span class="custom-tree-node">
+              <el-icon v-if="data.type == 2" color="#f1a81a"><FolderOpened /></el-icon>
+              <el-icon v-else color="#1af18a"><Document /></el-icon>
+              <span>{{ node.label }}</span>
+            </span>
+          </template>
+        </el-tree>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance, watch, nextTick } from 'vue';
+import { ElMessage, ElLoading } from 'element-plus';
+// 接口引入
+import { documentAllList } from '@/api/quality/onlineListquality/Online';
+import { onlineImport } from '@/api/quality/onlineListquality/profileData';
+import { useUserStoreHook } from '@/store/modules/user';
+
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const treeRef = ref(null);
+    const filterText = ref(''); //搜索树形结构参数
+    const state = reactive({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        type: '',
+        TemplateId: [], //模板id
+        DataId: '', //资料id
+        projectId: stores.selectedProject.goId
+      },
+      // 表单校验
+      checked: true,
+      treeList: [],
+      Props: {
+        children: 'treeStructureRes',
+        label: 'name'
+      },
+      value: '2',
+      folderList: [], //文件夹数据
+      fileList: [] //文件数据
+    });
+    // 搜索数据
+    watch(filterText, (val: any) => {
+      treeRef.value!.filter(val);
+    });
+    // 查询tree树形结构数据
+    const filterFolder = (value: string, data: any) => {
+      if (!value) return true;
+      return data.name.includes(value);
+    };
+    // 打开弹窗
+    const openDialog = (DataId) => {
+      state.value = '2';
+      state.formData.TemplateId = [];
+      state.formData.type = '';
+      state.formData.DataId = DataId;
+      state.isShowDialog = true;
+      nextTick(() => {
+        getInfo();
+      });
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 获取所有数据
+    const getInfo = () => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在加载中……',
+        background: 'rgba(0, 0, 0, 0.7)',
+        target: '.file_online_box'
+      });
+      documentAllList({}).then((res: any) => {
+        let arr = [];
+        let arr2 = [];
+        if (res.code == 0 && res.data.list && res.data.list.length) {
+          res.data.list.forEach((item) => {
+            // 把文件夹设置未不可选中
+            // 文件夹
+            if (item.type == 2) {
+              arr.push(item);
+            }
+            // 文件
+            let disabled = false;
+            if (item.type == 2) {
+              disabled = true;
+            }
+            arr2.push({ ...item, disabled });
+          });
+          state.folderList = listToTree(arr); //文件夹列表
+          state.treeList = state.folderList;
+          state.fileList = listToTree(arr2);
+          loading.close();
+        } else {
+          loading.close();
+        }
+      });
+    };
+    //数据处理
+    const listToTree = (list) => {
+      let array = [];
+      list.forEach((item) => {
+        // 遍历对象数组
+        item.name = item.name + item.suffix;
+        item.treeStructureRes = list.filter((info) => info.pid === item.idStr); // 找到每个对象的子节点
+        if (item.pid == 0) {
+          array.push(item); // 将一层节点放入新数组中
+        }
+      });
+      return array;
+    };
+    // 提交
+    const onSubmit = () => {
+      if (treeRef.value.getCheckedKeys().length) {
+        state.formData.TemplateId = treeRef.value.getCheckedKeys();
+      } else {
+        return;
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在上传……',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          onlineImport(state.formData).then((res: any) => {
+            loading.close();
+            if (res.code == 0) {
+              ElMessage.success('导入成功');
+              emit('getfileOnlineType', state.formData.type);
+              onCancel();
+            } else {
+              ElMessage.error(res.message);
+            }
+          });
+        }
+      });
+    };
+    const handleCheckChange = (data) => {
+      state.formData.type = data.type;
+    };
+    const onChange = (val) => {
+      state.formData.TemplateId = [];
+      // 选中得设置为空
+      if (val == 2) {
+        // 切换文件夹
+        state.treeList = state.folderList;
+      } else {
+        // 切换文件
+        state.treeList = state.fileList;
+      }
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      getInfo,
+      formRef,
+      filterText,
+      handleCheckChange,
+      filterFolder,
+      treeRef,
+      onChange,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped></style>
diff --git a/src/views/quality/onlineListquality/comm/profileEngineering/index.vue b/src/views/quality/onlineListquality/comm/profileEngineering/index.vue
new file mode 100644
index 0000000..661ca7c
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileEngineering/index.vue
@@ -0,0 +1,835 @@
+<template>
+  <div class="profile_engin">
+    <div class="box_info">
+      <div class="tree_left1" id="tree_left1">
+        <div class="check_select">
+          <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/newFolder'" @click="addFile"
+            ><el-icon><Plus /></el-icon>新建文件夹</el-button
+          >
+          <div class="box_btn" v-auth="'/zm/api/v1/system/documentData/add'">
+            <span>＋导入</span>
+            <div class="btn">
+              <el-button type="primary" style="float: left" @click="bigUploadFile1"
+                ><el-icon><Plus /></el-icon>导入压缩文件</el-button
+              >
+              <el-button type="primary" style="float: left" :disabled="!parentPid" @click="uploadFile(2)"
+                ><el-icon><Plus /></el-icon>导入文件</el-button
+              >
+            </div>
+          </div>
+        </div>
+        <div class="file_upload check_select">
+          <el-checkbox v-model="checked" @change="handleCheckedTreeExpand($event)" label="展开/折叠" size="large" />
+          <div style="margin: 0 10px">
+            <el-select v-model="paramsQuery.switch" placeholder="当前文件夹" size="small">
+              <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id" />
+            </el-select>
+          </div>
+          <!-- <el-button type="primary" v-auth="'/zm/api/v1/system/documentProject/dataCompressedDownload'" :disabled="!parentPid" @click="onExport"
+            ><el-icon><Download /></el-icon>下载</el-button
+          > -->
+          <el-button type="primary" @click="onBook" v-auth="'/zm/api/v1/system/documentData/dataFileQuery'"
+            ><el-icon><View /></el-icon>查看全项目文件</el-button
+          >
+        </div>
+        <div class="file_upload check_select">
+          <el-input class="input_left" v-model="filterText" size="small" placeholder="请输入文件名称" />
+        </div>
+        <el-tree
+          ref="treeRef"
+          highlight-current
+          :default-expand-all="checked"
+          :filter-node-method="filterFolder"
+          :data="treeList"
+          :props="Props"
+          node-key="id"
+          accordion
+          :draggable="draggableCheck"
+          :expand-on-click-node="false"
+          @node-click="handleNodeClick"
+          :current-node-key="selectedNodeId"
+          @node-drop="handleDragEnd"
+          :allow-drop="allowDrop"
+        >
+          <template #default="{ node, data }">
+            <span class="custom-tree-node">
+              <el-icon color="#f1a81a"><FolderOpened /></el-icon>
+              <span>{{ node.label }}</span>
+              <span style="margin-left: 20px" class="set-tool">
+                <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/onlineImport'" link @click.stop="uploadOnlineFile(node, data)"
+                  >在线模板复制</el-button
+                >
+                <el-button type="success" v-auth="'/zm/api/v1/system/documentData/edit'" link @click.stop="onUpdateName(node, data)"
+                  >重命名</el-button
+                >
+                <el-button type="danger" v-auth="'/zm/api/v1/system/documentData/delete'" link @click.stop="onRemove(node, data)">删除</el-button>
+              </span>
+            </span>
+          </template>
+        </el-tree>
+        <div class="resize-handle resize-handle-right right"></div>
+      </div>
+      <div class="list_right" id="list_right1">
+        <div>
+          <el-form :model="paramsQuery" ref="queryRef" :inline="true" label-width="100px">
+            <el-row>
+              <el-col :span="6" class="colBlock">
+                <el-form-item label="文件名称" prop="name">
+                  <el-input v-model="paramsQuery.name" placeholder="请输入文件名称" clearable @keyup.enter.native="getdocumentDataList" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item>
+                  <el-button type="primary" @click="searchInfo"
+                    ><el-icon><Search /></el-icon>搜索</el-button
+                  >
+                  <el-button @click="resetQuery"
+                    ><el-icon><Refresh /></el-icon>重置</el-button
+                  >
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="4">
+								<el-button type="primary" v-auth="'/zm/api/v1/system/documentData/add'" :disabled="!parentPid" @click="uploadFile(2)"
+									><el-icon><Plus /></el-icon>导入本地文件</el-button
+								>
+							</el-col> -->
+              <!-- <el-col :span="4">
+								<el-button type="primary" @click="onMoveFile"
+									><el-icon><Plus /></el-icon>移动</el-button
+								>
+							</el-col> -->
+            </el-row>
+          </el-form>
+        </div>
+        <el-table v-loading="loading" :data="infoList" height="67vh" border>
+          <el-table-column label="序号" align="center" type="index" min-width="50px" />
+          <el-table-column label="文件名称" align="center" prop="name">
+            <template #default="scope">
+              <span>{{ scope.row.name + scope.row.suffix }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上传时间" align="center" prop="createdAt"> </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                v-auth="'/zm/api/v1/system/documentData/get'"
+                v-if="acceptType.includes(scope.row.suffix)"
+                link
+                @click="handleView(scope.row)"
+                ><el-icon><View /></el-icon>查看</el-button
+              >
+              <el-button
+                type="primary"
+                v-auth="'/zm/api/v1/system/documentData/complaintBoxAdd'"
+                v-if="acceptType.includes(scope.row.suffix)"
+                link
+                @click="updataView(scope.row)"
+                ><el-icon><EditPen /></el-icon>修改文件</el-button
+              >
+              <!-- <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/uniFolderDownload'" link @click="onExportView(scope.row)"
+                ><el-icon><Download /></el-icon>下载</el-button
+              > -->
+              <el-button type="success" v-auth="'/zm/api/v1/system/documentData/edit'" link @click="updateName(scope.row)"
+                ><el-icon><EditPen /></el-icon>修改名称</el-button
+              >
+              <el-button type="danger" v-auth="'/zm/api/v1/system/documentData/delete'" link @click="handleDelete(scope.row)"
+                ><el-icon><DeleteFilled /></el-icon>删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="paramsQuery.pageNum" v-model:limit="paramsQuery.pageSize" @pagination="getdocumentDataList" />
+      </div>
+    </div>
+    <documentDetail ref="documentDetailRef" v-if="showDocumentDetail" @onClose="onClose"></documentDetail>
+    <documentsEdit ref="documentDataEditRef" v-if="showdocumentDataEdit" @onClose="onCloseEdit"></documentsEdit>
+    <uploadFileder
+      ref="uploadFilederRef"
+      v-if="showUploadFileder"
+      @onCloseFile="showUploadFileder = false"
+      @getDocumentListFileType="getdocumentDataListFileType"
+    ></uploadFileder>
+    <fileOnline ref="fileOnlineRef" @getfileOnlineType="getfileOnlineType"></fileOnline>
+    <moveFile ref="moveFileRef"></moveFile>
+    <bookFile ref="bookFileRef"></bookFile>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance, nextTick, onBeforeUnmount } from 'vue';
+import { ElLoading, ElMessageBox, ElMessage } from 'element-plus';
+import { uniFolderDownload, uniFileDownload } from '@/api/quality/onlineListquality/Online';
+import {
+  treeStructureData,
+  documentDataEdit,
+  documentDataDelete,
+  documentDataNewFolder,
+  documentDataList,
+  onlineMobile,
+  getProfileDetail
+} from '@/api/quality/onlineListquality/profileData';
+// 文档查看
+import documentDetail from '../documentsDetail/index.vue';
+// 文档修改编辑
+import documentsEdit from '../documentsEdit/index.vue';
+// 资料信息列表
+import profileData from '../profileData/index.vue';
+// 文件导入弹框
+import uploadFileder from '../uploadFileder/index.vue';
+// 在线模板文件导入
+import fileOnline from './fileOnline/index.vue';
+// 移动文件
+import moveFile from './moveFile/index.vue';
+// 所有资料文件
+import bookFile from '../bookFile/index.vue';
+import axios from 'axios';
+import sign from '@/utils/sign.js';
+import { Session } from '@/utils/storage';
+import { documentDataAdd } from '@/api/quality/onlineListquality/profileData';
+import { useUserStoreHook } from '@/store/modules/user';
+
+export default defineComponent({
+  name: 'index',
+  components: { documentDetail, documentsEdit, profileData, uploadFileder, fileOnline, moveFile, bookFile },
+  setup(props, { emit }) {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance(); //获取
+    const filterText = ref(''); //搜索树形结构参数
+    const treeRef = ref(); //树形结构dom
+    const documentDetailRef = ref(); //详情在线dom
+    const documentDataEditRef = ref(); //编辑在线dom
+    const uploadFilederRef = ref(); //上传文件在线dom
+    const fileOnlineRef = ref(); //上传在线模板dom
+    const moveFileRef = ref(); //移动模板dom
+    const bookFileRef = ref(); //资料文件弹框
+    const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL;
+    const state = reactive({
+      treeList: [] as any, //树形结构数据
+      arrayList: [] as any, //树形结构处理成一维数组
+      infoMap: new Map(), //用idstr 存储pid
+      infoList: [] as any, //文档列表数据
+      Props: {
+        children: 'treeStructureDataRes',
+        label: 'name'
+      },
+      total: 0, //文档数量
+      paramsQuery: { idStr: '', name: '', switch: 1, pageNum: 1, pageSize: 20, projectId: stores.selectedProject.goId }, //请求参数
+      loading: false, //列表加载
+      checked: true, //展开 折叠
+      options: [
+        { id: 1, label: '当前文件夹及以下' },
+        { id: 2, label: '当前文件夹' }
+      ],
+      showDocumentDetail: false, //详情弹框
+      showdocumentDataEdit: false, //编辑弹框
+      showUploadFileder: false,
+      parentRow: null, //父级对象
+      parentPid: null, //父级pid
+      parentName: '', //父级名称
+      selectedNodeId: null, //选中
+      projectId: stores.selectedProject.goId,
+      acceptType: ['.pdf', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx'],
+      draggableCheck: false, //判断是否可以移动
+      activeName: ''
+    });
+    // 搜索数据
+    watch(filterText, (val: any) => {
+      treeRef.value!.filter(val);
+    });
+    onMounted(() => {
+      // 判断是否可以移动
+      if (stores.permissions.includes('/zm/api/v1/system/documentData/onlineMobile') || stores.permissions.includes('*/*/*')) {
+        state.draggableCheck = true; //设置可移动
+      }
+      resizeHandleRight(); //鼠标移动
+      proxy.mittBus.on('bigUploader.uploadFileSuccess' + 1002, (res: any) => {
+        const { filename, totalSize, url, identifier, fileType } = res;
+        let arr = filename.split('.');
+        let fileType1 = arr[arr.length - 1];
+        let obj = {
+          filePath: {
+            url,
+            name: filename,
+            size: totalSize,
+            fileType: '.' + fileType1 //后缀名
+          },
+          fileType: 1,
+          pid: state.parentPid,
+          projectId: state.projectId
+        };
+        documentDataAdd(obj).then((res: any) => {
+          if (res.code == 0) {
+            getdocumentDataListFileType(1);
+            ElMessage({
+              type: 'success',
+              message: '添加成功'
+            });
+          } else {
+            ElMessage({
+              type: 'error',
+              message: res.message
+            });
+          }
+        });
+      });
+    });
+    onBeforeUnmount(() => {
+      // 取消订阅特定事件
+      proxy.mittBus.off('bigUploader.uploadFileSuccess' + 1002);
+    });
+    // 导入大文件
+    const bigUploadFile1 = () => {
+      // 文件上传
+      proxy.mittBus.emit('bigUploader.uploadFile', { type: 2, types: 1002, accept: ['.zip', '.rar'] });
+    };
+    // 新建文件夹
+    const addFile = () => {
+      let tip = '在根目录下新建文件夹';
+      if (state.parentPid) {
+        tip = '在“' + state.parentName + '文件夹”下新建文件夹';
+      }
+      ElMessageBox.prompt('请输入文件夹名称', tip, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputErrorMessage: '请输入文件夹名称',
+        inputValue: ''
+      })
+        .then(({ value }) => {
+          documentDataNewFolder({ fileName: value, pid: state.parentPid, fileType: 3, projectId: state.projectId }).then((res: any) => {
+            if (res.code == 0) {
+              ElMessage({
+                type: 'success',
+                message: '添加成功'
+              });
+              gettreeStructureData();
+            } else {
+              ElMessage({
+                type: 'error',
+                message: res.message
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    // 导入文件
+    const uploadFile = (fileType) => {
+      if (fileType == 2 && !state.parentPid) {
+        ElMessage.warning('请选择文件目录！');
+        return;
+      }
+      // 判断上传类型 文件与压缩包区分
+      let acceptType = '.zip'; //压缩文件类型
+      if (fileType == 2) {
+        //文件上传
+        acceptType = '';
+      }
+      state.showUploadFileder = true;
+      nextTick(() => {
+        // 打开弹框
+        uploadFilederRef.value.openDialog(state.parentPid, fileType, acceptType, true);
+      });
+    };
+    const searchInfo = () => {
+      // 搜索
+      getdocumentDataList();
+    };
+    const resetQuery = () => {
+      // 重置
+      state.paramsQuery.name = '';
+      getdocumentDataList();
+    };
+    // 获取树形结构文件夹目录
+    const gettreeStructureData = () => {
+      state.parentPid = null;
+      state.activeName = 'second';
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在加载中……',
+        background: 'rgba(0, 0, 0, 0.7)',
+        target: '.tree_left1'
+      });
+      treeStructureData({ projectId: state.projectId }).then((res: any) => {
+        loading.close();
+        if (res.code == 0 && res.data && res.data.list) {
+          state.selectedNodeId = '';
+          state.treeList = res.data.list;
+          state.paramsQuery.idStr = res.data.list[0].idStr;
+          getdocumentDataList();
+          setInfo(res.data.list);
+        }
+      });
+    };
+    // 处理数据
+    const setInfo = (arr) => {
+      arr.forEach((element) => {
+        state.arrayList.push(element);
+        state.infoMap.set(element.idStr, element.id);
+        if (element.treeStructureDataRes && element.treeStructureDataRes.length) {
+          setInfo(element.treeStructureDataRes);
+        }
+      });
+    };
+    // 选择目录文件
+    const handleNodeClick = (row) => {
+      state.parentRow = row;
+      state.parentPid = row.idStr;
+      state.parentName = row.name;
+      state.paramsQuery.idStr = row.idStr;
+      state.paramsQuery.name = '';
+      getdocumentDataList();
+      if (row.id === state.selectedNodeId) {
+        // 如果当前节点已经选中，则取消选中
+        state.selectedNodeId = null;
+        state.parentPid = null; //关闭父级选择的id
+        state.parentRow = null; //获取父级对象
+        state.parentName = ''; //获取父级对应的名称
+        state.paramsQuery.idStr = ''; //
+      } else {
+        // 否则选中当前节点 重新赋值
+        state.selectedNodeId = row.id;
+      }
+    };
+    // 获取文档列表数据
+    const getdocumentDataList = () => {
+      if (!state.paramsQuery.idStr) {
+        return;
+      }
+      state.loading = true;
+      documentDataList(state.paramsQuery).then((res: any) => {
+        state.loading = false;
+        if (res.code == 0) {
+          res.data.list.sort((a, b) => {
+            return a.name.localeCompare(b.name);
+          });
+          state.infoList = res.data.list;
+          state.total = res.data.total;
+        }
+      });
+    };
+    // 查询tree树形结构数据
+    const filterFolder = (value: string, data: any) => {
+      if (!value) return true;
+      return data.name.includes(value);
+    };
+    const handleClick = () => {
+      // 切换页面
+    };
+    const handleDelete = (row) => {
+      // 删除文档
+      let msg = '你确定要删除所选文件？';
+      delFile(msg, row, () => {
+        getdocumentDataList();
+      });
+    };
+    const onExportView = (row) => {
+      // baseURL + '/zm' +
+      axios({
+        method: 'get',
+        url: '/zm/api/v1/system/documentData/uniFileDownload',
+        responseType: 'blob',
+        params: {
+          relativePath: row.filenPath
+        },
+        headers: {
+          Authorization: 'Bearer ' + `${Session.get('token')}`,
+          ...sign({
+            relativePath: row.filenPath
+          })
+        }
+      }).then((res) => {
+        let blob = new Blob([res.data], { type: res.headers['content-type'] });
+        const blobURL = window.URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = blobURL;
+        link.setAttribute('download', row.name + row.suffix);
+        if (typeof link.download === 'undefined') {
+          link.setAttribute('target', '_blank');
+        }
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        window.URL.revokeObjectURL(blobURL);
+      });
+    };
+    const updateName = (row) => {
+      // 修改名称
+      editName(row, '请输入文件名称', 1);
+    };
+    const handleView = (row) => {
+      getProfileDetail(row.id).then((res: any) => {
+        if (res.code == 0) {
+          // 查看文档
+          state.showDocumentDetail = true;
+          nextTick(() => {
+            documentDetailRef.value.openDialog(res.data);
+          });
+        }
+      });
+    };
+    // 关闭在线编辑弹框
+    const onClose = () => {
+      state.showDocumentDetail = false;
+    };
+    // 展开或折叠节点
+    const handleCheckedTreeExpand = (value: any) => {
+      for (let i = 0; i < state.arrayList.length; i++) {
+        treeRef.value.store.nodesMap[state.arrayList[i].id].expanded = value;
+      }
+    };
+    // 关闭修改的在线文档弹框
+    const onCloseEdit = () => {
+      state.showdocumentDataEdit = false;
+    };
+    const updataView = (row) => {
+      // 修改文档
+      state.showdocumentDataEdit = true;
+      nextTick(() => {
+        documentDataEditRef.value.openDialog(row, '/zm/api/v1/system/busConstructionUser/complaintBoxAddTwo');
+      });
+    };
+    const resizeHandleRight = () => {
+      // 右侧鼠标移动大小
+      const resizeHandles = document.getElementsByClassName('resize-handle');
+      Array.from(resizeHandles).forEach((handle) => {
+        handle.addEventListener('mousedown', startResize);
+      });
+    };
+    const startResize = (event) => {
+      event.preventDefault();
+      let dragElement = document.getElementById('tree_left1') as any;
+      let dragElementRight = document.getElementById('list_right1');
+      const currentHandle = event.target;
+      const direction = currentHandle.className.split(' ')[1];
+      const startX = event.clientX;
+      const startY = event.clientY;
+      // 左侧移动的盒子大小
+      const startWidth = dragElement.offsetWidth;
+      const startHeight = dragElement.offsetHeight;
+      const startLeft = dragElement.offsetLeft;
+      const startTop = dragElement.offsetTop;
+      // 右侧移动盒子宽度
+      const rightWidth = dragElementRight.offsetWidth;
+      document.addEventListener('mousemove', resize);
+      document.addEventListener('mouseup', stopResize);
+      function resize(event) {
+        const dx = event.clientX - startX;
+        const dy = event.clientY - startY;
+        let width = startWidth;
+        let height = startHeight;
+        let left = startLeft;
+        let top = startTop;
+        let rightWidth1 = rightWidth as any;
+        if (direction.includes('right')) {
+          width = startWidth + dx + 'px';
+          let w = startWidth + dx + 10 + 'px';
+          rightWidth1 = `calc(100% - ${w})`; //计算右侧盒子的宽度
+        }
+        if (parseInt(width) <= 0 || parseInt(height) <= 0) return;
+        dragElementRight.style.width = rightWidth1;
+        dragElement.style.width = width;
+        dragElement.style.height = height;
+        dragElement.style.left = left;
+        dragElement.style.top = top;
+      }
+      function stopResize() {
+        document.removeEventListener('mousemove', resize);
+        document.removeEventListener('mouseup', stopResize);
+      }
+    };
+    // 删除文件及文件夹
+    const delFile = (msg, data, cb) => {
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          documentDataDelete([data.id]).then((res: any) => {
+            if (res.code == 0) {
+              ElMessage.success('删除成功');
+              cb();
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    const onRemove = (node, data) => {
+      const parent = node.parent;
+      const children = parent.data.treeStructureDataRes || parent.data;
+      const index = children.findIndex((d) => d.id === data.id);
+      let msg = '你确定要删除所选文件夹？';
+      delFile(msg, data, () => {
+        children.splice(index, 1);
+        if (data.idStr == state.paramsQuery.idStr) {
+          state.infoList = []; //清空文件列表
+        }
+        state.treeList = [...state.treeList]; //刷新当前列表数据
+      });
+    };
+    const editName = (data, title, type) => {
+      ElMessageBox.prompt(title, '温馨提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputErrorMessage: title,
+        inputValue: data.name
+      })
+        .then(({ value }) => {
+          documentDataEdit({ id: data.id, name: value, type, projectId: state.projectId }).then((res: any) => {
+            if (res.code == 0) {
+              ElMessage({
+                type: 'success',
+                message: '修改成功'
+              });
+              // 数据重新刷新
+              if (type == 2) {
+                gettreeStructureData();
+              } else {
+                getdocumentDataList();
+              }
+            } else {
+              ElMessage({
+                type: 'error',
+                message: res.message
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    const onUpdateName = (node, data) => {
+      editName(data, '请输入文件夹名称', 2);
+    };
+    const getdocumentDataListFileType = (fileType) => {
+      if (fileType == 2) {
+        getdocumentDataList();
+      } else {
+        gettreeStructureData();
+      }
+    };
+    const getfileOnlineType = (fileType) => {
+      if (fileType == 1) {
+        getdocumentDataList();
+      } else {
+        gettreeStructureData();
+      }
+    };
+    const onExport = () => {
+      uniFolderDownload(state.parentRow.filenPath).then((res: any) => {
+        if (res.code == 0) {
+          let fileUrl = res.data.RelativePath;
+          window.open(fileUrl, '_self');
+        }
+      });
+    };
+    // 在线模板文件导入
+    const uploadOnlineFile = (node, data) => {
+      state.paramsQuery.idStr = data.idStr;
+      fileOnlineRef.value.openDialog(data.id);
+    };
+    const onMoveFile = () => {
+      // 移动文件
+      // moveFileRef.value.openDialog();
+    };
+    // 拖拽移动
+    const handleDragEnd = (draggingNode, dropNode, dropType, ev) => {
+      // TemplateId 被移动  DataId位置
+      let obj = { type: draggingNode.data.type, TemplateId: draggingNode.data.id, projectId: state.projectId, DataId: '' };
+      let DataId = '';
+      if (dropType == 'after' || dropType == 'before') {
+        // 获取父级id
+        // 通过pid找父级id
+        let pid = dropNode.data.pid; //子级pid
+        if (state.infoMap.has(pid)) {
+          //
+          DataId = state.infoMap.get(pid);
+        }
+        obj.DataId = DataId;
+      } else {
+        obj.DataId = dropNode.data.id;
+      }
+      if (!obj.DataId) {
+        return false;
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在加载中……',
+        background: 'rgba(0, 0, 0, 0.7)',
+        target: '.tree_left1'
+      });
+      onlineMobile(obj).then((res: any) => {
+        loading.close();
+        if (res.code == 0) {
+          ElMessage.success('移动成功');
+          // 重新获取文件接口
+          gettreeStructureData();
+        } else {
+          ElMessage.error(res.message);
+        }
+      });
+    };
+    const allowDrop = (draggingNode, dropNode, type) => {
+      // 不可移动
+      if (dropNode.data.pid == 0 && type != 'inner') {
+        //不可移动到最外层
+        return false;
+      } else {
+        return true;
+      }
+    };
+    // 查看所有资料
+    const onBook = () => {
+      bookFileRef.value.openDialog();
+    };
+    return {
+      proxy,
+      filterText,
+      bookFileRef,
+      treeRef,
+      documentDetailRef,
+      uploadFilederRef,
+      fileOnlineRef,
+      moveFileRef,
+      documentDataEditRef,
+      onClose,
+      onCloseEdit,
+      handleClick,
+      handleNodeClick,
+      filterFolder,
+      searchInfo,
+      addFile,
+      uploadFile,
+      resetQuery,
+      onBook,
+      getdocumentDataList,
+      getdocumentDataListFileType,
+      getfileOnlineType,
+      handleDelete,
+      onExportView,
+      updateName,
+      gettreeStructureData,
+      updataView,
+      handleView,
+      onRemove,
+      onUpdateName,
+      handleCheckedTreeExpand,
+      onExport,
+      bigUploadFile1,
+      onMoveFile,
+      uploadOnlineFile,
+      handleDragEnd,
+      allowDrop,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.profile_engin {
+  height: 80vh;
+  .set-tool {
+    display: none;
+  }
+  .el-tree-node__content:hover,
+  .el-tree-node__content:active {
+    .set-tool {
+      display: inline-block;
+    }
+  }
+  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #354e67 !important;
+    color: #fff;
+  }
+  .box_info {
+    display: flex;
+    justify-content: space-between;
+  }
+  .pagination-container {
+    padding: 10px 0 !important;
+  }
+  > div {
+    height: 100%;
+    width: 100%;
+  }
+  .tree_left1 {
+    width: 30%;
+    background-color: #fff;
+    border: 1px solid #dddddd;
+    border-radius: 6px;
+    padding: 6px 0px;
+    position: relative;
+    min-width: 26%;
+    border-right: 6px solid;
+    border-right-color: rgba(204, 230, 255, 0);
+    .resize-handle-right {
+      top: 0;
+      width: 6px;
+      height: 100%;
+      right: -10px;
+      cursor: ew-resize;
+      position: absolute;
+      z-index: 999;
+    }
+    .check_select {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      // justify-content: space-between;
+      padding: 4px;
+      border-bottom: 1px solid #f1f1f1;
+      .box_btn {
+        width: 360px;
+        margin: 0 10px 0 20px;
+        position: relative;
+        > span {
+          padding: 4px 10px;
+          background: #67c23a;
+          color: #fff;
+          border-radius: 2px;
+        }
+        .btn {
+          position: absolute;
+          left: 20%;
+          display: none;
+          top: -2px;
+          width: 220px;
+          .el-button {
+            float: left;
+          }
+        }
+      }
+      .box_btn:hover,
+      .box_btn:active {
+        cursor: pointer;
+        .btn {
+          display: block;
+        }
+      }
+    }
+    .file_upload {
+      margin: 2px 0;
+    }
+    .input_left {
+      padding: 6px;
+      box-sizing: border-box;
+      // border-bottom: 1px solid #cbcbcb;
+    }
+  }
+  .list_right {
+    width: 69.5%;
+    background: white;
+    border: 1px solid #ededed;
+    padding: 10px;
+    box-sizing: border-box;
+  }
+  .el-tree {
+    height: calc(80vh - 160px);
+    width: 100%;
+    overflow: auto !important;
+  }
+  // .el-tree-node__children {
+  // 	overflow: visible !important;
+  // }
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/profileEngineering/moveFile/index.vue b/src/views/quality/onlineListquality/comm/profileEngineering/moveFile/index.vue
new file mode 100644
index 0000000..0815408
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/profileEngineering/moveFile/index.vue
@@ -0,0 +1,242 @@
+<template>
+  <div class="move_file">
+    <!-- 添加或修改题库_题库类别对话框 -->
+    <el-dialog v-model="isShowDialog" width="1200px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.move_file .el-dialog', '.move_file .el-dialog__header']">文件移动</div>
+      </template>
+      <div class="move_list">
+        <div class="all_list">
+          <div class="file_upload check_select">
+            <el-input class="input_left" v-model="filterText" size="small" placeholder="请输入文件名称" />
+          </div>
+          <el-tree
+            ref="treeRef"
+            highlight-current
+            :default-expand-all="checked"
+            :filter-node-method="filterFolder"
+            :data="treeList"
+            :props="Props"
+            check-strictly
+            show-checkbox
+            node-key="id"
+            accordion
+            :expand-on-click-node="false"
+            @check-change="handleCheckChange"
+          >
+            <template #default="{ node, data }">
+              <span class="custom-tree-node">
+                <el-icon v-if="data.type == 2" color="#f1a81a"><FolderOpened /></el-icon>
+                <el-icon v-else color="#f1a81a"><Document /></el-icon>
+                <span>{{ node.label }}</span>
+              </span>
+            </template>
+          </el-tree>
+        </div>
+        <div class="box_line">
+          <el-button type="primary" @click="onSubmit" style="margin: 10px 0">
+            <el-icon><Right /></el-icon>
+            移入</el-button
+          >
+          <!-- <el-button type="success" @click="onSubmit" style="margin: 10px 0">
+						<el-icon><Back /></el-icon>
+						移出</el-button
+					> -->
+        </div>
+        <div class="all_list">
+          <div class="file_upload check_select">
+            <el-input class="input_left" v-model="filterText1" size="small" placeholder="请输入文件名称" />
+          </div>
+          <el-tree
+            ref="lineTreeRef"
+            highlight-current
+            :default-expand-all="lineChecked"
+            :filter-node-method="filterFolder"
+            :data="onlineList"
+            :props="Props"
+            node-key="id"
+            accordion
+            :expand-on-click-node="false"
+            @check-change="handleCheckChange1"
+          >
+            <template #default="{ node, data }">
+              <span class="custom-tree-node">
+                <el-icon v-if="data.type == 2" color="#f1a81a"><FolderOpened /></el-icon>
+                <el-icon v-else color="#f1a81a"><Document /></el-icon>
+                <span>{{ node.label }}</span>
+              </span>
+            </template>
+          </el-tree>
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, getCurrentInstance, watch } from 'vue';
+import { ElMessage } from 'element-plus';
+// 接口引入
+import { documentAllList } from '@/api/quality/onlineListquality/Online';
+import { onlineImport, documentDataAllList } from '@/api/quality/onlineListquality/profileData';
+import { useUserStoreHook } from '@/store/modules/user';
+
+export default defineComponent({
+  name: 'index',
+  props: {},
+  setup(props, { emit }) {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const treeRef = ref(null);
+    const lineTreeRef = ref(null);
+    const filterText = ref(''); //搜索树形结构参数
+    const filterText1 = ref(''); //搜索树形结构参数
+    const state = reactive({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        type: '',
+        TemplateId: '', //模板id
+        DataId: '' //资料id
+      },
+      // 表单校验
+      rules: {
+        categoryName: [{ required: true, message: '题库类别不能为空', trigger: 'blur' }]
+      },
+      checked: true, //模板
+      treeList: [], //模板列表数据
+      Props: {
+        children: 'treeStructureRes',
+        label: 'name'
+      },
+      checkedId: '', //选中模板id
+      projectId: stores.selectedProject.goId,
+      onlineList: [], //资料列表数据
+      lineChecked: false,
+      lineCheckedId: '' //选中资料id
+    });
+    // 搜索模板列表数据
+    watch(filterText, (val: any) => {
+      treeRef.value!.filter(val);
+    });
+    // 搜索资料列表数据
+    watch(filterText1, (val: any) => {
+      lineTreeRef.value!.filter(val);
+    });
+    // 查询tree树形结构数据
+    const filterFolder = (value: string, data: any) => {
+      if (!value) return true;
+      return data.name.includes(value);
+    };
+    // 打开弹窗
+    const openDialog = (DataId) => {
+      state.isShowDialog = true;
+      getInfo();
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 获取所有数据
+    const getInfo = () => {
+      documentAllList().then((res) => {
+        if (res.code == 0 && res.data.list && res.data.list.length) {
+          state.treeList = listToTree(res.data.list);
+        }
+      });
+      documentDataAllList({ projectId: state.projectId }).then((res) => {
+        if (res.code == 0 && res.data.list && res.data.list.length) {
+          state.onlineList = listToTree(res.data.list);
+        }
+      });
+    };
+    //数据处理
+    const listToTree = (list) => {
+      let array = [];
+      list.forEach((item) => {
+        // 遍历对象数组
+        item.treeStructureRes = list.filter((info) => info.pid === item.idStr); // 找到每个对象的子节点
+        if (item.pid == 0) {
+          array.push(item); // 将一层节点放入新数组中
+        }
+      });
+      return array;
+    };
+    // 提交
+    const onSubmit = () => {
+      onlineImport(state.formData).then((res) => {
+        if (res.code == 0) {
+          ElMessage.success('导入成功');
+        } else {
+          ElMessage.error(res.message);
+          onCancel();
+        }
+      });
+    };
+    const handleCheckChange = (data, checked) => {
+      if (checked) {
+        state.checkedId = data.id;
+        treeRef.value.setCheckedKeys([data.id]);
+      } else {
+        if (state.checkedId === data.id) {
+          treeRef.value.setCheckedKeys([data.id]);
+        }
+      }
+    };
+    const handleCheckChange1 = (data, checked) => {
+      if (checked) {
+        state.lineCheckedId = data.id;
+        lineTreeRef.value.setCheckedKeys([data.id]);
+      } else {
+        if (state.lineCheckedId === data.id) {
+          lineTreeRef.value.setCheckedKeys([data.id]);
+        }
+      }
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      getInfo,
+      filterText,
+      filterText1,
+      handleCheckChange,
+      handleCheckChange1,
+      filterFolder,
+      treeRef,
+      lineTreeRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped lang="scss">
+.move_file {
+  .move_list {
+    display: flex;
+    .all_list {
+      width: 48%;
+      border: 1px solid #e8e8e8;
+      padding: 4px;
+    }
+    .box_line {
+      width: 100px;
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/recycleBIn/index.vue b/src/views/quality/onlineListquality/comm/recycleBIn/index.vue
new file mode 100644
index 0000000..3eb4228
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/recycleBIn/index.vue
@@ -0,0 +1,265 @@
+<template>
+  <div class="system-document-container">
+    <el-card shadow="hover">
+      <div class="system-document-search mb">
+        <el-form :model="param" ref="queryRef" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="5">
+              <el-form-item label="" prop="createdAt">
+                <!-- <el-radio-group v-model="value" @change="onChange" class="ml-4">
+									<el-radio border label="2">资料文件</el-radio>
+									<el-radio border label="1">模板文件</el-radio>
+								</el-radio-group> -->
+                <span>类型：</span>
+                <el-select v-model="value" class="m-2" placeholder="请选择类型" @change="onChange">
+                  <el-option label="资料文件" value="2" />
+                  <el-option label="模板文件" value="1" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2" v-if="value == '1'">
+              <el-button
+                type="success"
+                v-auth="'/zm/api/v1/system/document/templateRecycleBin'"
+                :disabled="multiple"
+                @click="onRecyclingStation(null, true)"
+                ><el-icon><RefreshRight /></el-icon>批量恢复</el-button
+              >
+            </el-col>
+            <el-col :span="2" v-if="value == '1'">
+              <el-button
+                type="danger"
+                v-auth="'/zm/api/v1/system/document/templateRecycleBin'"
+                :disabled="multiple"
+                @click="onRecyclingStation(null, false)"
+                ><el-icon><DeleteFilled /></el-icon>批量删除</el-button
+              >
+            </el-col>
+            <el-col :span="2" v-if="value == '2'">
+              <el-button
+                type="success"
+                v-auth="'/zm/api/v1/system/document/dataRecyclingStation'"
+                :disabled="multiple"
+                @click="onRecyclingStation(null, true)"
+                ><el-icon><RefreshRight /></el-icon>批量恢复</el-button
+              >
+            </el-col>
+            <el-col :span="2" v-if="value == '2'">
+              <el-button
+                type="danger"
+                v-auth="'/zm/api/v1/system/document/dataRecyclingStation'"
+                :disabled="multiple"
+                @click="onRecyclingStation(null, false)"
+                ><el-icon><DeleteFilled /></el-icon>批量删除</el-button
+              >
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" min-width="30px" />
+        <el-table-column label="文件名称" align="center" prop="name" min-width="100px" />
+        <el-table-column label="文件类型" align="center" prop="type" min-width="100px">
+          <template #default="scope">
+            <span>{{ scope.row.type == 1 ? '文件' : '文件夹' }}</span>
+          </template> </el-table-column
+        ><el-table-column label="文件路径" align="center" min-width="100px">
+          <template #default="scope">
+            <span>{{ filterfilenPath(scope.row.filenPath) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="删除时间" align="center" prop="deletedAt" min-width="100px"> </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="50px" fixed="right">
+          <template #default="scope">
+            <div v-if="value == '1'">
+              <el-button type="success" v-auth="'/zm/api/v1/system/document/templateRecycleBin'" link @click="onRecyclingStation(scope.row, true)"
+                ><el-icon><RefreshRight /></el-icon>恢复</el-button
+              >
+              <!-- <el-button type="danger" v-auth="'/zm/api/v1/system/document/templateRecycleBin'" link @click="onRecyclingStation(scope.row, false)"
+								><el-icon><DeleteFilled /></el-icon>删除</el-button
+							> -->
+            </div>
+            <div v-else>
+              <el-button
+                type="success"
+                v-auth="'/zm/api/v1/system/documentData/dataRecyclingStation'"
+                link
+                @click="onRecyclingStation(scope.row, true)"
+                ><el-icon><RefreshRight /></el-icon>恢复</el-button
+              >
+              <!-- <el-button
+								type="danger"
+								v-auth="'/zm/api/v1/system/documentData/dataRecyclingStation'"
+								link
+								@click="onRecyclingStation(scope.row, false)"
+								><el-icon><DeleteFilled /></el-icon>删除</el-button
+							> -->
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" v-model:page="param.pageNum" v-model:limit="param.pageSize" @pagination="documentList" />
+    </el-card>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, ref, defineComponent, getCurrentInstance } from 'vue';
+import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
+import { documentDataAllList, dataRecyclingStation, templateRecycleBin } from '@/api/quality/onlineListquality/profileData'; //获取资料删除的列表数据
+
+import { documentAllList } from '@/api/quality/onlineListquality/Online'; //获取模板删除列表数据
+import { useUserStoreHook } from '@/store/modules/user';
+
+export default defineComponent({
+  name: 'index',
+  setup() {
+    const stores = useUserStoreHook();
+    const { proxy } = <any>getCurrentInstance();
+    const loading = ref(false);
+    const queryRef = ref();
+    // 非多个禁用
+    const multiple = ref(true);
+    // 字典选项数据
+    const {} = proxy.useDict();
+    const state = reactive({
+      ids: [],
+      tableData: [],
+      param: {
+        type: 2,
+        projectId: stores.selectedProject.goId
+      },
+      total: 0,
+      value: '2',
+      ids: [], //所选择的文件
+      userName: stores.nickname // 当前用户名
+    });
+    // 获取资料删除的列表数据
+    const getDocumentDataList = () => {
+      loading.value = true;
+      state.tableData = [];
+      state.value = '2';
+      documentDataAllList(state.param).then((res: any) => {
+        let list = res.data.list ?? [];
+        state.tableData = list;
+        state.total = res.data.total;
+        loading.value = false;
+      });
+    };
+    // 获取模板删除的列表数据
+    const getDocumentList = () => {
+      loading.value = true;
+      state.tableData = [];
+      documentAllList(state.param).then((res: any) => {
+        let list = res.data.list ?? [];
+        state.tableData = list;
+        state.total = res.data.total;
+        loading.value = false;
+      });
+    };
+    // 多选框选中数据
+    const handleSelectionChange = (selection) => {
+      state.ids = selection.map((item) => item.id);
+      multiple.value = !selection.length;
+    };
+    const onRecyclingStation = (row, flag) => {
+      let type = 2;
+      let ids = [];
+      let title = '删除';
+      if (row) {
+        ids = [row.id];
+      } else {
+        // 批量
+        ids = state.ids;
+      }
+      let msg = '你确定要删除所选文件或文件夹？';
+      if (flag) {
+        type = 1;
+        title = '恢复';
+        msg = '你确定要恢复所选文件或文件夹？';
+      }
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const loading = ElLoading.service({
+            lock: true,
+            text: '正在' + title + '中……',
+            background: 'rgba(0, 0, 0, 0.7)'
+          });
+          if (state.value == 2) {
+            dataRecyclingStation({
+              ids,
+              type
+            }).then((res) => {
+              loading.close();
+              if (res.code == 0) {
+                getDocumentDataList();
+                ElMessage.success('操作成功');
+              } else {
+                ElMessage.error(res.message);
+              }
+            });
+          } else {
+            templateRecycleBin({
+              ids,
+              type
+            }).then((res) => {
+              loading.close();
+              if (res.code == 0) {
+                getDocumentList();
+                ElMessage.success('操作成功');
+              } else {
+                ElMessage.error(res.message);
+              }
+            });
+          }
+        })
+        .catch(() => {});
+    };
+    const onChange = (val) => {
+      // 切换文件类型
+      if (val == 2) {
+        getDocumentDataList();
+      } else {
+        getDocumentList();
+      }
+    };
+    const filterfilenPath = (val) => {
+      // 文件路径
+      if (state.value == 2) {
+        // 资料
+        if (state.userName) {
+          //用户名不存在的情况下
+          val.substring(val.lastIndexOf(state.userName) + state.userName.length);
+        }
+        return val.substring(val.lastIndexOf(state.userName));
+      } else {
+        // 模板 文件在masterMask目录下 默认显示目录下路径
+        return val.substring(val.lastIndexOf('masterMask') + 'masterMask'.length);
+      }
+    };
+    return {
+      proxy,
+      onChange,
+      multiple,
+      loading,
+      onRecyclingStation,
+      handleSelectionChange,
+      getDocumentDataList,
+      filterfilenPath,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss" scoped>
+.colBlock {
+  display: block;
+}
+.colNone {
+  display: none;
+}
+</style>
diff --git a/src/views/quality/onlineListquality/comm/uploadFileder/index.vue b/src/views/quality/onlineListquality/comm/uploadFileder/index.vue
new file mode 100644
index 0000000..ce5a4fc
--- /dev/null
+++ b/src/views/quality/onlineListquality/comm/uploadFileder/index.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="upload_fileder">
+    <el-dialog v-model="isShowDialog" width="400px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.upload_fileder .el-dialog', '.upload_fileder .el-dialog__header']">上传文件</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="80px">
+        <el-form-item label="文件上传">
+          <upload-file
+            :accept="acceptType"
+            uploadUrl="/zm/api/v1/system/upload/singleFile"
+            type="btn"
+            :data="{ token: fileToken }"
+            isGo
+            :onUploadSuccess="getOnSuccess"
+            :limit="1"
+          ></upload-file>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance, onMounted } from 'vue';
+import { ElMessage, genFileId } from 'element-plus';
+
+import { Session } from '@/utils/storage';
+import uploadFile from '@/components/FileUpload/index.vue';
+import { documentAdd } from '@/api/quality/onlineListquality/Online';
+import { documentDataAdd } from '@/api/quality/onlineListquality/profileData';
+import { useUserStoreHook } from '@/store/modules/user';
+
+export default defineComponent({
+  name: 'index',
+  components: { uploadFile },
+  setup(props, { emit }) {
+    const { proxy } = (<any>getCurrentInstance()) as any;
+    const fileToken = proxy.$cache.local.get('goToken');
+    const formRef = ref<HTMLElement | null>(null);
+    const stores = useUserStoreHook();
+    const uploadRef = ref(); //文件dom
+    const state = reactive({
+      isShowDialog: false,
+      formData: {
+        pid: null,
+        fileType: 1,
+        filePath: {},
+        projectId: stores.selectedProject.goId
+      },
+      // 表单校验
+      rules: {},
+      token: `Bearer ${fileToken}`,
+      acceptType: '',
+      flag: false
+    });
+    const getOnSuccess = (list, filePath) => {
+      console.log('🚀 ~ getOnSuccess ~ filePath:', filePath);
+      let { path, name, size } = filePath.data;
+      state.formData.filePath = {
+        url: path,
+        name,
+        size,
+        fileType: name.substring(name.lastIndexOf('.'), name.length) //后缀名
+      };
+    };
+    // 打开弹窗
+    const openDialog = (parentPid, fileType, acceptType, flag = false) => {
+      state.isShowDialog = true;
+      state.formData.pid = parentPid;
+      state.formData.fileType = fileType;
+      state.acceptType = acceptType;
+      state.flag = flag;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+      emit('onCloseFile', true);
+    };
+    const handleExceed = (files) => {
+      uploadRef.value!.clearFiles();
+      const file = files[0];
+      file.uid = genFileId();
+      uploadRef.value!.handleStart(file);
+    };
+    // 提交
+    const onSubmit = () => {
+      if (JSON.stringify(state.formData.filePath) === '{}') {
+        ElMessage({
+          type: 'warning',
+          message: '请上传文件'
+        });
+        return;
+      }
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          if (state.flag) {
+            // 资料文件上传
+            documentDataAdd(state.formData).then((res: any) => {
+              if (res.code == 0) {
+                emit('getDocumentListFileType', state.formData.fileType);
+                ElMessage({
+                  type: 'success',
+                  message: '添加成功'
+                });
+                onCancel();
+              } else {
+                ElMessage({
+                  type: 'error',
+                  message: res.message
+                });
+              }
+            });
+          } else {
+            // 模板文件上传
+            documentAdd(state.formData).then((res) => {
+              if (res.code == 0) {
+                emit('getDocumentListFileType', state.formData.fileType);
+                ElMessage({
+                  type: 'success',
+                  message: '添加成功'
+                });
+                onCancel();
+              } else {
+                ElMessage({
+                  type: 'error',
+                  message: res.message
+                });
+              }
+            });
+          }
+        }
+      });
+    };
+    const onSuccess = (res) => {
+      if (res.code == 0) {
+        ElMessage.success('上传成功');
+      } else {
+        ElMessage.error(res.message);
+      }
+    };
+    return {
+      proxy,
+      uploadRef,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      handleExceed,
+      fileToken,
+      formRef,
+      onSuccess,
+      getOnSuccess,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped></style>
diff --git a/src/views/quality/onlineListquality/index.vue b/src/views/quality/onlineListquality/index.vue
new file mode 100644
index 0000000..51d9430
--- /dev/null
+++ b/src/views/quality/onlineListquality/index.vue
@@ -0,0 +1,750 @@
+<template>
+  <div class="p-2">
+    <div class="onLine_list">
+      <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
+        <el-tab-pane label="模板" name="first">
+          <div class="box_info">
+            <div class="tree_left" id="tree_left">
+              <div class="check_select">
+                <el-button type="primary" v-auth="'/zm/api/v1/system/document/newFolder'" @click="addFile"
+                  ><el-icon><Plus /></el-icon>新建文件夹</el-button
+                >
+                <div class="box_btn" v-auth="'/zm/api/v1/system/document/add'">
+                  <span>＋导入</span>
+                  <div class="btn">
+                    <el-button type="primary" style="float: left" @click="bigUploadFile" size="small"
+                      ><el-icon><Plus /></el-icon>导入压缩文件</el-button
+                    >
+                    <el-button type="primary" style="float: left" :disabled="!parentPid" size="small" @click="uploadFile(2)"
+                      ><el-icon><Plus /></el-icon>导入文件</el-button
+                    >
+                  </div>
+                </div>
+              </div>
+              <div class="file_upload check_select">
+                <el-checkbox v-model="checked" @change="handleCheckedTreeExpand($event)" label="展开/折叠" size="large" />
+                <div style="margin: 0 10px">
+                  <el-select v-model="paramsQuery.switch" placeholder="当前文件夹" size="small">
+                    <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id" />
+                  </el-select>
+                </div>
+                <!-- <el-button type="primary" v-auth="'/zm/api/v1/system/document/compressedDownload'" :disabled="!parentPid" @click="onExport"
+                  ><el-icon><Download /></el-icon>下载</el-button
+                > -->
+              </div>
+              <div class="file_upload check_select">
+                <el-input class="input_left" v-model="filterText" size="small" placeholder="请输入文件名称" />
+              </div>
+              <el-tree
+                ref="treeRef"
+                highlight-current
+                :default-expand-all="checked"
+                :filter-node-method="filterFolder"
+                :data="treeList"
+                :props="Props"
+                node-key="id"
+                accordion
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+                :current-node-key="selectedNodeId"
+              >
+                <template #default="{ node, data }">
+                  <span class="custom-tree-node">
+                    <el-icon color="#f1a81a"><FolderOpened /></el-icon>
+                    <span>{{ node.label }}</span>
+                    <span style="margin-left: 20px" class="set-tool">
+                      <!-- <el-button type="primary" link @click="onAppend(node)">添加文件夹</el-button> -->
+                      <el-button type="success" link v-auth="'/zm/api/v1/system/document/edit'" @click.stop="onUpdateName(node, data)"
+                        >重命名</el-button
+                      >
+                      <el-button type="danger" v-auth="'/zm/api/v1/system/document/delete'" link @click.stop="onRemove(node, data)">删除</el-button>
+                    </span>
+                  </span>
+                </template>
+              </el-tree>
+              <div class="resize-handle resize-handle-right right"></div>
+            </div>
+            <div class="list_right" id="list_right">
+              <div>
+                <el-form :model="paramsQuery" ref="queryRef" :inline="true" label-width="100px">
+                  <el-row>
+                    <el-col :span="8" class="colBlock">
+                      <el-form-item label="文件名称" prop="name">
+                        <el-input v-model="paramsQuery.name" placeholder="请输入文件名称" clearable @keyup.enter.native="getDocumentList" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item>
+                        <el-button type="primary" @click="searchInfo"
+                          ><el-icon><Search /></el-icon>搜索</el-button
+                        >
+                        <el-button @click="resetQuery"
+                          ><el-icon><Refresh /></el-icon>重置</el-button
+                        >
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </div>
+              <el-table v-loading="loading" :data="infoList" height="67vh" border>
+                <el-table-column label="序号" align="center" type="index" min-width="50px" />
+                <el-table-column label="模板名称" align="center" prop="name">
+                  <template #default="scope">
+                    <span>{{ scope.row.name + scope.row.suffix }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="创建时间" align="center" prop="createdAt"> </el-table-column>
+                <el-table-column label="操作" align="center">
+                  <template #default="scope">
+                    <el-button type="primary" link v-auth="'/zm/api/v1/system/document/get'" @click="handleView(scope.row)"
+                      ><el-icon><View /></el-icon>预览模板</el-button
+                    >
+                    <el-button type="success" link v-auth="'/zm/api/v1/system/document/complaintBoxAdd'" @click="updataView(scope.row)"
+                      ><el-icon><EditPen /></el-icon>修改模板</el-button
+                    >
+                    <!-- <el-button type="primary" v-auth="'/zm/api/v1/system/document/compressedDownload'" link @click="onExportView(scope.row)"
+                      ><el-icon><Download /></el-icon>下载</el-button
+                    > -->
+                    <el-button type="success" v-auth="'/zm/api/v1/system/document/edit'" link @click="updateName(scope.row)"
+                      ><el-icon><EditPen /></el-icon>修改名称</el-button
+                    >
+                    <el-button type="danger" link v-auth="'/zm/api/v1/system/document/delete'" @click="handleDelete(scope.row)"
+                      ><el-icon><DeleteFilled /></el-icon>删除</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination :total="total" v-model:page="paramsQuery.pageNum" v-model:limit="paramsQuery.pageSize" @pagination="getDocumentList" />
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="资料" name="second">
+          <div style="width: 100%; height: 100%">
+            <profileEngineering ref="profileEngineeringRef" :activeName="activeName"></profileEngineering>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="回收站" name="three">
+          <div style="width: 100%; height: 100%">
+            <recycleBin ref="recycleBinRef"></recycleBin>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+      <documentDetail ref="documentDetailRef" v-if="showDocumentDetail" @onClose="onClose"></documentDetail>
+      <documentsEdit ref="documentEditRef" v-if="showDocumentEdit" @onClose="onCloseEdit"></documentsEdit>
+      <uploadFileder
+        ref="uploadFilederRef"
+        v-if="showUploadFileder"
+        @onCloseFile="showUploadFileder = false"
+        @getDocumentListFileType="getDocumentListFileType"
+      ></uploadFileder>
+      <bookFile ref="bookFileRef"></bookFile>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance, nextTick, onBeforeUnmount } from 'vue';
+import { ElLoading, ElMessageBox, ElMessage } from 'element-plus';
+import {
+  treeStructureList,
+  documentList,
+  documentEdit,
+  documentDelete,
+  documentNewFolder,
+  compressedDownload
+} from '@/api/quality/onlineListquality/Online';
+// 文档查看
+import documentDetail from './comm/documentsDetail/index.vue';
+// 文档修改编辑
+import documentsEdit from './comm/documentsEdit/index.vue';
+// 资料信息列表
+// import profileData from '/@/views/OnlineEngineering/profileData/index.vue';
+// 工程资料模块
+import profileEngineering from './comm/profileEngineering/index.vue';
+// 回收站功能
+import recycleBin from './comm/recycleBIn/index.vue';
+// 文件导入弹框
+import uploadFileder from './comm/uploadFileder/index.vue';
+//
+import { documentAdd } from '@/api/quality/onlineListquality/Online';
+import { useRouter } from 'vue-router';
+
+export default defineComponent({
+  name: 'index',
+  components: { documentDetail, documentsEdit, uploadFileder, profileEngineering, recycleBin },
+  setup() {
+    const { proxy } = <any>getCurrentInstance();
+    const router = useRouter();
+    const filterText = ref(''); //搜索树形结构参数
+    const treeRef = ref(); //树形结构dom
+    const documentDetailRef = ref(); //详情在线dom
+    const documentEditRef = ref(); //编辑在线dom
+    const uploadFilederRef = ref(); //上传文件在线dom
+    const profileEngineeringRef = ref(); //资料信息
+    const recycleBinRef = ref(); //回收站
+    const state = reactive({
+      treeList: [] as any, //树形结构数据
+      arrayList: [] as any, //数据
+      infoList: [] as any, //文档列表数据
+      activeName: 'first',
+      Props: {
+        children: 'treeStructureRes',
+        label: 'name'
+      },
+      total: 0, //文档数量
+      paramsQuery: { idStr: '', name: '', switch: 1, pageNum: 1, pageSize: 20 }, //请求参数
+      loading: false, //列表加载
+      checked: true, //展开 折叠
+      options: [
+        { id: 1, label: '当前文件夹及以下' },
+        { id: 2, label: '当前文件夹' }
+      ],
+      showDocumentDetail: false, //详情弹框
+      showDocumentEdit: false, //编辑弹框
+      showUploadFileder: false, //文件及文件夹导入
+      parentRow: null, //父级对象
+      parentPid: null, //父级pid
+      parentName: '', //父级名称
+      selectedNodeId: null //选中
+    });
+    // 搜索数据
+    watch(filterText, (val: any) => {
+      treeRef.value!.filter(val);
+    });
+    onMounted(() => {
+      // let rouerPath = router.currentRoute.value.fullPath;
+      // // 质量管理跳转至工程资料，优先展示资料模块
+      // if (rouerPath.includes('quality')) {
+      // 	state.activeName = 'second';
+      // } else {
+      // 	state.activeName = 'first';
+      // }
+      getTreeStructureList();
+      resizeHandleRight();
+      // 判断是否调用该页面文件成功后添加到后台
+      proxy.mittBus.on('bigUploader.uploadFileSuccess' + 1001, (res: any) => {
+        const { filename, totalSize, url, identifier, fileType } = res;
+        let arr = filename.split('.');
+        let fileType1 = arr[arr.length - 1];
+        let obj = {
+          filePath: {
+            url: '/file/' + url,
+            name: filename,
+            size: totalSize,
+            fileType: '.' + fileType1 //后缀名
+          },
+          fileType: 1,
+          pid: state.parentPid
+        };
+        documentAdd(obj).then((res: any) => {
+          if (res.code == 0) {
+            getDocumentListFileType(1);
+            ElMessage({
+              type: 'success',
+              message: '添加成功'
+            });
+          } else {
+            ElMessage({
+              type: 'error',
+              message: res.message
+            });
+          }
+        });
+      });
+    });
+    onBeforeUnmount(() => {
+      // 取消订阅特定事件
+      proxy.mittBus.off('bigUploader.uploadFileSuccess' + 1001);
+    });
+    // 导入大文件
+    const bigUploadFile = () => {
+      // 文件上传
+      proxy.mittBus.emit('bigUploader.uploadFile', { type: 1, types: 1001, accept: ['.zip', '.rar'] });
+    };
+    // 新建文件夹
+    const addFile = () => {
+      let tip = '在根目录下新建文件夹';
+      if (state.parentPid) {
+        tip = '在“' + state.parentName + '文件夹”下新建文件夹';
+      }
+      ElMessageBox.prompt('请输入文件夹名称', tip, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputErrorMessage: '请输入文件夹名称',
+        inputValue: ''
+      })
+        .then(({ value }) => {
+          documentNewFolder({ fileName: value, pid: state.parentPid, fileType: 3 }).then((res) => {
+            if (res.code == 0) {
+              ElMessage({
+                type: 'success',
+                message: '添加成功'
+              });
+              getTreeStructureList();
+            } else {
+              ElMessage({
+                type: 'error',
+                message: res.message
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    // 添加文件夹到树形结构上
+    const onAppend = (data) => {
+      if (state.parentRow) {
+        if (!state.parentRow.treeStructureRes) {
+          state.parentRow.treeStructureRes = [];
+        }
+        state.parentRow.treeStructureRes.push(data);
+        state.treeList = [...state.treeList];
+      } else {
+        state.treeList.push(data); //跟目录添加
+      }
+    };
+    //
+    // 导入文件
+    const uploadFile = (fileType) => {
+      if (fileType == 2 && !state.parentPid) {
+        ElMessage.warning('请选择文件目录！');
+        return;
+      }
+      // 判断上传类型 文件与压缩包区分
+      let acceptType = '.zip'; //压缩文件类型
+      if (fileType == 2) {
+        //文件上传
+        acceptType = '.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx,';
+      }
+      state.showUploadFileder = true;
+      nextTick(() => {
+        // 打开弹框
+        uploadFilederRef.value.openDialog(state.parentPid, fileType, acceptType);
+      });
+    };
+    const searchInfo = () => {
+      // 搜索
+      getDocumentList();
+    };
+
+    const resetQuery = () => {
+      // 重置
+      state.paramsQuery.name = '';
+      getDocumentList();
+    };
+    // 获取树形结构文件夹目录
+    const getTreeStructureList = () => {
+      const loading = ElLoading.service({
+        lock: true,
+        text: '正在加载中……',
+        background: 'rgba(0, 0, 0, 0.7)',
+        target: '.tree_left'
+      });
+      treeStructureList().then((res) => {
+        loading.close();
+        if (res.code == 0 && res.data && res.data.list) {
+          state.selectedNodeId = '';
+          state.treeList = res.data.list;
+          state.paramsQuery.idStr = res.data.list[0].idStr;
+          getDocumentList();
+          setInfo(res.data.list);
+        }
+      });
+    };
+    // 处理数据
+    const setInfo = (arr) => {
+      arr.forEach((element) => {
+        state.arrayList.push(element);
+        if (element.treeStructureRes && element.treeStructureRes.length) {
+          setInfo(element.treeStructureRes);
+        }
+      });
+    };
+    // 选择目录文件
+    const handleNodeClick = (row) => {
+      state.parentRow = row;
+      state.parentPid = row.idStr;
+      state.parentName = row.name;
+      state.paramsQuery.idStr = row.idStr;
+      state.paramsQuery.name = '';
+      if (row.id === state.selectedNodeId) {
+        // 如果当前节点已经选中，则取消选中
+        state.selectedNodeId = null;
+        state.parentPid = null; //关闭父级选择的id
+        state.parentRow = null; //获取父级对象
+        state.parentName = ''; //获取父级对应的名称
+        // state.paramsQuery.idStr = ''; //
+      } else {
+        getDocumentList();
+        // 否则选中当前节点 重新赋值
+        state.selectedNodeId = row.id;
+      }
+    };
+    // 获取文档列表数据
+    const getDocumentList = () => {
+      if (!state.paramsQuery.idStr) {
+        return;
+      }
+      state.loading = true;
+      documentList(state.paramsQuery).then((res: any) => {
+        state.loading = false;
+        if (res.code == 0) {
+          res.data.list.sort((a, b) => {
+            return a.name.localeCompare(b.name);
+          });
+          state.infoList = res.data.list;
+          state.total = res.data.total;
+        }
+      });
+    };
+    // 查询tree树形结构数据
+    const filterFolder = (value: string, data: any) => {
+      if (!value) return true;
+      return data.name.includes(value);
+    };
+    const handleClick = (type) => {
+      // 切换页面 结构重新调用
+      if (type == 'first') {
+        // 模板
+        state.parentPid = null;
+        getTreeStructureList();
+      } else if (type == 'second') {
+        // 资料
+        profileEngineeringRef.value.gettreeStructureData();
+      } else {
+        // 回收站列表数据获取
+        recycleBinRef.value.getDocumentDataList();
+      }
+    };
+    const handleDelete = (row) => {
+      // 删除文档
+      let msg = '你确定要删除所选文件？';
+      delFile(msg, row, () => {
+        getDocumentList();
+      });
+    };
+    const onExportView = (row) => {
+      // 下载模板
+      let fileUrl = row.filenPathCoding.replaceAll('+', ' ');
+      window.open(fileUrl, '_Black');
+    };
+    const updateName = (row) => {
+      // 修改名称
+      editName(row, '请输入文件名称', 1);
+    };
+    const handleView = (row) => {
+      // 查看文档
+      state.showDocumentDetail = true;
+      nextTick(() => {
+        documentDetailRef.value.openDialog(row);
+      });
+    };
+    // 关闭在线编辑弹框
+    const onClose = () => {
+      state.showDocumentDetail = false;
+    };
+    // 展开或折叠节点
+    const handleCheckedTreeExpand = (value: any) => {
+      for (let i = 0; i < state.arrayList.length; i++) {
+        treeRef.value.store.nodesMap[state.arrayList[i].id].expanded = value;
+      }
+    };
+    // 关闭修改的在线文档弹框
+    const onCloseEdit = () => {
+      state.showDocumentEdit = false;
+    };
+    const updataView = (row) => {
+      // 修改文档
+      state.showDocumentEdit = true;
+      nextTick(() => {
+        documentEditRef.value.openDialog(row, '/zm/api/v1/system/busConstructionUser/complaintBoxAdd');
+      });
+    };
+    const resizeHandleRight = () => {
+      // 右侧鼠标移动大小
+      const resizeHandles = document.getElementsByClassName('resize-handle');
+      Array.from(resizeHandles).forEach((handle) => {
+        handle.addEventListener('mousedown', startResize);
+      });
+    };
+    const startResize = (event) => {
+      event.preventDefault();
+      let dragElement = document.getElementById('tree_left') as any;
+      let dragElementRight = document.getElementById('list_right');
+      const currentHandle = event.target;
+      const direction = currentHandle.className.split(' ')[1];
+      const startX = event.clientX;
+      const startY = event.clientY;
+      // 左侧移动的盒子大小
+      const startWidth = dragElement.offsetWidth;
+      const startHeight = dragElement.offsetHeight;
+      const startLeft = dragElement.offsetLeft;
+      const startTop = dragElement.offsetTop;
+      // 右侧移动盒子宽度
+      const rightWidth = dragElementRight.offsetWidth;
+      document.addEventListener('mousemove', resize);
+      document.addEventListener('mouseup', stopResize);
+      function resize(event) {
+        const dx = event.clientX - startX;
+        const dy = event.clientY - startY;
+        let width = startWidth;
+        let height = startHeight;
+        let left = startLeft;
+        let top = startTop;
+        let rightWidth1 = rightWidth as any;
+        if (direction.includes('right')) {
+          width = startWidth + dx + 'px';
+          let w = startWidth + dx + 10 + 'px';
+          rightWidth1 = `calc(100% - ${w})`;
+        }
+        if (parseInt(width) <= 0 || parseInt(height) <= 0) return;
+        dragElementRight.style.width = rightWidth1;
+        dragElement.style.width = width;
+        dragElement.style.height = height;
+        dragElement.style.left = left;
+        dragElement.style.top = top;
+      }
+      function stopResize() {
+        document.removeEventListener('mousemove', resize);
+        document.removeEventListener('mouseup', stopResize);
+      }
+    };
+    // 删除文件及文件夹
+    const delFile = (msg, data, cb) => {
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          documentDelete([data.id]).then((res: any) => {
+            if (res.code == 0) {
+              ElMessage.success('删除成功');
+              cb();
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    const onRemove = (node, data) => {
+      const parent = node.parent;
+      const children = parent.data.treeStructureRes || parent.data;
+      const index = children.findIndex((d) => d.id === data.id);
+      let msg = '你确定要删除所选文件夹？';
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const loading = ElLoading.service({
+            lock: true,
+            text: '正在处理中……',
+            background: 'rgba(0, 0, 0, 0.7)',
+            target: '.tree_left'
+          });
+          documentDelete([data.id]).then((res: any) => {
+            if (res.code == 0) {
+              loading.close();
+              ElMessage.success('删除成功');
+              children.splice(index, 1);
+              state.treeList = [...state.treeList];
+              if (data.idStr == state.paramsQuery.idStr) {
+                // 说明此时删除的是右侧列表所在的文件夹
+                state.infoList = [];
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    const editName = (data, title, type) => {
+      ElMessageBox.prompt(title, '温馨提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputErrorMessage: title,
+        inputValue: data.name
+      })
+        .then(({ value }) => {
+          documentEdit({ id: data.id, name: value, type }).then((res) => {
+            if (res.code == 0) {
+              ElMessage({
+                type: 'success',
+                message: '修改成功'
+              });
+              if (type == 2) {
+                getTreeStructureList();
+              } else {
+                getDocumentList();
+              }
+            } else {
+              ElMessage({
+                type: 'error',
+                message: res.message
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    };
+    const onUpdateName = (node, data) => {
+      editName(data, '请输入文件夹名称', 2);
+    };
+    const getDocumentListFileType = (fileType) => {
+      if (fileType == 2) {
+        getDocumentList();
+      } else {
+        getTreeStructureList();
+      }
+    };
+    const onExport = () => {
+      compressedDownload(state.parentRow.filenPath).then((res: any) => {
+        if (res.code == 0) {
+          let fileUrl = res.data.RelativePath;
+          window.open(fileUrl, '_self');
+        }
+      });
+    };
+    return {
+      proxy,
+      filterText,
+      treeRef,
+      documentDetailRef,
+      uploadFilederRef,
+      profileEngineeringRef,
+      recycleBinRef,
+      documentEditRef,
+      onClose,
+      onCloseEdit,
+      handleClick,
+      handleNodeClick,
+      filterFolder,
+      searchInfo,
+      addFile,
+      uploadFile,
+      bigUploadFile,
+      resetQuery,
+      getDocumentList,
+      getDocumentListFileType,
+      handleDelete,
+      onExportView,
+      updateName,
+      getTreeStructureList,
+      updataView,
+      handleView,
+      onRemove,
+      onAppend,
+      onUpdateName,
+      handleCheckedTreeExpand,
+      onExport,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss" scoped>
+.onLine_list {
+  height: 86vh;
+  .set-tool {
+    display: none;
+  }
+  .el-tree-node__content:hover,
+  .el-tree-node__content:active {
+    .set-tool {
+      display: inline-block;
+    }
+  }
+  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #354e67 !important;
+    color: #fff;
+  }
+  .box_info {
+    display: flex;
+    justify-content: space-between;
+  }
+  .pagination-container {
+    padding: 10px 0 !important;
+  }
+  > div {
+    height: 100%;
+    width: 100%;
+  }
+  .tree_left {
+    width: 30%;
+    background-color: #fff;
+    border: 1px solid #dddddd;
+    border-radius: 6px;
+    padding: 6px 0px;
+    position: relative;
+    min-width: 26%;
+    border-right: 6px solid;
+    border-right-color: rgba(204, 230, 255, 0);
+    .resize-handle-right {
+      top: 0;
+      width: 6px;
+      height: 100%;
+      right: -10px;
+      cursor: ew-resize;
+      position: absolute;
+      z-index: 999;
+    }
+    .check_select {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      padding: 4px;
+      border-bottom: 1px solid #f1f1f1;
+      .box_btn {
+        width: 300px;
+        margin: 0 10px 0 20px;
+        position: relative;
+        > span {
+          padding: 4px 10px;
+          background: #67c23a;
+          color: #fff;
+          border-radius: 2px;
+        }
+        .btn {
+          position: absolute;
+          left: 22%;
+          display: none;
+          top: -2px;
+          width: 220px;
+          .el-button {
+            float: left;
+          }
+        }
+      }
+      .box_btn:hover,
+      .box_btn:active {
+        cursor: pointer;
+        .btn {
+          display: block;
+        }
+      }
+    }
+    .file_upload {
+      margin: 2px 0;
+    }
+    .input_left {
+      padding: 6px;
+      box-sizing: border-box;
+      // border-bottom: 1px solid #cbcbcb;
+    }
+  }
+  .list_right {
+    width: 69.5%;
+    background: white;
+    border: 1px solid #ededed;
+    padding: 10px;
+    box-sizing: border-box;
+  }
+  .el-tree {
+    height: calc(80vh - 160px);
+    width: 100%;
+    overflow: auto !important;
+  }
+  // .el-tree-node__children {
+  // 	overflow: visible !important;
+  // }
+}
+</style>
diff --git a/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue b/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue
index e843dc7..f177d8d 100644
--- a/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue
+++ b/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue
@@ -5,18 +5,18 @@
       <!-- <div class="resultIcon"><img src="../../../../assets/icons/svg/successLogo.png" alt="" /></div> -->
       <h2 style="text-align: center; margin-top: 5px; font-weight: bold">施工日志</h2>
       <el-row>
-        <el-col :span="12" style="text-align: left">记录人：{{ safetyInspectionDetail?.createBy }}</el-col>
-        <el-col :span="12" style="text-align: right">记录时间：{{ safetyInspectionDetail?.createTime }}</el-col>
+        <el-col :span="12" style="text-align: left">记录人：{{ safetyInspectionDetail?.createdBy }}</el-col>
+        <el-col :span="12" style="text-align: right">记录时间：{{ safetyInspectionDetail?.createdAt }}</el-col>
       </el-row>
       <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
         <el-descriptions-item label-align="center" label="项目名称" :span="2" class-name="zebra"
           >{{ safetyInspectionDetail?.projectName }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="发生日期" :span="2" label-class-name="white">
-          {{ parseTime(safetyInspectionDetail?.happenDate, '{y}-{m}-{d}') }}
+          {{ parseTime(safetyInspectionDetail?.dateOfOccurrence, '{y}-{m}-{d}') }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" :span="2" label="生产情况记录" class-name="zebra">
-          {{ safetyInspectionDetail?.productionStatus }}
+          {{ safetyInspectionDetail?.condition }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="技术质量安全工作" :span="2" label-class-name="white"
           >{{ safetyInspectionDetail?.technologyQuality }}
@@ -26,102 +26,25 @@
         </el-descriptions-item>
         <el-descriptions-item label-align="center" :span="2" label="附件" label-class-name="white"
           ><el-space wrap>
-            <div v-for="item in checkFileList" :key="item.ossId">
-              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-                <image-preview :src="item.url" width="200px" />
-              </span>
-              <span v-else>
-                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
-                  <span> {{ item.originalName }} </span>
-                </el-link>
-              </span>
-            </div>
-          </el-space>
-        </el-descriptions-item>
-      </el-descriptions>
-      <!-- <el-descriptions border direction="vertical" size="large">
-        <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
-      </el-descriptions>
-      <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
-          >{{ safetyInspectionDetail?.hiddenDanger }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
-          <el-space wrap>
-            <div v-for="item in checkFileList" :key="item.ossId">
-              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-                <image-preview :src="item.url" width="200px" />
-              </span>
-              <span v-else>
-                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
-                  <span> {{ item.originalName }} </span>
-                </el-link>
+            <div>
+              <span>
+                <image-preview :src="'http://58.17.134.85:8920' + safetyInspectionDetail?.path" width="200px" />
               </span>
             </div>
           </el-space>
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
-          <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.status)" finish-status="success">
-            <el-step v-for="item in safety_inspection_type" :key="item.value" :title="item.label" />
-          </el-steps>
-        </el-descriptions-item>
-      </el-descriptions>
-      <el-descriptions border direction="vertical" size="large">
-        <el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
       </el-descriptions>
-      <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="班组" label-class-name="white"
-          >{{ safetyInspectionDetail?.teamName }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="整改日期" label-class-name="white"
-          >{{ safetyInspectionDetail?.rectificationTime }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
-          {{ safetyInspectionDetail?.measure }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
-          <el-space wrap>
-            <div v-for="item in rectificationFileList" :key="item.ossId">
-              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-                <image-preview :src="item.url" width="200px" />
-              </span>
-              <span v-else>
-                <el-link :href="`${item.url}`" :underline="false" target="_blank">
-                  <span> {{ item.originalName }} </span>
-                </el-link>
-              </span>
-            </div>
-          </el-space>
-        </el-descriptions-item>
-      </el-descriptions>
-      <el-descriptions border direction="vertical" size="large">
-        <el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
-      </el-descriptions>
-      <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="复查人" label-class-name="white"
-          >{{ safetyInspectionDetail?.creatorName }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
-          >{{ safetyInspectionDetail?.reviewTime }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
-          >{{ safetyInspectionDetail?.review }}
-        </el-descriptions-item>
-      </el-descriptions> -->
     </div>
   </div>
 
   <!-- </el-card> -->
-  <div class="dialog-footer">
+  <!-- <div class="dialog-footer">
     <div class="btn-item" @click="handleExport">
       <img src="../../../../assets/icons/svg/derived.png" />
       <span>导出</span>
     </div>
-    <!-- <div class="btn-item" v-print="'#printMe'">
-      <img src="../../../../assets/icons/svg/print.png" />
-      <span>打印</span>
-    </div> -->
-  </div>
+    
+  </div> -->
 </template>
 
 <script lang="ts" setup>
@@ -129,7 +52,6 @@ import { getQualityConstructionLog } from '@/api/quality/qualityConstructionLog'
 import { QualityConstructionLogVO, QualityConstructionLogQuery, QualityConstructionLogForm } from '@/api/quality/qualityConstructionLog/types';
 import { dayjs } from 'element-plus';
 import { useUserStoreHook } from '@/store/modules/user';
-import { s } from 'node_modules/vite/dist/node/types.d-aGj9QkWt';
 import { downLoadOss, listByIds } from '@/api/system/oss';
 const safetyInspectionDetail = ref<QualityConstructionLogVO>();
 const checkFileList = ref<any[]>();
@@ -140,19 +62,14 @@ const currentProject = computed(() => userStore.selectedProject);
 interface Props {
   qualityConstructionId?: string | number;
 }
-
 const props = defineProps<Props>();
 
 //获取详情
 const get = async () => {
   const res = await getQualityConstructionLog(props.qualityConstructionId);
-  if (res.data && res.code === 200) {
-    safetyInspectionDetail.value = res.data;
+  if (res.data && res.code === 0) {
+    safetyInspectionDetail.value = res.data.dataEntity;
 
-    if (res.data.fileList) {
-      const checkFileRes = await listByIds(res.data.file.split(','));
-      checkFileList.value = checkFileRes.data;
-    }
     // if (res.data.rectificationFile) {
     //   const rectificationFileRes = await listByIds(res.data.rectificationFile.split(','));
     //   rectificationFileList.value = rectificationFileRes.data;
diff --git a/src/views/quality/qualityConstructionLog/index.vue b/src/views/quality/qualityConstructionLog/index.vue
index 880d3c2..945ec2a 100644
--- a/src/views/quality/qualityConstructionLog/index.vue
+++ b/src/views/quality/qualityConstructionLog/index.vue
@@ -1,13 +1,11 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="发生日期" prop="happenDate">
-              <el-date-picker clearable v-model="queryParams.happenDate" type="date" value-format="YYYY-MM-DD"
-                placeholder="请选择发生日期" />
+            <el-form-item label="发生日期" prop="dateOfOccurrence">
+              <el-date-picker clearable v-model="queryParams.dateOfOccurrence" type="date" value-format="YYYY-MM-DD" placeholder="请选择发生日期" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,35 +19,21 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['quality:qualityConstructionLog:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['quality:qualityConstructionLog:edit']">修改</el-button>
-          </el-col> -->
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['quality:qualityConstructionLog:remove']">删除</el-button>
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['quality:qualityConstructionLog:export']">导出</el-button>
-          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="qualityConstructionLogList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+      <el-table v-loading="loading" :data="qualityConstructionLogList">
         <el-table-column label="序号" align="center" type="index" width="70" />
 
-        <el-table-column label="生产情况" align="center" prop="productionStatus" width="410">
+        <el-table-column label="生产情况" align="center" prop="condition" width="410">
           <template #default="scope">
             <el-tooltip placement="top" effect="dark">
               <template #content>
-                <div class="w-670px">{{ scope.row.productionStatus }}</div>
+                <div class="w-670px">{{ scope.row.condition }}</div>
               </template>
               <el-text truncated>
-                {{ scope.row.productionStatus }}
+                {{ scope.row.condition }}
               </el-text>
             </el-tooltip>
           </template>
@@ -66,26 +50,21 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column label="发生日期" align="center" prop="happenDate" width="180">
+        <el-table-column label="发生日期" align="center" prop="dateOfOccurrence" width="180">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.happenDate, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.dateOfOccurrence, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建者" align="center" prop="createBy" />
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="创建者" align="center" prop="createdBy" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)">详情</el-button>
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['quality:qualityConstructionLog:remove']">
-              删除
-            </el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 详情对话框 -->
     <el-dialog title="施工日志详情" v-model="dialog.visible" width="60vw" append-to-body>
@@ -130,7 +109,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: QualityConstructionLogForm = {
   id: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.goId,
   happenDate: undefined,
   productionStatus: undefined,
   technologyQuality: undefined,
@@ -142,10 +121,10 @@ const data = reactive<PageData<QualityConstructionLogForm, QualityConstructionLo
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.goId,
     happenDate: undefined,
-    orderByColumn: "createTime",
-    isAsc: "desc",
+    orderByColumn: 'createTime',
+    isAsc: 'desc',
     params: {}
   },
   rules: {
@@ -161,8 +140,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listQualityConstructionLog(queryParams.value);
-  qualityConstructionLogList.value = res.rows;
-  total.value = res.total;
+  qualityConstructionLogList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -250,7 +229,7 @@ const handleExport = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
diff --git a/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue b/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
index 7efd667..02b331f 100644
--- a/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
+++ b/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
@@ -2,63 +2,57 @@
   <!-- <el-card v-loading="loading" body-class="printMe"> -->
   <div class="w75% m-a">
     <div id="printMe" class="pos-relative">
-      <div class="resultIcon"><img :src="'../../../../../src/assets/icons/svg/' + inspectionType + '.png'" alt="" />
-      </div>
+      <div class="resultIcon"><img :src="'/image/svg/' + inspectionType + '.png'" alt="" /></div>
       <h2 style="text-align: center; margin-top: 5px; font-weight: bold">整改通知单</h2>
       <el-row>
-        <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.createBy }}</el-col>
-        <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createTime }}</el-col>
+        <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.fill }}</el-col>
+        <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createdAt }}</el-col>
       </el-row>
       <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{
-          safetyInspectionDetail?.projectName }}
+        <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra"
+          >{{ safetyInspectionDetail?.projectName }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="巡检标题" :span="2" label-class-name="white">
           {{ safetyInspectionDetail?.inspectionHeadline }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="整改人" class-name="zebra">
-          {{ safetyInspectionDetail?.correctorName }}
+          {{ safetyInspectionDetail?.abarbeitung }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="整改日期" class-name="zebra">
           {{ safetyInspectionDetail?.rectificationTime }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="巡检类型" label-class-name="white">
-          <dict-tag :options="quality_inspection_check_type" :value="safetyInspectionDetail?.inspectionType" />
+          {{ safetyInspectionDetail?.dictLabel }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="填报人" label-class-name="white">{{
-          safetyInspectionDetail?.createBy }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="填报日期" class-name="zebra">{{ safetyInspectionDetail?.createTime
-        }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="要求回复期限" class-name="zebra">{{
-          parseTime(safetyInspectionDetail?.replyPeriodDate, '{y}-{m}-{d}') }}
+        <el-descriptions-item label-align="center" label="填报人" label-class-name="white">{{ safetyInspectionDetail?.fill }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="填报日期" class-name="zebra">{{ safetyInspectionDetail?.createdAt }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="要求回复期限" class-name="zebra"
+          >{{ parseTime(safetyInspectionDetail?.replyDate, '{y}-{m}-{d}') }}
         </el-descriptions-item>
       </el-descriptions>
       <el-descriptions border direction="vertical" size="large">
         <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">{{
-          safetyInspectionDetail?.inspectionResult }}
+        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
+          >{{ safetyInspectionDetail?.inspectionResult }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
           <el-space wrap>
-            <div v-for="item in checkFileList" :key="item.ossId">
-              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-                <image-preview :src="item.url" width="200px" />
+            <div v-for="item in safetyInspectionDetail?.inspectionccessories" :key="item.id">
+              <span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
+                <image-preview :src="BASE + item.path" width="200px" />
               </span>
               <span v-else>
-                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
-                  <span> {{ item.originalName }} </span>
+                <el-link :href="`${BASE + item.path}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.name }} </span>
                 </el-link>
               </span>
             </div>
           </el-space>
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
-          <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.inspectionStatus)"
-            finish-status="finish">
+          <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.status)" finish-status="finish">
             <el-step v-for="item in quality_inspection_status_type" :key="item.value" :title="item.label" />
           </el-steps>
         </el-descriptions-item>
@@ -77,7 +71,7 @@
                 <image-preview :src="item.url" width="200px" />
               </span>
               <span v-else>
-                <el-link :href="`${item.url}`" :underline="false" type="primary" target="_blank">
+                <el-link :href="`http://58.17.134.85:8920${item.url}`" :underline="false" type="primary" target="_blank">
                   <span> {{ item.originalName }} </span>
                 </el-link>
               </span>
@@ -89,8 +83,8 @@
         <el-descriptions-item label-align="center" label="验证" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="验证结果" label-class-name="white">{{
-          safetyInspectionDetail?.verificationResult }}
+        <el-descriptions-item label-align="center" label="验证结果" label-class-name="white"
+          >{{ safetyInspectionDetail?.verificationResult }}
         </el-descriptions-item>
       </el-descriptions>
     </div>
@@ -98,10 +92,10 @@
 
   <!-- </el-card> -->
   <div class="dialog-footer">
-    <div class="btn-item" @click="handleExport">
+    <!-- <div class="btn-item" @click="handleExport">
       <img src="../../../../assets/icons/svg/derived.png" />
       <span>导出</span>
-    </div>
+    </div> -->
     <div class="btn-item" v-print="'#printMe'">
       <img src="../../../../assets/icons/svg/print.png" />
       <span>打印</span>
@@ -110,9 +104,9 @@
 </template>
 
 <script lang="ts" setup>
-import { getQualityInspection } from '@/api/quality/qualityInspection';
+import { downLoadOss, getQualityInspection } from '@/api/quality/qualityInspection';
 import { QualityInspectionVO } from '@/api/quality/qualityInspection/types';
-import { downLoadOss, listByIds } from '@/api/system/oss';
+import { listByIds } from '@/api/system/oss';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { dayjs } from 'element-plus';
 const { quality_inspection_check_type, quality_inspection_status_type } = toRefs<any>(
@@ -126,11 +120,11 @@ const props = defineProps<Props>();
 const safetyInspectionDetail = ref<QualityInspectionVO>();
 const checkFileList = ref<any[]>();
 const rectificationFileList = ref<any[]>();
-
+const BASE = import.meta.env.VITE_APP_BASE_API_GO;
 //检查状态图片
 const inspectionType = computed(() => {
   let imgName = 'successLogo';
-  if (safetyInspectionDetail.value?.inspectionStatus == '2') imgName = 'rectification';
+  if (safetyInspectionDetail.value?.status == '2') imgName = 'rectification';
   if (safetyInspectionDetail.value?.verificationType == '1') imgName = 'successVerification';
   if (safetyInspectionDetail.value?.verificationType == '2') imgName = 'danggerVerification';
   return imgName;
@@ -139,8 +133,8 @@ const inspectionType = computed(() => {
 //获取详情
 const get = async () => {
   const res = await getQualityInspection(props.qualityInspectionDetailId);
-  if (res.data && res.code === 200) {
-    safetyInspectionDetail.value = res.data;
+  if (res.data && res.code === 0) {
+    safetyInspectionDetail.value = res.data.details;
 
     if (res.data.inspectionFile) {
       const checkFileRes = await listByIds(res.data.inspectionFile.split(','));
@@ -197,7 +191,7 @@ watch(
 }
 
 .dialog-footer {
-  height: 200px;
+  height: 100px;
   display: flex;
 
   flex-direction: column;
diff --git a/src/views/quality/qualityInspection/index.vue b/src/views/quality/qualityInspection/index.vue
index 820bc08..8837f92 100644
--- a/src/views/quality/qualityInspection/index.vue
+++ b/src/views/quality/qualityInspection/index.vue
@@ -1,20 +1,17 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="巡检类型" prop="inspectionType">
               <el-select v-model="queryParams.inspectionType" placeholder="全部" clearable>
-                <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="工单状态" prop="inspectionStatus">
-              <el-select v-model="queryParams.inspectionStatus" placeholder="全部" clearable>
-                <el-option v-for="dict in quality_inspection_status_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+            <el-form-item label="工单状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="全部" clearable>
+                <el-option v-for="dict in quality_inspection_status_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -30,21 +27,21 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"
-              v-hasPermi="['quality:qualityInspection:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['quality:qualityInspection:add']">新增</el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['quality:qualityInspection:edit']"
-              >修改</el-button
-            >
-          </el-col> -->
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['quality:qualityInspection:remove']">删除</el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['quality:qualityInspection:remove']"
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
-              v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -53,10 +50,10 @@
       <el-table v-loading="loading" :data="qualityInspectionList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键id" align="center" prop="id" v-if="false" />
-        <el-table-column label="填报人" align="center" prop="createByName" />
-        <el-table-column label="填报时间" align="center" prop="createTime" width="180">
+        <el-table-column label="填报人" align="center" prop="one" />
+        <el-table-column label="填报时间" align="center" prop="createdAt" width="180">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {hh}:{mm}:{ss}') }}</span>
+            <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d} {hh}:{mm}:{ss}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="巡检标题" align="center" prop="inspectionHeadline" />
@@ -77,52 +74,43 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column label="整改人" align="center" prop="correctorName" />
-        <!-- <el-table-column label="工单状态" align="center" prop="inspectionStatus">
+        <el-table-column label="整改人" align="center" prop="two" />
+        <el-table-column label="处理状态" align="center" prop="status" min-width="100px">
           <template #default="scope">
-            <dict-tag :options="quality_inspection_status_type" :value="scope.row.inspectionStatus" />
+            <template v-if="scope.row.isReply == '1'">
+              <el-tag type="primary" v-if="scope.row.status && scope.row.status == '1'">通知</el-tag>
+              <el-tag type="warning" v-if="scope.row.status && scope.row.status == '2'">整改</el-tag>
+              <el-tag type="success" v-if="scope.row.status && scope.row.status == '3' && scope.row.verificationType == '1'">通过</el-tag>
+              <el-tag type="danger" v-if="scope.row.status && scope.row.status == '3' && scope.row.verificationType == '2'">未通过</el-tag>
+            </template>
+            <template v-if="scope.row.isReply == '2'">
+              <el-tag type="success">通过</el-tag>
+            </template>
           </template>
-        </el-table-column> -->
-        <el-table-column label="备注" align="center" prop="remark" />
+        </el-table-column>
         <!-- <el-table-column label="创建者" align="center" prop="createBy" /> -->
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <!-- <el-tooltip content="验证" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="EditPen"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['quality:qualityInspection:edit']"
-              ></el-button>
-            </el-tooltip> -->
-            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)"
-              v-hasPermi="['quality:qualityInspection:edit']">
+            <el-button
+              link
+              type="primary"
+              v-if="scope.row.status == 2"
+              icon="EditPen"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['quality:qualityInspection:edit']"
+              >验证</el-button
+            >
+            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['quality:qualityInspection:edit']">
               详情
             </el-button>
-            <el-button link type="success"
-              v-if="scope.row.inspectionStatus === '1' || scope.row.verificationType === '2'" icon="Pointer"
-              @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:rectification']">
-              整改
-            </el-button>
-            <el-button link type="warning" icon="SuccessFilled" v-if="scope.row.inspectionStatus === '2'"
-              @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:review']">
-              复查
-            </el-button>
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['quality:qualityInspection:remove']">
-              删除
-            </el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改质量-检查工单对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="700px" append-to-body>
-      <el-form ref="qualityInspectionFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="qualityInspectionFormRef" :model="form" :rules="rules" label-width="80px" v-if="!form.id">
         <el-form-item label="巡检标题" prop="inspectionHeadline">
           <el-input v-model="form.inspectionHeadline" placeholder="请输入巡检标题" />
         </el-form-item>
@@ -131,39 +119,32 @@
         </el-form-item>
         <el-form-item label="巡检类型" prop="inspectionType">
           <el-select v-model="form.inspectionType" placeholder="请选择巡检类型">
-            <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="整改单位" prop="rectificationUnit">
-          <el-select v-model="form.rectificationUnit" placeholder="请选择整改单位">
-            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所在班组" prop="teamId">
-          <el-select v-model="form.teamId" placeholder="请选择所在班组">
-            <el-option v-for="dict in teamOpt" :key="dict.value" :label="dict.label" :value="dict.value"
-              @click="changeForeman(dict.value)"></el-option>
+            <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="整改人" prop="corrector">
-          <el-select v-model="form.corrector" placeholder="请输入整改人" :disabled="!form.teamId">
-            <el-option v-for="dict in foremanOpt" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          <el-select v-model="form.corrector" placeholder="请输入整改人">
+            <el-option v-for="dict in foremanOpt" :key="dict.openid" :label="dict.userName" :value="dict.openid"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否回复" prop="isReply">
-          <el-radio-group v-model="form.isReply">
-            <el-radio v-for="dict in isReply_type" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
+        <el-form-item label="附件" prop="inspectionFile">
+          <file-upload
+            ref="uploadRef"
+            v-model="form.inspectionFile"
+            :limit="1"
+            isGo
+            upload-url="/zm/api/v1/system/busInspectionTicket/add"
+            :data="form"
+            :fileType="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']"
+          />
         </el-form-item>
-        <!-- <el-form-item label="工单状态" prop="inspectionStatus">
-          <el-radio-group v-model="form.inspectionStatus">
-            <el-radio v-for="dict in quality_inspection_status_type" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+      </el-form>
+      <el-form ref="qualityInspectionFormRef" :model="form" :rules="rules" label-width="80px" v-else>
+        <el-form-item label="验证意见" prop="verificationType">
+          <el-radio-group v-model="form.verificationType">
+            <el-radio label="1">通过</el-radio>
+            <el-radio label="2">不通过</el-radio>
           </el-radio-group>
-        </el-form-item> -->
-        <el-form-item label="附件" prop="inspectionFile">
-          <file-upload v-model="form.inspectionFile" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -174,30 +155,7 @@
       </template>
     </el-dialog>
     <el-dialog title="质量工单详情" v-model="dialog.details" width="60vw">
-      <quality-inspection-detail :qualityInspectionDetailId="currentId" />
-    </el-dialog>
-    <el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible"
-      width="500px">
-      <el-form ref="handleFormRef" :model="handleForm" :rules="rules" label-width="120px">
-        <el-form-item label="整改反馈" prop="rectificationResult" v-if="handleType === 'rectification'">
-          <el-input v-model="handleForm.rectificationResult" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="整改附件" prop="rectificationFile" v-if="handleType === 'rectification'">
-          <image-upload v-model="handleForm.qualityInspection" />
-        </el-form-item>
-        <el-form-item label="验证结果" prop="review" v-if="handleType === 'review'">
-          <el-input v-model="handleForm.verificationResult" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="验证类型" prop="reviewType" v-if="handleType === 'review'">
-          <el-select v-model="handleForm.verificationType" placeholder="请选择复查类型">
-            <el-option v-for="dict in review_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleSubmit">确 定</el-button>
-        </el-form-item>
-      </el-form>
+      <quality-inspection-detail :quality-inspection-detail-id="currentId" />
     </el-dialog>
   </div>
 </template>
@@ -205,22 +163,37 @@
 <script setup name="QualityInspection" lang="ts">
 import { listProjectTeamForeman } from '@/api/project/projectTeam';
 import { foremanQuery, ProjectTeamForemanResp } from '@/api/project/projectTeam/types';
-import { dayjs } from 'element-plus';
 
 import {
   listQualityInspection,
   getQualityInspection,
   delQualityInspection,
   addQualityInspection,
-  updateQualityInspection
+  updateQualityInspection,
+  acquisitionOfCorrectivePersonnel
 } from '@/api/quality/qualityInspection';
 import { QualityInspectionVO, QualityInspectionQuery, QualityInspectionForm } from '@/api/quality/qualityInspection/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import QualityInspectionDetail from './component/qualityInspectionDetail.vue';
+import { getDictData } from '@/api/project/goUser';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { quality_inspection_check_type, quality_inspection_status_type, rectification_unit_type, review_type } = toRefs<any>(
-  proxy?.useDict('quality_inspection_check_type', 'quality_inspection_status_type', 'rectification_unit_type', 'review_type')
+const { quality_inspection_check_type, rectification_unit_type } = toRefs<any>(
+  proxy?.useDict('quality_inspection_check_type', 'rectification_unit_type')
 );
+const quality_inspection_status_type = [
+  {
+    label: '通知',
+    value: '1'
+  },
+  {
+    label: '整改',
+    value: '2'
+  },
+  {
+    label: '验证',
+    value: '3'
+  }
+];
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -233,35 +206,23 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const handleForm = ref({})
-const isReply_type = ref([
-  {
-    label: '是',
-    value: 1
-  },
-  {
-    label: '否',
-    value: 2
-  }
-]);
-
+const uploadRef = ref(null);
 const queryFormRef = ref<ElFormInstance>();
 const qualityInspectionFormRef = ref<ElFormInstance>();
-const handleDialogVisible = ref(false)
+
 const dialog = reactive<DialogOption>({
   visible: false,
   details: false,
   title: ''
 });
-const handleType = ref("")
 
 const initFormData: QualityInspectionForm = {
   id: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value?.goId,
   inspectionType: undefined,
   inspectionHeadline: undefined,
   inspectionResult: undefined,
-  inspectionStatus: undefined,
+  status: undefined,
   inspectionFile: undefined,
   teamId: undefined,
   corrector: undefined,
@@ -281,9 +242,9 @@ const data = reactive<PageData<QualityInspectionForm, QualityInspectionQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value?.goId,
     inspectionType: undefined,
-    inspectionStatus: undefined,
+    status: undefined,
     teamId: undefined,
     params: {}
   },
@@ -294,71 +255,21 @@ const data = reactive<PageData<QualityInspectionForm, QualityInspectionQuery>>({
     inspectionHeadline: [{ required: true, message: '巡检标题不能为空', trigger: 'blur' }],
     inspectionResult: [{ required: true, message: '巡检结果不能为空', trigger: 'blur' }],
     teamId: [{ required: true, message: '班组id不能为空', trigger: 'blur' }],
-    isReply: [{ required: true, message: '是否回复不能为空', trigger: 'change' }],
     corrector: [{ required: true, message: '整改人不能为空', trigger: 'blur' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
-const teamOpt = ref([]);
-const foremanOpt = ref([]);
-const teamList = ref<ProjectTeamForemanResp[]>();
 /** 查询质量-检查工单列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listQualityInspection(queryParams.value);
-  qualityInspectionList.value = res.rows;
-  total.value = res.total;
-  // 获取项目班组信息
-  const teamRes = await listProjectTeamForeman(currentProject.value?.id);
-  teamList.value = teamRes.data;
-  teamOpt.value = teamList.value.map((team: ProjectTeamForemanResp) => ({
-    label: team.teamName,
-    value: team.id
-  }));
+  qualityInspectionList.value = res.data.list;
+  console.log('🚀 ~ getList ~ res.data.list:', res.data.list);
+  total.value = res.data.total;
   loading.value = false;
 };
-const handleSubmit = async () => {
-  let flag = false;
-  if (handleType.value == "rectification") {
-    handleForm.value.inspectionStatus = "2";
-    handleForm.value.rectificationTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
-    const { code } = await updateQualityInspection(handleForm.value)
-    if (code == 200) flag = true
-  } else {
-    handleForm.value.inspectionStatus = "3";
-    handleForm.value.verificationTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
-    const { code } = await updateQualityInspection(handleForm.value)
-    if (code == 200) flag = true
-  }
-  if (flag) {
-    ElMessage.success("处理成功")
-    handleDialogVisible.value = false;
-    getList()
-    reset()
-  } else {
-    ElMessage.error("处理失败")
-  }
 
-}
-const handleDialog = (row) => {
-  handleForm.value = {};
-  if (row.inspectionStatus == '1') {
-    handleType.value = "rectification"
-  } else {
-    handleType.value = "review"
-  }
-  handleForm.value.id = row.id;
-  handleDialogVisible.value = true;
-};
-const changeForeman = (value: string) => {
-  const team = teamList.value.filter((team) => team.id === value)[0];
-  foremanOpt.value = team.foremanList?.map((foreman: foremanQuery) => ({
-    label: foreman.foremanName,
-    value: foreman.foremanId
-  }));
-  form.value.corrector = '';
-};
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -391,20 +302,27 @@ const handleSelectionChange = (selection: QualityInspectionVO[]) => {
 };
 
 /** 新增按钮操作 */
-const handleAdd = () => {
+const handleAdd = async () => {
   reset();
+  await getPeople();
   dialog.visible = true;
   dialog.title = '添加质量-检查工单';
 };
 
+const foremanOpt = ref([]);
+const getPeople = async () => {
+  await acquisitionOfCorrectivePersonnel(currentProject.value?.goId).then((res) => {
+    foremanOpt.value = res.data.list;
+  });
+};
+
 /** 验证按钮操作 */
 const handleUpdate = async (row?: QualityInspectionVO) => {
   reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getQualityInspection(_id);
-  Object.assign(form.value, res.data);
+  form.value.id = row?.id;
+  console.log('🚀 ~ handleUpdate ~ form.value.id:', form.value.id);
   dialog.visible = true;
-  dialog.title = '修改质量-检查工单';
+  dialog.title = '验证';
 };
 
 const currentId = ref<string | number>('');
@@ -420,13 +338,21 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateQualityInspection(form.value).finally(() => (buttonLoading.value = false));
+        await updateQualityInspection({ id: form.value.id, verificationType: form.value.verificationType }).finally(
+          () => (buttonLoading.value = false)
+        );
+        proxy?.$modal.msgSuccess('操作成功');
+        dialog.visible = false;
+        getList();
       } else {
-        await addQualityInspection(form.value).finally(() => (buttonLoading.value = false));
+        uploadRef.value.submitUpload().then((res) => {
+          if (res != 'noFile') {
+            proxy?.$modal.msgSuccess('操作成功');
+            dialog.visible = false;
+            getList();
+          }
+        });
       }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
     }
   });
 };
@@ -453,7 +379,7 @@ const handleExport = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
diff --git a/src/views/safety/documentSafetyMeeting/RecyclingStation/index.vue b/src/views/safety/documentSafetyMeeting/RecyclingStation/index.vue
index 7828abc..51fc97e 100644
--- a/src/views/safety/documentSafetyMeeting/RecyclingStation/index.vue
+++ b/src/views/safety/documentSafetyMeeting/RecyclingStation/index.vue
@@ -5,7 +5,11 @@
         <el-form :model="param" ref="queryRef" :inline="true" label-width="100px">
           <el-row>
             <el-col>
-              <el-button type="success" v-hasPermi="['project:project:remove']" :disabled="multiple" @click="onRecyclingStation(null)"
+              <el-button
+                type="success"
+                v-auth="'api/v1/system/documentCompletion/completionDataRecyclingStation'"
+                :disabled="multiple"
+                @click="onRecyclingStation(null, true)"
                 ><el-icon><RefreshRight /></el-icon>批量恢复</el-button
               >
             </el-col>
@@ -15,42 +19,43 @@
       <el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" min-width="30px" />
-        <el-table-column label="文件名称" align="center" prop="fileName" min-width="100px" />
-        <el-table-column label="文件类型" align="center" prop="fileType" min-width="100px">
+        <el-table-column label="文件名称" align="center" prop="name" min-width="100px" />
+        <el-table-column label="文件类型" align="center" prop="type" min-width="100px">
           <template #default="scope">
-            <span>{{ scope.row.fileType == '1' ? '文件' : '文件夹' }}</span>
+            <span>{{ scope.row.type == 1 ? '文件' : '文件夹' }}</span>
           </template> </el-table-column
         ><el-table-column label="文件路径" align="center" min-width="100px">
           <template #default="scope">
-            <span>{{ scope.row.filePath }}</span>
+            <span>{{ scope.row.filenPath }}</span>
           </template>
         </el-table-column>
         <el-table-column label="删除时间" align="center" prop="deletedAt" min-width="100px"> </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding" min-width="100px" fixed="right">
           <template #default="scope">
-            <el-button type="success" v-hasPermi="['project:project:remove']" link @click="onRecyclingStation(scope.row)"
+            <el-button
+              type="success"
+              v-auth="'api/v1/system/documentCompletion/completionDataRecyclingStation'"
+              link
+              @click="onRecyclingStation(scope.row)"
               ><el-icon><RefreshRight /></el-icon>恢复</el-button
             >
           </template>
         </el-table-column>
       </el-table>
-      <!-- <pagination v-show="total > 0" :total="total" v-model:page="param.pageNum" v-model:limit="param.pageSize" @pagination="getDocumentDataList" /> -->
+      <pagination v-show="total > 0" :total="total" v-model:page="param.pageNum" v-model:limit="param.pageSize" @pagination="documentList" />
     </el-card>
   </div>
 </template>
 <script lang="ts">
 import { toRefs, reactive, ref, defineComponent, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
-import { useUserStoreHook } from '@/store/modules/user';
 
-// 获取用户 store
-const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
-const currentProject = computed(() => userStore.selectedProject);
 import { documentRecycleBinList, completionDataRecyclingStation } from '@/api/safety/documentSafetyMeeting';
+import { useUserStoreHook } from '@/store/modules/user';
 export default defineComponent({
   name: 'index',
   setup() {
+    const stores = useUserStoreHook();
     const { proxy } = <any>getCurrentInstance();
     const loading = ref(false);
     const queryRef = ref();
@@ -60,7 +65,7 @@ export default defineComponent({
       tableData: [],
       param: {
         type: 2,
-        projectId: currentProject.value?.id
+        projectId: stores.selectedProject.goId
       },
       total: 0,
       ids: [] //所选择的文件
@@ -69,11 +74,9 @@ export default defineComponent({
     const getDocumentDataList = () => {
       loading.value = true;
       documentRecycleBinList(state.param).then((res: any) => {
-        let list = res.rows ?? [];
+        let list = res.data.list ?? [];
         state.tableData = list;
-        console.log('🚀 ~ documentRecycleBinList ~ state.tableData:', state.tableData);
-
-        state.total = res.total;
+        state.total = res.data.total;
         loading.value = false;
       });
     };
@@ -101,13 +104,16 @@ export default defineComponent({
             text: '正在恢复中……',
             background: 'rgba(0, 0, 0, 0.7)'
           });
-          completionDataRecyclingStation(ids).then((res) => {
+          completionDataRecyclingStation({
+            ids,
+            type: 1
+          }).then((res) => {
             loading.close();
-            if (res.code == 200) {
+            if (res.code == 0) {
               getDocumentDataList();
               ElMessage.success('操作成功');
             } else {
-              ElMessage.error(res.msg);
+              ElMessage.error(res.message);
             }
           });
         })
diff --git a/src/views/safety/documentSafetyMeeting/index.vue b/src/views/safety/documentSafetyMeeting/index.vue
index a54ea91..4016299 100644
--- a/src/views/safety/documentSafetyMeeting/index.vue
+++ b/src/views/safety/documentSafetyMeeting/index.vue
@@ -1,36 +1,49 @@
 <template>
-  <div class="documentCompletion-data">
-    <el-tabs v-model="activeName" class="p-4" @tab-click="handleClick">
+  <div class="documentCompletion-data p-2">
+    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="文件夹" name="first">
-        <el-button type="success" :disabled="toolStart" @click="handleFile(3)"><el-icon>
-            <Plus />
-          </el-icon>新建文件夹</el-button>
-        <el-button type="primary" :disabled="toolStart" @click="handleFile(2)"><el-icon>
-            <Upload />
-          </el-icon>上传文件</el-button>
+        <el-card>
+          <el-row>
+            <el-col :span="2" class="colBlock">
+              <el-button
+                type="success"
+                v-auth="'api/v1/system/documentSafetyMeeting/safetyNewFolderData'"
+                :disabled="toolStart"
+                @click="handleFile(3)"
+                ><el-icon><Plus /></el-icon>新建文件夹</el-button
+              >
+            </el-col>
+            <el-col :span="2" class="colBlock">
+              <el-button type="primary" v-auth="'api/v1/system/documentSafetyMeeting/add'" :disabled="toolStart" @click="handleFile(2)"
+                ><el-icon><Upload /></el-icon>上传文件</el-button
+              >
+            </el-col>
+          </el-row>
+        </el-card>
         <el-card style="margin-top: 10px">
           <div class="breadcrumb-img">
             <el-breadcrumb>
               <el-breadcrumb-item @click="onBreadcrumb(item)" v-for="(item, i) of breadcrumbList" :key="i">
-                <span title="点击打开文件夹" style="cursor: pointer">{{ item.fileName }}</span>
+                <span title="点击打开文件夹" style="cursor: pointer">{{ item.name }}</span>
               </el-breadcrumb-item>
             </el-breadcrumb>
             <div class="tool-All">
               <div v-if="!toolStart">
-                <el-button type="primary" v-hasPermi="['project:project:remove']" @click="onBatchAll">
-                  <el-icon>
-                    <Menu />
-                  </el-icon>批量操作</el-button>
+                <el-button type="primary" v-auth="'api/v1/system/documentSafetyMeeting/delete'" @click="onBatchAll">
+                  <el-icon><Menu /></el-icon>批量操作</el-button
+                >
               </div>
               <div v-if="toolStart">
                 <el-button type="warning" @click="onBatchAll">
                   <el-icon>
-                    <Tools />
-                  </el-icon>取消操作</el-button>
+                    <Tools /> </el-icon
+                  >取消操作</el-button
+                >
                 <el-button type="danger" @click="onDeleteAll">
                   <el-icon>
-                    <Delete />
-                  </el-icon>删除</el-button>
+                    <Delete /> </el-icon
+                  >删除</el-button
+                >
               </div>
             </div>
           </div>
@@ -41,14 +54,22 @@
               <el-col :span="2" v-for="(item, i) of fileList" :key="i">
                 <div :class="{ file_style: true }">
                   <div @click="onNav(item)" title="点击打开文件" @contextmenu="onContextmenu($event, item, i)">
-                    <img src="../../../assets/icons/svg/file1.png" v-if="item.fileType == '2'" alt="" />
-                    <img src="../../../assets/icons/svg/file.png" v-else-if="item.fileType == '1'" alt="" />
-                    <el-image v-else-if="item.fileType == '3'" style="width: 100%; height: 100%" :src="item.filePath"
-                      :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :initial-index="4"
-                      :preview-src-list="[item.filenPathCoding]" fit="cover" />
-                    <img :src="'/icon/' + item.fileType + '.png'" v-else />
+                    <img src="@/assets/icons/file1.png" v-if="item.suffix == 'folder'" alt="" />
+                    <img src="@/assets/icons/file.png" v-else-if="item.suffix == 'file'" alt="" />
+                    <el-image
+                      v-else-if="item.suffix == 'image'"
+                      style="width: 100%; height: 100%"
+                      :src="'http://58.17.134.85:8920' + item.filenPathCoding"
+                      :zoom-rate="1.2"
+                      :max-scale="7"
+                      :min-scale="0.2"
+                      :initial-index="4"
+                      :preview-src-list="['http://58.17.134.85:8920' + item.filenPathCoding]"
+                      fit="cover"
+                    />
+                    <img :src="'/image/' + item.suffix.replace('.', '').toUpperCase() + '.png'" v-else />
                   </div>
-                  <span @click="onFileName(item)" title="点击重命名">{{ item.fileName }}</span>
+                  <span @click="onFileName(item)" title="点击重命名">{{ item.name }}</span>
                   <div :class="{ fileActive: toolStart }" v-if="toolStart" @click="onToolAll(item)"></div>
                   <div class="checkbox-box" v-if="toolStart">
                     <el-checkbox v-model="item.checkbox" size="large" />
@@ -58,7 +79,7 @@
             </el-row>
             <el-empty :image-size="200" description="暂无文件" v-else />
             <div class="right_box" id="right_box">
-              <div v-for="(item, i) of list" :key="i" @click="item.callback($event)">
+              <div v-for="(item, i) of list" :key="i" v-auth="item.auth" @click="item.callback($event)">
                 {{ item.name }}
               </div>
             </div>
@@ -69,6 +90,7 @@
         <RecyclingStation ref="RecyclingStationRef"></RecyclingStation>
       </el-tab-pane>
     </el-tabs>
+    <bigUploader></bigUploader>
   </div>
 </template>
 <script lang="ts">
@@ -81,15 +103,12 @@ import {
   documentCompletionEdit,
   newFolder,
   uniFileDownload
-} from '@/api/safety/documentSafetyMeeting/index';
-import { useUserStoreHook } from '@/store/modules/user';
+} from '@/api/safety/documentSafetyMeeting';
 
-// 获取用户 store
-const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
-const currentProject = computed(() => userStore.selectedProject);
 // 回收站
-import RecyclingStation from '@/views/safety/documentSafetyMeeting/RecyclingStation/index.vue';
+import RecyclingStation from './RecyclingStation/index.vue';
+import { useUserStoreHook } from '@/store/modules/user';
+const stores = useUserStoreHook();
 export default defineComponent({
   name: 'index',
   components: {
@@ -99,35 +118,35 @@ export default defineComponent({
     const { proxy } = <any>getCurrentInstance();
     const RecyclingStationRef = ref();
     // 字典选项数据
-    const { } = proxy.useDict();
+    const {} = proxy.useDict();
     // 文件下载
-    const onExport = (event) => {
+    const onExport = (event, item) => {
       event.stopPropagation();
-      // 文件下载 state.typeFile: 2、文件夹 1、文件
-      if (state.typeFile == '2') {
+      // 文件下载 state.typeFile: 1、文件夹 2、文件
+      if (state.typeFile == 1) {
         window.open(state.relativePath, '_black');
       } else {
         uniFileDownload({ relativePath: state.relativePath, type: state.typeFile }).then((res) => {
-          if (res.code == 200) {
+          if (res.code == 0) {
             window.open(res.data.Path, '_black');
           }
         });
       }
     };
     // 文件删除
-    const onDeleteFile = (event) => {
+    const onDeleteFile = (event, item) => {
       event.stopPropagation();
       setDel([state.delId]);
     };
     const state = reactive({
       fileList: [],
       activeName: 'first',
-      breadcrumbList: [{ id: 0, fileName: '目录' }], //菜单列表
-      projectId: currentProject.value?.id,
+      breadcrumbList: [{ id: 0, name: '目录' }], //菜单列表
+      projectId: stores.selectedProject.goId,
       parentPid: '0', //父级的id 默认为0
       fileType: 0, //文件 或压缩文件
       list: [
-        { id: 1, name: '文件下载', callback: onExport, auth: 'api/v1/system/documentSafetyMeeting/safetyDataUniFileDownload' },
+        // { id: 1, name: '文件下载', callback: onExport, auth: 'api/v1/system/documentSafetyMeeting/safetyDataUniFileDownload' },
         { id: 2, name: '文件删除', callback: onDeleteFile, auth: 'api/v1/system/documentSafetyMeeting/delete' }
       ],
       relativePath: '', //文件下载需要相对路径
@@ -151,7 +170,6 @@ export default defineComponent({
       // 默认第一级 父级pid为0
       getdocumentCompletionTreeStructure();
       // 压缩文件上传
-
       proxy.mittBus.on('bigUploader.uploadFileSuccess' + 1010, (res: any) => {
         const { filename, totalSize, url, identifier, fileType } = res;
         let arr = filename.split('.');
@@ -164,15 +182,17 @@ export default defineComponent({
         }
         let obj = {
           filePath: {
-            url,
+            url: '/file/' + url,
             name: filename,
             size: totalSize,
             fileType: '.' + fileType1 //后缀名
           },
-          file: ''
+          fileType: state.fileType,
+          pid: state.parentPid == 0 ? '' : state.parentPid,
+          projectId: state.projectId
         };
         documentCompletionAdd(obj).then((res: any) => {
-          if (res.code == 200) {
+          if (res.code == 0) {
             ElMessage({
               type: 'success',
               message: '上传成功'
@@ -197,16 +217,32 @@ export default defineComponent({
         text: '正在查询文件……',
         background: 'rgba(0, 0, 0, 0.7)'
       });
-      documentCompletionTreeStructure({ projectId: currentProject.value?.id, pid: state.parentPid }).then((res: any) => {
+      documentCompletionTreeStructure({ projectId: state.projectId, pid: state.parentPid }).then((res: any) => {
         loading.close();
-        if (res.code == 200) {
-          state.fileList = res.data || [];
+        if (res.code == 0) {
+          state.fileList = res.data.list || [];
           if (state.fileList.length) {
             state.fileList.map((item) => {
-              return {
-                ...item,
-                checkbox: false
-              };
+              item.checkbox = false;
+              item.name = item.name + item.suffix;
+              item.suffix = item.suffix.slice(1).toUpperCase();
+
+              // 截取后缀
+              if (item.filenPathCoding.indexOf('.') != -1) {
+                let str = item.filenPathCoding.slice(item.filenPathCoding.indexOf('.') + 1);
+                if (state.imageType.includes(str)) {
+                  // 图片文件格式
+                  item.suffix = 'image';
+                } else {
+                  if (!window['$ICONLIST'].includes(item.suffix)) {
+                    item.suffix = 'file';
+                  }
+                }
+              } else {
+                // 当没得后缀的时候 默认未文件夹
+                item.suffix = 'folder';
+              }
+              return item;
             });
           }
         }
@@ -222,8 +258,8 @@ export default defineComponent({
         })
           .then(({ value }) => {
             // pid 父级
-            newFolder({ fileName: value, pid: state.parentPid == '0' ? '' : state.parentPid, projectId: state.projectId }).then((res: any) => {
-              if (res.code == 200) {
+            newFolder({ fileName: value, pid: state.parentPid == 0 ? '' : state.parentPid, projectId: state.projectId }).then((res: any) => {
+              if (res.code == 0) {
                 getdocumentCompletionTreeStructure();
                 ElMessage({
                   type: 'success',
@@ -232,12 +268,12 @@ export default defineComponent({
               } else {
                 ElMessage({
                   type: 'error',
-                  message: res.data
+                  message: res.message
                 });
               }
             });
           })
-          .catch(() => { });
+          .catch(() => {});
       } else {
         // 竣工图
         proxy.mittBus.emit('bigUploader.uploadFile', { type: 100, types: 1010, accept: [] });
@@ -250,12 +286,12 @@ export default defineComponent({
       // 图片格式 jpg、png、jpeg、
       // word文档格式:docx、doc、pdf、xls、xlsx、pptx、ppt
       // 其他全文件夹
-      if (item.fileType == '3') {
+      if (item.suffix == 'image') {
         // 可以预览图片
         return;
-      } else if (item.fileType == '2') {
+      } else if (item.suffix == 'folder') {
         // 打开文件夹
-        state.parentPid = item.id;
+        state.parentPid = item.idStr;
         state.breadcrumbList.push(item); //路径设置
         state.fileList = [];
         // 获取对应文件夹的数据
@@ -275,7 +311,7 @@ export default defineComponent({
         .then(({ value }) => {
           // 确定
           documentCompletionEdit({ id: item.id, name: value, type: item.type }).then((res: any) => {
-            if (res.code == 200) {
+            if (res.code == 0) {
               item.name = value;
               getdocumentCompletionTreeStructure();
               ElMessage({
@@ -290,7 +326,7 @@ export default defineComponent({
             }
           });
         })
-        .catch(() => { });
+        .catch(() => {});
     };
     const handleClick = (val) => {
       if (state.activeName == 'second') {
@@ -300,9 +336,9 @@ export default defineComponent({
       }
     };
     const onBreadcrumb = (item) => {
-      if (item.fileName == '目录') {
+      if (item.name == '目录') {
         state.parentPid = '0';
-        state.breadcrumbList = [{ id: 0, fileName: '目录' }]; //菜单列表
+        state.breadcrumbList = [{ id: 0, name: '目录' }]; //菜单列表
         // 最初目录
         getdocumentCompletionTreeStructure();
       } else {
@@ -310,15 +346,15 @@ export default defineComponent({
         let array = state.breadcrumbList;
         for (let index = 0; index < array.length; index++) {
           arr.push(array[index]);
-          if (array[index].fileName == item.fileName) {
+          if (array[index].name == item.name) {
             break;
           }
         }
         state.breadcrumbList = arr;
         // 通过 当前点击的文件进行获取数据
         // 重复点击不用再次获取
-        if (item.id == state.parentPid) return;
-        state.parentPid = item.id;
+        if (item.idStr == state.parentPid) return;
+        state.parentPid = item.idStr;
         getdocumentCompletionTreeStructure();
       }
     };
@@ -338,20 +374,18 @@ export default defineComponent({
         type: 'warning'
       })
         .then(() => {
-          console.log(ids);
-
-          documentCompletionDelete(ids).then((res) => {
-            if (res.code == 200) {
+          documentCompletionDelete({ ids }).then((res) => {
+            if (res.code == 0) {
               let box = document.getElementById('right_box');
               box.style.display = 'none'; //显示div盒子
               ElMessage.success('删除成功');
               getdocumentCompletionTreeStructure();
             } else {
-              ElMessage.error(res.msg);
+              ElMessage.error(res.message);
             }
           });
         })
-        .catch(() => { });
+        .catch(() => {});
     };
     // 批量删除
     const onDeleteAll = () => {
@@ -375,7 +409,7 @@ export default defineComponent({
       row.checkbox = !row.checkbox;
     };
     const onContextmenu = (event, item, i) => {
-      state.typeFile = item.fileType;
+      state.typeFile = item.type;
       state.relativePath = item.filenPath;
       state.delId = item.id;
       let len = (100 / 12) * (i % 12) + 4 + '%';
@@ -420,7 +454,7 @@ export default defineComponent({
       display: flex;
       align-items: center;
 
-      >div {
+      > div {
         display: flex;
         align-items: center;
       }
@@ -442,14 +476,13 @@ export default defineComponent({
       z-index: 999;
       background-color: rgb(0 0 0 / 56%);
       width: 120px;
-      height: 100px;
+      height: 50px;
       top: 0;
       left: 0;
       display: none;
       border-radius: 6px;
-      padding: 14px 4px;
-
-      >div {
+      padding: 4px 4px;
+      > div {
         font-size: 16px;
         font-weight: bold;
         color: #fff;
@@ -459,7 +492,7 @@ export default defineComponent({
         border-radius: 5px;
       }
 
-      >div:hover {
+      > div:hover {
         background-color: rgb(0 0 0 / 80%);
       }
     }
@@ -476,12 +509,12 @@ export default defineComponent({
       position: relative;
       margin-bottom: 10px;
 
-      >div {
+      > div {
         width: 100%;
         // height: 70%;
         height: 80px;
 
-        >img {
+        > img {
           width: 100%;
           height: 100%;
         }
@@ -494,7 +527,7 @@ export default defineComponent({
         z-index: 1000;
       }
 
-      >span {
+      > span {
         font-size: 12px;
         width: 100%;
         display: block;
diff --git a/src/views/safety/knowledgeDocument/component/documentsDeails.vue b/src/views/safety/knowledgeDocument/component/documentsDeails.vue
index 433d58f..18b34f5 100644
--- a/src/views/safety/knowledgeDocument/component/documentsDeails.vue
+++ b/src/views/safety/knowledgeDocument/component/documentsDeails.vue
@@ -3,8 +3,8 @@
     <div class="move_pop" id="detial_pop">
       <!-- <span>{{ title }}</span> -->
       <div class="box">
-        <img v-if="type == 2" src="../icon/suo.png" @click="onFull(1)" />
-        <img v-else src="../icon/full.png" @click="onFull(2)" />
+        <img v-if="type == 2" src="/image/suo.png" @click="onFull(1)" />
+        <img v-else src="/image/full.png" @click="onFull(2)" />
         <span class="close" @click="onClose">✖</span>
       </div>
     </div>
diff --git a/src/views/safety/knowledgeDocument/component/documentsEdit.vue b/src/views/safety/knowledgeDocument/component/documentsEdit.vue
index 3a0754b..d282d99 100644
--- a/src/views/safety/knowledgeDocument/component/documentsEdit.vue
+++ b/src/views/safety/knowledgeDocument/component/documentsEdit.vue
@@ -3,8 +3,8 @@
     <div class="move_pop" id="detial_edit">
       <!-- <span>{{ title }}</span> -->
       <div class="box">
-        <img v-if="type == 2" src="../icon/full.png" @click="onFull(1)" />
-        <img v-else src="../icon/suo.png" @click="onFull(2)" />
+        <img v-if="type == 2" src="/image/full.png" @click="onFull(1)" />
+        <img v-else src="/image/suo.png" @click="onFull(2)" />
         <span class="close" @click="onClose">✖</span>
       </div>
     </div>
diff --git a/src/views/safety/knowledgeDocument/index.vue b/src/views/safety/knowledgeDocument/index.vue
index 904da92..398c391 100644
--- a/src/views/safety/knowledgeDocument/index.vue
+++ b/src/views/safety/knowledgeDocument/index.vue
@@ -127,7 +127,7 @@
       <el-image-viewer
         ref="imageRef"
         style="width: 100%; height: 100%"
-        :url-list="[imgUrl]"
+        :url-list="['http://58.17.134.85:8920' + imgUrl]"
         v-if="imgUrl"
         show-progress
         fit="cover"
diff --git a/src/views/safety/recognizeRecord/index.vue b/src/views/safety/recognizeRecord/index.vue
index 84bfca0..95c7cad 100644
--- a/src/views/safety/recognizeRecord/index.vue
+++ b/src/views/safety/recognizeRecord/index.vue
@@ -4,22 +4,19 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="类别" prop="recordCategory">
-              <el-select v-model="queryParams.recordCategory" placeholder="请选择类别" clearable>
+            <el-form-item label="类别" prop="tourCategory">
+              <el-select v-model="queryParams.tourCategory" placeholder="请选择类别" clearable>
                 <el-option v-for="dict in recordCategoryType" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="类型" prop="violationType">
-              <el-select v-model="queryParams.violationType" placeholder="请选择违章类型" clearable>
-                <el-option v-for="dict in violation_level_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="违章类型" prop="tourType">
+              <el-select v-model="queryParams.tourType" placeholder="全部" clearable>
+                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.key" :label="dict.value" :value="dict.key" />
               </el-select>
             </el-form-item>
-            <el-form-item label="故障描述" prop="description">
-              <el-input v-model="queryParams.description" placeholder="请输入故障描述" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="创建时间" prop="createTime">
-              <el-date-picker clearable v-model="queryParams.createTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择创建时间" />
-            </el-form-item>
+            <!-- <el-form-item label="故障描述" prop="describe">
+              <el-input v-model="queryParams.describe" placeholder="请输入故障描述" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -30,79 +27,39 @@
     </transition>
 
     <el-card shadow="never">
+      <el-row :gutter="10" class="mb8">
+        <el-button type="danger" @click="handleDelete()" plain icon="Delete" :disabled="multiple">删除</el-button>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+
       <el-table v-loading="loading" :data="recognizeRecordList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键id" align="center" prop="id" v-if="false" />
-        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备名称" align="center" prop="sxtName" />
         <el-table-column label="识别类别" align="center" prop="recordCategory">
           <template #default="scope">
             {{ scope.row.recordCategory === '1' ? '无人机识别' : '监控拍摄' }}
           </template>
         </el-table-column>
-        <el-table-column label="违章类型" align="center" prop="violationType">
+        <el-table-column label="违章类型" align="center">
           <template #default="scope">
-            <dict-tag :options="violation_level_type" :value="scope.row.violationType" />
+            <span>{{ filterRiskTourType(scope.row.tourType) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="图片路径" align="center" prop="picture" width="100">
           <template #default="scope">
-            <image-preview :src="scope.row.picture" :width="50" :height="50" />
+            <image-preview :src="'http://58.17.134.85:8920' + scope.row.picture" :width="50" :height="50" />
           </template>
         </el-table-column>
-        <el-table-column label="故障描述" align="center" prop="description" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <el-table-column label="故障描述" align="center" prop="describe" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" width="180"> </el-table-column>
+        <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:recognizeRecord:remove']"
-              >删除</el-button
-            >
+            <el-button type="danger" link icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改识别记录对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="recognizeRecordFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="设备序列号" prop="deviceSerial">
-          <el-input v-model="form.deviceSerial" placeholder="请输入设备序列号" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="deviceName">
-          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="违章类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违章类型">
-            <el-option v-for="dict in violation_level_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="图片路径" prop="picture">
-          <image-upload v-model="form.picture" />
-        </el-form-item>
-        <el-form-item label="违规数量" prop="num">
-          <el-input v-model="form.num" placeholder="请输入违规数量" />
-        </el-form-item>
-        <el-form-item label="故障描述" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -110,6 +67,7 @@
 import { listRecognizeRecord, getRecognizeRecord, delRecognizeRecord, addRecognizeRecord, updateRecognizeRecord } from '@/api/safety/recognizeRecord';
 import { RecognizeRecordVO, RecognizeRecordQuery, RecognizeRecordForm } from '@/api/safety/recognizeRecord/types';
 import { useUserStoreHook } from '@/store/modules/user';
+import { getDictData } from '@/api/project/goUser/index';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { violation_level_type } = toRefs<any>(proxy?.useDict('violation_level_type'));
@@ -132,7 +90,7 @@ const recognizeRecordFormRef = ref<ElFormInstance>();
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-
+const safety_inspection_violation_type = ref([]); // 违章类型
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -140,7 +98,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: RecognizeRecordForm = {
   id: undefined,
-  projectId: undefined,
+  projectId: currentProject.value.goId,
   deviceSerial: undefined,
   deviceName: undefined,
   recordCategory: undefined,
@@ -155,7 +113,7 @@ const data = reactive<PageData<RecognizeRecordForm, RecognizeRecordQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: undefined,
+    projectId: currentProject.value.goId,
     deviceName: undefined,
     recordCategory: undefined,
     violationType: undefined,
@@ -174,11 +132,15 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listRecognizeRecord(queryParams.value);
-  recognizeRecordList.value = res.rows;
-  total.value = res.total;
+  recognizeRecordList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
-
+// 获取字典
+const getDictDataList = async () => {
+  const res1 = await getDictData('tour_type');
+  safety_inspection_violation_type.value = res1.data.values;
+};
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -243,7 +205,17 @@ const submitForm = () => {
     }
   });
 };
-
+const filterRiskTourType = (val: any) => {
+  let label = '';
+  if (val) {
+    safety_inspection_violation_type.value.forEach((item: any) => {
+      if (val == item.key) {
+        label = item.value;
+      }
+    });
+  }
+  return label;
+};
 /** 删除按钮操作 */
 const handleDelete = async (row?: RecognizeRecordVO) => {
   const _ids = row?.id || ids.value;
@@ -265,14 +237,16 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getDictDataList();
   getList();
 });
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
+    getDictDataList();
     getList();
   }
 );
diff --git a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
index b3be56d..f688572 100644
--- a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
+++ b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
@@ -2,32 +2,29 @@
   <!-- <el-card v-loading="loading" body-class="printMe"> -->
   <div class="w75% m-a">
     <div id="printMe" class="pos-relative">
-      <div class="resultIcon"><img :src="'../../../../../src/assets/icons/svg/' + inspectionType + '.png'" alt="" />
-      </div>
+      <div class="resultIcon"><img :src="'/image/svg/' + inspectionType + '.png'" alt="" /></div>
       <h2 style="text-align: center; margin-top: 5px; font-weight: bold">安全生产监督检查通知书</h2>
       <el-row>
-        <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.creatorName }}</el-col>
-        <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createTime }}</el-col>
+        <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.fill }}</el-col>
+        <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createdAt }}</el-col>
       </el-row>
       <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{ currentProject?.name }}
-        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{ currentProject?.name }} </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
-          <dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
+          {{ safetyInspectionDetail?.studyTypeName }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
-          <dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
+          {{ safetyInspectionDetail?.tourTypeName }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="检查时间" class-name="zebra">{{ safetyInspectionDetail?.checkTime
-        }} </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.creatorName
-        }} </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="整改人" label-class-name="white">{{
-          safetyInspectionDetail?.correctorName }}
+        <el-descriptions-item label-align="center" label="检查时间" class-name="zebra">{{ safetyInspectionDetail?.checkTime }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.abarbeitung }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="整改人" label-class-name="white"
+          >{{ safetyInspectionDetail?.abarbeitung }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
           <span v-if="safetyInspectionDetail?.rectificationDeadline">{{
-            dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}</span>
+            dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日')
+          }}</span>
           <span v-else></span>
         </el-descriptions-item>
       </el-descriptions>
@@ -35,11 +32,23 @@
         <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">{{
-          safetyInspectionDetail?.hiddenDanger }}
+        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
+          >{{ safetyInspectionDetail?.inspectionResult }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
           <el-space wrap>
+            <div v-for="item in safetyInspectionDetail.checkAttachment" :key="item.id">
+              <span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
+                <image-preview :src="'http://58.17.134.85:8920' + item.path" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${'http://58.17.134.85:8920' + item.path}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.name }} </span>
+                </el-link>
+              </span>
+            </div>
+          </el-space>
+          <!-- <el-space wrap>
             <div v-for="item in checkFileList" :key="item.ossId">
               <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
                 <image-preview :src="item.url" width="200px" />
@@ -50,7 +59,7 @@
                 </el-link>
               </span>
             </div>
-          </el-space>
+          </el-space> -->
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
           <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.status)" finish-status="finish">
@@ -62,24 +71,24 @@
         <el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="班组" label-class-name="white">{{
-          safetyInspectionDetail?.rectificationName }}
+        <el-descriptions-item label-align="center" label="班组" label-class-name="white"
+          >{{ safetyInspectionDetail?.rectificationName }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="整改日期" label-class-name="white">{{
-          safetyInspectionDetail?.rectificationTime }}
+        <el-descriptions-item label-align="center" label="整改日期" label-class-name="white"
+          >{{ safetyInspectionDetail?.rectificationTime }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
           {{ safetyInspectionDetail?.measure }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
           <el-space wrap>
-            <div v-for="item in rectificationFileList" :key="item.ossId">
-              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-                <image-preview :src="item.url" width="200px" />
+            <div v-for="item in safetyInspectionDetail.abarbeitungAttachment" :key="item.id">
+              <span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
+                <image-preview :src="'http://58.17.134.85:8920' + item.path" width="200px" />
               </span>
               <span v-else>
-                <el-link :href="`${item.url}`" :underline="false" target="_blank">
-                  <span> {{ item.originalName }} </span>
+                <el-link :href="`${'http://58.17.134.85:8920' + item.path}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.name }} </span>
                 </el-link>
               </span>
             </div>
@@ -90,21 +99,19 @@
         <el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="复查人" label-class-name="white">{{
-          safetyInspectionDetail?.creatorName }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="复查日期" label-class-name="white">{{
-          safetyInspectionDetail?.reviewTime }}
+        <el-descriptions-item label-align="center" label="复查人" label-class-name="white">{{ safetyInspectionDetail?.fill }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
+          >{{ safetyInspectionDetail?.reviewTime }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white">{{
-          safetyInspectionDetail?.review }}
+        <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
+          >{{ safetyInspectionDetail?.review }}
         </el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
 
   <!-- </el-card> -->
-  <div class="dialog-footer">
+  <!-- <div class="dialog-footer">
     <div class="btn-item" @click="handleExport">
       <img src="../../../../assets/icons/svg/derived.png" />
       <span>导出</span>
@@ -113,7 +120,7 @@
       <img src="../../../../assets/icons/svg/print.png" />
       <span>打印</span>
     </div>
-  </div>
+  </div> -->
 </template>
 
 <script setup lang="ts">
@@ -138,7 +145,7 @@ const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const props = defineProps<Props>();
 const loading = ref<boolean>(false);
-const safetyInspectionDetail = ref<SafetyInspectionVO>();
+const safetyInspectionDetail = ref({ checkAttachment: [] });
 const checkFileList = ref<OssVO[]>();
 const rectificationFileList = ref<OssVO[]>();
 //检查状态图片
@@ -154,18 +161,12 @@ const inspectionType = computed(() => {
 
 const get = async () => {
   loading.value = true;
-  const res = await getSafetyInspection(props.safetyInspectionId);
-  if (res.data && res.code === 200) {
+  const res = await getSafetyInspection({ id: props.safetyInspectionId });
+  if (res.data && res.code === 0) {
     safetyInspectionDetail.value = res.data;
-    if (res.data.checkFile) {
-      const checkFileRes = await listByIds(res.data.checkFile.split(','));
-      checkFileList.value = checkFileRes.data;
-    }
-    if (res.data.rectificationFile) {
-      const rectificationFileRes = await listByIds(res.data.rectificationFile.split(','));
-      rectificationFileList.value = rectificationFileRes.data;
-    }
+    console.log('🚀 ~ get ~ res.data:', res.data);
   }
+
   loading.value = false;
 };
 
@@ -214,7 +215,7 @@ watch(
 }
 
 .dialog-footer {
-  height: 200px;
+  height: 100px;
   display: flex;
 
   flex-direction: column;
diff --git a/src/views/safety/safetyInspection/index.vue b/src/views/safety/safetyInspection/index.vue
index 1ce5e1c..a1affcc 100644
--- a/src/views/safety/safetyInspection/index.vue
+++ b/src/views/safety/safetyInspection/index.vue
@@ -1,26 +1,17 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="检查类型" prop="checkType">
-              <el-select v-model="queryParams.checkType" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+            <el-form-item label="检查类型" prop="studyType">
+              <el-select v-model="queryParams.studyType" placeholder="全部" clearable>
+                <el-option v-for="dict in safety_inspection_check_type" :key="dict.key" :label="dict.value" :value="dict.key" />
               </el-select>
             </el-form-item>
             <el-form-item label="违章类型" prop="violationType">
               <el-select v-model="queryParams.violationType" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="处理状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.key" :label="dict.value" :value="dict.key" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -36,46 +27,47 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyInspection:add']">
-              新增 </el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyInspection:add']"> 新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['safety:safetyInspection:remove']">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:safetyInspection:remove']">
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
-              v-hasPermi="['safety:safetyInspection:export']">导出 </el-button>
-          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" :disabled="multiple" v-hasPermi="['safety:safetyInspection:export']"
+              >导出
+            </el-button>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <el-table v-loading="loading" :data="safetyInspectionList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="检查项目" align="center" prop="checkProject" />
-        <el-table-column label="处理状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="safety_inspection_type" :value="scope.row.status" />
-          </template>
-        </el-table-column>
-        <el-table-column label="检查人" align="center" prop="correctorName" />
-        <el-table-column label="检查时间" align="center" prop="rectificationDeadline" width="180">
+        <el-table-column label="处理状态" align="center" prop="status" min-width="100px">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.rectificationDeadline, '{y}-{m}-{d}') }}</span>
+            <template v-if="scope.row.isReply == 1">
+              <el-tag type="primary" v-if="scope.row.status && scope.row.status == 1">通知</el-tag>
+              <el-tag type="warning" v-if="scope.row.status && scope.row.status == 2">整改</el-tag>
+              <el-tag type="success" v-if="scope.row.status && scope.row.status == 3 && scope.row.reviewType == 1">通过</el-tag>
+              <el-tag type="danger" v-if="scope.row.status && scope.row.status == 3 && scope.row.reviewType == 2">未通过</el-tag>
+            </template>
+            <template v-if="scope.row.isReply == 2">
+              <el-tag type="success">通过</el-tag>
+            </template>
           </template>
         </el-table-column>
+        <el-table-column label="检查人" align="center" prop="fill" />
+        <el-table-column label="检查时间" align="center" prop="checkTime" width="180"> </el-table-column>
         <el-table-column label="检查类型" align="center" prop="checkType">
           <template #default="scope">
-            <dict-tag :options="safety_inspection_check_type" :value="scope.row.checkType" />
+            <span>{{ filterType(scope.row.studyType) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="违章类型" align="center" prop="violationType">
+        <el-table-column label="违章类型" align="center" prop="tourType">
           <template #default="scope">
-            <dict-tag :options="safety_inspection_violation_type" :value="scope.row.violationType" />
+            <span>{{ filterTypeS(scope.row.tourType) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="巡检结果" align="center" prop="inspectionResult">
@@ -90,107 +82,59 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column label="整改人" align="center" prop="correctorName" />
+        <el-table-column label="整改人" align="center" prop="abarbeitung" />
         <el-table-column label="复查状态" align="center" prop="reviewType">
           <template #default="scope">
             <dict-tag :options="review_type" :value="scope.row.reviewType" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)"
-                v-hasPermi="['safety:safetyInspection:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)" v-hasPermi="['safety:safetyInspection:query']">
                 详情
               </el-button>
-              <el-button link type="success" v-if="scope.row.status === '1' || scope.row.reviewType === '2'"
-                icon="Pointer" @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:rectification']">
-                整改
-              </el-button>
-              <el-button link type="warning" icon="SuccessFilled" v-if="scope.row.status === '2'"
-                @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:review']">
-                复查
-              </el-button>
-              <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyInspection:edit']">修改 </el-button> -->
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['safety:safetyInspection:remove']">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
                 删除
               </el-button>
             </el-space>
           </template>
         </el-table-column>
       </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改安全巡检工单对话框 -->
-
     <el-dialog :title="dialog.title" v-model="dialog.visible" append-to-body>
       <el-form ref="safetyInspectionFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="检查项目" prop="checkProject">
-          <el-input v-model="form.checkProject" placeholder="请输入检查项目" />
-        </el-form-item>
-        <el-form-item label="检查类型" prop="checkType">
-          <el-select v-model="form.checkType" placeholder="请选择检查类型">
-            <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="违章类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违章类型">
-            <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="巡检结果" prop="inspectionResult">
-          <el-input v-model="form.inspectionResult" placeholder="请输入巡检结果" />
-        </el-form-item>
-        <el-form-item label="工单整改单位" prop="rectificationUnit">
-          <el-select v-model="form.rectificationUnit" placeholder="请选择整改单位类型">
-            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+        <el-form-item label="检查类型" prop="studyType">
+          <el-select v-model="form.studyType" placeholder="请选择检查类型">
+            <el-option v-for="dict in safety_inspection_check_type" :key="dict.key" :label="dict.value" :value="dict.key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="整改班组" prop="teamId">
-          <el-select v-model="form.teamId" placeholder="请选择整改班组">
-            <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value"
-              @click="changeForeman(item.value)" />
+        <el-form-item label="违章类型" prop="tourType">
+          <el-select v-model="form.tourType" placeholder="请选择违章类型">
+            <el-option v-for="dict in safety_inspection_violation_type" :key="dict.key" :label="dict.value" :value="dict.key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="整改人" prop="correctorId">
-          <el-select v-model="form.correctorId" placeholder="请选择整改人" :disabled="!form.teamId">
-            <el-option v-for="item in foremanOpt" :key="item.value" :label="item.label" :value="item.value" />
+        <el-form-item label="整改人" prop="corrector">
+          <el-select v-model="form.corrector" placeholder="请选择整改人">
+            <el-option v-for="dict in foremanOpt" :key="dict.openid" :label="dict.userName" :value="dict.openid"></el-option>
           </el-select>
         </el-form-item>
-
-        <el-form-item label="是否回复" prop="isReply">
-          <el-radio-group v-model="form.isReply">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="2">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="问题隐患" prop="hiddenDanger">
-          <el-input v-model="form.hiddenDanger" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <!-- <el-form-item label="整改措施" prop="measure">
-          <el-input v-model="form.measure" type="textarea" placeholder="请输入内容" />
-        </el-form-item> -->
-        <el-form-item label="要求整改期限" prop="checkTime">
-          <el-date-picker clearable v-model="form.rectificationDeadline" type="date" value-format="YYYY-MM-DD"
-            placeholder="选择要求整改期限" />
-        </el-form-item>
-        <el-form-item label="检查附件" prop="checkFile">
-          <file-upload v-model="form.checkFile" :file-size="20"
-            :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
+        <el-form-item label="要求整改期限" prop="replyDate">
+          <el-date-picker clearable v-model="form.replyDate" type="date" value-format="YYYY-MM-DD" placeholder="选择要求整改期限" />
         </el-form-item>
         <el-form-item label="整改附件" prop="rectificationFile">
-          <file-upload v-model="form.rectificationFile" :file-size="20"
-            :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <file-upload
+            ref="uploadRef"
+            v-model="form.inspectionFile"
+            isGo
+            upload-url="/zm/api/v1/system/busHseManagement/add"
+            :auto-upload="false"
+            show-file-list
+            :data="form"
+            :accept="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']"
+          />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -203,29 +147,6 @@
     <el-dialog title="巡检工单详情" v-model="showDetailDialog" width="60vw">
       <safety-inspection-detail-dialog :safety-inspection-id="currentSafetyInspectionId" />
     </el-dialog>
-    <el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible"
-      width="500px">
-      <el-form ref="handleFormRef" :model="handleForm" :rules="rules" label-width="120px">
-        <el-form-item label="整改措施" prop="measure" v-if="handleType === 'rectification'">
-          <el-input v-model="handleForm.measure" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="整改附件" prop="rectificationFile" v-if="handleType === 'rectification'">
-          <image-upload v-model="handleForm.rectificationFile" />
-        </el-form-item>
-        <el-form-item label="复查情况" prop="review" v-if="handleType === 'review'">
-          <el-input v-model="handleForm.review" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="复查类型" prop="reviewType" v-if="handleType === 'review'">
-          <el-select v-model="handleForm.reviewType" placeholder="请选择复查类型">
-            <el-option v-for="dict in review_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleSubmit">确 定</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
   </div>
 </template>
 
@@ -235,26 +156,18 @@ import {
   delSafetyInspection,
   getSafetyInspection,
   listSafetyInspection,
-  updateSafetyInspection,
-  addSafetyInspectionReview,
-  addSafetyInspectionRectification,
+  updateSafetyInspection
 } from '@/api/safety/safetyInspection';
 import { SafetyInspectionForm, SafetyInspectionQuery, SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import SafetyInspectionDetailDialog from '@/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue';
 import { listProjectTeamForeman } from '@/api/project/projectTeam';
 import { foremanQuery, ProjectTeamForemanResp } from '@/api/project/projectTeam/types';
+import { getDictData } from '@/api/project/goUser/index';
+import { acquisitionOfCorrectivePersonnel } from '@/api/quality/qualityInspection';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { rectification_unit_type, safety_inspection_violation_type, review_type, safety_inspection_type, safety_inspection_check_type } = toRefs<any>(
-  proxy?.useDict(
-    'rectification_unit_type',
-    'safety_inspection_violation_type',
-    'review_type',
-    'safety_inspection_type',
-    'safety_inspection_check_type'
-  )
-);
+const { review_type } = toRefs<any>(proxy?.useDict('review_type', 'safety_inspection_type'));
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -267,7 +180,8 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const safety_inspection_check_type = ref([]); // 检查类型
+const safety_inspection_violation_type = ref([]); // 违章类型
 const queryFormRef = ref<ElFormInstance>();
 const safetyInspectionFormRef = ref<ElFormInstance>();
 
@@ -275,39 +189,14 @@ const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-const handleForm = ref({
-  id: undefined,
-  measure: undefined,
-  rectificationFile: undefined,
-  review: undefined,
-  reviewType: undefined,
-  remark: undefined,
-})
-const initFormData: SafetyInspectionForm = {
-  id: undefined,
-  pid: undefined,
-  projectId: currentProject.value?.id,
-  checkType: undefined,
-  violationType: undefined,
-  inspectionResult: undefined,
-  teamId: undefined,
-  correctorId: undefined,
-  rectificationDeadline: undefined,
-  isReply: undefined,
+
+const initFormData: any = {
+  projectId: currentProject.value.goId,
   replyDate: undefined,
-  status: undefined,
-  hiddenDanger: undefined,
-  measure: undefined,
-  review: undefined,
-  reviewType: undefined,
-  checkTime: undefined,
-  rectificationTime: undefined,
-  rectificationUnit: undefined,
-  checkProject: undefined,
-  reviewTime: undefined,
-  checkFile: undefined,
-  rectificationFile: undefined,
-  remark: undefined
+  studyType: undefined,
+  tourType: undefined,
+  corrector: undefined,
+  teamName: 'undefined'
 };
 const data = reactive<PageData<SafetyInspectionForm, SafetyInspectionQuery>>({
   form: { ...initFormData },
@@ -316,7 +205,7 @@ const data = reactive<PageData<SafetyInspectionForm, SafetyInspectionQuery>>({
     pageSize: 10,
     id: undefined,
     pid: undefined,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.goId,
     checkType: undefined,
     violationType: undefined,
     inspectionResult: undefined,
@@ -339,9 +228,7 @@ const data = reactive<PageData<SafetyInspectionForm, SafetyInspectionQuery>>({
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
     projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
     checkType: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }],
-    violationType: [{ required: true, message: '违章类型不能为空', trigger: 'blur' }],
-    checkProject: [{ required: true, message: '检查项目不能为空', trigger: 'blur' }],
-    isReply: [{ required: true, message: '是否回复不能为空', trigger: 'blur' }]
+    violationType: [{ required: true, message: '违章类型不能为空', trigger: 'blur' }]
   }
 });
 
@@ -349,78 +236,31 @@ const { queryParams, form, rules } = toRefs(data);
 
 const teamOpt = ref([]);
 const foremanOpt = ref([]);
-const teamList = ref<ProjectTeamForemanResp[]>();
-const handleType = ref("")
-
-
-
 /** 查询安全巡检工单列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listSafetyInspection(queryParams.value);
-  safetyInspectionList.value = res.rows;
-  total.value = res.total;
-  // 获取项目班组信息
-  const teamRes = await listProjectTeamForeman(currentProject.value?.id);
-  teamList.value = teamRes.data;
-  teamOpt.value = teamList.value.map((team: ProjectTeamForemanResp) => ({
-    label: team.teamName,
-    value: team.id
-  }));
+  safetyInspectionList.value = res.data.list;
+  total.value = res.data.total;
 
   loading.value = false;
 };
-
-const changeForeman = (value: string | number) => {
-  const team = teamList.value.filter((team) => team.id === value)[0];
-  foremanOpt.value = team.foremanList?.map((foreman: foremanQuery) => ({
-    label: foreman.foremanName,
-    value: foreman.foremanId
-  }));
-  form.value.correctorId = '';
+// 获取字典
+const getDictDataList = async () => {
+  const res = await getDictData('study_type');
+  safety_inspection_check_type.value = res.data.values;
+  const res1 = await getDictData('tour_type');
+  safety_inspection_violation_type.value = res1.data.values;
 };
-/** 处理安全巡查工单 */
-const handleSubmit = async () => {
-  let flag = false;
-  if (handleType.value == "rectification") {
-    const { code } = await addSafetyInspectionRectification(handleForm.value)
-    if (code == 200) flag = true
-  } else {
-    const { code } = await addSafetyInspectionReview(handleForm.value)
-    if (code == 200) flag = true
-  }
-  if (flag) {
-    ElMessage.success("处理成功")
-    handleDialogVisible.value = false;
-    getList()
-    reset()
-  } else {
-    ElMessage.error("处理失败")
-  }
-
-}
-
 
 /** 展开安全巡检工单详情对话框操作 */
 const currentSafetyInspectionId = ref<string | number>();
 const showDetailDialog = ref<boolean>(false);
-const handleDialogVisible = ref<boolean>(false);
 const handleShowDialog = (row?: SafetyInspectionVO) => {
   currentSafetyInspectionId.value = row.id;
-
   showDetailDialog.value = true;
 };
-/**打开整改/复查对话框操作*/
-const handleDialog = (row?: SafetyInspectionVO) => {
 
-  if (row.status == '1') {
-    handleType.value = "rectification"
-  } else {
-    handleType.value = "review"
-  }
-  handleForm.value.id = row.id;
-  handleDialogVisible.value = true;
-};
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -452,64 +292,66 @@ const handleSelectionChange = (selection: SafetyInspectionVO[]) => {
   multiple.value = !selection.length;
 };
 
+//删除
+const handleDelete = async (row?: SafetyInspectionVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除安全巡检工单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delSafetyInspection(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
 /** 新增按钮操作 */
-const handleAdd = () => {
+const handleAdd = async () => {
   reset();
+  await getPeople();
   dialog.visible = true;
   dialog.title = '添加安全巡检工单';
 };
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: SafetyInspectionVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getSafetyInspection(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改安全巡检工单';
+const getPeople = async () => {
+  await acquisitionOfCorrectivePersonnel(currentProject.value?.goId).then((res) => {
+    foremanOpt.value = res.data.list;
+  });
 };
-
 /** 提交按钮 */
+const uploadRef = ref(null);
 const submitForm = () => {
   safetyInspectionFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
-      if (form.value.id) {
-        await updateSafetyInspection(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addSafetyInspection(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
+      uploadRef.value.submitUpload().then((res) => {
+        if (res != 'noFile') {
+          proxy?.$modal.msgSuccess('操作成功');
+          dialog.visible = false;
+          getList();
+          buttonLoading.value = false;
+        }
+      });
     }
   });
 };
 
-/** 删除按钮操作 */
-const handleDelete = async (row?: SafetyInspectionVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除安全巡检工单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delSafetyInspection(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
+const filterType = (studyType) => {
+  let label = '';
+  safety_inspection_check_type.value.map((item) => {
+    if (item.key == studyType) {
+      label = item.value;
+    }
+  });
+  return label;
 };
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'safety/safetyInspection/export',
-    {
-      ...queryParams.value
-    },
-    `safetyInspection_${new Date().getTime()}.xlsx`
-  );
+const filterTypeS = (violationType) => {
+  let label = '';
+  safety_inspection_violation_type.value.map((item) => {
+    if (item.key == violationType) {
+      label = item.value;
+    }
+  });
+  return label;
 };
-
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
@@ -522,6 +364,7 @@ onUnmounted(() => {
 });
 
 onMounted(() => {
+  getDictDataList();
   getList();
 });
 </script>
diff --git a/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue b/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue
index 2d57f1e..3646189 100644
--- a/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue
+++ b/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue
@@ -2,70 +2,63 @@
   <el-card v-loading="loading">
     <h2 style="text-align: center; margin-top: 5px; font-weight: bold">安全日志</h2>
     <el-row>
-      <el-col :span="12" style="text-align: left">记录人：{{ safetyLogDetail?.creator?.name }}</el-col>
-      <el-col :span="12" style="text-align: right">记录时间：{{ safetyLogDetail?.createTime }}</el-col>
+      <el-col :span="12" style="text-align: left">记录人：{{ safetyLogDetail?.fill }}</el-col>
+      <el-col :span="12" style="text-align: right">记录时间：{{ safetyLogDetail?.createdAt }}</el-col>
     </el-row>
     <el-descriptions :column="3" border style="margin-top: 8px">
-      <el-descriptions-item label-align="center" width="160px" label="项目名称" :span="3">{{ currentProject?.name }}
+      <el-descriptions-item label-align="center" width="160px" label="项目名称" :span="3">{{ safetyLogDetail?.projectName }} </el-descriptions-item>
+      <el-descriptions-item label-align="center" label="发生日期" :span="safetyLogDetail?.fileList ? 3 : 1"
+        >{{ safetyLogDetail?.dateOfOccurrence }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="发生日期">{{ safetyLogDetail?.dateOfOccurrence }}
-      </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="气温">
+      <el-descriptions-item label-align="center" label="气温" v-if="!safetyLogDetail?.fileList">
         <span>最高：{{ safetyLogDetail?.airTemperatureMax }}（℃）</span>
         <span>最低：{{ safetyLogDetail?.airTemperatureMin }}（℃）</span>
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="气候">
-        <dict-tag :value="safetyLogDetail?.weather" :options="weather_type" />
+      <el-descriptions-item label-align="center" label="气候" v-if="!safetyLogDetail?.fileList">
+        {{ safetyLogDetail?.climateName }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="工程施工部位及施工进展情况" :span="3">
+      <el-descriptions-item label-align="center" label="工程施工部位及施工进展情况" :span="3" v-if="!safetyLogDetail?.fileList">
         {{ safetyLogDetail?.progress }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="当日主要危险性项目作业内容" :span="3">
+      <el-descriptions-item label-align="center" label="当日主要危险性项目作业内容" :span="3" v-if="!safetyLogDetail?.fileList">
         {{ safetyLogDetail?.jobContent }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="施工项目安全教育与安全交底情况" :span="3">
-        {{ safetyLogDetail?.discloseCondition }}
+      <el-descriptions-item label-align="center" label="施工项目安全教育与安全交底情况" :span="3" v-if="!safetyLogDetail?.fileList">
+        {{ safetyLogDetail?.discloseTheFacts }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="施工作业队伍班前施工安全活动情况" :span="3">
-        {{ safetyLogDetail?.activityCondition }}
+      <el-descriptions-item label-align="center" label="施工作业队伍班前施工安全活动情况" :span="3" v-if="!safetyLogDetail?.fileList">
+        {{ safetyLogDetail?.progressOfActivity }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="现场施工安全巡视与检查情况" :span="3">
-        {{ safetyLogDetail?.examineCondition }}
+      <el-descriptions-item label-align="center" label="现场施工安全巡视与检查情况" :span="3" v-if="!safetyLogDetail?.fileList">
+        {{ safetyLogDetail?.examine }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="季节施工防寒、防暑等措施实施情况" :span="3">
-        {{ safetyLogDetail?.implementCondition }}
+      <el-descriptions-item label-align="center" label="季节施工防寒、防暑等措施实施情况" :span="3" v-if="!safetyLogDetail?.fileList">
+        {{ safetyLogDetail?.implementation }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="监理通知有关部门安全检查情况" :span="3">
-        {{ safetyLogDetail?.safetyInspectionCondition }}
+      <el-descriptions-item label-align="center" label="监理通知有关部门安全检查情况" :span="3" v-if="!safetyLogDetail?.fileList">
+        {{ safetyLogDetail?.safetyInspectionSituation }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="停工、加班情况" :span="3">{{ safetyLogDetail?.stoppageOrOvertime }}
+      <el-descriptions-item label-align="center" label="停工、加班情况" :span="3" v-if="!safetyLogDetail?.fileList"
+        >{{ safetyLogDetail?.stoppageOrOvertime }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="其他应记录的安全与文明施工事项" :span="3">
-        {{ safetyLogDetail?.otherCondition }}
+      <el-descriptions-item label-align="center" label="其他应记录的安全与文明施工事项" :span="3" v-if="!safetyLogDetail?.fileList">
+        {{ safetyLogDetail?.otherRecords }}
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="附件" :span="3">
+      <el-descriptions-item label-align="center" label="附件" :span="3" v-if="safetyLogDetail?.fileList">
         <el-space direction="vertical">
-          <template v-for="item in fileList" :key="item.ossId">
-            <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank""
-              v-if="item.fileSuffix.includes('pdf')">
-              <span> {{ item.originalName }} </span>
-            </el-link>
-            <el-space wrap>
-              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-                <image-preview :src="item.url" width="200px" />
-              </span>
-              <span v-else>
-                <el-link :href="`${item.url}`" :underline="false" target="_blank">
-                  <span> {{ item.originalName }} </span>
-                </el-link>
-              </span>
-            </el-space>
-          </template>
-
+          <el-link
+            v-for="item in safetyLogDetail?.fileList"
+            :key="item.id"
+            :href="`${BASE_URL}${item.path}`"
+            type="primary"
+            :underline="false"
+            target="_blank"
+          >
+            <span> {{ item.name }} </span>
+          </el-link>
         </el-space>
       </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="备注" :span="3">{{ safetyLogDetail?.remark }}
-      </el-descriptions-item>
+      <!-- <el-descriptions-item label-align="center" label="备注" :span="3">{{ safetyLogDetail?.remark }} </el-descriptions-item> -->
     </el-descriptions>
   </el-card>
   <el-dialog width="80%" v-model="viewFileVisible" title="查看文件" append-to-body>
@@ -88,6 +81,8 @@ import { OssVO } from '@/api/system/oss/types';
 interface Props {
   safetyLogId?: string | number;
 }
+const BASE_URL = import.meta.env.VITE_APP_BASE_API_GO;
+console.log('🚀 ~ BASE_URL:', BASE_URL);
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { weather_type } = toRefs<any>(proxy?.useDict('weather_type'));
@@ -105,7 +100,7 @@ const fileUrl = ref<string>('');
 const get = async () => {
   loading.value = true;
   const res = await getSafetyLog(props.safetyLogId);
-  if (res.data && res.code === 200) {
+  if (res.data && res.code === 0) {
     safetyLogDetail.value = res.data;
     if (res.data.fileId) {
       const fileRes = await listByIds(res.data.fileId.split(','));
diff --git a/src/views/safety/safetyLog/index.vue b/src/views/safety/safetyLog/index.vue
index 97b253b..3328c84 100644
--- a/src/views/safety/safetyLog/index.vue
+++ b/src/views/safety/safetyLog/index.vue
@@ -1,16 +1,11 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="发生日期" prop="dateOfOccurrence">
-              <el-date-picker clearable v-model="queryParams.dateOfOccurrence" type="date" value-format="YYYY-MM-DD"
-                placeholder="请选择发生日期" />
-            </el-form-item>
-            <el-form-item label="录入人" prop="creatorName">
-              <el-input clearable v-model="queryParams.creatorName" placeholder="请输入录入人" />
+            <el-form-item label="录入人" prop="fill">
+              <el-input clearable v-model="queryParams.fill" placeholder="请输入录入人" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -25,23 +20,14 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyLog:add']">新增
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['safety:safetyLog:remove']">
-              批量删除
-            </el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyLog:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
-              v-hasPermi="['safety:safetyLog:export']">导出 </el-button>
+            <el-button type="primary" plain icon="Upload" @click="handleAdd('file')" v-hasPermi="['safety:safetyLog:add']">上传附件 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <el-table v-loading="loading" :data="safetyLogList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
@@ -55,79 +41,134 @@
             <span>{{ parseTime(scope.row.dateOfOccurrence, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="录入时间" align="center" prop="createTime" />
-        <el-table-column label="录入人" align="center" prop="creatorName" />
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="录入时间" align="center" prop="updatedAt" />
+        <el-table-column label="录入人" align="center" prop="fill" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)"
-                v-hasPermi="['safety:safetyLog:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)" v-hasPermi="['safety:safetyLog:query']">
                 详情
               </el-button>
               <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyLog:edit']"> 修改 </el-button> -->
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['safety:safetyLog:remove']"> 删除 </el-button>
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyLog:remove']"> 删除 </el-button>
             </el-space>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改安全日志对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="950px" append-to-body>
-      <el-form ref="safetyLogFormRef" :model="form" :rules="rules" label-width="250px">
+      <el-form ref="safetyLogFormRef" :model="form" :rules="rules" label-width="210px">
         <el-form-item label="发生日期" prop="dateOfOccurrence">
-          <el-date-picker clearable v-model="form.dateOfOccurrence" type="date" value-format="YYYY-MM-DD"
-            placeholder="请选择发生日期">
-          </el-date-picker>
+          <el-date-picker
+            clearable
+            style="width: 200px"
+            v-model="form.dateOfOccurrence"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            type="date"
+            placeholder="选择发生日期"
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item label="最高气温" prop="airTemperatureMax">
-          <el-input v-model="form.airTemperatureMax" placeholder="请输入最高气温" />
+        <el-form-item label="最高气温" prop="airTemperatureMax" v-if="!fileStatus">
+          <el-input v-model="form.airTemperatureMax" placeholder="请输入最高气温" type="number">
+            <template #append>℃</template>
+          </el-input>
         </el-form-item>
-        <el-form-item label="最低气温" prop="airTemperatureMin">
-          <el-input v-model="form.airTemperatureMin" placeholder="请输入最低气温" />
+        <el-form-item label="最低气温" prop="airTemperatureMin" v-if="!fileStatus">
+          <el-input v-model="form.airTemperatureMin" :min="-275" :max="form.airTemperatureMax" placeholder="请输入最低气温" type="number">
+            <template #append>℃</template>
+          </el-input>
         </el-form-item>
-        <el-form-item label="气候" prop="weather">
-          <el-select v-model="form.weather" placeholder="请选择气候">
-            <el-option v-for="dict in weather_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+        <el-form-item label="气候" prop="climate" v-if="!fileStatus">
+          <el-select v-model="form.climate" placeholder="请选择气候">
+            <el-option v-for="dict in weather_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工程施工部位及施工进展情况" prop="progress">
-          <el-input v-model="form.progress" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="工程施工部位及施工进展情况" prop="progress" v-if="!fileStatus">
+          <el-input v-model="form.progress" placeholder="请输入工程施工部位及施工进展情况" autosize maxlength="300" show-word-limit type="textarea" />
         </el-form-item>
-        <el-form-item label="当日主要危险性项目作业内容">
-          <editor v-model="form.jobContent" :min-height="192" />
+        <el-form-item label="当日主要危险性项目作业内容" prop="jobContent" v-if="!fileStatus">
+          <el-input
+            v-model="form.jobContent"
+            placeholder="请输入当日主要危险性项目作业内容"
+            autosize
+            maxlength="300"
+            show-word-limit
+            type="textarea"
+          />
         </el-form-item>
-        <el-form-item label="施工项目安全教育与安全交底情况">
-          <editor v-model="form.discloseCondition" :min-height="192" />
+        <el-form-item label="施工项目安全教育与安全交底情况" prop="discloseTheFacts" v-if="!fileStatus">
+          <el-input
+            v-model="form.discloseTheFacts"
+            placeholder="请输入施工项目安全教育与安全交底情况"
+            autosize
+            maxlength="300"
+            show-word-limit
+            type="textarea"
+          />
         </el-form-item>
-        <el-form-item label="施工作业队伍班前施工安全活动情况">
-          <editor v-model="form.activityCondition" :min-height="192" />
+        <el-form-item label="施工作业队伍班前施工安全活动情况" prop="progressOfActivity" v-if="!fileStatus">
+          <el-input
+            v-model="form.progressOfActivity"
+            placeholder="请输入施工作业队伍班前施工安全活动情况"
+            autosize
+            maxlength="300"
+            show-word-limit
+            type="textarea"
+          />
         </el-form-item>
-        <el-form-item label="现场施工安全巡视与检查情况">
-          <editor v-model="form.examineCondition" :min-height="192" />
+        <el-form-item label="现场施工安全巡视与检查情况" prop="examine" v-if="!fileStatus">
+          <el-input v-model="form.examine" placeholder="请输入现场施工安全巡视与检查情况" autosize maxlength="300" show-word-limit type="textarea" />
         </el-form-item>
-        <el-form-item label="季节施工防寒、防暑等措施实施情况">
-          <editor v-model="form.implementCondition" :min-height="192" />
+        <el-form-item label="季节施工防寒、防署等措施实施情况" prop="implementation" v-if="!fileStatus">
+          <el-input
+            v-model="form.implementation"
+            placeholder="请输入季节施工防寒、防署等措施实施情况"
+            autosize
+            maxlength="300"
+            show-word-limit
+            type="textarea"
+          />
         </el-form-item>
-        <el-form-item label="监理通知有关部门安全检查情况">
-          <editor v-model="form.safetyInspectionCondition" :min-height="192" />
+        <el-form-item label="监理通知或有关部门安全检查情况" prop="safetyInspectionSituation" v-if="!fileStatus">
+          <el-input
+            v-model="form.safetyInspectionSituation"
+            placeholder="请输入监理通知或有关部门安全检查情况"
+            autosize
+            maxlength="300"
+            show-word-limit
+            type="textarea"
+          />
         </el-form-item>
-        <el-form-item label="停工、加班情况">
-          <editor v-model="form.stoppageOrOvertime" :min-height="192" />
+        <el-form-item label="停工、加班情况" prop="stoppageOrOvertime" v-if="!fileStatus">
+          <el-input v-model="form.stoppageOrOvertime" placeholder="请输入停工、加班情况" autosize maxlength="300" show-word-limit type="textarea" />
         </el-form-item>
-        <el-form-item label="其他应记录的安全与文明施工事项">
-          <editor v-model="form.otherCondition" :min-height="192" />
+        <el-form-item label="其他应记录的安全与文明施工事项" prop="otherRecords" v-if="!fileStatus">
+          <el-input
+            v-model="form.otherRecords"
+            placeholder="请输入其他应记录的安全与文明施工事项"
+            autosize
+            maxlength="300"
+            show-word-limit
+            type="textarea"
+          />
         </el-form-item>
-        <el-form-item label="附件" prop="fileId">
-          <file-upload v-model="form.fileId" />
+        <el-form-item label="文件上传" v-if="fileStatus">
+          <file-upload
+            v-model="form.file"
+            :auto-upload="false"
+            ref="uploadRef"
+            upload-url="/zm/api/v1/system/busHseSecurityLog/addFile"
+            isGo
+            :data="form"
+            show-file-list
+          />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input type="textarea" v-model="form.remark" maxlength="300" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -137,6 +178,7 @@
         </div>
       </template>
     </el-dialog>
+
     <el-dialog title="安全日志详情" v-model="showDetailDialog">
       <safety-log-detail-dialog :safety-log-id="currentSafetyLogId" />
     </el-dialog>
@@ -148,11 +190,13 @@ import { addSafetyLog, delSafetyLog, getSafetyLog, listSafetyLog, updateSafetyLo
 import { SafetyLogForm, SafetyLogQuery, SafetyLogVO } from '@/api/safety/safetyLog/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import { dayjs } from 'element-plus';
+import { busHseSecurityLogList } from '@/api/project/goUser/index';
 
 import SafetyLogDetailDialog from '@/views/safety/safetyLog/component/SafetyLogDetailDialog.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { weather_type } = toRefs<any>(proxy?.useDict('weather_type'));
+
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -173,9 +217,10 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const initFormData: SafetyLogForm = {
+const initFormData: any = {
   id: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.goId,
+  file: undefined,
   dateOfOccurrence: undefined,
   airTemperatureMax: undefined,
   airTemperatureMin: undefined,
@@ -198,7 +243,7 @@ const data = reactive<PageData<SafetyLogForm, SafetyLogQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.goId,
     dateOfOccurrence: undefined,
     airTemperatureMax: undefined,
     airTemperatureMin: undefined,
@@ -214,8 +259,8 @@ const data = reactive<PageData<SafetyLogForm, SafetyLogQuery>>({
     otherCondition: undefined,
     remark: undefined,
     creatorName: undefined,
-    orderByColumn: "createTime",
-    isAsc: "desc",
+    orderByColumn: 'createTime',
+    isAsc: 'desc',
     params: {}
   },
   rules: {
@@ -229,9 +274,9 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询安全日志列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listSafetyLog(queryParams.value);
-  safetyLogList.value = res.rows;
-  total.value = res.total;
+  const res = await busHseSecurityLogList(queryParams.value);
+  safetyLogList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -273,32 +318,17 @@ const handleShowDialog = (row?: SafetyLogVO) => {
   currentSafetyLogId.value = row.id;
   showDetailDialog.value = true;
 };
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加安全日志';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: SafetyLogVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getSafetyLog(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改安全日志';
-};
-
 /** 提交按钮 */
+const uploadRef = ref();
 const submitForm = () => {
   safetyLogFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
-      if (form.value.id) {
-        await updateSafetyLog(form.value).finally(() => (buttonLoading.value = false));
+      form.value.projectId = currentProject.value?.goId;
+      if (fileStatus.value) {
+        await uploadRef.value.submitUpload().finally((res) => {
+          buttonLoading.value = false;
+        });
       } else {
         await addSafetyLog(form.value).finally(() => (buttonLoading.value = false));
       }
@@ -318,20 +348,28 @@ const handleDelete = async (row?: SafetyLogVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'safety/safetyLog/export',
-    {
-      ...queryParams.value
-    },
-    `safetyLog_${new Date().getTime()}.xlsx`
-  );
+/** 新增按钮操作 */
+const fileStatus = ref<boolean>(false);
+const handleAdd = (type?: string) => {
+  reset();
+  if (weather_type.value.length == 5) {
+    weather_type.value = weather_type.value.filter((item) => item.value != '3');
+    weather_type.value[2].value = '3';
+  }
+  console.log('🚀 ~ handleAdd ~ type:', type);
+  if (type == 'file') {
+    fileStatus.value = true;
+  } else {
+    fileStatus.value = false;
+  }
+
+  dialog.visible = true;
+  dialog.title = '添加安全日志';
 };
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
diff --git a/src/views/safety/safetyWeeklyReport/component/add.vue b/src/views/safety/safetyWeeklyReport/component/add.vue
new file mode 100644
index 0000000..4083477
--- /dev/null
+++ b/src/views/safety/safetyWeeklyReport/component/add.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="system-busWeeklySecurityReport-add">
+    <!-- 添加或修改安全周期对话框 -->
+    <el-dialog v-model="isShowDialog" width="500px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.system-busWeeklySecurityReport-add .el-dialog', '.system-busWeeklySecurityReport-add .el-dialog__header']">添加安全周期</div>
+      </template>
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="90px">
+        <el-form-item label="周期范围" prop="timeRange">
+          <el-date-picker
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            v-model="formData.timeRange"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            size="large"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSubmit">确 定</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { addSafetyWeeklyReport } from '@/api/safety/safetyWeeklyReport';
+// 获取用户 store
+import { useUserStoreHook } from '@/store/modules/user';
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const formRef = ref<HTMLElement | null>(null);
+    const menuRef = ref();
+    const state = reactive({
+      loading: false,
+      isShowDialog: false,
+      formData: {
+        timeRange: [],
+        projectId: currentProject.value?.goId
+      },
+      // 表单校验
+      rules: {
+        timeRange: [{ required: true, message: '时间范围不能为空', trigger: 'blur' }]
+      }
+    });
+    // 打开弹窗
+    const openDialog = () => {
+      resetForm();
+      state.isShowDialog = true;
+    };
+    // 关闭弹窗
+    const closeDialog = () => {
+      state.isShowDialog = false;
+    };
+    // 取消
+    const onCancel = () => {
+      closeDialog();
+    };
+    // 提交
+    const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          state.loading = true;
+          let timeRange = state.formData.timeRange.join(',');
+          addSafetyWeeklyReport({ projectId: state.formData.projectId, timeRange })
+            .then(() => {
+              ElMessage.success('添加成功');
+              closeDialog(); // 关闭弹窗
+              emit('busWeeklySecurityReportList');
+            })
+            .finally(() => {
+              state.loading = false;
+            });
+        }
+      });
+    };
+    const resetForm = () => {
+      state.formData = {
+        timeRange: [],
+        projectId: currentProject.value?.goId
+      };
+    };
+    return {
+      proxy,
+      openDialog,
+      closeDialog,
+      onCancel,
+      onSubmit,
+      menuRef,
+      formRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style scoped></style>
diff --git a/src/views/safety/safetyWeeklyReport/component/documentsDetail/index.vue b/src/views/safety/safetyWeeklyReport/component/documentsDetail/index.vue
new file mode 100644
index 0000000..5d5fbaa
--- /dev/null
+++ b/src/views/safety/safetyWeeklyReport/component/documentsDetail/index.vue
@@ -0,0 +1,186 @@
+<template>
+  <div class="document_detail" id="document_detail">
+    <div class="move_pop" id="detial_pop">
+      <!-- <span>{{ title }}</span> -->
+      <div class="box">
+        <img v-if="type == 2" src="../icon/suo.png" @click="onFull(1)" />
+        <img v-else src="../icon/full.png" @click="onFull(2)" />
+        <span class="close" @click="onClose">✖</span>
+      </div>
+    </div>
+    <div class="box_app" id="box_app"></div>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, defineComponent, getCurrentInstance } from 'vue';
+import { setMove } from '@/utils/moveDiv';
+import { getSafetyWeeklyReport } from '@/api/safety/safetyWeeklyReport';
+
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const state = reactive({
+      title: '',
+      type: 2
+    });
+    onMounted(() => {
+      setMove('detial_pop', 'document_detail');
+    });
+    // 打开弹窗
+    const openDialog = (obj) => {
+      // state.title = obj.name;
+      getSafetyWeeklyReport(obj.id).then((res: any) => {
+        console.log(res);
+        if (res.code == 0) {
+          init(res.data);
+        }
+      });
+    };
+    const onError = function (event) {
+      //举例，强制保存后，判断文档内容是否保存成功
+      if (event.data) {
+        if (event.data.errorCode == 'forcesave') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //保存成功
+          } else {
+            //保存失败或异常
+          }
+        } else if (event.data.errorCode == 'setallcellvalue') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //填充成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //填充异常
+          }
+        } else if (event.data.errorCode == 'clearsheet') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //清除成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //清除异常
+          }
+        }
+      }
+    };
+    const onDocumentReady = function () {
+      // console.log('文档加载完成');
+    };
+    const init = (obj) => {
+      let documentKey = obj.id.toString() + new Date().getTime();
+      let baseURL = window['$HOSTSRC'].replace('ws:', 'http:').replace('/ws', '');
+      let url = baseURL + obj.path;
+      new CXO_API.CXEditor('box_app', {
+        document: {
+          fileType: 'docx',
+          key: documentKey,
+          title: '周报',
+          url
+        },
+        documentType: 'word',
+        editorConfig: {
+          mode: 'view',
+          callbackUrl: ''
+        },
+        height: '100%',
+        events: {
+          onDocumentReady: onDocumentReady,
+          onError: onError
+        }
+      });
+    };
+    const onClose = () => {
+      emit('onClose', false);
+    };
+    const onFull = (type) => {
+      // 全屏
+      let document_detail = document.getElementById('document_detail');
+      state.type = type;
+      if (type == 2) {
+        document_detail.style.width = '100%';
+        document_detail.style.height = '100%';
+      } else {
+        document_detail.style.width = '1200px';
+        document_detail.style.height = '80vh';
+      }
+    };
+    return {
+      proxy,
+      openDialog,
+      onClose,
+      onFull,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.document_detail {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 999999;
+  width: 100%;
+  height: 100%;
+  border: 1px solid #9f9f9f;
+  .box_app {
+    // width: 1300px !important;
+    // height: 80vh !important;
+    background-color: #f1f1f1;
+  }
+  .move_pop {
+    width: 100%;
+    // position: absolute;
+    // top: 0;
+    // right: 0%;
+    height: 24px;
+    // background: linear-gradient(#2a5095, #213f7b, #111e48);
+    background-color: #f4f5f6;
+    display: grid;
+    place-items: center;
+    > span {
+      color: #000000;
+      font-weight: bold;
+      font-size: 20px;
+      letter-spacing: 2px;
+    }
+    .box {
+      display: flex;
+      width: 60px;
+      position: absolute;
+      top: 0;
+      right: 10px;
+      // height: 100%;
+      align-items: center;
+      img {
+        width: 22px;
+        margin-top: 6px;
+        cursor: pointer;
+      }
+      .close {
+        position: absolute;
+        right: 2px;
+        /* top: -8px; */
+        color: #8d8d8d;
+        width: 24px;
+        height: 24px;
+        font-size: 20px;
+        //border: 2px solid #0ff;
+        border-radius: 50%;
+        display: grid;
+        place-items: center;
+        cursor: pointer;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/safety/safetyWeeklyReport/component/documentsEdit/index.vue b/src/views/safety/safetyWeeklyReport/component/documentsEdit/index.vue
new file mode 100644
index 0000000..3059b35
--- /dev/null
+++ b/src/views/safety/safetyWeeklyReport/component/documentsEdit/index.vue
@@ -0,0 +1,186 @@
+<template>
+  <div class="document_detail_eidt1" id="document_detail_eidt1">
+    <div class="move_pop" id="detial_edit1">
+      <!-- <span>{{ title }}</span> -->
+      <div class="box">
+        <img v-if="type == 2" src="../icon/full.png" @click="onFull(1)" />
+        <img v-else src="../icon/suo.png" @click="onFull(2)" />
+        <span class="close" @click="onClose">✖</span>
+      </div>
+    </div>
+    <div class="box_app" id="box_app_edit1"></div>
+  </div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance } from 'vue';
+import { setMove } from '@/utils/moveDiv';
+import { getSafetyWeeklyReport } from '@/api/safety/safetyWeeklyReport';
+
+export default defineComponent({
+  name: 'index',
+  setup(props, { emit }) {
+    const { proxy } = <any>getCurrentInstance();
+    const state = reactive({
+      title: '',
+      type: 2
+    });
+    onMounted(() => {
+      setMove('detial_edit1', 'document_detail_eidt1');
+    });
+    // 打开弹窗
+    const openDialog = (obj) => {
+      getSafetyWeeklyReport(obj.id).then((res: any) => {
+        if (res.code == 0) {
+          init(res.data);
+        }
+      });
+    };
+    const onError = function (event) {
+      console.log('编辑器错误: code ' + event.data.errorCode + ', 描述' + event.data.errorDescription);
+      //举例，强制保存后，判断文档内容是否保存成功
+      if (event.data) {
+        if (event.data.errorCode == 'forcesave') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //保存成功
+          } else {
+            //保存失败或异常
+          }
+        } else if (event.data.errorCode == 'setallcellvalue') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //填充成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //填充异常
+          }
+        } else if (event.data.errorCode == 'clearsheet') {
+          var desc = event.data.errorDescription;
+          desc = JSON.parse(desc);
+          if (desc.error == 0) {
+            //清除成功
+          } else if (desc.error == -1) {
+            //当前文档正处于协同编辑中
+          } else {
+            //清除异常
+          }
+        }
+      }
+    };
+    const onDocumentReady = function () {
+      // console.log('文档加载完成');
+    };
+    const init = (obj) => {
+      let documentKey = obj.id.toString() + new Date().getTime();
+      let baseURL = window['$HOSTSRC'].replace('ws:', 'http:').replace('/ws', '');
+      let url = baseURL + obj.path;
+      new CXO_API.CXEditor('box_app_edit1', {
+        document: {
+          fileType: 'docx',
+          key: documentKey,
+          title: '周报',
+          url
+        },
+        documentType: 'word',
+        editorConfig: {
+          callbackUrl: baseURL + '/zm/api/v1/system/busWeeklySecurityReport/securityReportAdd?path=' + obj.path
+        },
+        events: {
+          onDocumentReady: onDocumentReady,
+          onError: onError
+        }
+      });
+    };
+    const onClose = () => {
+      emit('onClose', false);
+    };
+    const onFull = (type) => {
+      // 全屏
+      let document_detail = document.getElementById('document_detail_eidt1');
+      state.type = type;
+      if (type == 2) {
+        // 弹框放大
+        document_detail.style.width = '100%';
+        document_detail.style.height = '100%';
+      } else {
+        // 弹框缩小
+        document_detail.style.width = '1200px';
+        document_detail.style.height = '80vh';
+      }
+    };
+    return {
+      proxy,
+      onFull,
+      openDialog,
+      onClose,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+<style lang="scss">
+.document_detail_eidt1 {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 999999;
+  width: 100%;
+  height: 100%;
+  border: 1px solid #9f9f9f;
+  .box_app {
+    width: 1200px !important;
+    height: 80vh !important;
+    background-color: #f1f1f1;
+    margin-top: 100px;
+  }
+  .move_pop {
+    width: 100%;
+    // position: absolute;
+    // top: 0;
+    // right: 0%;
+    height: 24px;
+    // background: linear-gradient(#2a5095, #213f7b, #111e48);
+    background-color: #f4f5f6;
+    display: grid;
+    place-items: center;
+    > span {
+      color: #000000;
+      font-weight: bold;
+      font-size: 20px;
+      letter-spacing: 2px;
+    }
+    .box {
+      display: flex;
+      width: 60px;
+      position: absolute;
+      top: 0;
+      right: 10px;
+      // height: 100%;
+      align-items: center;
+      img {
+        width: 22px;
+        margin-top: 6px;
+        cursor: pointer;
+      }
+      .close {
+        position: absolute;
+        right: 2px;
+        /* top: -8px; */
+        color: #8d8d8d;
+        width: 24px;
+        height: 24px;
+        font-size: 20px;
+        //border: 2px solid #0ff;
+        border-radius: 50%;
+        display: grid;
+        place-items: center;
+        cursor: pointer;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/safety/safetyWeeklyReport/component/icon/full.png b/src/views/safety/safetyWeeklyReport/component/icon/full.png
new file mode 100644
index 0000000..973cf14
Binary files /dev/null and b/src/views/safety/safetyWeeklyReport/component/icon/full.png differ
diff --git a/src/views/safety/safetyWeeklyReport/component/icon/suo.png b/src/views/safety/safetyWeeklyReport/component/icon/suo.png
new file mode 100644
index 0000000..80f2233
Binary files /dev/null and b/src/views/safety/safetyWeeklyReport/component/icon/suo.png differ
diff --git a/src/views/safety/safetyWeeklyReport/component/model.ts b/src/views/safety/safetyWeeklyReport/component/model.ts
new file mode 100644
index 0000000..90873c4
--- /dev/null
+++ b/src/views/safety/safetyWeeklyReport/component/model.ts
@@ -0,0 +1,58 @@
+export interface BusWeeklySecurityReportTableColumns {    
+    id:number;  // 主键ID    
+    projectId:number;  // 项目ID    
+    projectName:string;  // 项目名称    
+    scope:string;  // 周期范围    
+    scopeEnd:string;  // 周期范围结束    
+    path:string;  // 文件位置    
+    createBy:string;  // 创建者    
+    updateBy:string;  // 更新者    
+    createdAt:string;  // 创建时间    
+}
+
+
+export interface BusWeeklySecurityReportInfoData {    
+    id:number|undefined;        // 主键ID    
+    projectId:number|undefined; // 项目ID    
+    projectName:string|undefined; // 项目名称    
+    scope:string|undefined; // 周期范围    
+    scopeEnd:string|undefined; // 周期范围结束    
+    path:string|undefined; // 文件位置    
+    createBy:string|undefined; // 创建者    
+    updateBy:string|undefined; // 更新者    
+    createdAt:string|undefined; // 创建时间    
+    updatedAt:string|undefined; // 更新时间    
+    deletedAt:string|undefined; // 删除时间    
+}
+
+
+export interface BusWeeklySecurityReportTableDataState {
+    ids:any[];
+    tableData: {
+        data: Array<BusWeeklySecurityReportTableColumns>;
+        total: number;
+        loading: boolean;
+        param: {
+            pageNum: number;
+            pageSize: number;            
+            id: number|undefined;            
+            projectId: number|undefined;            
+            projectName: string|undefined;            
+            scope: string|undefined;            
+            scopeEnd: string|undefined;            
+            path: string|undefined;            
+            createBy: string|undefined;            
+            updateBy: string|undefined;            
+            createdAt: string|undefined;            
+            dateRange: string[];
+        };
+    };
+}
+
+
+export interface BusWeeklySecurityReportEditState{
+    loading:boolean;
+    isShowDialog: boolean;
+    formData:BusWeeklySecurityReportInfoData;
+    rules: object;
+}
\ No newline at end of file
diff --git a/src/views/safety/safetyWeeklyReport/index.vue b/src/views/safety/safetyWeeklyReport/index.vue
index 2ac4adf..670cfb7 100644
--- a/src/views/safety/safetyWeeklyReport/index.vue
+++ b/src/views/safety/safetyWeeklyReport/index.vue
@@ -1,112 +1,95 @@
 <template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="周期范围" prop="scope">
-              <el-date-picker
-                clearable
-                v-model="queryParams.scopeDate"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
+  <div class="system-busWeeklySecurityReport-container">
+    <el-card shadow="hover">
+      <div class="system-busWeeklySecurityReport-search mb15">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="1.5">
+              <el-form-item label="周期范围" prop="scopeDate">
+                <el-date-picker
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  v-model="scopeDate"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item>
+                <el-button type="primary" @click="onSearch"
+                  ><el-icon><Search /></el-icon>搜索</el-button
+                >
+                <el-button @click="resetQuery(queryRef)"
+                  ><el-icon><Refresh /></el-icon>重置</el-button
+                >
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyWeeklyReport:add']">新增 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['safety:safetyWeeklyReport:remove']"
+            <el-button type="primary" @click="handleAdd" v-auth="'api/v1/system/busWeeklySecurityReport/add'"
+              ><el-icon><Plus /></el-icon>新增</el-button
             >
-              批量删除
-            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:safetyWeeklyReport:export']">导出 </el-button>
+            <el-button type="danger" :disabled="multiple" @click="handleDelete(null)" v-auth="'api/v1/system/busWeeklySecurityReport/delete'"
+              ><el-icon><Delete /></el-icon>删除</el-button
+            >
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="safetyWeeklyReportList" @selection-change="handleSelectionChange">
+      </div>
+      <el-table v-loading="loading" :data="tableData.data" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="周期" align="center" prop="week" />
-        <el-table-column label="周期范围" align="center" prop="scope" width="260">
+        <el-table-column label="序号" align="center" type="index" min-width="50px" />
+        <el-table-column label="周" align="center" prop="week" min-width="100px" />
+        <el-table-column label="周期范围" align="center" prop="scope" min-width="200px">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.scope, '{y}-{m}-{d}') }} 至 {{ parseTime(scope.row.scopeEnd, '{y}-{m}-{d}') }}</span>
+            <span>{{ scope.row.scope + '至' + scope.row.scopeEnd }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <!-- <el-table-column label="文件位置" align="center" prop="path" min-width="100px" /> -->
+        <el-table-column label="创建时间" align="center" prop="createdAt" min-width="100px">
           <template #default="scope">
-            <el-space>
-              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyWeeklyReport:edit']">
-                修改
-              </el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyWeeklyReport:remove']">
-                删除
-              </el-button>
-            </el-space>
+            <span>{{ scope.row.createdAt }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding" min-width="200px" fixed="right">
+          <template #default="scope">
+            <el-button type="primary" link @click="handleView(scope.row)"
+              ><el-icon><View /></el-icon>预览</el-button
+            >
+            <el-button type="success" link @click="handleUpdate(scope.row)" v-auth="'api/v1/system/busWeeklySecurityReport/edit'"
+              ><el-icon><EditPen /></el-icon>修改</el-button
+            >
+            <el-button type="danger" link @click="handleDelete(scope.row)" v-auth="'api/v1/system/busWeeklySecurityReport/delete'"
+              ><el-icon><DeleteFilled /></el-icon>删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination
+        v-show="tableData.total > 0"
+        :total="tableData.total"
+        v-model:page="tableData.param.pageNum"
+        v-model:limit="tableData.param.pageSize"
+        @pagination="busWeeklySecurityReportList"
+      />
     </el-card>
-    <!-- 添加或修改安全周报对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="safetyWeeklyReportFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="周期" prop="week">
-          <el-input v-model="form.week" placeholder="请输入周期" />
-        </el-form-item>
-        <el-form-item label="周期开始范围" prop="scope">
-          <el-date-picker clearable v-model="form.scope" type="date" value-format="YYYY-MM-DD" placeholder="请选择周期范围" />
-        </el-form-item>
-        <el-form-item label="周期范围结束" prop="scopeEnd">
-          <el-date-picker clearable v-model="form.scopeEnd" type="date" value-format="YYYY-MM-DD" placeholder="请选择周期范围结束" />
-        </el-form-item>
-        <el-form-item label="文件位置" prop="path">
-          <div><file-upload v-model="form.path" :file-size="20" :limit="1" :file-type="['doc', 'docx']" /></div>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <apiV1SystemBusWeeklySecurityReportAdd
+      ref="addRef"
+      @busWeeklySecurityReportList="busWeeklySecurityReportList"
+    ></apiV1SystemBusWeeklySecurityReportAdd>
+    <documentsEdit ref="documentsEditRef" v-if="documentsEditShow" @onClose="documentsEditShow = false"></documentsEdit>
+    <documentsDetail ref="documentsDetailRef" v-if="documentsDetailShow" @onClose="documentsDetailShow = false"></documentsDetail>
   </div>
 </template>
-
-<script setup name="SafetyWeeklyReport" lang="ts">
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, computed, getCurrentInstance, toRaw, nextTick } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import {
   addSafetyWeeklyReport,
   delSafetyWeeklyReport,
@@ -114,171 +97,170 @@ import {
   listSafetyWeeklyReport,
   updateSafetyWeeklyReport
 } from '@/api/safety/safetyWeeklyReport';
-import { SafetyWeeklyReportForm, SafetyWeeklyReportQuery, SafetyWeeklyReportVO } from '@/api/safety/safetyWeeklyReport/types';
-import { useUserStoreHook } from '@/store/modules/user';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+import apiV1SystemBusWeeklySecurityReportAdd from './component/add.vue';
+// 预览文档
+import documentsDetail from './component/documentsDetail/index.vue';
+// 编辑文档
+import documentsEdit from './component/documentsEdit/index.vue';
 // 获取用户 store
+import { useUserStoreHook } from '@/store/modules/user';
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const safetyWeeklyReportList = ref<SafetyWeeklyReportVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const safetyWeeklyReportFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: SafetyWeeklyReportForm = {
-  id: undefined,
-  projectId: currentProject.value?.id,
-  week: undefined,
-  scope: undefined,
-  scopeEnd: undefined,
-  path: undefined,
-  remark: undefined
-};
-const data = reactive<PageData<SafetyWeeklyReportForm, SafetyWeeklyReportQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    id: undefined,
-    projectId: currentProject.value?.id,
-    week: undefined,
-    scopeDate: undefined,
-    remark: undefined,
-    params: {}
+export default defineComponent({
+  name: 'index',
+  components: {
+    apiV1SystemBusWeeklySecurityReportAdd,
+    documentsDetail,
+    documentsEdit
   },
-  rules: {
-    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
-    projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询安全周报列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listSafetyWeeklyReport(queryParams.value);
-  safetyWeeklyReportList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  safetyWeeklyReportFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: SafetyWeeklyReportVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加安全周报';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: SafetyWeeklyReportVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getSafetyWeeklyReport(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改安全周报';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  safetyWeeklyReportFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      form.value.projectId = currentProject.value?.id;
-      if (form.value.id) {
-        await updateSafetyWeeklyReport(form.value).finally(() => (buttonLoading.value = false));
+  setup() {
+    const { proxy } = <any>getCurrentInstance();
+    const loading = ref(false);
+    const queryRef = ref();
+    const addRef = ref();
+    // 是否显示所有搜索选项
+    const showAll = ref(false);
+    const documentsDetailRef = ref(false);
+    const documentsEditRef = ref(false);
+    // 非单个禁用
+    const single = ref(true);
+    // 非多个禁用
+    const multiple = ref(true);
+    // 字典选项数据
+    const state = reactive({
+      ids: [],
+      documentsDetailShow: false,
+      documentsEditShow: false,
+      tableData: {
+        data: [],
+        total: 0,
+        loading: false,
+        param: {
+          pageNum: 1,
+          pageSize: 10,
+          id: undefined,
+          projectId: currentProject.value?.goId,
+          projectName: undefined,
+          scope: undefined,
+          scopeEnd: undefined,
+          path: undefined,
+          createBy: undefined,
+          updateBy: undefined,
+          createdAt: undefined,
+          dateRange: [],
+          scopeDate: ''
+        }
+      },
+      projectList: [],
+      scopeDate: [] //时间范围
+    });
+    // 页面加载时
+    onMounted(() => {
+      initTableData();
+    });
+    // 初始化表格数据
+    const initTableData = () => {
+      busWeeklySecurityReportList();
+    };
+    /** 重置按钮操作 */
+    const resetQuery = (formEl: FormInstance | undefined) => {
+      if (!formEl) return;
+      state.scopeDate = [];
+      state.tableData.param.scopeDate = '';
+      formEl.resetFields();
+      busWeeklySecurityReportList();
+    };
+    const onSearch = () => {
+      state.tableData.param.scopeDate = state.scopeDate.join(',');
+      busWeeklySecurityReportList();
+    };
+    // 获取列表数据
+    const busWeeklySecurityReportList = () => {
+      loading.value = true;
+      listSafetyWeeklyReport(state.tableData.param).then((res: any) => {
+        let list = res.data.list ?? [];
+        state.tableData.data = list;
+        state.tableData.total = res.data.total;
+        loading.value = false;
+      });
+    };
+    // 多选框选中数据
+    const handleSelectionChange = (selection) => {
+      state.ids = selection.map((item) => item.id);
+      single.value = selection.length != 1;
+      multiple.value = !selection.length;
+    };
+    const handleAdd = () => {
+      addRef.value.openDialog();
+    };
+    const handleUpdate = (row) => {
+      state.documentsEditShow = true;
+      nextTick(() => {
+        documentsEditRef.value.openDialog(row);
+      });
+    };
+    const handleDelete = (row) => {
+      let msg = '你确定要删除所选数据？';
+      let id: number[] = [];
+      if (row) {
+        msg = `此操作将永久删除数据，是否继续?`;
+        id = [row.id];
       } else {
-        await addSafetyWeeklyReport(form.value).finally(() => (buttonLoading.value = false));
+        id = state.ids;
       }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: SafetyWeeklyReportVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除安全周报编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delSafetyWeeklyReport(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'safety/safetyWeeklyReport/export',
-    {
-      ...queryParams.value
-    },
-    `safetyWeeklyReport_${new Date().getTime()}.xlsx`
-  );
-};
+      if (id.length === 0) {
+        ElMessage.error('请选择要删除的数据。');
+        return;
+      }
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          delSafetyWeeklyReport(id).then(() => {
+            ElMessage.success('删除成功');
+            busWeeklySecurityReportList();
+          });
+        })
+        .catch(() => {});
+    };
+    const handleView = (row) => {
+      state.documentsDetailShow = true;
+      nextTick(() => {
+        documentsDetailRef.value.openDialog(row);
+      });
+    };
 
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    queryParams.value.projectId = nid;
-    form.value.projectId = nid;
-    getList();
+    return {
+      proxy,
+      addRef,
+      showAll,
+      loading,
+      single,
+      multiple,
+      documentsEditRef,
+      documentsDetailRef,
+      queryRef,
+      resetQuery,
+      onSearch,
+      busWeeklySecurityReportList,
+      handleSelectionChange,
+      handleAdd,
+      handleUpdate,
+      handleDelete,
+      handleView,
+      ...toRefs(state)
+    };
   }
-);
-
-onUnmounted(() => {
-  listeningProject();
-});
-
-onMounted(() => {
-  getList();
 });
 </script>
+<style lang="scss" scoped>
+.colBlock {
+  display: block;
+}
+.colNone {
+  display: none;
+}
+</style>
diff --git a/src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue b/src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue
index 7ead441..b344963 100644
--- a/src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue
+++ b/src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue
@@ -3,19 +3,17 @@
     <el-descriptions v-loading="loading" :column="2">
       <el-descriptions-item :span="2" label="宣讲人">{{ teamMeetingDetail?.compereName }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="参与人">
-        <!-- <span :key="item.id" v-for="item in teamMeetingDetail?.participantList">{{ item.name }}，</span> -->
-        <span>{{teamMeetingDetail?.participantList.map(item => item.name).join("，")}}</span>
+        <span :key="item.id" v-for="item in teamMeetingDetail?.participantName.split(',')">{{ item }}，</span>
       </el-descriptions-item>
       <el-descriptions-item label="班组名称">{{ teamMeetingDetail?.teamName }}</el-descriptions-item>
-      <el-descriptions-item label="施工单位">{{ teamMeetingDetail?.contractorName }}</el-descriptions-item>
-      <el-descriptions-item label="开会时间">{{ dayjs(teamMeetingDetail?.meetingDate).format('YYYY 年 MM 月 DD 日')
-      }}</el-descriptions-item>
-      <el-descriptions-item label="上传时间">{{ teamMeetingDetail?.createTime }}</el-descriptions-item>
+      <el-descriptions-item label="施工单位">{{ teamMeetingDetail?.labourserviceName }}</el-descriptions-item>
+      <el-descriptions-item label="开会时间">{{ dayjs(teamMeetingDetail?.meetingDate).format('YYYY 年 MM 月 DD 日') }}</el-descriptions-item>
+      <el-descriptions-item label="上传时间">{{ teamMeetingDetail?.createdAt }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="班会内容">{{ teamMeetingDetail?.content }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="班会图片" v-if="teamMeetingDetail?.pictureUrlList">
         <el-space wrap>
-          <span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList?.split(',')">
-            <image-preview :src="item" width="200px" />
+          <span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList">
+            <image-preview :src="'http://58.17.134.85:8920' + item" width="200px" />
           </span>
         </el-space>
       </el-descriptions-item>
@@ -37,9 +35,10 @@ const loading = ref<boolean>(false);
 const teamMeetingDetail = ref<TeamMeetingVO>();
 const get = async () => {
   loading.value = true;
-  const res = await getTeamMeeting(props.teamMeetingId);
-  if (res.data && res.code === 200) {
+  const res = await getTeamMeeting({ id: props.teamMeetingId });
+  if (res.data && res.code === 0) {
     teamMeetingDetail.value = res.data;
+    teamMeetingDetail.value.pictureUrlList = res.data?.picture.split(',');
   }
   loading.value = false;
 };
diff --git a/src/views/safety/teamMeeting/index.vue b/src/views/safety/teamMeeting/index.vue
index 5a45dfa..a6e4c2c 100644
--- a/src/views/safety/teamMeeting/index.vue
+++ b/src/views/safety/teamMeeting/index.vue
@@ -1,13 +1,11 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="开会时间" prop="meetingDate">
-              <el-date-picker clearable v-model="queryParams.meetingDate" type="date" value-format="YYYY-MM-DD"
-                placeholder="请选择开会时间" />
+              <el-date-picker clearable v-model="queryParams.meetingDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开会时间" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,19 +19,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:teamMeeting:add']"> 新增
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['safety:teamMeeting:remove']">
-              删除
-            </el-button>
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:teamMeeting:export']">导出 </el-button>
-          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -42,11 +27,11 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
         <el-table-column label="宣讲人" align="center" prop="compereName" />
-        <el-table-column label="施工单位" align="center" prop="contractorName" />
+        <el-table-column label="施工单位" align="center" prop="labourserviceName" />
         <el-table-column label="班组名称" align="center" prop="teamName" />
         <el-table-column label="参与人数" align="center">
           <template #default="scope">
-            <span>{{ scope.row.participantList.length + 1 }}</span>
+            <span>{{ scope.row.participantId.split(',').length }}</span>
           </template>
         </el-table-column>
         <el-table-column label="开会时间" align="center" prop="meetingDate" width="180">
@@ -54,38 +39,27 @@
             <span>{{ parseTime(scope.row.meetingDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="上传时间" align="center" prop="createTime" width="180" />
-        <!-- <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {hh}:{mm}:{ss}') }}</span>
-          </template>
-        </el-table-column> -->
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="上传时间" align="center" prop="createdAt" width="180"> </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)"
-                v-hasPermi="['safety:teamMeeting:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['safety:teamMeeting:query']">
                 详情
               </el-button>
-              <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:teamMeeting:edit']"> 修改 </el-button> -->
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['safety:teamMeeting:remove']">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:teamMeeting:remove']">
                 删除
               </el-button>
             </el-space>
           </template>
         </el-table-column>
       </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改站班会对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="50%" append-to-body>
       <el-form ref="teamMeetingFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="开会时间" prop="meetingDate">
-          <el-date-picker clearable v-model="form.meetingDate" type="date" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择开会时间" />
+          <el-date-picker clearable v-model="form.meetingDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开会时间" />
         </el-form-item>
         <el-form-item label="班组名称" prop="teamId">
           <el-select v-model="form.teamId" placeholder="请选择班组">
@@ -99,14 +73,12 @@
         </el-form-item>
         <el-form-item label="宣讲人" prop="compereId">
           <el-select v-model="form.compereId" placeholder="请选择宣讲人">
-            <el-option v-for="item in compereList" :key="item.memberId" :label="item.memberName"
-              :value="item.memberId" />
+            <el-option v-for="item in compereList" :key="item.memberId" :label="item.memberName" :value="item.memberId" />
           </el-select>
         </el-form-item>
         <el-form-item label="参与人" prop="participantIdList">
           <el-select v-model="form.participantIdList" placeholder="请选择参与人" multiple>
-            <el-option v-for="item in participantList" :key="item.memberId" :label="item.memberName"
-              :value="item.memberId" />
+            <el-option v-for="item in participantList" :key="item.memberId" :label="item.memberName" :value="item.memberId" />
           </el-select>
         </el-form-item>
         <el-form-item label="班会主题" prop="meetingTheme">
@@ -136,9 +108,7 @@
 </template>
 
 <script setup name="TeamMeeting" lang="ts">
-console.log(111);
-
-import { addTeamMeeting, delTeamMeeting, getTeamMeeting, listTeamMeeting, updateTeamMeeting, listProjectTeamMember, getProjectContractorTeamList } from '@/api/safety/teamMeeting';
+import { addTeamMeeting, delTeamMeeting, getTeamMeeting, listTeamMeeting, updateTeamMeeting } from '@/api/safety/teamMeeting';
 import { TeamMeetingForm, TeamMeetingQuery, TeamMeetingVO } from '@/api/safety/teamMeeting/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import TeamMeetingDetailDrawer from '@/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue';
@@ -162,8 +132,6 @@ const contractorList = ref<any>([]);
 const compereList = ref<any>([]);
 const participantList = ref<any>([]);
 
-
-
 const queryFormRef = ref<ElFormInstance>();
 const teamMeetingFormRef = ref<ElFormInstance>();
 const currentTeamMeetingId = ref<string | number>(0);
@@ -174,7 +142,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: TeamMeetingForm = {
   id: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value.goId,
   teamId: undefined,
   contractorId: undefined,
   meetingDate: undefined,
@@ -190,7 +158,7 @@ const data = reactive<PageData<TeamMeetingForm, TeamMeetingQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value?.id,
+    projectId: currentProject.value.goId,
     teamId: undefined,
     contractorId: undefined,
     meetingDate: undefined,
@@ -213,8 +181,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listTeamMeeting(queryParams.value);
-  teamMeetingList.value = res.rows;
-  total.value = res.total;
+  teamMeetingList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
@@ -255,6 +223,14 @@ const handleAdd = () => {
   dialog.visible = true;
   dialog.title = '添加站班会';
 };
+/** 删除按钮操作 */
+const handleDelete = async (row: TeamMeetingVO) => {
+  proxy?.$modal.confirm('确定删除选中数据吗？').then(async () => {
+    await delTeamMeeting(row.id);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  });
+};
 
 /** 展开站班会详情抽屉操作 */
 const showDetailDrawer = ref<boolean>(false);
@@ -262,17 +238,6 @@ const handleShowDrawer = (row?: TeamMeetingVO) => {
   currentTeamMeetingId.value = row.id;
   showDetailDrawer.value = true;
 };
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: TeamMeetingVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getTeamMeeting(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改站班会';
-};
-
 /** 提交按钮 */
 const submitForm = () => {
   teamMeetingFormRef.value?.validate(async (valid: boolean) => {
@@ -289,30 +254,9 @@ const submitForm = () => {
     }
   });
 };
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: TeamMeetingVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除站班会编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delTeamMeeting(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'safety/teamMeeting/export',
-    {
-      ...queryParams.value
-    },
-    `teamMeeting_${new Date().getTime()}.xlsx`
-  );
-};
-
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
@@ -326,7 +270,9 @@ onUnmounted(() => {
 console.log(11);
 const getTeamAndContractor = async () => {
   const projectId = currentProject.value?.id;
-  const { data: { teamList: teamListRes, contractorList: contractorListRes } } = await getProjectContractorTeamList(projectId);
+  const {
+    data: { teamList: teamListRes, contractorList: contractorListRes }
+  } = await getProjectContractorTeamList(projectId);
   console.log(teamListRes, contractorListRes);
 
   teamList.value = teamListRes;
@@ -335,13 +281,13 @@ const getTeamAndContractor = async () => {
 const getUsers = async () => {
   const { rows } = await listProjectTeamMember({
     projectId: currentProject.value?.id
-  })
-  compereList.value = rows.filter(item => item.postId == 1)
-  participantList.value = rows.filter(item => item.postId == 0)
+  });
+  compereList.value = rows.filter((item) => item.postId == 1);
+  participantList.value = rows.filter((item) => item.postId == 0);
 };
 const getData = async () => {
-  await getTeamAndContractor()
-  await getUsers()
+  await getTeamAndContractor();
+  await getUsers();
 };
 onMounted(() => {
   console.log(122);
diff --git a/src/views/safety/violationLevel/component/add.vue b/src/views/safety/violationLevel/component/add.vue
index c52b881..177289f 100644
--- a/src/views/safety/violationLevel/component/add.vue
+++ b/src/views/safety/violationLevel/component/add.vue
@@ -7,8 +7,8 @@
       <el-form ref="formRef" size="large" :model="formData" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="违章等级" prop="violationLevel">
-              <el-input v-model="formData.violationLevel" placeholder="请输入违章等级" />
+            <el-form-item label="违章等级" prop="grade">
+              <el-input v-model="formData.grade" placeholder="请输入违章等级" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -17,43 +17,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="风险等级" prop="riskType">
-              <el-select v-model="formData.riskType" placeholder="请选择风险等级">
-                <el-option v-for="dict in risxList" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="风险等级" prop="risx">
+              <el-select v-model="formData.risx" placeholder="请选择风险等级">
+                <el-option v-for="dict in risxList" :key="dict.key" :label="dict.value" :value="dict.key" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" :offset="0" prop="dept">
-            <el-form-item label="部门">
-              <el-cascader
-                :options="postListAll"
-                v-model="formData.dept"
-                clearable
-                filterable
-                :show-all-levels="false"
-                placeholder="请选择部门"
-                :props="{ expandTrigger: 'hover', checkStrictly: true, value: 'id', emitPath: false, multiple: true }"
-                @change="changeDept"
-              >
-              </el-cascader>
-            </el-form-item>
-          </el-col>
           <el-col :span="24">
-            <el-form-item label="岗位" prop="postIdList">
-              <el-select v-model="formData.postIdList" placeholder="请选择岗位" multiple :disabled="!formData.dept">
-                <el-option
-                  v-for="dict in formData.postWorkList"
-                  :key="dict.postId"
-                  :label="dict.deptName + '/' + dict.postName"
-                  :value="dict.postId"
-                />
+            <el-form-item label="岗位" prop="posts">
+              <el-select v-model="formData.posts" placeholder="请选择岗位" multiple>
+                <el-option v-for="dict in postListAll" :key="dict.postId" :label="dict.postName" :value="dict.postId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="违章类型" prop="violationType">
-              <el-select v-model="formData.violationType" placeholder="请选择违章类型" multiple>
-                <el-option v-for="dict in tourTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="违章类型" prop="tourType">
+              <el-select v-model="formData.tourType" placeholder="请选择违章类型" multiple>
+                <el-option v-for="dict in tourTypeOptions" :key="dict.key" :label="dict.value" :value="dict.key" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -166,16 +146,14 @@ const resetForm = () => {
 // 提交操作
 const onSubmit = () => {
   if (!formRef.value) return;
-
   formRef.value.validate((valid: boolean) => {
     if (valid) {
       loading.value = true;
 
       const param = JSON.parse(JSON.stringify(formData));
-      if (param.violationType?.length) {
-        param.violationType = param.violationType.join(',');
+      if (param.tourType?.length) {
+        param.tourType = param.tourType.join(',');
       }
-
       addViolationLevel(param)
         .then(() => {
           ElMessage.success('添加成功');
@@ -189,32 +167,6 @@ const onSubmit = () => {
   });
 };
 
-const changeDept = (val: any) => {
-  formData.postWorkList = getPostVoListByIds(props.postListAll, val);
-  formData.postIdList = [];
-  console.log(formData.postWorkList, val);
-};
-
-function getPostVoListByIds(tree: any[], idList: (string | number)[]): any[] {
-  const idSet = new Set(idList.map(String)); // 用于快速匹配 ID（统一为字符串比较）
-  const result: any[] = [];
-
-  function dfs(nodes: any[]) {
-    for (const node of nodes) {
-      if (idSet.has(String(node.id))) {
-        result.push(...(node.postVoList || []));
-      }
-
-      if (node.children && node.children.length > 0) {
-        dfs(node.children);
-      }
-    }
-  }
-
-  dfs(tree);
-  return result;
-}
-
 defineExpose({
   openDialog,
   closeDialog
diff --git a/src/views/safety/violationLevel/component/edit.vue b/src/views/safety/violationLevel/component/edit.vue
index 50f520d..a0abcff 100644
--- a/src/views/safety/violationLevel/component/edit.vue
+++ b/src/views/safety/violationLevel/component/edit.vue
@@ -1,16 +1,14 @@
 <template>
   <div class="system-busViolationLevel-edit">
-    <el-dialog v-model="isShowDialog" width="550px" :close-on-click-modal="false" :destroy-on-close="true" custom-class="busViolationLevel_edit">
+    <el-dialog v-model="isShowDialog" width="550px" :close-on-click-modal="false" :destroy-on-close="true">
       <template #header>
-        <div v-drag="['.system-busViolationLevel-edit .el-dialog', '.system-busViolationLevel-edit .el-dialog__header']">
-          {{ (!formData.id || formData.id == 0 ? '添加' : '修改') + '违章等级' }}
-        </div>
+        <div v-drag="['.system-busViolationLevel-add .el-dialog', '.system-busViolationLevel-add .el-dialog__header']">修改违章等级</div>
       </template>
       <el-form ref="formRef" size="large" :model="formData" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="违章等级" prop="violationLevel">
-              <el-input v-model="formData.violationLevel" placeholder="请输入违章等级" />
+            <el-form-item label="违章等级" prop="grade">
+              <el-input v-model="formData.grade" placeholder="请输入违章等级" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -19,43 +17,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="风险等级" prop="riskType">
-              <el-select v-model="formData.riskType" placeholder="请选择风险等级">
-                <el-option v-for="dict in risxList" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="风险等级" prop="risx">
+              <el-select v-model="formData.risx" placeholder="请选择风险等级">
+                <el-option v-for="dict in risxList" :key="dict.key" :label="dict.value" :value="dict.key" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" :offset="0" prop="dept">
-            <el-form-item label="部门">
-              <el-cascader
-                :options="postListAll"
-                v-model="formData.dept"
-                clearable
-                filterable
-                :show-all-levels="false"
-                placeholder="请选择部门"
-                :props="{ expandTrigger: 'hover', checkStrictly: true, value: 'id', emitPath: false, multiple: true }"
-                @change="changeDept"
-              >
-              </el-cascader>
-            </el-form-item>
-          </el-col>
           <el-col :span="24">
-            <el-form-item label="岗位" prop="postIdList">
-              <el-select v-model="formData.postIdList" placeholder="请选择岗位" multiple :disabled="!formData.dept">
-                <el-option
-                  v-for="dict in formData.postWorkList"
-                  :key="dict.postId"
-                  :label="dict.deptName + '/' + dict.postName"
-                  :value="dict.postId"
-                />
+            <el-form-item label="岗位" prop="posts">
+              <el-select v-model="formData.posts" placeholder="请选择岗位" multiple>
+                <el-option v-for="dict in postListAll" :key="dict.postId" :label="dict.postName" :value="dict.postId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="违章类型" prop="violationType">
-              <el-select v-model="formData.violationType" placeholder="请选择违章类型" multiple>
-                <el-option v-for="dict in tourTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="违章类型" prop="tourType">
+              <el-select v-model="formData.tourType" placeholder="请选择违章类型" multiple>
+                <el-option v-for="dict in tourTypeOptions" :key="dict.key" :label="dict.value" :value="dict.key" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -138,11 +116,10 @@ const openDialog = (row?: ViolationLevelVO) => {
       getViolationLevel(row.id as string).then((res) => {
         loadingInstance.close();
         const data = res.data;
-        data.postIdList = (data.postList || []).map((item: any) => item.postId);
-        data.violationType = data.violationType ? (data.violationType as string).split(',') : [];
-        formData.dept = (data.postList || []).map((item: any) => item.deptId);
-        formData.postWorkList = getPostVoListByIds(props.postListAll, formData.dept);
+        data.posts = (data.postEntity || []).map((item: any) => item.postId);
+        data.tourType = data.tourType ? (data.tourType as string).split(',') : [];
         Object.assign(formData, data);
+        console.log(formData);
       });
     });
   }
@@ -167,11 +144,8 @@ const onSubmit = () => {
     loading.value = true;
 
     const param = JSON.parse(JSON.stringify(formData));
-    if (Array.isArray(param.violationType)) {
-      param.violationType = param.violationType.join(',');
-    }
-    if (Array.isArray(param.riskType)) {
-      param.riskType = param.riskType.join(',');
+    if (Array.isArray(param.tourType)) {
+      param.tourType = param.tourType.join(',');
     }
 
     const action = !param.id || param.id === 0 ? addViolationLevel : updateViolationLevel;
diff --git a/src/views/safety/violationLevel/index.vue b/src/views/safety/violationLevel/index.vue
index b954995..f4c3c0a 100644
--- a/src/views/safety/violationLevel/index.vue
+++ b/src/views/safety/violationLevel/index.vue
@@ -6,8 +6,8 @@
           <el-row>
             <el-col :span="8" class="colBlock">
               <el-form-item label="违章类型" prop="tourType">
-                <el-select v-model="state.tableData.param.violationType" placeholder="请选择违章类型" clearable>
-                  <el-option v-for="dict in violation_level_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-select v-model="state.tableData.param.tourType" placeholder="全部" clearable>
+                  <el-option v-for="dict in safety_inspection_violation_type" :key="dict.key" :label="dict.value" :value="dict.key" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -44,23 +44,23 @@
       <el-table v-loading="loading" :data="state.tableData.data" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" :index="indexMethod" width="60" />
-        <el-table-column label="违章等级" align="center" prop="violationLevel" width="100px" />
+        <el-table-column label="违章等级" align="center" prop="grade" width="100px" />
         <el-table-column label="颜色" align="center" prop="color" width="100px">
           <template #default="scope">
             <div :style="`background: ${scope.row.color};width:15px;height:15px;margin:auto;`"></div>
           </template>
         </el-table-column>
-        <el-table-column label="风险等级" align="center" prop="riskType" width="150px">
+        <el-table-column label="风险等级" align="center" width="150px">
           <template #default="scope">
-            <span>{{ filterRiskLevelType(scope.row.riskType) }}</span>
+            <span>{{ filterRiskLevelType(scope.row.risx) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="违章类型" show-overflow-tooltip align="center" prop="violationType" :formatter="tourTypeFormat" min-width="100px" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="150px">
+        <el-table-column label="违章类型" align="center">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ filterRiskTourType(scope.row.tourType) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createdAt"> </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding" width="160px" fixed="right">
           <template #default="scope">
             <el-button type="success" link @click="handleUpdate(scope.row)" v-auth="'api/v1/system/busViolationLevel/edit'">
@@ -83,15 +83,15 @@
 
     <apiV1SystemBusViolationLevelAdd
       ref="addRef"
-      :tourTypeOptions="violation_level_type"
-      :risxList="risk_level_type"
+      :tourTypeOptions="safety_inspection_violation_type"
+      :risxList="risx"
       @busViolationLevelList="busViolationLevelList"
       :postListAll="state.postListAll"
     />
     <apiV1SystemBusViolationLevelEdit
       ref="editRef"
-      :tourTypeOptions="violation_level_type"
-      :risxList="risk_level_type"
+      :tourTypeOptions="safety_inspection_violation_type"
+      :risxList="risx"
       :postListAll="state.postListAll"
       @busViolationLevelList="busViolationLevelList"
     />
@@ -107,6 +107,8 @@ import apiV1SystemBusViolationLevelAdd from '@/views/safety/violationLevel/compo
 import apiV1SystemBusViolationLevelEdit from '@/views/safety/violationLevel/component/edit.vue';
 import { useUserStoreHook } from '@/store/modules/user';
 import { listPost, listTreeByProject, optionselect } from '@/api/system/post';
+import { getDictData } from '@/api/project/goUser/index';
+
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -118,7 +120,8 @@ const queryRef = ref<FormInstance>();
 const addRef = ref<InstanceType<typeof apiV1SystemBusViolationLevelAdd>>();
 const editRef = ref<InstanceType<typeof apiV1SystemBusViolationLevelEdit>>();
 const detailRef = ref<any>();
-
+const risx = ref([]); // 风险等级
+const safety_inspection_violation_type = ref([]); // 违章类型
 const showAll = ref(false);
 const single = ref(true);
 const multiple = ref(true);
@@ -133,7 +136,7 @@ const state = reactive<any>({
     total: 0,
     loading: false,
     param: {
-      projectId: currentProject.value?.id,
+      projectId: currentProject.value?.goId,
       pageNum: 1,
       pageSize: 10,
       tourType: undefined,
@@ -147,7 +150,7 @@ const state = reactive<any>({
 const postList = () => {
   listTreeByProject().then((res) => {
     console.log('🚀 ~ listTreeByProject ~ res:', res);
-    state.postListAll = res.data ?? [];
+    state.postListAll = res.data.postList ?? [];
   });
 };
 
@@ -164,27 +167,17 @@ const resetQuery = (formEl?: FormInstance) => {
 const busViolationLevelList = () => {
   loading.value = true;
   listViolationLevel(state.tableData.param).then((res: any) => {
-    const list = res.rows ?? [];
-    state.tableData.data = list;
-    state.tableData.total = res.total;
+    state.tableData.data = res.data.list;
+    state.tableData.total = res.data.total;
     loading.value = false;
   });
 };
-
-const toggleSearch = () => {
-  showAll.value = !showAll.value;
-};
-
-const tourTypeFormat = (row: ViolationLevelVO) => {
-  const type: string[] = [];
-  if (row.violationType.includes(',')) {
-    (row.violationType as string).split(',').forEach((item) => {
-      type.push(proxy.selectDictLabel(violation_level_type.value, item));
-    });
-  } else {
-    type.push(proxy.selectDictLabel(violation_level_type.value, row.violationType as string));
-  }
-  return type.join(',');
+// 获取字典
+const getDictDataList = async () => {
+  const res = await getDictData('risx');
+  risx.value = res.data.values;
+  const res1 = await getDictData('tour_type');
+  safety_inspection_violation_type.value = res1.data.values;
 };
 
 const handleSelectionChange = (selection: ViolationLevelForm[]) => {
@@ -233,10 +226,6 @@ const handleDelete = (row: ViolationLevelVO | null) => {
     .catch(() => {});
 };
 
-const handleView = (row: ViolationLevelVO) => {
-  detailRef.value?.openDialog(toRaw(row));
-};
-
 const indexMethod = (index: number) => {
   const pageNum = state.tableData.param.pageNum - 1;
   if (pageNum !== -1 && pageNum !== 0) {
@@ -247,27 +236,41 @@ const indexMethod = (index: number) => {
 };
 
 const filterRiskLevelType = (val: any) => {
+  console.log(val);
   let label = '';
   if (val) {
-    if (risk_level_type.value.length) {
-      risk_level_type.value.forEach((item: any) => {
-        if (item.value == val) {
-          label = item.label;
+    if (risx.value.length) {
+      risx.value.forEach((item: any) => {
+        if (item.key == val) {
+          label = item.value;
+        }
+      });
+    }
+  }
+  return label;
+};
+const filterRiskTourType = (val: any) => {
+  let label = '';
+  if (val) {
+    if (risx.value.length) {
+      safety_inspection_violation_type.value.forEach((item: any) => {
+        if (val.split(',').includes(item.key)) {
+          label += item.value + ',';
         }
       });
     }
   }
   return label;
 };
-
 onMounted(() => {
+  getDictDataList();
   postList();
   initTableData();
 });
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value?.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     state.tableData.param.projectId = nid;
     initTableData();
diff --git a/src/views/safety/violationRecord/component/violationRecordDetailDialog.vue b/src/views/safety/violationRecord/component/violationRecordDetailDialog.vue
index 5cce5d0..c289a3b 100644
--- a/src/views/safety/violationRecord/component/violationRecordDetailDialog.vue
+++ b/src/views/safety/violationRecord/component/violationRecordDetailDialog.vue
@@ -6,30 +6,23 @@
       <!-- <h2 style="text-align: center; margin-top: 5px; font-weight: bold">安全生产监督检查通知书</h2> -->
       <el-row>
         <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.createByName }}</el-col>
-        <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createTime }}</el-col>
+        <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createdAt }}</el-col>
       </el-row>
       <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
         <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{ currentProject?.name }} </el-descriptions-item>
 
         <el-descriptions-item label-align="center" label="违章类型" label-class-name="white" width="300px">
-          <dict-tag :options="violation_level_type" :value="safetyInspectionDetail?.violationType" />
+          {{ safetyInspectionDetail?.tt }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="违章等级" label-class-name="white">
-          <div class="flex">
-            {{ safetyInspectionDetail?.levelVo.violationLevel }}：<dict-tag
-              :options="risk_level_type"
-              :value="safetyInspectionDetail?.levelVo.riskType"
-            />
-          </div>
+          {{ safetyInspectionDetail?.level }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查时间" class-name="zebra"
-          >{{ safetyInspectionDetail?.violationTime }}
-        </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="检查人" class-name="zebra"
-          >{{ safetyInspectionDetail?.createByName }}
+          >{{ safetyInspectionDetail?.reviewTime }}
         </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.reviewName }} </el-descriptions-item>
         <el-descriptions-item label-align="center" label="整改人" label-class-name="white"
-          >{{ safetyInspectionDetail?.handlerName }}
+          >{{ safetyInspectionDetail?.openidName }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
           {{ safetyInspectionDetail?.disposeDeadline ? dayjs(safetyInspectionDetail?.disposeDeadline).format('YYYY - MM - DD ') : '' }}
@@ -39,24 +32,24 @@
         <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
-          >{{ safetyInspectionDetail?.recognizeVo.description }}
+        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">
+          {{ safetyInspectionDetail?.tt }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
           <el-space wrap>
-            <!-- <div v-for="item in checkFileList" :key="item.ossId">
-              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-                <image-preview :src="item.url" width="200px" />
+            <div v-for="item in safetyInspectionDetail.checkAttachment" :key="item.ossId">
+              <span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
+                <image-preview :src="'http://58.17.134.85:8920' + item.path" width="200px" />
               </span>
               <span v-else>
-                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
-                  <span> {{ item.originalName }} </span>
+                <el-link :href="`${item.path}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.name }} </span>
                 </el-link>
               </span>
-            </div> -->
-            <span>
+            </div>
+            <!-- <span>
               <image-preview :src="safetyInspectionDetail?.recognizeVo.picture" width="200px" />
-            </span>
+            </span> -->
           </el-space>
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
@@ -69,16 +62,16 @@
   </div>
 
   <!-- </el-card> -->
-  <!-- <div class="dialog-footer">
-    <div class="btn-item" @click="handleExport">
+  <div class="dialog-footer">
+    <!-- <div class="btn-item" @click="handleExport">
       <img src="../../../../assets/icons/svg/derived.png" />
       <span>导出</span>
-    </div>
+    </div> -->
     <div class="btn-item" v-print="'#printMe'">
       <img src="../../../../assets/icons/svg/print.png" />
       <span>打印</span>
     </div>
-  </div> -->
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -91,6 +84,7 @@ import { ViolationRecordVO } from '@/api/safety/violationRecord/types';
 
 interface Props {
   violationRecordId?: string | number;
+  safety_inspection_violation_type?: Array<any>;
 }
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -103,7 +97,11 @@ const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const props = defineProps<Props>();
 const loading = ref<boolean>(false);
-const safetyInspectionDetail = ref<any>();
+const safetyInspectionDetail = ref<any>([
+  {
+    checkAttachment: []
+  }
+]);
 const checkFileList = ref<OssVO[]>();
 const rectificationFileList = ref<OssVO[]>();
 //检查状态图片
@@ -119,17 +117,9 @@ const inspectionType = computed(() => {
 
 const get = async () => {
   loading.value = true;
-  const res = await getViolationRecord(props.violationRecordId);
-  if (res.data && res.code === 200) {
+  const res = await getViolationRecord(props.violationRecordId as string);
+  if (res.data && res.code === 0) {
     safetyInspectionDetail.value = res.data;
-    if (res.data.checkFile) {
-      const checkFileRes = await listByIds(res.data.checkFile.split(','));
-      checkFileList.value = checkFileRes.data;
-    }
-    if (res.data.rectificationFile) {
-      const rectificationFileRes = await listByIds(res.data.rectificationFile.split(','));
-      rectificationFileList.value = rectificationFileRes.data;
-    }
   }
   loading.value = false;
 };
@@ -142,7 +132,17 @@ onMounted(() => {
   console.log('🚀 ~ onMounted ~ props.safetyInspectionId:', props.violationRecordId);
   get();
 });
-
+const filterRiskTourType = (val: any) => {
+  let label = '';
+  if (val) {
+    props.safety_inspection_violation_type.value.forEach((item: any) => {
+      if (val == item.key) {
+        label = item.value;
+      }
+    });
+  }
+  return label;
+};
 watch(
   () => props.violationRecordId,
   (newId, oldId) => {
@@ -179,7 +179,7 @@ watch(
 }
 
 .dialog-footer {
-  height: 200px;
+  height: 100px;
   display: flex;
 
   flex-direction: column;
diff --git a/src/views/safety/violationRecord/index.vue b/src/views/safety/violationRecord/index.vue
index 6841f43..2e71805 100644
--- a/src/views/safety/violationRecord/index.vue
+++ b/src/views/safety/violationRecord/index.vue
@@ -1,18 +1,17 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="工单号" prop="id">
               <el-input v-model="queryParams.id" placeholder="请输入工单号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="违章时间" prop="violationTime">
-              <el-date-picker clearable v-model="queryParams.violationTime" type="date" value-format="YYYY-MM-DD"
-                placeholder="请选择违章时间" />
+            <el-form-item label="违章类型" prop="tourType">
+              <el-select v-model="queryParams.tourType" placeholder="全部" clearable>
+                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.key" :label="dict.value" :value="dict.key" />
+              </el-select>
             </el-form-item>
-
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -21,14 +20,10 @@
         </el-card>
       </div>
     </transition>
-
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['safety:violationRecord:remove']">删除</el-button>
-          </el-col>
+          <el-button type="danger" @click="handleDelete()" plain icon="Delete" :disabled="multiple">删除</el-button>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -36,141 +31,148 @@
       <el-table v-loading="loading" :data="violationRecordList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="工单号" align="center" prop="id" v-if="true" />
-        <el-table-column label="违章等级" align="center" prop="levelVo" width="180">
+        <el-table-column label="违章/风险等级" align="center" prop="level" width="180"> </el-table-column>
+        <el-table-column label="数据源头" align="center" prop="dataSource" width="180">
           <template #default="scope">
-            <div class="flex justify-center">
-              {{ scope.row.levelVo.violationLevel }}：<dict-tag :options="risk_level_type"
-                :value="scope.row.levelVo.riskType" />
-            </div>
+            <span>{{ filterRiskTourTypes(scope.row.dataSource) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="违章类型" align="center" prop="violationType">
+        <el-table-column label="违章类型" align="center">
           <template #default="scope">
-            <dict-tag :options="violation_level_type" :value="scope.row.violationType" />
+            <span>{{ filterRiskTourType(scope.row.tourType) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="违章时间" align="center" prop="violationTime" width="180">
+        <el-table-column label="处理人" align="center" prop="nickName" min-width="100px">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.violationTime, '{y}-{m}-{d}') }}</span>
+            {{ scope.row.userName ? scope.row.userName : scope.row.nickName }}
           </template>
         </el-table-column>
-        <el-table-column label="处理人" align="center" prop="handlerName" />
-        <el-table-column label="整改措施" align="center" prop="measure" />
-        <el-table-column label="整改时间" align="center" prop="rectificationTime" width="180">
+        <el-table-column label="状态" align="center" prop="status" min-width="100px">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.rectificationTime, '{y}-{m}-{d}') }}</span>
+            <el-tag type="primary" v-if="scope.row.status == 1">通知</el-tag>
+            <el-tag type="warning" v-if="scope.row.status == 2">整改</el-tag>
+            <el-tag type="success" v-if="scope.row.status == 3 && scope.row.reviewType == 1">复查成功</el-tag>
+            <el-tag type="danger" v-if="scope.row.status == 3 && scope.row.reviewType == 2">复查失败</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="复查情况" align="center" prop="review" />
-        <el-table-column label="复查状态" align="center" prop="reviewType">
+        <el-table-column label="违规时间" align="center" prop="createdAt" min-width="100px">
           <template #default="scope">
-            {{ scope.row.reviewType ? (scope.row.reviewType == 1 ? '已通过' : '未通过') : '' }}
+            <span v-if="scope.row.dataSource == 'artificial'">{{ scope.row.laborDate }}</span>
+            <span v-else>{{ scope.row.createdAt }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="复查时间" align="center" prop="reviewTime" width="180">
+        <el-table-column label="复查记录" align="center" min-width="100px">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.reviewTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="处理流程类型(0仅通知 1通知整改复查)" align="center" prop="processType" /> -->
-        <el-table-column label="工单状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="safety_inspection_type" :value="scope.row.status" />
+            <span>{{ filterHis(scope.row.refuseList) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template #default="scope">
-            <el-space>
-              <el-tooltip content="详情" placement="top">
-                <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)"
-                  v-hasPermi="['safety:violationRecord:view']"></el-button>
-              </el-tooltip>
-              <el-tooltip content="违章处理人" placement="top">
-                <el-button link type="primary" icon="User" @click="handleUpdate(scope.row)"
-                  v-hasPermi="['safety:violationRecord:edit']"></el-button>
-              </el-tooltip>
-              <el-tooltip content="删除" placement="top">
-                <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-                  v-hasPermi="['safety:violationRecord:remove']"></el-button>
-              </el-tooltip>
-              <el-tooltip content="整改" placement="top" v-if="scope.row.status === '1' || scope.row.reviewType === '2'">
-                <el-button link type="success" icon="Pointer" @click="handleDialog(scope.row)"
-                  v-hasPermi="['safety:violationRecord:rectification']">整改</el-button>
-              </el-tooltip>
-              <el-tooltip content="复查" placement="top" v-if="scope.row.status == 2">
-                <el-button link type="warning" icon="SuccessFilled" @click="handleDialog(scope.row)"
-                  v-hasPermi="['safety:violationRecord:review']">复查</el-button>
-              </el-tooltip>
-
-            </el-space>
+            <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)" v-hasPermi="['safety:violationRecord:view']"
+              >详情</el-button
+            >
+            <el-button
+              link
+              type="primary"
+              icon="User"
+              v-if="!scope.row.openid"
+              @click="handleEdit(scope.row)"
+              v-hasPermi="['safety:violationRecord:view']"
+              >违章处理人</el-button
+            >
+            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:violationRecord:view']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改违规记录对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="violationRecordFormRef" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="违章处理人" prop="handlerId">
-          <el-input v-model="form.handlerId" placeholder="请输入违章处理人" />
-        </el-form-item>
-        <el-form-item label="处理期限" prop="disposeDeadline">
-          <el-date-picker clearable v-model="form.disposeDeadline" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择处理期限">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
+    <el-dialog title="违规记录详情" v-model="showDetailDialog" width="60vw">
+      <ViolationRecordDetailDialog
+        :violation-record-id="currentViolationRecordId"
+        :safety_inspection_violation_type="safety_inspection_violation_type"
+      />
+    </el-dialog>
+    <el-dialog v-model="isShowDialog" width="450px" :close-on-click-modal="false" :destroy-on-close="true">
+      <template #header>
+        <div v-drag="['.system-busViolationRecord-add .el-dialog', '.system-busViolationRecord-add .el-dialog__header']">选择违章处理人</div>
+      </template>
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="处理人" prop="openid">
+              <el-select v-model="form.openid" :filter-method="filterMethod" filterable placeholder="请选择处理人">
+                <el-option
+                  v-for="(item, i) of userQuery.userList"
+                  :key="item.openid"
+                  :label="item.userName ? item.userName : item.nickName"
+                  :value="item.openid"
+                />
+                <pagination
+                  v-show="userQuery.total > 0"
+                  :total="userQuery.total"
+                  v-model:page="userQuery.param.pageNum"
+                  v-model:limit="userQuery.param.pageSize"
+                  @pagination="busConstructionUserList"
+                  :layout="'total, prev, pager, next'"
+                  :isSmall="true"
+                  style="padding: 5px 10px"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="要求处理期限" prop="processingPeriod">
+              <el-date-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="form.processingPeriod" type="date" placeholder="要求处理期限" />
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit" :loading="loading">确 定</el-button>
+          <el-button @click="isShowDialog = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
-    <el-dialog title="违规记录详情" v-model="showDetailDialog" width="60vw">
-      <ViolationRecordDetailDialog :violation-record-id="currentViolationRecordId" />
-    </el-dialog>
-    <el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible"
-      width="500px">
-      <el-form ref="handleFormRef" :model="handleForm" :rules="rules" label-width="120px">
-        <el-form-item label="整改措施" prop="measure" v-if="handleType === 'rectification'">
-          <el-input v-model="handleForm.measure" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="整改附件" prop="rectificationFile" v-if="handleType === 'rectification'">
-          <image-upload v-model="handleForm.rectificationFile" />
-        </el-form-item>
-        <el-form-item label="复查情况" prop="review" v-if="handleType === 'review'">
-          <el-input v-model="handleForm.review" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="复查类型" prop="reviewType" v-if="handleType === 'review'">
-          <el-select v-model="handleForm.reviewType" placeholder="请选择复查类型">
-            <el-option v-for="dict in review_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleSubmit">确 定</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="ViolationRecord" lang="ts">
-import { listViolationRecord, getViolationRecord, delViolationRecord, addViolationRecord, updateViolationRecord, addSafetyInspectionReview, addSafetyInspectionRectification } from '@/api/safety/violationRecord';
+import {
+  listViolationRecord,
+  getViolationRecord,
+  delViolationRecord,
+  addViolationRecord,
+  updateViolationRecord,
+  listBusConstructionUser
+} from '@/api/safety/violationRecord';
 import { ViolationRecordVO, ViolationRecordQuery, ViolationRecordForm } from '@/api/safety/violationRecord/types';
 import ViolationRecordDetailDialog from './component/violationRecordDetailDialog.vue';
-
+import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { violation_level_type, risk_level_type, safety_inspection_type, review_type } = toRefs<any>(
-  proxy?.useDict('violation_level_type', 'risk_level_type', 'safety_inspection_type', 'review_type')
+import { getDictData } from '@/api/project/goUser/index';
+import { disable } from 'ol/rotationconstraint';
+const { violation_level_type, risk_level_type, safety_inspection_type } = toRefs<any>(
+  proxy?.useDict('violation_level_type', 'risk_level_type', 'safety_inspection_type')
 );
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const userQuery = reactive({
+  userList: [],
+  total: 0,
+  param: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: undefined,
+    phone: undefined,
+    projectId: currentProject.value.goId
+  }
+});
 
 const violationRecordList = ref<ViolationRecordVO[]>([]);
 const buttonLoading = ref(false);
@@ -182,14 +184,12 @@ const multiple = ref(true);
 const total = ref(0);
 const currentViolationRecordId = ref<string | number>(undefined);
 const showDetailDialog = ref(false);
+const isShowDialog = ref(false);
 
 const queryFormRef = ref<ElFormInstance>();
 const violationRecordFormRef = ref<ElFormInstance>();
-const handleType = ref<string>('');
-const handleForm = ref({
-  id: undefined,
-})
-const handleDialogVisible = ref(false);
+const safety_inspection_violation_type = ref([]); // 违章类型
+const violation_record_data_source = ref([]); // 数据来源
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -197,7 +197,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: ViolationRecordForm = {
   id: undefined,
-  projectId: undefined,
+  projectId: currentProject.value.goId,
   levelId: undefined,
   recognizeId: undefined,
   violationType: undefined,
@@ -220,7 +220,7 @@ const data = reactive<PageData<ViolationRecordForm, ViolationRecordQuery>>({
     pageNum: 1,
     pageSize: 10,
     id: undefined,
-    projectId: undefined,
+    projectId: currentProject.value.goId,
     violationType: undefined,
     violationTime: undefined,
     handlerId: undefined,
@@ -241,55 +241,38 @@ const data = reactive<PageData<ViolationRecordForm, ViolationRecordQuery>>({
     levelId: [{ required: true, message: '违章等级id不能为空', trigger: 'blur' }],
     recognizeId: [{ required: true, message: '识别记录id不能为空', trigger: 'blur' }],
     processType: [{ required: true, message: '处理流程类型(0仅通知 1通知整改复查)不能为空', trigger: 'change' }],
-    status: [{ required: true, message: '工单状态不能为空', trigger: 'change' }]
+    status: [{ required: true, message: '工单状态不能为空', trigger: 'change' }],
+    openid: [{ required: true, message: '处理人不能为空', trigger: 'change' }],
+    processingPeriod: [{ required: true, message: '要求处理期限不能为空', trigger: 'change' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
+const filterMethod = (val) => {
+  userQuery.param.userName = val;
+  busConstructionUserList();
+};
 
-
-/** 处理安全巡查工单 */
-const handleSubmit = async () => {
-  let flag = false;
-  if (handleType.value == "rectification") {
-    const { code } = await addSafetyInspectionRectification(handleForm.value)
-    if (code == 200) flag = true
-  } else {
-    const { code } = await addSafetyInspectionReview(handleForm.value)
-    if (code == 200) flag = true
-  }
-  if (flag) {
-    ElMessage.success("处理成功")
-    handleDialogVisible.value = false;
-    getList()
-    reset()
-  } else {
-    ElMessage.error("处理失败")
-  }
-
-}
+const busConstructionUserList = () => {
+  listBusConstructionUser(userQuery.param).then((res: any) => {
+    if (res.code === 0) {
+      userQuery.userList = [];
+      userQuery.userList = res.data.list;
+      userQuery.total = res.data.total;
+    }
+  });
+};
 
 /** 查询违规记录列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listViolationRecord(queryParams.value);
-  violationRecordList.value = res.rows;
-  total.value = res.total;
+  violationRecordList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 
-const handleDialog = (row) => {
-  if (row.status == '1') {
-    handleType.value = "rectification"
-  } else {
-    handleType.value = "review"
-  }
-  handleForm.value.id = row.id;
-  handleDialogVisible.value = true;
-};
-
-
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -328,6 +311,14 @@ const handleAdd = () => {
   dialog.title = '添加违规记录';
 };
 
+const handleEdit = async (row: any) => {
+  reset();
+  busConstructionUserList();
+  const res = await getViolationRecord(row.id);
+  form.value.id = res.data.id;
+  isShowDialog.value = true;
+};
+
 /** 修改按钮操作 */
 const handleUpdate = async (row?: ViolationRecordVO) => {
   reset();
@@ -342,11 +333,11 @@ const handleShowDialog = (row?: ViolationRecordVO) => {
 };
 
 /** 提交按钮 */
-const submitForm = () => {
+const onSubmit = () => {
   violationRecordFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
-      buttonLoading.value = true;
-      await addViolationRecord(form.value).finally(() => (buttonLoading.value = false));
+      loading.value = true;
+      await addViolationRecord(form.value).finally(() => (loading.value = false));
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
@@ -373,8 +364,42 @@ const handleExport = () => {
     `violationRecord_${new Date().getTime()}.xlsx`
   );
 };
-
+const filterHis = (list) => {
+  if (list && list.length) {
+    return '重新复查';
+  }
+};
+const filterRiskTourType = (val: any) => {
+  let label = '';
+  if (val) {
+    safety_inspection_violation_type.value.forEach((item: any) => {
+      if (val == item.key) {
+        label = item.value;
+      }
+    });
+  }
+  return label;
+};
+const filterRiskTourTypes = (val: any) => {
+  let label = '';
+  if (val) {
+    violation_record_data_source.value.forEach((item: any) => {
+      if (val == item.key) {
+        label = item.value;
+      }
+    });
+  }
+  return label;
+};
+// 获取字典
+const getDictDataList = async () => {
+  const res = await getDictData('tour_type');
+  safety_inspection_violation_type.value = res.data.values;
+  const res1 = await getDictData('violation_record_data_source');
+  violation_record_data_source.value = res1.data.values;
+};
 onMounted(() => {
+  getDictDataList();
   getList();
 });
 </script>
diff --git a/src/views/system/user/comm/roleInfo.vue b/src/views/system/user/comm/roleInfo.vue
index c4f4ce5..6867a26 100644
--- a/src/views/system/user/comm/roleInfo.vue
+++ b/src/views/system/user/comm/roleInfo.vue
@@ -274,6 +274,7 @@ const initData = async () => {
   try {
     // 获取项目列表
     const projectRes = await listProject();
+    console.log('🚀 ~ initData ~ projectRes:', projectRes);
     projectOptions.value = projectRes.rows.map((item: any) => ({
       id: item.id,
       projectName: item.projectName,
diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue
index 4c35487..86ed4f0 100644
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@@ -812,7 +812,7 @@ onUnmounted(() => {
   }
 }
 
-.upload-file-list .ele-upload-list__item-content {
+.upload-file-list .upload-list__item-content {
   display: flex;
   justify-content: space-between;
   align-items: center;
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index b4df31b..451895d 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -113,8 +113,8 @@
 </template>
 
 <script setup name="Gen" lang="ts">
-import {delTable, genCode, getDataNames, listTable, previewTable, synchDb} from '@/api/tool/gen';
-import {TableQuery, TableVO} from '@/api/tool/gen/types';
+import { delTable, genCode, getDataNames, listTable, previewTable, synchDb } from '@/api/tool/gen';
+import { TableQuery, TableVO } from '@/api/tool/gen/types';
 import router from '@/router';
 import ImportTable from './importTable.vue';
 
diff --git a/src/views/workflows/leave/leaveEdit.vue b/src/views/workflows/leave/leaveEdit.vue
index fd55623..3d5dd4a 100644
--- a/src/views/workflows/leave/leaveEdit.vue
+++ b/src/views/workflows/leave/leaveEdit.vue
@@ -73,8 +73,12 @@ import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { AxiosResponse } from 'axios';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const leaveTime = ref<Array<string>>([]);
@@ -100,27 +104,27 @@ const options = [
 ];
 const flowCodeOptions = [
   {
-    value: 'leave1',
+    value: currentProject.value.id + '_leave1',
     label: '请假申请-普通'
   },
   {
-    value: 'leave2',
+    value: currentProject.value.id + '_leave2',
     label: '请假申请-排他网关'
   },
   {
-    value: 'leave3',
+    value: currentProject.value.id + '_leave3',
     label: '请假申请-并行网关'
   },
   {
-    value: 'leave4',
+    value: currentProject.value.id + '_leave4',
     label: '请假申请-会签'
   },
   {
-    value: 'leave5',
+    value: currentProject.value.id + '_leave5',
     label: '请假申请-并行会签网关'
   },
   {
-    value: 'leave6',
+    value: currentProject.value.id + '_leave6',
     label: '请假申请-排他并行会签'
   }
 ];
diff --git a/vite.config.ts b/vite.config.ts
index 88c913d..068030e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -48,12 +48,18 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
         },
-         '/auth': {
+        '/auth': {
           target: env.VITE_APP_BASE_API,
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
         },
+        [env.VITE_APP_BASE_API_GO]: {
+          target: 'http://192.168.110.159:8919',
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API_GO), '')
+        }
       }
     },
     css: {
diff --git a/vite.config.ts.timestamp-1754120930342-7e68e85b4df1e.mjs b/vite.config.ts.timestamp-1754120930342-7e68e85b4df1e.mjs
new file mode 100644
index 0000000..11045fe
--- /dev/null
+++ b/vite.config.ts.timestamp-1754120930342-7e68e85b4df1e.mjs
@@ -0,0 +1,236 @@
+// vite.config.ts
+import { loadEnv, defineConfig } from "file:///E:/XNY/td_official/node_modules/vite/dist/node/index.js";
+
+// vite/plugins/index.ts
+import vue from "file:///E:/XNY/td_official/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/unocss.ts
+import UnoCss from "file:///E:/XNY/td_official/node_modules/unocss/dist/vite.mjs";
+var unocss_default = () => {
+  return UnoCss({
+    hmrTopLevelAwait: false
+    // unocss默认是true，低版本浏览器是不支持的，启动后会报错
+  });
+};
+
+// vite/plugins/auto-import.ts
+import AutoImport from "file:///E:/XNY/td_official/node_modules/unplugin-auto-import/dist/vite.js";
+import { ElementPlusResolver } from "file:///E:/XNY/td_official/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver from "file:///E:/XNY/td_official/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname = "E:\\XNY\\td_official\\vite\\plugins";
+var auto_import_default = (path3) => {
+  return AutoImport({
+    // 自动导入 Vue 相关函数
+    imports: ["vue", "vue-router", "@vueuse/core", "pinia"],
+    eslintrc: {
+      enabled: false,
+      filepath: "./.eslintrc-auto-import.json",
+      globalsPropValue: true
+    },
+    resolvers: [
+      // 自动导入 Element Plus 相关函数ElMessage, ElMessageBox... (带样式)
+      ElementPlusResolver(),
+      IconsResolver({
+        prefix: "Icon"
+      })
+    ],
+    vueTemplate: true,
+    // 是否在 vue 模板中自动导入
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname, "../../src"), "types", "auto-imports.d.ts")
+  });
+};
+
+// vite/plugins/components.ts
+import Components from "file:///E:/XNY/td_official/node_modules/unplugin-vue-components/dist/vite.js";
+import { ElementPlusResolver as ElementPlusResolver2 } from "file:///E:/XNY/td_official/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver2 from "file:///E:/XNY/td_official/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname2 = "E:\\XNY\\td_official\\vite\\plugins";
+var components_default = (path3) => {
+  return Components({
+    resolvers: [
+      // 自动导入 Element Plus 组件
+      ElementPlusResolver2(),
+      // 自动注册图标组件
+      IconsResolver2({
+        enabledCollections: ["ep"]
+      })
+    ],
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname2, "../../src"), "types", "components.d.ts")
+  });
+};
+
+// vite/plugins/icons.ts
+import Icons from "file:///E:/XNY/td_official/node_modules/unplugin-icons/dist/vite.js";
+var icons_default = () => {
+  return Icons({
+    // 自动安装图标库
+    autoInstall: true
+  });
+};
+
+// vite/plugins/svg-icon.ts
+import { createSvgIconsPlugin } from "file:///E:/XNY/td_official/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+var __vite_injected_original_dirname3 = "E:\\XNY\\td_official\\vite\\plugins";
+var svg_icon_default = (path3, isBuild) => {
+  return createSvgIconsPlugin({
+    // 指定需要缓存的图标文件夹
+    iconDirs: [path3.resolve(path3.resolve(__vite_injected_original_dirname3, "../../src"), "assets/icons/svg")],
+    // 指定symbolId格式
+    symbolId: "icon-[dir]-[name]",
+    svgoOptions: isBuild
+  });
+};
+
+// vite/plugins/compression.ts
+import compression from "file:///E:/XNY/td_official/node_modules/vite-plugin-compression/dist/index.mjs";
+var compression_default = (env) => {
+  const { VITE_BUILD_COMPRESS } = env;
+  const plugin = [];
+  if (VITE_BUILD_COMPRESS) {
+    const compressList = VITE_BUILD_COMPRESS.split(",");
+    if (compressList.includes("gzip")) {
+      plugin.push(
+        compression({
+          ext: ".gz",
+          deleteOriginFile: false
+        })
+      );
+    }
+    if (compressList.includes("brotli")) {
+      plugin.push(
+        compression({
+          ext: ".br",
+          algorithm: "brotliCompress",
+          deleteOriginFile: false
+        })
+      );
+    }
+  }
+  return plugin;
+};
+
+// vite/plugins/setup-extend.ts
+import setupExtend from "file:///E:/XNY/td_official/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js";
+var setup_extend_default = () => {
+  return setupExtend({});
+};
+
+// vite/plugins/index.ts
+import path from "path";
+var plugins_default = (viteEnv, isBuild = false) => {
+  const vitePlugins = [];
+  vitePlugins.push(vue());
+  vitePlugins.push(unocss_default());
+  vitePlugins.push(auto_import_default(path));
+  vitePlugins.push(components_default(path));
+  vitePlugins.push(compression_default(viteEnv));
+  vitePlugins.push(icons_default());
+  vitePlugins.push(svg_icon_default(path, isBuild));
+  vitePlugins.push(setup_extend_default());
+  return vitePlugins;
+};
+
+// vite.config.ts
+import path2 from "path";
+var __vite_injected_original_dirname4 = "E:\\XNY\\td_official";
+var vite_config_default = defineConfig(({ mode, command }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    // 部署生产环境和开发环境下的URL。
+    // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+    base: env.VITE_APP_CONTEXT_PATH,
+    resolve: {
+      alias: {
+        "~": path2.resolve(__vite_injected_original_dirname4, "./"),
+        "@": path2.resolve(__vite_injected_original_dirname4, "./src")
+      },
+      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue", ".tif"]
+    },
+    // https://cn.vitejs.dev/config/#resolve-extensions
+    plugins: plugins_default(env, command === "build"),
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      proxy: {
+        [env.VITE_APP_BASE_API]: {
+          target: "http://localhost:8899",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow-ui": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/workflow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/auth": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        [env.VITE_APP_BASE_API_GO]: {
+          target: "http://192.168.110.159:8919",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API_GO), "")
+        }
+      }
+    },
+    css: {
+      preprocessorOptions: {
+        scss: {
+          javascriptEnabled: true
+        }
+      },
+      postcss: {
+        plugins: [
+          {
+            postcssPlugin: "internal:charset-removal",
+            AtRule: {
+              charset: (atRule) => {
+                if (atRule.name === "charset") {
+                  atRule.remove();
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
+    // 预编译
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "@vueuse/core",
+        "echarts",
+        "vue-i18n",
+        "@vueup/vue-quill",
+        "image-conversion",
+        "element-plus/es/components/**/css"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "vite/plugins/index.ts", "vite/plugins/unocss.ts", "vite/plugins/auto-import.ts", "vite/plugins/components.ts", "vite/plugins/icons.ts", "vite/plugins/svg-icon.ts", "vite/plugins/compression.ts", "vite/plugins/setup-extend.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite.config.ts\";import { UserConfig, ConfigEnv, loadEnv, defineConfig } from 'vite';\r\n\r\nimport createPlugins from './vite/plugins';\r\n\r\nimport path from 'path';\r\nexport default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    // \u90E8\u7F72\u751F\u4EA7\u73AF\u5883\u548C\u5F00\u53D1\u73AF\u5883\u4E0B\u7684URL\u3002\r\n    // \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0Cvite \u4F1A\u5047\u8BBE\u4F60\u7684\u5E94\u7528\u662F\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u57DF\u540D\u7684\u6839\u8DEF\u5F84\u4E0A\r\n    // \u4F8B\u5982 https://www.ruoyi.vip/\u3002\u5982\u679C\u5E94\u7528\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u5B50\u8DEF\u5F84\u4E0A\uFF0C\u4F60\u5C31\u9700\u8981\u7528\u8FD9\u4E2A\u9009\u9879\u6307\u5B9A\u8FD9\u4E2A\u5B50\u8DEF\u5F84\u3002\u4F8B\u5982\uFF0C\u5982\u679C\u4F60\u7684\u5E94\u7528\u88AB\u90E8\u7F72\u5728 https://www.ruoyi.vip/admin/\uFF0C\u5219\u8BBE\u7F6E baseUrl \u4E3A /admin/\u3002\r\n    base: env.VITE_APP_CONTEXT_PATH,\r\n    resolve: {\r\n      alias: {\r\n        '~': path.resolve(__dirname, './'),\r\n        '@': path.resolve(__dirname, './src')\r\n      },\r\n      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.tif']\r\n    },\r\n    // https://cn.vitejs.dev/config/#resolve-extensions\r\n    plugins: createPlugins(env, command === 'build'),\r\n    server: {\r\n      host: '0.0.0.0',\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true,\r\n      proxy: {\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: 'http://localhost:8899',\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow-ui': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/workflow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/auth': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        [env.VITE_APP_BASE_API_GO]: {\r\n          target: 'http://192.168.110.159:8919',\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API_GO), '')\r\n        }\r\n      }\r\n    },\r\n    css: {\r\n      preprocessorOptions: {\r\n        scss: {\r\n          javascriptEnabled: true\r\n        }\r\n      },\r\n      postcss: {\r\n        plugins: [\r\n          {\r\n            postcssPlugin: 'internal:charset-removal',\r\n            AtRule: {\r\n              charset: (atRule) => {\r\n                if (atRule.name === 'charset') {\r\n                  atRule.remove();\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    // \u9884\u7F16\u8BD1\r\n    optimizeDeps: {\r\n      include: [\r\n        'vue',\r\n        'vue-router',\r\n        'pinia',\r\n        'axios',\r\n        '@vueuse/core',\r\n        'echarts',\r\n        'vue-i18n',\r\n        '@vueup/vue-quill',\r\n        'image-conversion',\r\n        'element-plus/es/components/**/css'\r\n      ]\r\n    }\r\n  };\r\n});\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/index.ts\";import vue from '@vitejs/plugin-vue';\r\nimport createUnoCss from './unocss';\r\nimport createAutoImport from './auto-import';\r\nimport createComponents from './components';\r\nimport createIcons from './icons';\r\nimport createSvgIconsPlugin from './svg-icon';\r\nimport createCompression from './compression';\r\nimport createSetupExtend from './setup-extend';\r\nimport path from 'path';\r\n\r\nexport default (viteEnv: any, isBuild = false): [] => {\r\n  const vitePlugins: any = [];\r\n  vitePlugins.push(vue());\r\n  vitePlugins.push(createUnoCss());\r\n  vitePlugins.push(createAutoImport(path));\r\n  vitePlugins.push(createComponents(path));\r\n  vitePlugins.push(createCompression(viteEnv));\r\n  vitePlugins.push(createIcons());\r\n  vitePlugins.push(createSvgIconsPlugin(path, isBuild));\r\n  vitePlugins.push(createSetupExtend());\r\n  return vitePlugins;\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\unocss.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/unocss.ts\";import UnoCss from 'unocss/vite';\r\n\r\nexport default () => {\r\n  return UnoCss({\r\n    hmrTopLevelAwait: false // unocss\u9ED8\u8BA4\u662Ftrue\uFF0C\u4F4E\u7248\u672C\u6D4F\u89C8\u5668\u662F\u4E0D\u652F\u6301\u7684\uFF0C\u542F\u52A8\u540E\u4F1A\u62A5\u9519\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\auto-import.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/auto-import.ts\";import AutoImport from 'unplugin-auto-import/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return AutoImport({\r\n    // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\r\n    imports: ['vue', 'vue-router', '@vueuse/core', 'pinia'],\r\n    eslintrc: {\r\n      enabled: false,\r\n      filepath: './.eslintrc-auto-import.json',\r\n      globalsPropValue: true\r\n    },\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570ElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n      ElementPlusResolver(),\r\n      IconsResolver({\r\n        prefix: 'Icon'\r\n      })\r\n    ],\r\n    vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'auto-imports.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\components.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/components.ts\";import Components from 'unplugin-vue-components/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return Components({\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n      ElementPlusResolver(),\r\n      // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n      IconsResolver({\r\n        enabledCollections: ['ep']\r\n      })\r\n    ],\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'components.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\icons.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/icons.ts\";import Icons from 'unplugin-icons/vite';\r\n\r\nexport default () => {\r\n  return Icons({\r\n    // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n    autoInstall: true\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\svg-icon.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/svg-icon.ts\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';\r\nexport default (path: any, isBuild: boolean) => {\r\n  return createSvgIconsPlugin({\r\n    // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n    iconDirs: [path.resolve(path.resolve(__dirname, '../../src'), 'assets/icons/svg')],\r\n    // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n    symbolId: 'icon-[dir]-[name]',\r\n    svgoOptions: isBuild\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\compression.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/compression.ts\";import compression from 'vite-plugin-compression';\r\n\r\nexport default (env: any) => {\r\n  const { VITE_BUILD_COMPRESS } = env;\r\n  const plugin: any[] = [];\r\n  if (VITE_BUILD_COMPRESS) {\r\n    const compressList = VITE_BUILD_COMPRESS.split(',');\r\n    if (compressList.includes('gzip')) {\r\n      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n      plugin.push(\r\n        compression({\r\n          ext: '.gz',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n    if (compressList.includes('brotli')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.br',\r\n          algorithm: 'brotliCompress',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n  }\r\n  return plugin;\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\td_official\\\\vite\\\\plugins\\\\setup-extend.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/td_official/vite/plugins/setup-extend.ts\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite';\r\n\r\nexport default () => {\r\n  return setupExtend({});\r\n};\r\n"],
  "mappings": ";AAA8O,SAAgC,SAAS,oBAAoB;;;ACA9B,OAAO,SAAS;;;ACAd,OAAO,YAAY;AAElS,IAAO,iBAAQ,MAAM;AACnB,SAAO,OAAO;AAAA,IACZ,kBAAkB;AAAA;AAAA,EACpB,CAAC;AACH;;;ACNyR,OAAO,gBAAgB;AAChT,SAAS,2BAA2B;AACpC,OAAO,mBAAmB;AAF1B,IAAM,mCAAmC;AAIzC,IAAO,sBAAQ,CAACA,UAAc;AAC5B,SAAO,WAAW;AAAA;AAAA,IAEhB,SAAS,CAAC,OAAO,cAAc,gBAAgB,OAAO;AAAA,IACtD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,kBAAkB;AAAA,IACpB;AAAA,IACA,WAAW;AAAA;AAAA,MAET,oBAAoB;AAAA,MACpB,cAAc;AAAA,QACZ,QAAQ;AAAA,MACV,CAAC;AAAA,IACH;AAAA,IACA,aAAa;AAAA;AAAA,IACb,KAAKA,MAAK,QAAQA,MAAK,QAAQ,kCAAW,WAAW,GAAG,SAAS,mBAAmB;AAAA,EACtF,CAAC;AACH;;;ACvBuR,OAAO,gBAAgB;AAC9S,SAAS,uBAAAC,4BAA2B;AACpC,OAAOC,oBAAmB;AAF1B,IAAMC,oCAAmC;AAIzC,IAAO,qBAAQ,CAACC,UAAc;AAC5B,SAAO,WAAW;AAAA,IAChB,WAAW;AAAA;AAAA,MAETC,qBAAoB;AAAA;AAAA,MAEpBC,eAAc;AAAA,QACZ,oBAAoB,CAAC,IAAI;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,IACA,KAAKF,MAAK,QAAQA,MAAK,QAAQG,mCAAW,WAAW,GAAG,SAAS,iBAAiB;AAAA,EACpF,CAAC;AACH;;;AChB6Q,OAAO,WAAW;AAE/R,IAAO,gBAAQ,MAAM;AACnB,SAAO,MAAM;AAAA;AAAA,IAEX,aAAa;AAAA,EACf,CAAC;AACH;;;ACPmR,SAAS,4BAA4B;AAAxT,IAAMC,oCAAmC;AACzC,IAAO,mBAAQ,CAACC,OAAW,YAAqB;AAC9C,SAAO,qBAAqB;AAAA;AAAA,IAE1B,UAAU,CAACA,MAAK,QAAQA,MAAK,QAAQC,mCAAW,WAAW,GAAG,kBAAkB,CAAC;AAAA;AAAA,IAEjF,UAAU;AAAA,IACV,aAAa;AAAA,EACf,CAAC;AACH;;;ACTyR,OAAO,iBAAiB;AAEjT,IAAO,sBAAQ,CAAC,QAAa;AAC3B,QAAM,EAAE,oBAAoB,IAAI;AAChC,QAAM,SAAgB,CAAC;AACvB,MAAI,qBAAqB;AACvB,UAAM,eAAe,oBAAoB,MAAM,GAAG;AAClD,QAAI,aAAa,SAAS,MAAM,GAAG;AAEjC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AACA,QAAI,aAAa,SAAS,QAAQ,GAAG;AACnC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,WAAW;AAAA,UACX,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;;;AC3B2R,OAAO,iBAAiB;AAEnT,IAAO,uBAAQ,MAAM;AACnB,SAAO,YAAY,CAAC,CAAC;AACvB;;;APIA,OAAO,UAAU;AAEjB,IAAO,kBAAQ,CAAC,SAAc,UAAU,UAAc;AACpD,QAAM,cAAmB,CAAC;AAC1B,cAAY,KAAK,IAAI,CAAC;AACtB,cAAY,KAAK,eAAa,CAAC;AAC/B,cAAY,KAAK,oBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,mBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,oBAAkB,OAAO,CAAC;AAC3C,cAAY,KAAK,cAAY,CAAC;AAC9B,cAAY,KAAK,iBAAqB,MAAM,OAAO,CAAC;AACpD,cAAY,KAAK,qBAAkB,CAAC;AACpC,SAAO;AACT;;;ADjBA,OAAOC,WAAU;AAJjB,IAAMC,oCAAmC;AAKzC,IAAO,sBAAQ,aAAa,CAAC,EAAE,MAAM,QAAQ,MAA6B;AACxE,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA;AAAA;AAAA;AAAA,IAIL,MAAM,IAAI;AAAA,IACV,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAKC,MAAK,QAAQC,mCAAW,IAAI;AAAA,QACjC,KAAKD,MAAK,QAAQC,mCAAW,OAAO;AAAA,MACtC;AAAA,MACA,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,SAAS,QAAQ,MAAM;AAAA,IAC5E;AAAA;AAAA,IAEA,SAAS,gBAAc,KAAK,YAAY,OAAO;AAAA,IAC/C,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA,MACN,OAAO;AAAA,QACL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACD,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,iBAAiB;AAAA,UACf,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,cAAc;AAAA,UACZ,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,aAAa;AAAA,UACX,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,SAAS;AAAA,UACP,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,CAAC,IAAI,oBAAoB,GAAG;AAAA,UAC1B,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,oBAAoB,GAAG,EAAE;AAAA,QAChF;AAAA,MACF;AAAA,IACF;AAAA,IACA,KAAK;AAAA,MACH,qBAAqB;AAAA,QACnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,QACrB;AAAA,MACF;AAAA,MACA,SAAS;AAAA,QACP,SAAS;AAAA,UACP;AAAA,YACE,eAAe;AAAA,YACf,QAAQ;AAAA,cACN,SAAS,CAAC,WAAW;AACnB,oBAAI,OAAO,SAAS,WAAW;AAC7B,yBAAO,OAAO;AAAA,gBAChB;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname"]
}
