dedsudiyu 1 місяць тому
батько
коміт
62faec1a4e

+ 1 - 21
pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -214,13 +214,13 @@
 		},
 		mounted() {
 			if (this.optionData.pageType == 0) {
+				this.securityCheckOptionSelAllList();
 				if (this.optionData.manageStatus == 2) {
 					this.securityAppCheckSetOptionList(this.optionData, 1)
 				} else {
 					this.securityAppCheckSetOptionList(this.optionData, 0)
 				}
 			}
-			this.securityCheckOptionSelAllList();
 		},
 		methods: {
 			//滚动事件
@@ -697,26 +697,6 @@
 					for (let o = 0; o < maxList[i].children.length; o++) {
 						for (let x = 0; x < minList.length; x++) {
 							if (maxList[i].children[o].id == minList[x].parentId) {
-								// //一级
-								// minList[x].hazardCheckPro = minList[x].id
-								// minList[x].hazardCheckCode = minList[x].code
-								// minList[x].hazardCheckName = minList[x].name
-								// minList[x].hazardCheckPro2 = maxList[i].children[o].id
-								// minList[x].hazardCheckCode2 = maxList[i].children[o].code
-								// minList[x].hazardCheckName2 = maxList[i].children[o].name
-								// minList[x].hazardCheckPro1 = maxList[i].id
-								// minList[x].hazardCheckCode1 = maxList[i].code
-								// minList[x].hazardCheckName1 = maxList[i].name
-								// //二级
-								// minList[x].children[o].hazardCheckPro = minList[x].id
-								// minList[x].children[o].hazardCheckCode = minList[x].code
-								// minList[x].children[o].hazardCheckName = minList[x].name
-								// minList[x].children[o].hazardCheckPro2 = maxList[i].children[o].id
-								// minList[x].children[o].hazardCheckCode2 = maxList[i].children[o].code
-								// minList[x].children[o].hazardCheckName2 = maxList[i].children[o].name
-								// minList[x].children[o].hazardCheckPro1 = maxList[i].id
-								// minList[x].children[o].hazardCheckCode1 = maxList[i].code
-								// minList[x].children[o].hazardCheckName1 = maxList[i].name
 								// //三级
 								minList[x].level = 3;
 								minList[x].hazardCheckPro = minList[x].id

+ 1 - 0
pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -370,6 +370,7 @@
 					planSetId: this.optionData.checkPlanSetVoList.planSetId,
 					checkCategory: this.optionData.checkCategory,
 					hazardCheckPro: this.optionData.hazardCheckPro,
+					setOptionId: this.optionData.setOptionId?this.optionData.setOptionId:'',
 					subId: this.optionData.subId,
 				}
 				const {

+ 2 - 0
pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -206,12 +206,14 @@
 			},
 			//详情
 			async securityAppCheckDangerGetCheckProDetail() {
+				console.log(this.optionData);
 				let self=this;
 				let obj = {
 					planId: this.optionData.checkPlanSetVoList.planId,
 					planSetId: this.optionData.checkPlanSetVoList.planSetId,
 					checkCategory: this.optionData.checkCategory,
 					hazardCheckPro: this.optionData.hazardCheckPro,
+					setOptionId: this.optionData.setOptionId,
 					subId: this.optionData.subId,
 				}
 				const {