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/xx.xlsx b/public/xx.xlsx index fb25b99..95009db 100644 Binary files a/public/xx.xlsx and b/public/xx.xlsx 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 a731d05..155aa49 100644 --- a/src/api/safety/safetyInspection/index.ts +++ b/src/api/safety/safetyInspection/index.ts @@ -64,3 +64,26 @@ export const delSafetyInspection = (id: string | number | Array data: { ids: id } }); }; +/** + * + * 新增安全巡检工单复查 + * @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 a056c4d..268c6dd 100644 --- a/src/api/safety/teamMeeting/index.ts +++ b/src/api/safety/teamMeeting/index.ts @@ -66,3 +66,18 @@ export const delTeamMeeting = (id: string | number | Array) => } }); }; +// 查询项目班组下的成员列表 +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/utils/request-go.ts b/src/utils/request-go.ts index e9b3d06..2eeaa5a 100644 --- a/src/utils/request-go.ts +++ b/src/utils/request-go.ts @@ -10,7 +10,6 @@ import CryptoJS from 'crypto-js'; */ const BASE_GO_URL = import.meta.env.VITE_APP_BASE_API_GO; -const token = $cache.local.get('goToken'); interface RequestGo extends Function { (config: any): Promise; @@ -70,12 +69,12 @@ const exceptionStr = '/api/v1/test/'; // /api/v1/test/*接口拦截 service.interceptors.request.use( (config: any) => { // 在发送请求之前做些什么 token - + const token = $cache.local.get('goToken'); if (token) { config.headers = config.headers || {}; (config.headers as any)['Authorization'] = `Bearer ${token}`; - console.log('🚀 ~ config.headers:', config.headers); } + const stores = useUserStore(); if (!whiteUrl.includes(config.url) && !config.url.includes(exceptionStr)) { if (config.params && Reflect.has(config.params, 'projectId')) { 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 @@