diff --git a/.env.development b/.env.development index 4f5bca2..c17e50e 100644 --- a/.env.development +++ b/.env.development @@ -11,13 +11,16 @@ VITE_APP_ENV = 'development' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 -# VITE_APP_BASE_API = 'http://192.168.110.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 VITE_APP_BASE_API = 'http://192.168.110.149:8899' #曾涛 # VITE_APP_BASE_API = 'http://192.168.110.171:8899' +# 屈展航 +# VITE_APP_BASE_API = 'http://192.168.110.210:8899' + # ws VITE_APP_BASE_WS_API = 'ws://192.168.110.149:8899/resource/websocket' diff --git a/public/assets/demo/czzl.png b/public/assets/demo/czzl.png new file mode 100644 index 0000000..99fd4e6 Binary files /dev/null and b/public/assets/demo/czzl.png differ diff --git a/public/assets/demo/dayImg.png b/public/assets/demo/dayImg.png new file mode 100644 index 0000000..05c44a2 Binary files /dev/null and b/public/assets/demo/dayImg.png differ diff --git a/public/assets/demo/glsc.png b/public/assets/demo/glsc.png new file mode 100644 index 0000000..49b2ecd Binary files /dev/null and b/public/assets/demo/glsc.png differ diff --git a/public/assets/demo/sjjk.png b/public/assets/demo/sjjk.png new file mode 100644 index 0000000..290bf14 Binary files /dev/null and b/public/assets/demo/sjjk.png differ diff --git a/public/供应商导入模板(1).xlsx b/public/供应商导入模板(1).xlsx new file mode 100644 index 0000000..6f6cfb3 Binary files /dev/null and b/public/供应商导入模板(1).xlsx differ diff --git a/src/api/safety/safetyInspection/index.ts b/src/api/safety/safetyInspection/index.ts index cd9076c..8fc0707 100644 --- a/src/api/safety/safetyInspection/index.ts +++ b/src/api/safety/safetyInspection/index.ts @@ -61,3 +61,26 @@ export const delSafetyInspection = (id: string | number | Array method: 'delete' }); }; +/** + * + * 新增安全巡检工单复查 + * @param data + */ +export const addSafetyInspectionReview = (data: any) => { + return request({ + url: '/safety/safetyInspection/review', + method: 'post', + data: data + }); +} +/** + * 新增安全巡检工单整改 + * @param data + */ +export const addSafetyInspectionRectification = (data: any) => { + return request({ + url: '/safety/safetyInspection/rectification', + method: 'post', + data: data + }); +} diff --git a/src/api/safety/safetyInspection/types.ts b/src/api/safety/safetyInspection/types.ts index a3a68f0..f407503 100644 --- a/src/api/safety/safetyInspection/types.ts +++ b/src/api/safety/safetyInspection/types.ts @@ -1,4 +1,9 @@ export interface SafetyInspectionVO { + + /** + * 整改单位名称 + */ + rectificationName: string; /** * 主键ID */ diff --git a/src/api/safety/teamMeeting/index.ts b/src/api/safety/teamMeeting/index.ts index 073414c..e0c518d 100644 --- a/src/api/safety/teamMeeting/index.ts +++ b/src/api/safety/teamMeeting/index.ts @@ -61,3 +61,18 @@ export const delTeamMeeting = (id: string | number | Array) => method: 'delete' }); }; +// 查询项目班组下的成员列表 +export const listProjectTeamMember = (data: any) => { + return request({ + url: '/project/projectTeamMember/list', + method: 'get', + data + }); +}; +// 根据 id 查询项目以及项目下的分包公司、班组列表 +export const getProjectContractorTeamList = (id: string | number) => { + return request({ + url: '/project/project/contractorTeamList/' + id, + method: 'get' + }); +}; diff --git a/src/api/safety/teamMeeting/types.ts b/src/api/safety/teamMeeting/types.ts index c00a46e..2f37bc6 100644 --- a/src/api/safety/teamMeeting/types.ts +++ b/src/api/safety/teamMeeting/types.ts @@ -58,6 +58,10 @@ export interface TeamMeetingVO { } export interface TeamMeetingForm extends BaseEntity { + /** + * 班会主题 + */ + meetingTheme?: string; /** * 主键id */ diff --git a/src/api/safety/violationRecord/index.ts b/src/api/safety/violationRecord/index.ts index 050bec4..81d44e3 100644 --- a/src/api/safety/violationRecord/index.ts +++ b/src/api/safety/violationRecord/index.ts @@ -61,3 +61,23 @@ export const delViolationRecord = (id: string | number | Array) method: 'delete' }); }; +/** + * 新增违规记录复查 + */ +export const addSafetyInspectionReview = (data: any) => { + return request({ + url: '/safety/violationRecord/review', + method: 'post', + data: data + }); +} +/** + * 新增违规记录整改 + */ +export const addSafetyInspectionRectification = (data: any) => { + return request({ + url: '/safety/violationRecord/rectification', + method: 'post', + data: data + }); +} diff --git a/src/views/demo/components/TitleComponent.vue b/src/views/demo/components/TitleComponent.vue index f39d13a..4729b3c 100644 --- a/src/views/demo/components/TitleComponent.vue +++ b/src/views/demo/components/TitleComponent.vue @@ -1,10 +1,8 @@