解决冲突

.env.development

@@ -5,7 +5,10 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.119:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.119:8899'
+VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+# GO开发环境
+VITE_APP_BASE_API_GO = 'http://58.17.134.85:8919'
 
 # 无人机接口地址
 

.env.production

@@ -15,6 +15,8 @@ VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
 VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+# GO生产环境
+VITE_APP_BASE_API_GO = 'http://58.17.134.85:7363'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

src/api/gis/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import {
   QualityVO,
@@ -12,15 +12,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 +46,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 +75,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 +87,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: '/safety/safetyInspection/gis',
+    url: '/zm/api/v1/system/busHseManagement/gisSafetyManagement',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询大屏安全列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getsafetyInspectionList = (query?: any): AxiosPromise<safetyInspectionVO> => {
+  return request({
+    url: '/zm/api/v1/system/busHseManagement/gisSafetyManagementList',
     method: 'get',
     params: query
   });
@@ -75,7 +117,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 +131,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 +145,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 +157,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' }
   });
 };
 
@@ -134,3 +177,16 @@ export const getSafetyDay = (id?: string): AxiosPromise<safetyDayVO> => {
     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
+  });
+};

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,17 @@ 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'
+    }
+  });
+}

src/api/materials/company/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types';
 
@@ -10,7 +10,7 @@ import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/ty
 
 export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> => {
   return request({
-    url: '/materials/company/list',
+    url: '/zm/api/v1/system/busCompany/list',
     method: 'get',
     params: query
   });

src/api/materials/materials/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';
 
@@ -9,7 +9,7 @@ import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/mate
  */
 export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[]> => {
   return request({
-    url: '/materials/materials/list',
+    url: '/zm/api/v1/system/busEquipmentMaterials/list',
     method: 'get',
     params: query
   });
@@ -21,8 +21,11 @@ export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[
  */
 export const getMaterials = (id: string | number): AxiosPromise<MaterialsVO> => {
   return request({
-    url: '/materials/materials/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/busEquipmentMaterials/get',
+    method: 'get',
+    params: {
+      equipmentMaterialsId: id
+    }
   });
 };
 

src/api/materials/materialsInventory/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
 
@@ -10,7 +10,7 @@ import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO }
 
 export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise<MaterialsInventoryVO[]> => {
   return request({
-    url: '/materials/materialsInventory/list',
+    url: '/zm/api/v1/system/busEquipmentMaterialsInventory/excellist',
     method: 'get',
     params: query
   });

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
   });

src/api/project/constructionUser/index.ts

@@ -1,4 +1,4 @@
-import request, { download } from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import {
   ConstructionUserForm,
@@ -177,7 +177,7 @@ export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
 export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
   let { projectId } = query;
   const fileName = projectId + '_project.zip';
-  return download('/contractor/constructionUserFile/exportFileTemplate', query, fileName);
+  return request.download('/contractor/constructionUserFile/exportFileTemplate', query, fileName);
 };
 
 /**
@@ -186,8 +186,8 @@ export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateF
  */
 export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
   return request({
-    url: '/contractor/projectTeamMember/',
-    method: 'delete',
+    url: '/zm/api/v1/system/busConstructionUser/departure',
+    method: 'post',
     data
   });
 };

src/api/project/constructionUserFile/index.ts

@@ -10,7 +10,7 @@ import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQ
 
 export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => {
   return request({
-    url: '/project/constructionUserFile/list',
+    url: '/contractor/constructionUserFile/list',
     method: 'get',
     params: query
   });

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
+  });
+};

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
   });

src/api/project/project/index.ts

@@ -1,6 +1,7 @@
 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';
 
 /**
  * 查询项目列表
@@ -9,10 +10,10 @@ import { childProjectQuery, ProjectForm, ProjectQuery, ProjectVO } from '@/api/p
  */
 
 export const listProject = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> => {
-  return request({
-    url: '/project/project/list',
+  return requestGo({
+    url: '/zm/api/v1/system/sysProject/list',
     method: 'get',
-    params: query
+    params: { ...query, isShow: '2' }
   });
 };
 

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,9 +68,10 @@ 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 }
   });
 };

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',
+    params: { ids: id }
   });
 };

src/api/quality/qualityConstructionLog/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructionLogQuery } from '@/api/quality/qualityConstructionLog/types';
 
@@ -10,7 +10,7 @@ import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructi
 
 export const listQualityConstructionLog = (query?: QualityConstructionLogQuery): AxiosPromise<QualityConstructionLogVO[]> => {
   return request({
-    url: '/quality/qualityConstructionLog/list',
+    url: '/zm/api/v1/system/busConstructionLog/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listQualityConstructionLog = (query?: QualityConstructionLogQuery):
  */
 export const getQualityConstructionLog = (id: string | number): AxiosPromise<QualityConstructionLogVO> => {
   return request({
-    url: '/quality/qualityConstructionLog/' + id,
-    method: 'get'
+    url: 'zm/api/v1/system/busConstructionLog/get',
+    method: 'get',
+    params: { id }
   });
 };
 

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
   });
@@ -61,3 +62,8 @@ export const delQualityInspection = (id: string | number | Array<string | number
     method: 'delete'
   });
 };
+
+// 下载OSS对象存储
+export function downLoadOss(ossId: { id?: string | number; idList?: string | number | Array<string | number> }, url: string, fileName: string) {
+  return request.download(url, ossId, fileName);
+}

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
   });

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
   });
 };
 

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
   });
 };
 

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
   });

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,10 +21,11 @@ export const listViolationRecord = (query?: ViolationRecordQuery): AxiosPromise<
  * 查询违规记录详细
  * @param id
  */
-export const getViolationRecord = (id: string | number): AxiosPromise<ViolationRecordVO> => {
-  return request({
-    url: '/safety/violationRecord/' + id,
-    method: 'get'
+export const getViolationRecord = (query): AxiosPromise<ViolationRecordVO> => {
+  return request1({
+    url: '/zm/api/v1/system/busViolationRecord/get',
+    method: 'get',
+    params: query
   });
 };
 

src/api/types.ts

@@ -67,6 +67,7 @@ export interface UserProject {
   projectId: string;
   projectName: string;
   shortName: string;
+  goId: string;
 }
 
 export interface IdAndNameVO {

src/components/ProjectSelector/index.vue

@@ -38,6 +38,8 @@ watch(
 );
 
 const handleSelect = (projectId: string) => {
+  console.log(projects.value);
+
   const selectedProject = projects.value.find((p) => p.id === projectId);
   if (selectedProject) {
     userStore.setSelectedProject(selectedProject);

src/store/modules/user.ts

@@ -42,9 +42,9 @@ export const useUserStore = defineStore('user', () => {
   const roles = ref<Array<string>>([]); // 用户角色编码集合 → 判断路由权限
   const permissions = ref<Array<string>>([]); // 用户权限编码集合 → 判断按钮权限
 
-  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());
 
   /**
@@ -88,7 +88,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);
@@ -115,6 +116,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');
@@ -124,11 +126,11 @@ 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 }) => {
     selectedProject.value = project;
     saveSelectedProjectToStorage(project);
   };

src/utils/projectTeam.ts

@@ -12,9 +12,9 @@ export const getProjectTeam = async () => {
     projectId: id
   });
 
-  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);
 };

src/utils/request-go.ts

@@ -0,0 +1,50 @@
+import $cache from '@/plugins/cache';
+import request from '@/utils/request';
+
+/**
+ * 包装 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 requestGo: RequestGo = (config: any) => {
+  return request({
+    baseURL: BASE_GO_URL,
+    ...config,
+    headers: {
+      'Authorization': `Bearer ${$cache.local.get('goToken') || ''}`
+    }
+  });
+};
+
+requestGo.download = function (url: string, params: any, filename: string) {
+  return request({
+    url,
+    method: 'post',
+    baseURL: BASE_GO_URL,
+    data: params,
+    headers: {
+      'Authorization': `Bearer ${$cache.local.get('goToken') || ''}`
+    },
+    responseType: 'blob'
+  }).then((response) => {
+    // ✅ 只取 response.data
+    const blob = new Blob([response.data]);
+    const link = document.createElement('a');
+    link.style.display = 'none';
+    link.href = URL.createObjectURL(blob);
+    link.setAttribute('download', filename);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    URL.revokeObjectURL(link.href);
+  });
+};
+
+export default requestGo;

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参数

src/views/design/volumeCatalog/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div>init</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  setup() {
+    // todo
+    return {};
+  }
+});
+</script>
+
+<style lang="stylus" scoped></style>

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) {

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';

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');
 

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 getProgressData = async () => {
+  const res = await getProgressList();
+  if (res.code !== 0) return;
+  progressData.value = res.data.progress;
+  initUserChart();
 };
 
 //查询大屏安全信息
-const getsafetyInspectionData = async () => {
-  const res = await getsafetyInspectionList({ projectId: currentProject.value.id });
-  if (res.code !== 200) return;
-  safetyInspectionData.value = res.data;
+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 safetyData = ref([]);
-new Array(10).fill(0).forEach((item) => {
-  safetyData.value.push({
-    id: 1,
-    name: '站班会',
-    teamName: '测试组',
-    meetingDate: '2024-03-18'
-  });
-});
-
 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;
   }
 }
 

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>

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';
@@ -151,8 +151,12 @@ 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);
+
         loading.value = false;
       } else {
         loading.value = false;

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;

src/views/materials/materials/index.vue

@@ -52,8 +52,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" />
@@ -64,8 +68,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']">
@@ -78,7 +82,7 @@
               <el-button link type="primary" icon="Plus" @click="handleAddMaterialsInventory(scope.row)"> 出入库 </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" />
@@ -177,7 +181,7 @@ const initFormData: MaterialsForm = {
   id: undefined,
   materialsName: undefined,
   companyId: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   typeSpecificationName: undefined,
   fileOssIdMap: undefined,
   usePart: undefined,
@@ -193,7 +197,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,
@@ -214,8 +218,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;
 };
 
@@ -227,10 +231,12 @@ const getCompanyList = async () => {
     pageSize: 1000,
     projectId: currentProject.value.id
   });
-  companyOptions.value = companyRes.rows.map((company: CompanyVO) => ({
-    value: company.id,
-    label: company.companyName
+  companyOptions.value = companyRes.data.list.map((company: CompanyVO) => ({
+    value: company.companyId + '',
+    label: company.companyName,
+    elTagType: 'default'
   }));
+  console.log('🚀 ~ getCompanyList ~ companyOptions.value:', companyOptions.value);
   loading.value = false;
 };
 
@@ -268,7 +274,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;
 };
 
@@ -354,7 +360,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;

src/views/materials/materialsInventory/index.vue

@@ -31,53 +31,53 @@
       <el-table v-loading="loading" :data="materialsInventoryList" @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="materialsName" />
+        <el-table-column label="材料名称" align="center" prop="equipmentMaterialsName" />
         <el-table-column label="入库登记" align="center">
           <el-table-column label="数量" align="center" prop="number">
             <template #default="scope">
-              <span v-if="scope.row.outPut === '0'">{{ scope.row.number }}</span>
-              <span v-else></span>
+              <span>{{ scope.row.inventory.number }}</span>
             </template>
           </el-table-column>
           <el-table-column label="签收人" align="center" prop="operator">
             <template #default="scope">
-              <span v-if="scope.row.outPut === '0'">{{ scope.row.operator }}</span>
-              <span v-else></span>
+              <span>{{ scope.row.inventory.operator }}</span>
             </template>
           </el-table-column>
           <el-table-column label="日期" align="center" prop="outPutTime" width="160">
             <template #default="scope">
-              <span v-if="scope.row.outPut === '0'">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
-              <span v-else></span>
+              <span>{{ parseTime(scope.row.inventory.outPutTime, '{y}年{m}月{d}日') }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="出库登记" align="center">
-          <el-table-column label="交接单位" align="center" prop="recipient" />
+        <el-table-column label="出库登记" align="center" prop="outbound">
+          <el-table-column label="交接单位" align="center" prop="recipient">
+            <template #default="scope">
+              <span>{{ scope.row.outbound.recipient }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="数量" align="center" prop="number">
             <template #default="scope">
-              <span v-if="scope.row.outPut === '1'">{{ scope.row.number }}</span>
-              <span v-else></span>
+              <span>{{ scope.row.outbound.number }}</span>
             </template>
           </el-table-column>
           <el-table-column label="出库人" align="center" prop="operator">
             <template #default="scope">
-              <span v-if="scope.row.outPut === '1'">{{ scope.row.operator }}</span>
-              <span v-else></span>
+              <span>{{ scope.row.outbound.operator }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="领用人" align="center" prop="shipper">
+            <template #default="scope">
+              <span>{{ scope.row.outbound.shipper }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="领用人" align="center" prop="shipper" />
           <el-table-column label="日期" align="center" prop="outPutTime" width="160">
             <template #default="scope">
-              <span v-if="scope.row.outPut === '1'">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
-              <span v-else></span>
+              <span>{{ parseTime(scope.row.outbound.outPutTime, '{y}年{m}月{d}日') }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="剩余处理" align="center">
-          <el-table-column label="剩余量" align="center" prop="residue" />
-          <el-table-column label="处理方式" align="center" prop="disposition" />
-        </el-table-column>
+        <el-table-column label="剩余量" align="center" prop="residue" />
+
         <el-table-column label="备注" align="center" prop="remark" />
         <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -179,7 +179,7 @@ const dialog = reactive<DialogOption>({
 const initFormData: MaterialsInventoryForm = {
   id: undefined,
   materialsId: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   outPut: undefined,
   number: undefined,
   outPutTime: undefined,
@@ -197,7 +197,7 @@ const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
     pageNum: 1,
     pageSize: 10,
     materialsId: undefined,
-    projectId: currentProject.value.id,
+    projectId: currentProject.value.goId,
     outPut: undefined,
     number: undefined,
     outPutTime: undefined,
@@ -222,8 +222,8 @@ const materialsOptions = ref([]);
 const getList = async () => {
   loading.value = true;
   const res = await listMaterialsInventory(queryParams.value);
-  materialsInventoryList.value = res.rows;
-  total.value = res.total;
+  materialsInventoryList.value = res.data.list;
+  total.value = res.data.total;
   const materialsMap = new Map();
   materialsOptions.value = Array.from(materialsMap.values());
   loading.value = false;
@@ -310,7 +310,7 @@ const handleExport = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;

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,29 @@
         </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>
           <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" />
-          </template>
-        </el-table-column>
-        <el-table-column label="拍摄时间" align="center" prop="createTime" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['other:ys7DeviceImg:remove']">删除</el-button>
+            <el-image
+              :z-index="9999"
+              :preview-src-list="['http://58.17.134.85:8919' + scope.row.path]"
+              preview-teleported
+              :src="'http://58.17.134.85:8919' + scope.row.path"
+              class="w20"
+            />
           </template>
         </el-table-column>
+        <el-table-column label="拍摄时间" align="center" prop="createdAt" />
       </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 +99,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;
 };
 

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">
@@ -27,7 +28,6 @@
                 @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>
@@ -39,10 +39,6 @@
     <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>
@@ -51,109 +47,28 @@
     </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> -->
-
       <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="LackOfCard" />
+        <el-table-column label="早退(次)" align="center" prop="LeaveEarly" />
+        <el-table-column label="缺卡(次)" align="center" prop="BeLate" />
+        <!-- <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-calendar ref="calendar" v-model="calendarDay" class="h170 pos-relative">
@@ -188,40 +103,28 @@
 </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';
+
 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';
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const ProjectTeam = computed(() => proxy?.$cache.local.getJSON('ProjectTeamList') || []);
 
 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,7 +150,7 @@ const initFormData: AttendanceForm = {
   clockRecord: undefined,
   commuter: undefined,
   dailyWage: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   lng: undefined,
   lat: undefined,
   remark: undefined,
@@ -263,7 +166,7 @@ const data = reactive<PageData<AttendanceForm, AttendanceQuery>>({
     clockDate: undefined,
     clockStatus: undefined,
     commuter: undefined,
-    projectId: currentProject.value.id,
+    projectId: currentProject.value.goId,
     typeOfWork: undefined,
     teamId: undefined,
     params: {}
@@ -277,6 +180,7 @@ const data = reactive<PageData<AttendanceForm, AttendanceQuery>>({
     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('-');
@@ -338,16 +242,20 @@ const handleViewPlayCard = async (data: any) => {
 /** 查询考勤列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listAttendance(queryParams.value);
-  attendanceList.value = res.rows;
-  total.value = res.total;
+  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);
@@ -423,25 +331,6 @@ 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');
@@ -454,8 +343,9 @@ const init = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
+    getTeamList();
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
     getList();
@@ -463,10 +353,12 @@ const listeningProject = watch(
 );
 
 onUnmounted(() => {
+  getTeamList();
   listeningProject();
 });
 
 onMounted(() => {
+  getTeamList();
   getList();
   getListTwoWeek();
   init();

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>

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);

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">
+        <el-table-column label="状态" align="center" prop="cardNumber">
           <template #default="scope">
-            <dict-tag :options="user_review_status_type" :value="scope.row.status" />
+            <dict-tag :options="user_review_status_type" :value="scope.row.cardNumber" />
           </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">
-          <template #default="scope">
-            <dict-tag :options="user_opinion_type" :value="scope.row.managerOpinion" />
-          </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>

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" @click="handleOpenSetChild(row.id)" icon="plus">添加子项目</el-button>
@@ -92,34 +92,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" />
@@ -128,7 +118,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
@@ -140,9 +130,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" class-name="small-padding fixed-width" width="400">
           <template #default="scope">
             <el-space>
               <el-button link type="primary" icon="FolderOpened" @click="handleShowUpload(scope.row)">导入安全协议书 </el-button>
@@ -151,7 +141,7 @@
               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project: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" />
@@ -460,8 +450,8 @@ 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;
+  projectList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
 /** 取消按钮 */

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="请选择岗位">
@@ -53,25 +53,12 @@
     <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>
-            <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:projectTeamMember:edit']">
-              修改
-            </el-button>
-            <el-button link type="danger" icon="Position" @click="handleExit(scope.row)" v-hasPermi="['project:projectTeamMember:remove']">
-              退场
-            </el-button>
-          </el-space>
-        </template>
-      </el-table-column>
     </el-table>
     <pagination
       size="small"
@@ -100,12 +87,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">
@@ -174,7 +159,7 @@ const props = defineProps<Props>();
 // 是否可见
 const visible = ref(false);
 const initFormData: ProjectTeamMemberForm = {
-  projectId: currentProject.value.id
+  projectId: currentProject.value.goId
 };
 const data = reactive<PageData<ProjectTeamMemberForm, ProjectTeamMemberQuery>>({
   form: { ...initFormData },
@@ -183,7 +168,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' }]
@@ -210,10 +195,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;
 };
 
@@ -263,7 +250,7 @@ const userQueryParams = ref<ConstructionUserQuery>({
   pageSize: 10,
   orderByColumn: 'createTime',
   isAsc: 'desc',
-  projectId: currentProject.value.id
+  projectId: currentProject.value.goId
 });
 
 // 获取不在当前班组的成员
@@ -327,7 +314,7 @@ const submitMemberForm = async () => {
 /** 退场按钮操作 */
 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;
   memberStatus.value = true;

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,17 +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="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -91,7 +87,7 @@
         </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>
@@ -120,7 +116,7 @@ const total = ref(0);
 const currentRow = ref<ProjectTeamVO>({
   id: undefined,
   projectId: undefined,
-  teamName: undefined,
+  name: undefined,
   isClockIn: undefined,
   remark: undefined,
   createTime: undefined
@@ -136,8 +132,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
@@ -149,8 +145,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
@@ -167,8 +163,8 @@ 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;
 };
 
@@ -232,7 +228,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 {
@@ -266,7 +262,7 @@ const handleExport = () => {
 };
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;

src/views/project/projectUser/component/ConstructionUserDetail.vue

@@ -6,7 +6,7 @@
         <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:8919' + userDetail?.pacePhoto" style="width: 150px; height: 150px" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -137,9 +137,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,8 +153,8 @@ 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);
+  if (res.data && res.code === 0) {
     userDetail.value = res.data;
   }
   loading.value = false;

src/views/project/projectUser/index.vue

@@ -7,14 +7,20 @@
             <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-form-item label="分包公司" prop="contractorId">
               <el-select v-model="queryParams.contractorId" clearable placeholder="全部">
                 <el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
+            </el-form-item> -->
+            <el-form-item label="打卡状态" prop="clock">
+              <el-select v-model="queryParams.clock" placeholder="请选择状态" clearable>
+                <el-option label="启用打卡" :value="1" />
+                <el-option label="禁用打卡" :value="2" />
+              </el-select>
             </el-form-item>
             <el-form-item label="班组" prop="teamId">
               <el-select v-model="queryParams.teamId" clearable placeholder="全部">
-                <el-option v-for="item in ProjectTeam" :key="item.value" :label="item.label" :value="item.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">
@@ -35,93 +41,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="['contractor:constructionUser:add']">新增 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['contractor:constructionUser:remove']"
-            >
-              删除
-            </el-button>
-          </el-col>
-          <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 :span="1.5">
-            <el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-switch
-              v-model="playCardStatus"
-              class="ml-2"
-              inline-prompt
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
-              :loading="playCardLoding"
-              @change="handlePlayCardStatus"
-              inactive-text="一键关闭打卡"
-              active-text="一键开启打卡"
-            />
-          </el-col>
-          <el-row @mouseover="informationStatus = true" :gutter="10" @mouseout="informationStatus = false">
-            <el-col :span="1.5">
-              <el-button type="success" plain>员工资料 </el-button>
-            </el-col>
-            <el-col :span="1.5" v-show="informationStatus">
-              <el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
-                >下载资料模板
-              </el-button>
-            </el-col>
-            <el-col :span="1.5" v-show="informationStatus">
-              <file-upload
-                v-model="filePath"
-                isImportInfo
-                :isShowTip="false"
-                uploadUrl="/project/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-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 height="60vh" v-loading="loading" :data="constructionUserList" @selection-change="handleSelectionChange" v-cloak>
         <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">
-          <template #default="scope">
-            <el-link type="primary" @click="handleUpdate(scope.row)">{{ scope.row.userName }}</el-link>
-          </template>
-        </el-table-column>
+        <el-table-column label="姓名" align="center" prop="userName"> </el-table-column>
         <el-table-column label="分包公司" align="center" prop="contractorVo.name" />
-        <el-table-column label="班组" align="center" prop="teamId">
-          <template #default="scope">
-            {{ getTeamName(scope.row.teamId) }}
-          </template>
-        </el-table-column>
+        <el-table-column label="班组" align="center" prop="bzName"> </el-table-column>
         <el-table-column label="联系电话" align="center" prop="phone" min-width="120" />
         <el-table-column label="性别" align="center" prop="sex">
           <template #default="scope">
             <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">
@@ -136,24 +74,15 @@
               inline-prompt
               style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
               active-text="开启"
-              inactive-text="禁用"
-              :loading="playCardLoding"
+              inactive-text="关闭"
               active-value="0"
               inactive-value="1"
-              @change="handleClockStatus(scope.row)"
             />
           </template>
         </el-table-column>
-        <el-table-column label="薪水" align="center" min-width="180">
-          <template #default="scope">
-            <span class="flex justify-center">
-              {{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
-              (<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>
-          </template>
-        </el-table-column>
+        <el-table-column label="薪水" align="center" prop="original" min-width="180"> </el-table-column>
         <el-table-column label="入场时间" align="center" prop="entryDate" min-width="180" />
+        <el-table-column label="施工单位" align="center" prop="lwName" min-width="180" />
         <el-table-column label="离场时间" align="center" prop="leaveDate" min-width="180" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
@@ -167,202 +96,22 @@
               <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
                 详情
               </el-button>
-              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
-                修改
-              </el-button>
-              <el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
-              <el-button
-                link
-                type="danger"
-                icon="Avatar"
-                @click="handleJoinBlacklist(scope.row)"
-                v-hasPermi="['contractor:constructionBlacklist:add']"
-              >
-                黑名单
-              </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="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-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button>
-                </el-badge>
-              </el-tooltip>
+              <el-badge :is-dot="scope.row.fileStatus > 1" :class="['item', scope.row.fileStatus == 3 ? 'badgeColor' : '']">
+                <el-tooltip class="box-item" effect="dark" content="红点：部分上传，绿点：已上传，无点：未上传" placement="left">
+                  <el-button type="primary" link @click="handleUpload(scope.row)" v-auth="'api/wxApplet/wxApplet/busConstructionUser/edit'"
+                    ><el-icon><ele-FolderAdd /></el-icon>文件上传</el-button
+                  >
+                </el-tooltip>
+              </el-badge>
             </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" />
     </el-card>
-    <!-- 添加或修改施工人员对话框 -->
-    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
-      <el-form ref="constructionUserFormRef" :model="form" :rules="rules" label-width="130px" :inline="true">
-        <div class="block_box">
-          <div class="msg">用户信息</div>
-          <div class="el-row">
-            <div class="el-col el-col-24">
-              <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">
-              <el-form-item label="身份证正面图片" prop="sfzFrontPic">
-                <image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="身份证背面图片" prop="sfzBackPic">
-                <image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="人员姓名" prop="userName">
-                <el-input v-model="form.userName" placeholder="请输入人员姓名" />
-              </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-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="联系电话" prop="phone">
-                <el-input v-model="form.phone" placeholder="请输入联系电话" />
-              </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>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="身份证号码" prop="sfzNumber">
-                <el-input v-model="form.sfzNumber" placeholder="请输入身份证号码" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="身份证有效开始期" prop="sfzStart">
-                <el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="身份证有效结束期" prop="sfzEnd">
-                <el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="身份证地址" prop="sfzSite">
-                <el-input v-model="form.sfzSite" placeholder="请输入身份证地址" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="身份证出生日期" prop="sfzBirth">
-                <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">
-              <el-form-item label="籍贯" prop="nativePlace">
-                <el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
-              </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">
-              <el-form-item label="银行图片" prop="yhkPic">
-                <image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="银行卡号" prop="yhkNumber">
-                <el-input v-model="form.yhkNumber" placeholder="请输入银行卡号" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="开户行" prop="yhkOpeningBank">
-                <el-input v-model="form.yhkOpeningBank" placeholder="请输入开户行" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="持卡人" prop="yhkCardholder">
-                <el-input v-model="form.yhkCardholder" placeholder="请输入持卡人" />
-              </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">
-              <el-form-item label="特种作业证图片" prop="specialWorkPic">
-                <image-upload v-model="form.specialWorkPic" :limit="1" :is-show-tip="false" />
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="工种" prop="typeOfWork">
-                <el-select v-model="form.typeOfWork" clearable placeholder="请选择工种">
-                  <el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </div>
-            <div class="el-col el-col-12">
-              <el-form-item label="打卡" prop="clock">
-                <el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
-                  <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </div>
-            <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">
-              <el-form-item label="备注" prop="remark">
-                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 240px" />
-              </el-form-item>
-            </div>
-          </div>
-        </div>
-      </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 draggable title="施工人员详情" v-model="showDetailDrawer" width="800px">
       <construction-user-detail :user-id="currentUserId" />
     </el-dialog>
-    <el-dialog draggable :title="skipName + '-人员迁移'" v-model="skip" width="500px">
-      <el-form-item label="所属项目" label-width="130px">
-        <el-select v-model="skipObject.projectId" @change="selectProject" placeholder="请选择所属项目" style="width: 240px">
-          <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-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="setUnits">确认</el-button>
-          <el-button @click="skip = false"> 取消 </el-button>
-        </div>
-      </template>
-    </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>
@@ -392,127 +141,27 @@
         </span>
       </template>
     </el-dialog>
-    <el-dialog draggable title="修改在职状态" v-model="statusDialog" width="30%">
-      <el-form-item label="在职状态">
-        <el-select v-model="vocationalStatus" placeholder="请选择状态">
-          <el-option v-for="item in user_status_type" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <template #footer>
-        <span
-          ><el-button type="primary" @click="handleEdit">保存</el-button>
-          <el-button @click="statusDialog = false">取消</el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <el-dialog draggable title="温馨提示" v-model="salaryStatus" width="30%">
-      <span>请输入薪资</span>
-      <el-input class="mt-xl" v-model="changeSalary" placeholder="" clearable @change=""></el-input>
-      <template #footer>
-        <span>
-          <el-button type="primary" @click="handleSalary">确认</el-button>
-          <el-button @click="salaryStatus = false">取消</el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <el-dialog draggable title="入场退场记录" v-model="exitStatus" width="600px">
-      <div v-for="(item, index) in exitList">
-        <el-timeline>
-          <el-timeline-item color="#0bbd87" class="mb">
-            {{ '入场时间：' + item.entryDate }}
-          </el-timeline-item>
-          <el-timeline-item color="rgb(255, 73, 73)">
-            <div class="mb">{{ '退场时间：' + item.entryDate }}</div>
-            <div class="pl-xl">
-              <span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm" width="100px" class="mr" /></span
-              ><br />
-              <p class="mt text-coolgray">
-                备注：<span class="text-blue">{{ item.remark }}</span>
-              </p>
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-
-      <template #footer>
-        <span>
-          <el-button @click="exitStatus = false">关闭</el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <el-dialog draggable :title="`打卡记录`" v-model="playCardCalendar" width="770px" :close-on-click-modal="false">
-      <el-calendar ref="calendar" v-model="calendarDay">
-        <template #header="{ date }">
-          <span>{{ date }}</span>
-          <div class="status-detail flex items-center justify-between">
-            <div class="green">全天考勤正常</div>
-            <div class="orange">半勤</div>
-            <div class="red">缺卡</div>
-            <div class="gray">请假</div>
-          </div>
-          <el-date-picker v-model="monthValue" type="month" placeholder="请选择月份" @change="handleMonth" />
-        </template>
-        <template #date-cell="{ data }">
-          <div
-            class="w100% h100% position-relative m-0 monthDay"
-            :class="data.isSelected ? 'is-selected' : ''"
-            @click="handleViewPlayCard(playCardIdx(data), data)"
-          >
-            {{ data.day.split('-').slice(1).join('-') }}
-            <div :style="{ background: playCardColor(data) }" v-if="playCardIdx(data) != -1"></div>
-          </div>
-        </template>
-      </el-calendar>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="ConstructionUser" lang="ts">
 import {
   addConstructionUser,
-  delConstructionUser,
   getConstructionUser,
-  listConstructionUser,
   updateConstructionUser,
-  getProjectContractorList,
-  transferConstructionUser,
-  updateConstructionUserStatus,
-  updateConstructionUserPlayCardStatus,
-  updateConstructionUserPlayCardOneStatus,
   updateConstructionUserSalary,
-  getConstructionUserExit,
-  dowloadConstructionUserTemplate,
-  importConstructionUserInfo,
   listConstructionMonth
 } from '@/api/project/constructionUser';
-import {
-  ConstructionUserForm,
-  ConstructionUserQuery,
-  ConstructionUserVO,
-  skipType,
-  skipOptionType,
-  skipTeamType
-} from '@/api/project/constructionUser/types';
+import { ConstructionUserForm, ConstructionUserQuery, ConstructionUserVO, skipType } from '@/api/project/constructionUser/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import { listContractor } from '@/api/project/contractor';
-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 { listConstructionUserFile, setConstructionUserFile } from '@/api/project/constructionUserFile';
-import {
-  ConstructionUserFileVO,
-  ConstructionUserExitVO,
-  ConstructionUserFileForm,
-  ConstructionUserFileQuery
-} from '@/api/project/constructionUserFile/types';
-import { ElLoadingService } from 'element-plus';
-import type { CalendarDateType, CalendarInstance } from 'element-plus';
+import ConstructionUserDetail from '@/views/project/projectUser/component/ConstructionUserDetail.vue';
+import { listConstructionUserFile } from '@/api/project/constructionUserFile';
+import { ConstructionUserFileVO } from '@/api/project/constructionUserFile/types';
 import { AttendanceMonthVO } from '@/api/project/attendance/types';
 import { parseTime } from '@/utils/ruoyi';
-
-const calendar = ref<CalendarInstance>();
+import { getBusConstructionUser, getSysProjectTeamList } from '@/api/project/goUser/index';
 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')
@@ -521,7 +170,6 @@ const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_statu
 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);
@@ -530,22 +178,12 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const skip = ref(false);
 const fileStatus = ref(false);
 const showFaceDrawer = ref(false);
-const statusDialog = ref(false);
-const playCardStatus = ref(false);
-const playCardLoding = ref(false);
 const playCardCalendar = ref(false);
 const salaryStatus = ref(false);
-const exitStatus = ref(false);
 const calendarDay = ref<Date | null>(null);
-const monthValue = ref<Date | null>(null);
-const informationStatus = ref(false);
-const filePath = ref<string>('');
-const exitList = ref<ConstructionUserExitVO[]>([]);
 const changeSalary = ref<string>('');
-const vocationalStatus = ref<number>(null);
 const fileList = ref<ConstructionUserFileVO[]>([]);
 const queryFormRef = ref<ElFormInstance>();
 const constructionUserFormRef = ref<ElFormInstance>();
@@ -556,24 +194,14 @@ const dialog = reactive<DialogOption>({
   title: '',
   id: undefined
 });
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
-//人员迁移条件
-const skipObject: skipType = reactive({
-  id: '',
-  projectId: '',
-  contractorId: ''
-});
-const contractorList = ref<Array<skipTeamType>>([]);
-//项目列表
-const skipOptions = ref<Array<skipOptionType>>([]);
-
+const TeamList = ref([]); //班组列表
 const initFormData: ConstructionUserForm = {
   id: undefined,
   openid: undefined,
   nickName: undefined,
   facePic: undefined,
   userName: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   contractorId: undefined,
   teamId: undefined,
   status: undefined,
@@ -610,7 +238,7 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
     openid: undefined,
     nickName: undefined,
     userName: undefined,
-    projectId: currentProject.value.id,
+    projectId: currentProject.value.goId,
     contractorId: undefined,
     teamId: undefined,
     status: undefined,
@@ -694,81 +322,18 @@ const uploadStatusColor = computed(() => (str: string) => {
 });
 
 const { queryParams, form, rules } = toRefs(data);
-
-//打卡时间下标
-const playCardIdx = computed(() => (date) => {
-  return calendarList.value.findIndex((item) => item.clockDate == date.day);
-});
-
-//打卡状态颜色
-const playCardColor = computed(() => (date) => {
-  const idx = calendarList.value[playCardIdx.value(date)]?.status;
-  switch (idx) {
-    case '1':
-      return 'green';
-    case '2':
-      return 'orange';
-    case '3':
-      return 'red';
-    case '4':
-      return 'gray';
-    default:
-      return '';
-  }
-});
-
 /** 查询施工人员列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listConstructionUser(queryParams.value);
-  constructionUserList.value = res.rows;
-  total.value = res.total;
+  const res = await getBusConstructionUser(queryParams.value);
+  constructionUserList.value = res.data.list;
+  total.value = res.data.total;
   loading.value = false;
 };
-
-/** 查看打卡记录详情 */
-const handleViewPlayCard = async (idx: number, data: any) => {
-  if (data.type == 'next-month' || data.type == 'prev-month') {
-    monthValue.value = data.date;
-    handleCalendarMonth(monthValue.value);
-  }
-
-  const statusColor = calendarList.value[idx]?.status;
-  if (idx == -1 || statusColor == '4' || statusColor == '3') {
-    return proxy?.$modal.msgWarning('暂无打卡记录数据');
-  }
-  const { downClockTime, downClockPic, upClockTime, upClockPic } = calendarList.value[idx]?.clockList;
-  ElNotification({
-    title: '温馨提示',
-    dangerouslyUseHTMLString: true,
-    message: `<div style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;height:60px">
-  						<span>头像：</span>
-  						<div style="width: 50px;height: 50px;border-radius:15px;">
-  							<img src="${upClockPic}" style="width: 100%;height: 100%;border-radius:15px;">
-  						</div>
-  					</div><span>上班打卡时间：${upClockTime ? upClockTime : ''}</span><div style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;height:60px">
-  						<span>头像：</span>
-  						<div style="width: 50px;height: 50px;border-radius:15px;">
-  							<img src="${downClockPic}" style="width: 100%;height: 100%;border-radius:15px;">
-  						</div>
-  					</div><span>下班打卡时间：${downClockTime ? downClockTime : ''}</span>`
-  });
-};
-
-const selectProject = (e: any) => {
-  //选中项目筛选出项目下的分包单位并清空分包单位value
-  contractorList.value = skipOptions.value.filter((item) => item.id == e)[0].contractorList;
-  skipObject.contractorId = '';
-};
-
-const setUnits = async () => {
-  //人员迁移
-  let res = await transferConstructionUser(skipObject);
-  if (res.code == 200) {
-    ElMessage.success(res.msg);
-    skip.value = false;
-    getList();
-  }
+// 获取班组
+const getTeamList = async () => {
+  const res = await getSysProjectTeamList({ pageNum: 1, pageSize: 1000, projectId: currentProject.value.goId });
+  TeamList.value = res.data.list;
 };
 const contractorOpt = ref();
 
@@ -804,38 +369,7 @@ const handleCalendarMonth = async (e?) => {
 };
 
 /** 上传安全协议书按钮操作 */
-
-const updateProjectFile = async () => {
-  buttonLoading.value = true;
-  let fileList = uploadPath.value.map((item) => {
-    return {
-      fileId: item.path,
-      fileType: item.fileType
-    };
-  });
-  const data = {
-    userId: currentUserId.value,
-    fileList
-  };
-  console.log('🚀 ~ updateProjectFile ~ data:', data);
-  await setConstructionUserFile(data);
-  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;
-});
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
+const updateProjectFile = async () => {};
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
@@ -897,48 +431,6 @@ const handlePlayCard = async (row: ConstructionUserVO) => {
   playCardCalendar.value = true;
 };
 
-//下载模板
-const downloadTemplate = async () => {
-  const loadingInstance = ElLoadingService({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
-  const res = await dowloadConstructionUserTemplate({ projectId: currentProject.value.id });
-  loadingInstance.close();
-};
-
-//导入资料
-const importInformation = async () => {};
-
-/** 人员迁移 */
-const handleChange = async (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
-  skipName.value = row?.userName;
-  skipObject.id = _id;
-  const res = await getProjectContractorList();
-  skipOptions.value = res.data;
-  skip.value = true;
-};
-
-// //切换人脸
-// const handleToggle = async (row: ConstructionUserVO) => {
-//   reset();
-//   skipName.value = row?.userName;
-//   const _id = row?.id || ids.value[0];
-//   const res = await getConstructionUser(_id);
-//   Object.assign(form.value, res.data);
-//   showFaceDrawer.value = true;
-// };
-
-const handleExit = async (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
-  currentUserId.value = _id;
-  const res = await getConstructionUserExit({ userId: _id });
-  exitList.value = res.rows;
-  exitStatus.value = true;
-};
-
 //上传按钮
 const handleUpload = async (row: ConstructionUserVO) => {
   const _id = row?.id || ids.value[0];
@@ -969,74 +461,6 @@ const submitForm = () => {
     }
   });
 };
-
-/** 加入黑名单按钮操作 */
-const handleJoinBlacklist = async (row?: ConstructionUserVO) => {
-  await proxy?.$modal.confirm('确认要将该员工加入黑名单吗？').finally(() => (loading.value = false));
-  await addConstructionBlacklist({
-    userId: row.id,
-    projectId: currentProject.value.id
-  });
-  proxy?.$modal.msgSuccess('加入成功');
-  await getList();
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: ConstructionUserVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除施工人员编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delConstructionUser(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'project/constructionUser/export',
-    {
-      ...queryParams.value
-    },
-    `constructionUser_${new Date().getTime()}.xlsx`
-  );
-};
-/** 用户状态编辑操作 */
-const handleEdit = async () => {
-  if (!vocationalStatus.value) {
-    proxy?.$modal.msgError('请选择状态');
-    return;
-  }
-  const data = {
-    idList: ids.value,
-    status: vocationalStatus.value
-  };
-  await updateConstructionUserStatus(data);
-  proxy?.$modal.msgSuccess('修改成功');
-  getList();
-  ids.value = [];
-  statusDialog.value = false;
-};
-
-//打开修改日薪
-const openSalaryDialog = (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
-  currentUserId.value = _id;
-  if (row.salary) {
-    setSalary();
-    return;
-  }
-  console.log(row);
-  salaryStatus.value = true;
-};
-
-//变更日薪
-const handleSalary = async () => {
-  if (!changeSalary.value) {
-    proxy?.$modal.msgError('请输入薪资');
-    return;
-  }
-  setSalary();
-};
 const setSalary = async () => {
   await updateConstructionUserSalary({ id: currentUserId.value, salary: changeSalary.value });
   proxy?.$modal.msgSuccess('修改成功');
@@ -1044,29 +468,9 @@ const setSalary = async () => {
   changeSalary.value = '';
   salaryStatus.value = false;
 };
-
-// 批量切换在职状态
-const handlePlayCardStatus = async (e) => {
-  playCardLoding.value = true;
-  const clock = e ? 1 : 0;
-  await updateConstructionUserPlayCardStatus({ projectId: currentProject.value.id, clock });
-  proxy?.$modal.msgSuccess('修改成功');
-  getList();
-  playCardLoding.value = false;
-};
-
-// 切换在职状态
-const handleClockStatus = async (row: ConstructionUserVO) => {
-  playCardLoding.value = true;
-  await updateConstructionUserPlayCardOneStatus({ id: row.id, clock: row.clock });
-  proxy?.$modal.msgSuccess('修改成功');
-  getList();
-  playCardLoding.value = false;
-};
-
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
@@ -1079,6 +483,7 @@ onUnmounted(() => {
 });
 
 onMounted(() => {
+  getTeamList();
   getContractorList();
 });
 </script>

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,39 @@
     </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">
           <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 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="gangerTime" width="180"> </el-table-column>
         <el-table-column label="管理员意见" align="center" prop="managerOpinion">
           <template #default="scope">
             <dict-tag :options="user_opinion_type" :value="scope.row.managerOpinion" />
           </template>
         </el-table-column>
         <el-table-column label="管理员说明" align="center" prop="managerExplain" />
-        <el-table-column label="补卡申请时间" align="center" prop="userTime" width="180">
+        <el-table-column label="补卡申请时间" align="center" prop="createdAt" width="180"> </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
           <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">
-          <template #default="scope">
-            <el-button link type="success" icon="View" @click="handleDetail(scope.row)">详情</el-button>
+            <dict-tag :options="user_review_status_type" :value="scope.row.cardNumber" />
           </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 +122,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 +146,10 @@ 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 auditForm = reactive<AuditReissueCardForm>({
   id: undefined,
   managerOpinion: '2',
@@ -222,7 +164,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 +174,7 @@ const initFormData: ReissueCardForm = {
   gangerExplain: undefined,
   managerOpinion: undefined,
   managerExplain: undefined,
-  projectId: currentProject.value?.id,
+  projectId: currentProject.value?.goId,
   attendanceId: undefined,
   remark: undefined
 };
@@ -242,10 +183,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 +201,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 +217,7 @@ const auditStatus = computed(() => {
   return false;
 });
 //管理员审核状态
+// eslint-disable-next-line vue/return-in-computed-property
 const managerStatus = computed(() => {
   switch (detailObj.value.managerOpinion) {
     case '1':
@@ -287,6 +229,7 @@ const managerStatus = computed(() => {
   }
 });
 //班组审核状态
+// eslint-disable-next-line vue/return-in-computed-property
 const teamStatus = computed(() => {
   switch (detailObj.value.gangerOpinion) {
     case '1':
@@ -307,12 +250,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 +278,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 +295,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 +309,7 @@ onUnmounted(() => {
 });
 
 onMounted(() => {
+  getTeamList();
   getList();
 });
 </script>

src/views/project/subManagementUser/component/ConstructionUserDetail.vue

@@ -0,0 +1,188 @@
+<template>
+  <div>
+    <div class="block_box">
+      <span>用户信息</span>
+      <el-form label-width="130px">
+        <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-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="姓名">
+              {{ userDetail?.userName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话">
+              {{ userDetail?.phone }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="性别">
+              <dict-tag :options="user_sex_type" :value="userDetail?.sex" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="年龄">
+              {{ dayjs().diff(dayjs(userDetail?.sfzBirth), 'year') }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="民族">
+              {{ userDetail?.nation }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="籍贯">
+              {{ userDetail?.nativePlace }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证号码">
+              {{ userDetail?.sfzNumber }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证号码">
+              {{ userDetail?.sfzNumber }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证有效开始期">
+              {{ dayjs(userDetail?.sfzStart).format('YYYY 年 MM 月 DD 日') }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证有效结束期">
+              {{ dayjs(userDetail?.sfzEnd).format('YYYY 年 MM 月 DD 日') }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证地址">
+              {{ userDetail?.sfzSite }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="block_box">
+      <span>银行卡</span>
+      <el-form label-width="130px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="银行卡号">
+              {{ userDetail?.yhkNumber }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="银行开户行">
+              {{ userDetail?.yhkOpeningBank }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="持卡人">
+              {{ userDetail?.yhkCardholder }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="block_box">
+      <span>单位信息</span>
+      <el-form label-width="130px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="施工单位">
+              {{ userDetail?.contractorVo?.name }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工种">
+              <dict-tag :options="type_of_work" :value="userDetail?.typeOfWork" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="block_box">
+      <span>其他信息</span>
+      <el-form label-width="130px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="班组">
+              {{ userDetail?.teamVo?.teamName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="打卡状态">
+              <dict-tag :options="user_clock_type" :value="userDetail?.clock" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入场时间">
+              {{ userDetail?.entryDate ? dayjs(userDetail?.entryDate).format('YYYY 年 MM 月 DD 日 HH:mm:ss') : '' }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="离场时间">
+              {{ userDetail?.leaveDate ? dayjs(userDetail?.leaveDate).format('YYYY 年 MM 月 DD 日 HH:mm:ss') : '' }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { getConstructionUser } from '@/api/project/constructionUser';
+import { ConstructionUserVO } from '@/api/project/constructionUser/types';
+import { dayjs } from 'element-plus';
+
+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'));
+
+interface Props {
+  userId?: string | number;
+}
+
+const props = defineProps<Props>();
+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) {
+    userDetail.value = res.data;
+  }
+  loading.value = false;
+};
+
+onMounted(() => {
+  getUserDetail();
+});
+
+watch(
+  () => props.userId,
+  (newId, oldId) => {
+    if (newId !== oldId) {
+      getUserDetail();
+    }
+  }
+);
+</script>
+<style lang="scss" scoped>
+.block_box {
+  border: 1px solid #9eccfa;
+  border-radius: 6px;
+  padding: 10px 20px 20px 10px;
+  margin: 15px;
+  > span {
+    color: #409eff;
+    font-weight: 700;
+    font-size: 14px;
+  }
+}
+</style>

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>
+            <div>
+              <span>
+                <image-preview :src="BASE_URL + safetyInspectionDetail?.path" width="200px" />
               </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>
-              </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>
@@ -140,19 +63,15 @@ const currentProject = computed(() => userStore.selectedProject);
 interface Props {
   qualityConstructionId?: string | number;
 }
-
+const BASE_URL = import.meta.env.VITE_BASE_URL_GO;
 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;

src/views/quality/qualityConstructionLog/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="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>
@@ -19,42 +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>
@@ -71,19 +50,15 @@
             </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>
           </template>
         </el-table-column>
       </el-table>
@@ -133,7 +108,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: QualityConstructionLogForm = {
   id: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   happenDate: undefined,
   productionStatus: undefined,
   technologyQuality: undefined,
@@ -145,7 +120,7 @@ const data = reactive<PageData<QualityConstructionLogForm, QualityConstructionLo
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value.id,
+    projectId: currentProject.value.goId,
     happenDate: undefined,
     params: {}
   },
@@ -162,8 +137,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;
 };
 
@@ -251,7 +226,7 @@ const handleExport = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;

src/views/quality/qualityInspection/component/qualityInspectionDetail.vue

@@ -5,8 +5,8 @@
       <div class="resultIcon"><img :src="'../../../../../src/assets/icons/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"
@@ -16,22 +16,18 @@
           {{ 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" />
-        </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 }}
+          {{ safetyInspectionDetail?.dictLabel }}
         </el-descriptions-item>
+        <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?.replyPeriodDate, '{y}-{m}-{d}') }}
+          >{{ parseTime(safetyInspectionDetail?.replyDate, '{y}-{m}-{d}') }}
         </el-descriptions-item>
       </el-descriptions>
       <el-descriptions border direction="vertical" size="large">
@@ -43,13 +39,13 @@
         </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>
@@ -96,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>
@@ -108,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>(
@@ -124,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;
@@ -137,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.rectificationFileList) {
       const checkFileRes = await listByIds(res.data.inspectionFile.split(','));
@@ -195,7 +191,7 @@ watch(
 }
 
 .dialog-footer {
-  height: 200px;
+  height: 100px;
   display: flex;
 
   flex-direction: column;

src/views/quality/qualityInspection/index.vue

@@ -9,8 +9,8 @@
                 <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-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>
@@ -26,14 +26,9 @@
     <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="['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"
@@ -47,7 +42,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -55,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="createBy" />
-        <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" />
@@ -79,14 +74,13 @@
             </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">
           <template #default="scope">
-            <dict-tag :options="quality_inspection_status_type" :value="scope.row.inspectionStatus" />
+            <dict-tag :options="quality_inspection_status_type" :value="scope.row.status" />
           </template>
         </el-table-column> -->
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="创建者" align="center" prop="createBy" />
+        <!-- <el-table-column label="创建者" align="center" prop="createBy" /> -->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <!-- <el-tooltip content="验证" placement="top">
@@ -101,61 +95,12 @@
             <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['quality:qualityInspection:edit']">
               详情
             </el-button>
-            <el-button link type="primary" 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" />
     </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-item label="巡检标题" prop="inspectionHeadline">
-          <el-input v-model="form.inspectionHeadline" placeholder="请输入巡检标题" />
-        </el-form-item>
-        <el-form-item label="巡检结果" prop="inspectionResult">
-          <el-input v-model="form.inspectionResult" placeholder="请输入巡检结果" />
-        </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="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-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>
-        </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-radio-group>
-        </el-form-item> -->
-        <el-form-item label="附件" prop="inspectionFile">
-          <file-upload v-model="form.inspectionFile" />
-        </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 title="质量工单详情" v-model="dialog.details" width="60vw">
       <quality-inspection-detail :quality-inspection-detail-id="currentId" />
     </el-dialog>
@@ -204,11 +149,11 @@ const dialog = reactive<DialogOption>({
 
 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,
@@ -227,9 +172,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: {}
   },
@@ -245,33 +190,15 @@ const data = reactive<PageData<QualityInspectionForm, QualityInspectionQuery>>({
 });
 
 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;
+  total.value = res.data.total;
   loading.value = false;
 };
 
-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();
@@ -366,7 +293,7 @@ const handleExport = () => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;

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>
@@ -32,77 +29,27 @@
     <el-card shadow="never">
       <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" />
-          </template>
-        </el-table-column>
-        <el-table-column label="故障描述" align="center" prop="description" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-          <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
-            >
+            <image-preview :src="'http://58.17.134.85:8919' + scope.row.picture" :width="50" :height="50" />
           </template>
         </el-table-column>
+        <el-table-column label="故障描述" align="center" prop="describe" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" width="180"> </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 +57,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 +80,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 +88,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: RecognizeRecordForm = {
   id: undefined,
-  projectId: undefined,
+  projectId: currentProject.value.goId,
   deviceSerial: undefined,
   deviceName: undefined,
   recordCategory: undefined,
@@ -155,7 +103,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 +122,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 +195,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 +227,16 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getDictDataList();
   getList();
 });
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
+    getDictDataList();
     getList();
   }
 );

src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue

@@ -5,8 +5,8 @@
       <div class="resultIcon"><img :src="'../../../../../src/assets/icons/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>
@@ -19,7 +19,7 @@
         <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 }}
+          >{{ safetyInspectionDetail?.abarbeitung }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
           {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
@@ -67,12 +67,12 @@
         </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.checkAttachment" :key="item.id">
+              <span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
+                <image-preview :src="item.path" width="200px" />
               </span>
               <span v-else>
-                <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                <el-link :href="`${'http://58.17.134.85:8919' + item.url}`" :underline="false" target="_blank">
                   <span> {{ item.originalName }} </span>
                 </el-link>
               </span>
@@ -84,9 +84,7 @@
         <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?.fill }} </el-descriptions-item>
         <el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
           >{{ safetyInspectionDetail?.reviewTime }}
         </el-descriptions-item>
@@ -103,10 +101,10 @@
       <img src="../../../../assets/icons/svg/derived.png" />
       <span>导出</span>
     </div>
-    <div class="btn-item" v-print="'#printMe'">
+    <!-- <div class="btn-item" v-print="'#printMe'">
       <img src="../../../../assets/icons/svg/print.png" />
       <span>打印</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -132,7 +130,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[]>();
 //检查状态图片
@@ -148,17 +146,9 @@ 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;
-    }
   }
   loading.value = false;
 };

src/views/safety/safetyInspection/index.vue

@@ -4,19 +4,14 @@
       <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>
@@ -29,45 +24,32 @@
     </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="['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>
-          </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>
-          <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="status">
+        <el-table-column label="处理状态" align="center" prop="status" min-width="100px">
           <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">
-          <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">
           <template #default="scope">
-            <dict-tag :options="safety_inspection_violation_type" :value="scope.row.violationType" />
+            <span>{{ filterTypeS(scope.row.violationType) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="巡检结果" align="center" prop="inspectionResult">
@@ -82,28 +64,22 @@
             </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>
-              <!-- <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>
             </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" />
     </el-card>
     <!-- 添加或修改安全巡检工单对话框 -->
@@ -177,11 +153,10 @@ 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';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { safety_inspection_violation_type, review_type, safety_inspection_type, safety_inspection_check_type } = toRefs<any>(
-  proxy?.useDict('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 中获取项目列表和当前选中的项目
@@ -194,7 +169,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>();
 
@@ -206,7 +182,7 @@ const dialog = reactive<DialogOption>({
 const initFormData: SafetyInspectionForm = {
   id: undefined,
   pid: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   checkType: undefined,
   violationType: undefined,
   inspectionResult: undefined,
@@ -234,7 +210,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,
@@ -265,31 +241,21 @@ 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 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;
 };
 
 /** 展开安全巡检工单详情对话框操作 */
@@ -297,7 +263,6 @@ const currentSafetyInspectionId = ref<string | number>();
 const showDetailDialog = ref<boolean>(false);
 const handleShowDialog = (row?: SafetyInspectionVO) => {
   currentSafetyInspectionId.value = row.id;
-
   showDetailDialog.value = true;
 };
 
@@ -331,24 +296,6 @@ const handleSelectionChange = (selection: SafetyInspectionVO[]) => {
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 };
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  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 submitForm = () => {
   safetyInspectionFormRef.value?.validate(async (valid: boolean) => {
@@ -367,29 +314,27 @@ const submitForm = () => {
   });
 };
 
-/** 删除按钮操作 */
-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;
@@ -402,6 +347,7 @@ onUnmounted(() => {
 });
 
 onMounted(() => {
+  getDictDataList();
   getList();
 });
 </script>

src/views/safety/safetyLog/index.vue

@@ -4,11 +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="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>
@@ -22,21 +19,9 @@
     <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: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-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:safetyLog:export']">导出 </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" />
@@ -138,6 +123,7 @@ 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';
 
@@ -165,7 +151,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: SafetyLogForm = {
   id: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   dateOfOccurrence: undefined,
   airTemperatureMax: undefined,
   airTemperatureMin: undefined,
@@ -188,7 +174,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,
@@ -217,9 +203,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;
 };
 
@@ -261,24 +247,6 @@ 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 submitForm = () => {
   safetyLogFormRef.value?.validate(async (valid: boolean) => {
@@ -306,20 +274,9 @@ const handleDelete = async (row?: SafetyLogVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'safety/safetyLog/export',
-    {
-      ...queryParams.value
-    },
-    `safetyLog_${new Date().getTime()}.xlsx`
-  );
-};
-
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value.goId,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;

src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue

@@ -3,17 +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 :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="施工单位">{{ teamMeetingDetail?.labourserviceName }}</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?.createdAt }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="班会内容">{{ teamMeetingDetail?.content }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="班会图片">
         <el-space wrap>
           <span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList">
-            <image-preview :src="item" width="200px" />
+            <image-preview :src="'http://xny.yj-3d.com:7363' + item" width="200px" />
           </span>
         </el-space>
       </el-descriptions-item>
@@ -35,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;
 };

src/views/safety/teamMeeting/index.vue

@@ -19,17 +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>
@@ -38,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">
@@ -50,27 +39,17 @@
             <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>
-              <!-- <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>
             </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" />
     </el-card>
     <!-- 添加或修改站班会对话框 -->
@@ -103,8 +82,6 @@
 </template>
 
 <script setup name="TeamMeeting" lang="ts">
-console.log(111);
-
 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';
@@ -135,7 +112,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: TeamMeetingForm = {
   id: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value.goId,
   teamId: undefined,
   contractorId: undefined,
   meetingDate: undefined,
@@ -150,7 +127,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,
@@ -173,8 +150,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;
 };
 
@@ -222,17 +199,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) => {
@@ -249,30 +215,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;

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>
@@ -23,54 +23,27 @@
             </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/busViolationLevel/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/busViolationLevel/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/busViolationLevel/delete'">
-              <el-icon><Delete /></el-icon>删除
-            </el-button>
-          </el-col>
-        </el-row>
       </div>
       <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>
-          </template>
-        </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'">
-              <el-icon><EditPen /></el-icon>修改
-            </el-button>
-            <el-button type="danger" link @click="handleDelete(scope.row)" v-auth="'api/v1/system/busViolationLevel/delete'">
-              <el-icon><DeleteFilled /></el-icon>删除
-            </el-button>
+            <span>{{ filterRiskTourType(scope.row.tourType) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createdAt"> </el-table-column>
       </el-table>
       <pagination
         v-show="state.tableData.total > 0"
@@ -107,6 +80,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 +93,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 +109,7 @@ const state = reactive<any>({
     total: 0,
     loading: false,
     param: {
-      projectId: currentProject.value?.id,
+      projectId: currentProject.value?.goId,
       pageNum: 1,
       pageSize: 10,
       tourType: undefined,
@@ -164,27 +140,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 +199,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 +209,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();

src/views/safety/violationRecord/component/violationRecordDetailDialog.vue

@@ -6,21 +6,16 @@
       <!-- <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 }}
@@ -39,24 +34,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:8919' + 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 +64,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 +86,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 +99,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 +119,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({ id: props.violationRecordId });
+  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 +134,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) => {

src/views/safety/violationRecord/index.vue

@@ -7,10 +7,11 @@
             <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>
@@ -19,15 +20,9 @@
         </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>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -35,45 +30,39 @@
       <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" />
@@ -88,12 +77,6 @@
                 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>
           </template>
         </el-table-column>
       </el-table>
@@ -122,7 +105,10 @@
       </template>
     </el-dialog>
     <el-dialog title="违规记录详情" v-model="showDetailDialog" width="60vw">
-      <ViolationRecordDetailDialog :violation-record-id="currentViolationRecordId" />
+      <ViolationRecordDetailDialog
+        :violation-record-id="currentViolationRecordId"
+        :safety_inspection_violation_type="safety_inspection_violation_type"
+      />
     </el-dialog>
   </div>
 </template>
@@ -131,11 +117,16 @@
 import { listViolationRecord, getViolationRecord, delViolationRecord, addViolationRecord, updateViolationRecord } 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;
+import { getDictData } from '@/api/project/goUser/index';
 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 violationRecordList = ref<ViolationRecordVO[]>([]);
 const buttonLoading = ref(false);
@@ -150,7 +141,8 @@ const showDetailDialog = ref(false);
 
 const queryFormRef = ref<ElFormInstance>();
 const violationRecordFormRef = ref<ElFormInstance>();
-
+const safety_inspection_violation_type = ref([]); // 违章类型
+const violation_record_data_source = ref([]); // 数据来源
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -158,7 +150,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: ViolationRecordForm = {
   id: undefined,
-  projectId: undefined,
+  projectId: currentProject.value.goId,
   levelId: undefined,
   recognizeId: undefined,
   violationType: undefined,
@@ -181,7 +173,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,
@@ -212,8 +204,8 @@ const { queryParams, form, rules } = toRefs(data);
 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;
 };
 
@@ -300,8 +292,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>

src/views/workflows/leave/leaveEdit.vue

@@ -65,8 +65,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>>([]);
@@ -92,27 +96,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: '请假申请-排他并行会签'
   }
 ];
@@ -284,7 +288,7 @@ const approvalVerifyOpen = async () => {
 
 onMounted(() => {
   console.log(proxy.$route.query);
-  
+
   nextTick(async () => {
     routeParams.value = proxy.$route.query;
     reset();

src/views/workflows/processDefinition/design.vue

@@ -27,9 +27,11 @@ const iframeLoaded = () => {
 };
 //baseUrl +
 const open = async (definitionId, disabled) => {
-  const url = baseUrl + `/warm-flow-ui/index.html?id=${definitionId}&disabled=${disabled}`;
+  const url = import.meta.env.DEV
+    ? `/warm-flow-ui/index.html?id=${definitionId}&disabled=${disabled}`
+    : baseUrl + `/warm-flow-ui/index.html?id=${definitionId}&disabled=${disabled}`;
   iframeUrl.value = url + '&Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID;
-  console.log('🚀 ~ open ~ iframeUrl:', iframeUrl.value);
+  console.log('🚀 ~ open ~ iframeUrl:', import.meta.env);
 };
 /** 关闭按钮 */
 function close() {

vite.config.ts

@@ -48,11 +48,17 @@ 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), '')
         }
       }
     },