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 | 109 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 96 insertions(+), 13 deletions(-) diff --git a/src/views/experiment/project/index.ts b/src/views/experiment/project/index.ts index c27e2db..695639c 100644 --- a/src/views/experiment/project/index.ts +++ b/src/views/experiment/project/index.ts @@ -1,20 +1,25 @@ declare interface ProjectStateType { - projectData: Array<ProjectType> + projectData?: Array<ProjectType> + developData?: Array<ProjectType> searchQuery: { pageIndex: number, pageSize: number, searchParams: { experimentName: string, experimentType: null | number, + assessLevel: null | number, } }, total: 0, experimentTypeList: Type [] + riskLevelList: Type [] allRoomList: RoomType [] + tagBg: Array<string> } declare interface ProjectType { id?: number | null, + liabilityUserId?: number | null, experimentCode: string, experimentName: string, } @@ -24,6 +29,10 @@ id: number, name: string, } +declare interface eType { + typeId: number, + typeName: string, +} declare interface ProjectDialogType { title: string, @@ -32,15 +41,22 @@ 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, + 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, @@ -48,16 +64,14 @@ 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, - expectStartTime: null | number, + startTime?: string, + createExperimentTime: string persons: SelectPersonType [], + siteList: SelectRoomType [], deviceList: SelectEquipmentType [], stuffList: SelectMaterialType [], hazardousWasteList: SelectDangerType [] @@ -66,7 +80,10 @@ }, allPersonList: Array<AllPersonListType> + systemPersonList: Array<AllPersonListType> allRoomList: Array<RoomType> + experimentTypeList: eType [] + deptList: Array<any> } declare interface SelectDangerType { @@ -90,9 +107,10 @@ } declare interface AllPersonListType { - id: null | number, + id?: null | number, personId?: null | number, - personName: null, + personName: string, + realName?: string personAge: null, personGender:'', personMajor:'', @@ -102,10 +120,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 { @@ -116,6 +147,8 @@ deviceName: string, devicePower: string, specialDevice: string, + deviceUnit?: null | number, + safeProtect?: null | number } @@ -123,6 +156,57 @@ disabled: boolean materialList: Array<AllMaterialListType>, allMaterialList: Array<AllMaterialListType>, + stuffTypeList: Array<stuffType> + stuffStorageList: Array<stuffType> + 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<allRoomListType>, + 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 allRoomListType { + id: 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 { @@ -135,7 +219,6 @@ stuffStorage: string, stuffUnit: string } - declare interface ApplyStartDialogType { title: string, -- Gitblit v1.9.2