From e65a116f1ff1d9d99a093f76a9b02a6d27bfb35e Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期二, 29 四月 2025 08:47:50 +0800 Subject: [PATCH] 修改 --- src/views/experiment/project/index.ts | 64 +++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 17 deletions(-) diff --git a/src/views/experiment/project/index.ts b/src/views/experiment/project/index.ts index 188cb14..695639c 100644 --- a/src/views/experiment/project/index.ts +++ b/src/views/experiment/project/index.ts @@ -7,11 +7,14 @@ searchParams: { experimentName: string, experimentType: null | number, + assessLevel: null | number, } }, total: 0, experimentTypeList: Type [] + riskLevelList: Type [] allRoomList: RoomType [] + tagBg: Array<string> } declare interface ProjectType { @@ -26,6 +29,10 @@ id: number, name: string, } +declare interface eType { + typeId: number, + typeName: string, +} declare interface ProjectDialogType { title: string, @@ -34,9 +41,12 @@ projectForm: { id: null | number, experimentName: string, - experimentType: null | number, + experimentType: null | number | any, + typeList: Array<eType>, + liabilityUser: string liabilityUserId: null | number, safeLiabilityUser: string + safeLiabilityUserId: null | number, liabilityUserPhone: string, safeLiabilityUserPhone: string, sisStatus?: null | number, @@ -54,13 +64,9 @@ explosionProof: string, fireProof: string, poisonProof: string, - hazardousWaste: null | number, safeManagerMethod: string, - emergencyPlan: string, - emergencyDrill: string, - emergencyPlanName: string, - emergencyDrillStatus: string, - partitionCondition: string, + emergencyList: Array<emergencyListType>, + partitionCondition: null | number, note: string, startTime?: string, createExperimentTime: string @@ -76,6 +82,8 @@ allPersonList: Array<AllPersonListType> systemPersonList: Array<AllPersonListType> allRoomList: Array<RoomType> + experimentTypeList: eType [] + deptList: Array<any> } declare interface SelectDangerType { @@ -101,7 +109,8 @@ declare interface AllPersonListType { id?: null | number, personId?: null | number, - personName: null, + personName: string, + realName?: string personAge: null, personGender:'', personMajor:'', @@ -152,10 +161,22 @@ stuffUnitList: Array<stuffType> } +declare interface SelectEmergencyType { + disabled: boolean + emergencyList: Array<emergencyListType> +} + +declare interface emergencyListType { + emergencyPlanName: string, + emergencyDrillStatus: string, + emergencyDrill: string, + emergencyPlan: string +} + declare interface SelectRoomType { disabled: boolean roomList: Array<roomListType>, - allRoomList: Array<roomListType>, + allRoomList: Array<allRoomListType>, specialDeviceList: Array<stuffType> memberList: Array<any> typeList: Array<any> @@ -164,13 +185,23 @@ } declare interface roomListType { - siteId?: null | number, - siteName?: string, - floor?: string, - room?: string, - fireFacilities?: null | number, - partitionStatus?: null | number, - siteType?: string, + siteId: null | number, + siteName: string, + floor: string, + room: string, + fireFacilities: null | number, + partitionStatus: null | number, + siteType: string, +} + +declare interface allRoomListType { + id: null | number, + siteName: string, + floor: string, + room: string, + fireFacilities: null | number, + partitionStatus: null | number, + siteType: string, } declare interface stuffType { @@ -188,7 +219,6 @@ stuffStorage: string, stuffUnit: string } - declare interface ApplyStartDialogType { title: string, -- Gitblit v1.9.2