From 8d14fec97344df49d58db115852c03b466482bc6 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 12 四月 2023 14:47:21 +0800
Subject: [PATCH] 设备、场所、部门接口
---
src/views/experiment/project/index.ts | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/src/views/experiment/project/index.ts b/src/views/experiment/project/index.ts
index 6ec1f48..188cb14 100644
--- a/src/views/experiment/project/index.ts
+++ b/src/views/experiment/project/index.ts
@@ -1,5 +1,6 @@
declare interface ProjectStateType {
- projectData: Array<ProjectType>
+ projectData?: Array<ProjectType>
+ developData?: Array<ProjectType>
searchQuery: {
pageIndex: number,
pageSize: number,
@@ -15,6 +16,7 @@
declare interface ProjectType {
id?: number | null,
+ liabilityUserId?: number | null,
experimentCode: string,
experimentName: string,
}
@@ -34,13 +36,17 @@
experimentName: string,
experimentType: null | number,
liabilityUserId: null | number,
- safeLiabilityUserId: null | number,
+ safeLiabilityUser: string
+ liabilityUserPhone: string,
+ safeLiabilityUserPhone: string,
+ sisStatus?: null | number,
+ safeInformationSystem?: string,
dep: string,
- siteId: null | number,
experimentStep: string,
experimentMethod: string,
process: string,
keyProcess: string,
+ measure: string,
timeout: null | number,
timeoutManager: string,
closed: null | number,
@@ -56,8 +62,10 @@
emergencyDrillStatus: string,
partitionCondition: string,
note: string,
- expectStartTime: null | number,
+ startTime?: string,
+ createExperimentTime: string
persons: SelectPersonType [],
+ siteList: SelectRoomType [],
deviceList: SelectEquipmentType [],
stuffList: SelectMaterialType [],
hazardousWasteList: SelectDangerType []
@@ -66,7 +74,7 @@
},
allPersonList: Array<AllPersonListType>
- systemPersonList: Array<SystemPersonType>
+ systemPersonList: Array<AllPersonListType>
allRoomList: Array<RoomType>
}
@@ -91,7 +99,7 @@
}
declare interface AllPersonListType {
- id: null | number,
+ id?: null | number,
personId?: null | number,
personName: null,
personAge: null,
@@ -103,10 +111,23 @@
training:''
}
+declare interface NewPersonListType {
+ depId: number | null
+ depName: string
+ id: number
+ idSerial: string
+ idType: number | null
+ name: string
+ phone: string
+ realName: string
+}
+
declare interface SelectEquipmentType {
disabled: boolean
equipmentList: Array<AllEquipmentListType>,
allEquipmentList: Array<AllEquipmentListType>,
+ equipmentTypeList: Array<any>,
+ specialDeviceList: Array<Type>
}
declare interface AllEquipmentListType {
@@ -117,6 +138,8 @@
deviceName: string,
devicePower: string,
specialDevice: string,
+ deviceUnit?: null | number,
+ safeProtect?: null | number
}
@@ -124,6 +147,35 @@
disabled: boolean
materialList: Array<AllMaterialListType>,
allMaterialList: Array<AllMaterialListType>,
+ stuffTypeList: Array<stuffType>
+ stuffStorageList: Array<stuffType>
+ stuffUnitList: Array<stuffType>
+}
+
+declare interface SelectRoomType {
+ disabled: boolean
+ roomList: Array<roomListType>,
+ allRoomList: Array<roomListType>,
+ specialDeviceList: Array<stuffType>
+ memberList: Array<any>
+ typeList: Array<any>
+ stuffStorageList: Array<stuffType>
+ stuffUnitList: Array<stuffType>
+}
+
+declare interface roomListType {
+ siteId?: null | number,
+ siteName?: string,
+ floor?: string,
+ room?: string,
+ fireFacilities?: null | number,
+ partitionStatus?: null | number,
+ siteType?: string,
+}
+
+declare interface stuffType {
+ id: null | number,
+ name: string
}
declare interface AllMaterialListType {
--
Gitblit v1.9.2