From f1f40e9a28fafab5d884630b8900b11060ebe9fc Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 31 十月 2023 08:53:35 +0800
Subject: [PATCH] 修改

---
 src/views/analyse/identify/index.ts |   54 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/views/analyse/identify/index.ts b/src/views/analyse/identify/index.ts
index c99a614..66859ae 100644
--- a/src/views/analyse/identify/index.ts
+++ b/src/views/analyse/identify/index.ts
@@ -1,5 +1,6 @@
 declare interface IdentifyStateType {
 	identifyData: Array<IdentifyType>
+	user: null | number
 	searchQuery: {
 		pageIndex: number,
 		pageSize: number,
@@ -19,28 +20,32 @@
 	activeName: string,
 	list?: IdentifyType [],
 	identifyQueryVisible: boolean,
-	identifyQueryForm: {
-		id: null | number,
-		identificationMethod: null | number,
-	},
-	identifyForm: {},
+	identifyMethodVisible: boolean
+	currentMethod: number | null
+	identifyQueryForm: identifyQueryFormType,
+	identifyForm: IdentifyType,
 	identificationMethodList: Array<Type>,
 	planList: Array<PlanType>
+	personList: Array<AllPersonListType>
 }
 
-declare  interface SystemPersonType {
-	id: number,
-	realName: string,
+declare interface identifyQueryFormType {
+	id: null | number,
+	identificationMethod: null | number,
+	assessType: null | number,
+	assessStartTime: string,
+	riskUnitName: string
 }
+
 
 declare interface IdentifyType {
 	id: number | null,
-	technologyMeasure: string,
-	assessPlanName: string,
-	manageMeasure: string,
-	educationMeasure: string,
-	personalProtectionMeasure: string,
-	emergencyMeasure: string,
+	technologyMeasure?: string,
+	assessPlanName?: string,
+	manageMeasure?: string,
+	educationMeasure?: string,
+	personalProtectionMeasure?: string,
+	emergencyMeasure?: string,
 	identificationMethod: number | null,
 	hazopId?: number | null,
 	jhaId?: number | null,
@@ -68,9 +73,12 @@
 	sclCheckStandard: string,
 	sclCheckUnstandard: string,
 	sclCheckResult: string,
-	planExecStatus: number,
-	evaluateMethod: number,
-	factorQueryDTOList?: IdentifyType [],
+	planExecStatus?: number,
+	evaluateMethod?: number,
+	factorQueryDTOList?: EvaluateType [],
+	evaluateUser?: string,
+	result?: number | null,
+	identificationDesc: string
 }
 
 declare interface Type {
@@ -80,17 +88,17 @@
 
 declare interface IdentifyDialogType {
 	title: string,
+	method: null | number,
+	evaluateMethod: null | number,
+	evaluateUser?: string,
 	time: string [],
 	disabled: boolean,
 	identifyDialogVisible: boolean,
 	identifyForm: {
 		id: number | null,
-		technologyMeasure: string,
-		manageMeasure: string,
-		educationMeasure: string,
-		personalProtectionMeasure: string,
-		emergencyMeasure: string,
 		identificationMethod: number | null,
+		result: null | number,
+		identificationDesc: string,
 		hazopId?: number | null,
 		jhaId?: number | null,
 		phaId?: number | null,
@@ -124,5 +132,5 @@
 	identificationMethodList: Array<Type>,
 	evaluateMethodList: Array<Type>
 	planList: Array<PlanType>
-	personList: Array<SystemPersonType>
+	personList?: Array<NewPersonListType>
 }

--
Gitblit v1.9.2