合并

src/api/safety/safetyInspection/index.ts

@@ -61,3 +61,26 @@ export const delSafetyInspection = (id: string | number | Array<string | number>
     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
+  });
+}

src/api/safety/safetyInspection/types.ts

@@ -1,4 +1,9 @@
 export interface SafetyInspectionVO {
+
+  /**
+   * 整改单位名称
+   */
+  rectificationName: string;
   /**
    * 主键ID
    */

src/api/safety/teamMeeting/index.ts

@@ -61,3 +61,18 @@ export const delTeamMeeting = (id: string | number | Array<string | number>) =>
     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'
+  });
+};

src/api/safety/teamMeeting/types.ts

@@ -58,6 +58,10 @@ export interface TeamMeetingVO {
 }
 
 export interface TeamMeetingForm extends BaseEntity {
+  /**
+   * 班会主题
+   */
+  meetingTheme?: string;
   /**
    * 主键id
    */

src/api/safety/violationRecord/index.ts

@@ -61,3 +61,23 @@ export const delViolationRecord = (id: string | number | Array<string | number>)
     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
+  });
+}