安全会议纪要,站班会,安全巡检工单

src/api/safety/documentSafetyMeeting/index.ts

@@ -0,0 +1,87 @@
+import request from '@/utils/request';
+import {
+  documentSafetyMeetingListFile,
+  documentSafetyMeetingListFolder,
+  documentSafetyMeetingListQuery,
+  documentSafetyMeetingListVo,
+  documentRecycleBinListQuery,
+  documentRecycleBinListVO
+} from './type';
+import { AxiosPromise } from 'axios';
+// 查询安全会议结构
+export function documentCompletionTreeStructure(query: object) {
+  return request({
+    url: '/safety/documentSafetyMeeting/list',
+    method: 'get',
+    params: query
+  });
+}
+// 查询安全会议文件列表
+export function documentCompletionList(query: documentSafetyMeetingListQuery): AxiosPromise<documentSafetyMeetingListVo> {
+  return request({
+    url: '/safety/documentSafetyMeeting/list',
+    method: 'get',
+    params: query
+  });
+}
+// 安全会议添加
+export function documentCompletionAdd(data: documentSafetyMeetingListFile) {
+  return request({
+    url: '/safety/documentSafetyMeeting/file',
+    method: 'post',
+    data
+  });
+}
+// 安全会议修改文件名
+export function documentCompletionEdit(query: object) {
+  return request({
+    url: '/api/v1/system/documentSafetyMeeting/edit',
+    method: 'put',
+    params: query
+  });
+}
+// 安全会议删除文件
+export function documentCompletionDelete(id: string) {
+  return request({
+    url: '/safety/documentSafetyMeeting/' + id,
+    method: 'delete'
+  });
+}
+// 安全会议获取指定id信息
+export function documentCompletionGet(id: string) {
+  return request({
+    url: '/safety/documentSafetyMeeting/' + id,
+    method: 'get'
+  });
+}
+// 新建文件夹
+export function newFolder(data: documentSafetyMeetingListFolder): AxiosPromise<any> {
+  return request({
+    url: '/safety/documentSafetyMeeting/folder',
+    method: 'post',
+    data
+  });
+}
+// 单文件下载
+export function uniFileDownload(query: object) {
+  return request({
+    url: '/api/v1/system/documentSafetyMeeting/safetyDataUniFileDownload',
+    method: 'get',
+    params: query
+  });
+}
+// 回收站恢复
+export function completionDataRecyclingStation(id: string[]) {
+  return request({
+    url: '/safety/documentSafetyMeeting/recovery/' + id,
+    method: 'put'
+  });
+}
+// 回收站列表数据
+export function documentRecycleBinList(query: documentRecycleBinListQuery): AxiosPromise<documentRecycleBinListVO> {
+  return request({
+    url: '/safety/documentSafetyMeeting/recycleBin/list',
+    method: 'get',
+    params: { ...query, fileType: '2' }
+  });
+}

src/api/safety/documentSafetyMeeting/type.ts

@@ -0,0 +1,61 @@
+export interface documentSafetyMeetingListFolder {
+  //新增文件夹
+  projectId: string;
+  pid?: string;
+  fileName: string;
+  remark?: string;
+}
+
+export interface documentSafetyMeetingListFile {
+  //新增文件
+  file: any;
+  req?: reqQuery;
+}
+
+export interface reqQuery {
+  projectId: string;
+  pid?: string;
+}
+
+export interface documentSafetyMeetingListQuery {
+  projectId: string;
+  pid?: string;
+  //1文件 2文件夹 3图片
+  fileType?: string;
+}
+
+export interface documentSafetyMeetingListVo {
+  projectId: string;
+  id: string;
+  pid: string;
+  fileName: string;
+  fileStatus?: string;
+  filePath: string;
+  fileSuffix: string;
+  originalName: string;
+  remark?: string;
+  //1文件 2文件夹 3图片
+  fileType?: string;
+}
+
+export interface documentRecycleBinListQuery {
+  projectId: string;
+  pid?: string;
+  fileType?: string;
+  pageSize?: number;
+  pageNum?: number;
+  orderByColumn?: string;
+  isAsc?: string;
+}
+
+export interface documentRecycleBinListVO {
+  id: string;
+  projectId: string;
+  pid?: string;
+  fileName?: string;
+  filePath?: number;
+  fileSuffix?: number;
+  fileStatus?: string;
+  originalName?: string;
+  remark?: string;
+}

src/api/safety/safetyLog/types.ts

@@ -102,6 +102,7 @@ export interface SafetyLogForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
+  creatorName?: string;
 
   /**
    * 项目id
@@ -189,6 +190,7 @@ export interface SafetyLogQuery extends PageQuery {
    * 项目id
    */
   projectId?: string | number;
+  creatorName?: string;
 
   /**
    * 发生日期

src/api/safety/teamMeeting/types.ts

@@ -14,12 +14,12 @@ export interface TeamMeetingVO {
   /**
    * 班组
    */
-  team: IdAndNameVO;
+  teamName: IdAndNameVO;
 
   /**
    * 分包公司
    */
-  contractor: IdAndNameVO;
+  contractorName: IdAndNameVO;
 
   /**
    * 开会时间
@@ -29,7 +29,7 @@ export interface TeamMeetingVO {
   /**
    * 宣讲人
    */
-  compere: IdAndNameVO;
+  compereName: IdAndNameVO;
 
   /**
    * 参与人列表