diff --git a/pages/apply/subPages/HM/2riskRecordEdit.vue b/pages/apply/subPages/HM/2riskRecordEdit.vue
index b5ebbf5..7410913 100644
--- a/pages/apply/subPages/HM/2riskRecordEdit.vue
+++ b/pages/apply/subPages/HM/2riskRecordEdit.vue
@@ -465,9 +465,9 @@
 								i].Nav_Identifying.NAME;
 						}
 					}
-					let strPosts = ''
 					if (res.Nav_Details && res.Nav_Details.length > 0) {
 						for (let i = 0; i < res.Nav_Details.length; i++) {
+							let strPosts = ''
 							for (let j = 0; j < res.Nav_Details[i].Nav_EvaluateRiskRecordWorkduty.length; j++) {
 								strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Details[i]
 									.Nav_EvaluateRiskRecordWorkduty[
@@ -476,9 +476,9 @@
 							this.model.Nav_Details[i].Posts = strPosts;
 						}
 					}
-					let strEqus = ''
 					if (res.Nav_Details && res.Nav_Details.length > 0) {
 						for (let i = 0; i < res.Nav_Details.length; i++) {
+							let strEqus = ''
 							for (let j = 0; j < res.Nav_Details[i].Nav_EvaluateRiskRecordEquipment.length; j++) {
 								strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Details[i]
 									.Nav_EvaluateRiskRecordEquipment[
diff --git a/pages/apply/subPages/HM/6evaluateEdit.vue b/pages/apply/subPages/HM/6evaluateEdit.vue
index 9e9337b..88a0c18 100644
--- a/pages/apply/subPages/HM/6evaluateEdit.vue
+++ b/pages/apply/subPages/HM/6evaluateEdit.vue
@@ -99,10 +99,10 @@
 										disabled disabledColor="#fff"></u--input>
 								</u-form-item>
 								<u-form-item class="custom-form-item" label="个体防护措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskIndividualMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskIndividualMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_IndividualMeasures.NAME"></u--text>
 										</view>
@@ -112,11 +112,11 @@
 								</u-form-item>
 
 								<u-form-item class="custom-form-item" label="工程控制措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskEngineeringMeasures"
-												:key="k" class="item"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskEngineeringMeasures" :key="k"
+												class="item"
 												:text="k + 1 + '. ' + i.Nav_EngineeringMeasures.NAME"></u--text>
 										</view>
 										<u-icon class="icon" name="arrow-down">
@@ -125,10 +125,10 @@
 								</u-form-item>
 
 								<u-form-item class="custom-form-item" label="管理控制措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Management', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Management', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskManagementMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskManagementMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_ManagementMeasures.NAME"></u--text>
 										</view>
@@ -138,10 +138,10 @@
 								</u-form-item>
 
 								<u-form-item class="custom-form-item" label="教育培训措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Education', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Education', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskEducationMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskEducationMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_EducationMeasures.NAME"></u--text>
 										</view>
@@ -151,10 +151,10 @@
 								</u-form-item>
 
 								<u-form-item class="custom-form-item" label="应急处置措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskEmergencyMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskEmergencyMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_EmergencyMeasures.NAME"></u--text>
 										</view>
@@ -211,8 +211,8 @@
 										inputAlign="right" disabled disabledColor="#fff"></u--input>
 								</u-form-item>
 								<u-form-item label="职业危害位置：" prop="HAZARD_POSITION" borderBottom>
-									<u--input v-model="item.HAZARD_POSITION" placeholder="职业危害位置" border="none" inputAlign="right"
-										disabled disabledColor="#fff"></u--input>
+									<u--input v-model="item.HAZARD_POSITION" placeholder="职业危害位置" border="none"
+										inputAlign="right" disabled disabledColor="#fff"></u--input>
 								</u-form-item>
 								<u-form-item label="风险地点：" prop="RISK_PLACE" borderBottom>
 									<u--input v-model="item.RISK_PLACE" border="none" inputAlign="right" disabled
@@ -252,10 +252,10 @@
 										disabled disabledColor="#fff"></u--input>
 								</u-form-item>
 								<u-form-item class="custom-form-item" label="个体防护措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskIndividualMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskIndividualMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_IndividualMeasures.NAME"></u--text>
 										</view>
@@ -263,25 +263,25 @@
 										</u-icon>
 									</view>
 								</u-form-item>
-		
+
 								<u-form-item class="custom-form-item" label="工程控制措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskEngineeringMeasures"
-												:key="k" class="item"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskEngineeringMeasures" :key="k"
+												class="item"
 												:text="k + 1 + '. ' + i.Nav_EngineeringMeasures.NAME"></u--text>
 										</view>
 										<u-icon class="icon" name="arrow-down">
 										</u-icon>
 									</view>
 								</u-form-item>
-		
+
 								<u-form-item class="custom-form-item" label="管理控制措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Management', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Management', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskManagementMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskManagementMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_ManagementMeasures.NAME"></u--text>
 										</view>
@@ -289,12 +289,12 @@
 										</u-icon>
 									</view>
 								</u-form-item>
-		
+
 								<u-form-item class="custom-form-item" label="教育培训措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Education', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Education', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskEducationMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskEducationMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_EducationMeasures.NAME"></u--text>
 										</view>
@@ -302,12 +302,12 @@
 										</u-icon>
 									</view>
 								</u-form-item>
-		
+
 								<u-form-item class="custom-form-item" label="应急处置措施" :borderBottom="false"
-									@click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true})">
+									@click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true,itemIndex:index})">
 									<view slot="right" class="custom-form-item-right">
 										<view class="multi">
-											<u--text v-for="(i, k) in model.Nav_EvaluateRiskEmergencyMeasures" :key="k"
+											<u--text v-for="(i, k) in item.Nav_EvaluateRiskEmergencyMeasures" :key="k"
 												class="item"
 												:text="k + 1 + '. ' + i.Nav_EmergencyMeasures.NAME"></u--text>
 										</view>
@@ -396,6 +396,7 @@
 					show: false,
 					lists: [],
 					formIndex: undefined,
+					itemIndex: undefined,
 					isMultiple: false,
 					defaultChecked: []
 				},
@@ -430,6 +431,7 @@
 					this.qsCom = {
 						show: true,
 						formIndex: opt.formIndex,
+						itemIndex: opt.itemIndex,
 						isMultiple: opt.isMultiple,
 						lists: column
 					}
@@ -497,9 +499,11 @@
 			onSelectedQS(val) {
 				const {
 					formIndex,
+					itemIndex,
 				} = this.qsCom
+				console.log(itemIndex)
 				if (formIndex == "Individual") {
-					this.model.Nav_EvaluateRiskIndividualMeasures = [];
+					this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskIndividualMeasures = [];
 					val.forEach(item => {
 						let obj = {
 							INDIVIDUAL_MEASURES_ID: item.ID,
@@ -509,11 +513,12 @@
 							ID: guid(),
 							EVALUATION_RESULT_RISK_ID: this.model.ID,
 							ORG_ID: this.ORG_ID,
+							IS_DELETED: false,
 						}
-						this.model.Nav_EvaluateRiskIndividualMeasures.push(obj);
+						this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskIndividualMeasures.push(obj);
 					})
 				} else if (formIndex == "Engineering") {
-					this.model.Nav_EvaluateRiskEngineeringMeasures = [];
+					this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEngineeringMeasures = [];
 					val.forEach(item => {
 						let obj = {
 							ENGINEERING_MEASURES_ID: item.ID,
@@ -523,11 +528,12 @@
 							ID: guid(),
 							EVALUATION_RESULT_RISK_ID: this.model.ID,
 							ORG_ID: this.ORG_ID,
+							IS_DELETED: false,
 						}
-						this.model.Nav_EvaluateRiskEngineeringMeasures.push(obj);
+						this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEngineeringMeasures.push(obj);
 					})
 				} else if (formIndex == "Management") {
-					this.model.Nav_EvaluateRiskManagementMeasures = [];
+					this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskManagementMeasures = [];
 					val.forEach(item => {
 						let obj = {
 							MANAGEMENT_MEASURES_ID: item.ID,
@@ -537,11 +543,12 @@
 							ID: guid(),
 							EVALUATION_RESULT_RISK_ID: this.model.ID,
 							ORG_ID: this.ORG_ID,
+							IS_DELETED: false,
 						}
-						this.model.Nav_EvaluateRiskManagementMeasures.push(obj);
+						this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskManagementMeasures.push(obj);
 					})
 				} else if (formIndex == "Education") {
-					this.model.Nav_EvaluateRiskEducationMeasures = [];
+					this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEducationMeasures = [];
 					val.forEach(item => {
 						let obj = {
 							EDUCATION_MEASURES_ID: item.ID,
@@ -551,11 +558,12 @@
 							ID: guid(),
 							EVALUATION_RESULT_RISK_ID: this.model.ID,
 							ORG_ID: this.ORG_ID,
+							IS_DELETED: false,
 						}
-						this.model.Nav_EvaluateRiskEducationMeasures.push(obj);
+						this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEducationMeasures.push(obj);
 					})
 				} else if (formIndex == "Emergency") {
-					this.model.Nav_EvaluateRiskEmergencyMeasures = [];
+					this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEmergencyMeasures = [];
 					val.forEach(item => {
 						let obj = {
 							EMERGENCY_MEASURES_ID: item.ID,
@@ -565,8 +573,9 @@
 							ID: guid(),
 							EVALUATION_RESULT_RISK_ID: this.model.ID,
 							ORG_ID: this.ORG_ID,
+							IS_DELETED: false,
 						}
-						this.model.Nav_EvaluateRiskEmergencyMeasures.push(obj);
+						this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEmergencyMeasures.push(obj);
 					})
 				}
 				this.qsCom.defaultChecked = [];
@@ -597,9 +606,9 @@
 							this.AUDIT_OPINION = refusRes;
 						})
 					}
-					let strPosts = ''
 					if (res.Nav_Risks && res.Nav_Risks.length > 0) {
 						for (let i = 0; i < res.Nav_Risks.length; i++) {
+							let strPosts = ''
 							for (let j = 0; j < res.Nav_Risks[i].Nav_EvaluateRiskWorkduty.length; j++) {
 								strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Risks[i]
 									.Nav_EvaluateRiskWorkduty[
@@ -618,9 +627,9 @@
 							this.model.Nav_Risks[i].Posts = strPosts;
 						}
 					}
-					let strEqus = ''
 					if (res.Nav_Risks && res.Nav_Risks.length > 0) {
 						for (let i = 0; i < res.Nav_Risks.length; i++) {
+							let strEqus = ''
 							for (let j = 0; j < res.Nav_Risks[i].Nav_EvaluateRiskEquipment.length; j++) {
 								strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Risks[i]
 									.Nav_EvaluateRiskEquipment[
@@ -670,15 +679,15 @@
 					this.model.ORG_ID = this.ORG_ID;
 				}
 				this.model.Nav_Files = null;
-				this.model.Nav_Risks.forEach(item => {
-					item.Nav_EvaluateRiskWorkduty = null;
-					item.Nav_EvaluateRiskEquipment = null;
-					item.Nav_EvaluateRiskIndividualMeasures = null;
-					item.Nav_EvaluateRiskEngineeringMeasures = null;
-					item.Nav_EvaluateRiskManagementMeasures = null;
-					item.Nav_EvaluateRiskEducationMeasures = null;
-					item.Nav_EvaluateRiskEmergencyMeasures = null;
-				});
+				// this.model.Nav_Risks.forEach(item => {
+				// 	item.Nav_EvaluateRiskWorkduty = null;
+				// 	item.Nav_EvaluateRiskEquipment = null;
+				// 	item.Nav_EvaluateRiskIndividualMeasures = null;
+				// 	item.Nav_EvaluateRiskEngineeringMeasures = null;
+				// 	item.Nav_EvaluateRiskManagementMeasures = null;
+				// 	item.Nav_EvaluateRiskEducationMeasures = null;
+				// 	item.Nav_EvaluateRiskEmergencyMeasures = null;
+				// });
 				const ele = this.$refs
 				//ele['wForm'].validate().then(res => {
 				getRequest(this.model, "/HM/HMEvaluateResult/FullUpdate").then(res => {