zc

api/request/config.js

@@ -2,13 +2,13 @@ const config = {
 	/************************************ 后台服务地址 ************************************/
 	
 	// base_url: 'http://192.168.1.43/api', //43服务器
-	base_url: 'http://192.168.1.8/api',//1.8服务器
+	// base_url: 'http://192.168.1.8/api',//1.8服务器
 	// base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.43/api',//小飞
-	// base_url: 'http://192.168.1.20:8080',//志伟
+	base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.39:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',

pages_safetyCheck/api/index.js

@@ -638,4 +638,12 @@ export const subjectList = (data) => {
         method: 'GET',
         data: data
     })
+};
+//根据名称查询实验室
+export const securityAppCheckPlanSetGetOptionList = (data) => {
+    return apiResquest({
+        url: '/security/appCheckPlanSet/getOptionList',
+        method: 'POST',
+        data: {...data}
+    })
 };

pages_safetyCheck/component/checkItemModule.vue

@@ -95,29 +95,22 @@
 			</view>
 			<view class="input-for-max-box">
 				<view class="for-box" v-for="(item,index) in dataList" :key="index" v-if="optionData.infoType==0">
-					<view class="for-box-n" v-html="brightenKeyword(item.hazardCheckCode1,item.hazardCheckName1,searchValue)">
-						{{item.hazardCheckCode1}}{{item.hazardCheckName1}}
-					</view>
-					<view class="for-box-n" v-html="brightenKeyword(item.hazardCheckCode2,item.hazardCheckName2,searchValue)">
-						{{item.hazardCheckCode2}}{{item.hazardCheckName2}}
+					<view class="for-box-n">
+						{{item.hazardCheckCode1}} {{item.hazardCheckName1}}
 					</view>
-					<view v-for="(item2,index2) in item.data">
-						<view  class="for-box-n" v-html="brightenKeyword(item2.hazardCheckCode,item2.hazardCheckName,searchValue)">
-							{{item2.hazardCheckCode}}{{item2.hazardCheckName}}
+					<view v-for="(item2,index2) in item.children">
+						<view  class="for-box-n">
+							{{item2.hazardCheckCode2}} {{item2.hazardCheckName2}}
 						</view>
-						<view class="for-box-n" @click="checkItemButton(item2,item3)"
-							v-for="(item3,index3) in item2.hazardCheckPointList" v-html="brightenKeyword('',item3,searchValue)">
-							{{item3}}
+						<view class="for-box-n"
+							v-for="(item3,index3) in item2.children">
+							<view>{{item3.hazardCheckCode}} {{item3.hazardCheckName}}</view>
+							<view class="for-box-n-b" @click="checkItemButton(item3,item4)"
+								v-for="(item4,index4) in item3.hazardCheckPointList">
+								<view>{{item4}}</view>
+							</view>
 						</view>
 					</view>
-					
-				</view>
-				
-				<view class="for-box" @click="checkItemButton(item,'')" v-for="(item,index) in dataList" :key="index"
-					v-if="optionData.infoType==1 || optionData.infoType==2">
-					<view class="for-box-n">
-						{{item.hazardCheckCode}}{{item.hazardCheckName}}
-					</view>
 				</view>
 			</view>
 		</view>
@@ -129,18 +122,11 @@
 				<view v-if="levelListThree" @click="cascadeButton(3)">三级检查</view>
 			</view>
 			<view class="check-for-max-box">
-				<view v-if="!levelListThree" v-for="(item,index) in checkList" :key="index" @click="cascadeItemButton(item,item2)">
-					<view>{{item.hazardCheckCode?item.hazardCheckCode:item.code}}
-						{{item.hazardCheckName?item.hazardCheckName:item.name}}
-					</view>
-				</view>
-				<view v-for="(item,index) in checkList" :key="index" v-if="levelListThree">
-					<view>{{item.hazardCheckCode?item.hazardCheckCode:item.code}}
-						{{item.hazardCheckName?item.hazardCheckName:item.name}}
-					</view>
-					<view  v-for="(item2,index2) in item.hazardCheckPointList" @click="checkItemButton(item,item2)">
-						{{item2}}
+				<view v-for="(item,index) in checkList" :key="index" @click="cascadeItemButton(item)">
+					<view>
+						{{item.code}} {{item.name}}
 					</view>
+					<view v-for="(minItem,minIndex) in item.hazardCheckPointList" @click="checkItemButton(item,minItem)">{{minItem}}</view>
 				</view>
 
 			</view>
@@ -155,6 +141,7 @@
 		securityAppCheckSetOptionList,
 		securityAppCheckSetOptionGetReviewList,
 		securityAppCheckDangerGetCheckDangerSubId,
+		securityAppCheckPlanSetGetOptionList,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "checkItemModule",
@@ -171,6 +158,8 @@
 				searchValue: "",
 				//输入搜索返回列表
 				dataList: [],
+				//当前级联数据
+				cascadeButtonType:1,
 				//一级-级联数据
 				levelListOne: null,
 				//二级-级联数据
@@ -199,7 +188,8 @@
 			getSearchValue() {
 				if (this.optionData.infoType == 0) {
 					//检查
-					this.securityAppCheckSetOptionList();
+					// this.securityAppCheckSetOptionList();
+					this.securityCheckOptionSelAllList();
 				} else if (this.optionData.infoType == 1) {
 					//复查
 					this.securityAppCheckSetOptionGetReviewList();
@@ -228,6 +218,7 @@
 			},
 			//级联等级点击
 			cascadeButton(type) {
+				this.$set(this,'cascadeButtonType',type);
 				if (type == 1) {
 					this.$set(this, 'levelListTwo', null);
 					this.$set(this, 'levelListThree', null);
@@ -252,9 +243,6 @@
 						})
 					}
 					this.$set(this, 'checkList', item.children);
-				} else if (item.level == 3) {
-					this.checkItemButton(item, item2);
-
 				}
 			},
 			//选中检查项
@@ -279,7 +267,8 @@
 					let maxList = this.getCascaderData(JSON.parse(JSON.stringify(data.data)), 2)
 					this.$nextTick(() => {
 						if (this.optionData.infoType == 0) {
-							this.securityAppCheckSetOptionList(maxList);
+							this.securityAppCheckPlanSetGetOptionList(maxList);
+							// this.securityAppCheckSetOptionList(maxList);
 						} else if (this.optionData.infoType == 1) {
 							this.securityAppCheckSetOptionGetReviewList(maxList);
 						} else if (this.optionData.infoType == 2) {
@@ -288,6 +277,41 @@
 					})
 				}
 			},
+			//查询批次下-检查项
+			async securityAppCheckPlanSetGetOptionList(maxList){
+				let self = this;
+				const {
+					data
+				} = await securityAppCheckPlanSetGetOptionList({
+					planSetId:this.optionData.planSetId,
+					searchValue: this.searchValue
+				});
+				if (data.code == 200) {
+					if (data.data[0]) {
+						let minList = JSON.parse(JSON.stringify(data.data))
+						this.newCascadeData(maxList, minList);
+					}
+					
+					// //查询数据
+					// let map = new Map();
+					// for (let item of data.data) {
+					//     let hazardCheckCode2 = item.hazardCheckCode2;
+					//     if (!map.has(hazardCheckCode2)) {
+					//         map.set(hazardCheckCode2, {
+					//             hazardCheckCode2: hazardCheckCode2,
+					//             hazardCheckName2: item.hazardCheckName2,
+					//             hazardCheckCode1: item.hazardCheckCode1,
+					//             hazardCheckName1: item.hazardCheckName1,
+					//             data: [item]
+					//         });
+					//     } else {
+					//         map.get(hazardCheckCode2).data.push(item);
+					//     }
+					// }
+					// let finalResult = Array.from(map.values());
+					// this.$set(this, 'dataList', finalResult);
+				}
+			},
 			/********************** 检查相关查询 **********************/
 			async securityAppCheckSetOptionList(maxList) {
 				let self = this;
@@ -337,8 +361,6 @@
 					
 				}
 			},
-			
-			
 			/********************** 复查相关查询 **********************/
 			async securityAppCheckSetOptionGetReviewList(maxList) {
 				let self = this;
@@ -411,6 +433,64 @@
 				
 				
 			},
+			newCascadeData(maxList, minList) {
+				for (let i = 0; i < maxList.length; i++) {
+					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) {
+								//一级
+								maxList[i].hazardCheckPro = minList[x].id
+								maxList[i].hazardCheckCode = minList[x].code
+								maxList[i].hazardCheckName = minList[x].name
+								maxList[i].hazardCheckPro2 = maxList[i].children[o].id
+								maxList[i].hazardCheckCode2 = maxList[i].children[o].code
+								maxList[i].hazardCheckName2 = maxList[i].children[o].name
+								maxList[i].hazardCheckPro1 = maxList[i].id
+								maxList[i].hazardCheckCode1 = maxList[i].code
+								maxList[i].hazardCheckName1 = maxList[i].name
+								//二级
+								maxList[i].children[o].hazardCheckPro = minList[x].id
+								maxList[i].children[o].hazardCheckCode = minList[x].code
+								maxList[i].children[o].hazardCheckName = minList[x].name
+								maxList[i].children[o].hazardCheckPro2 = maxList[i].children[o].id
+								maxList[i].children[o].hazardCheckCode2 = maxList[i].children[o].code
+								maxList[i].children[o].hazardCheckName2 = maxList[i].children[o].name
+								maxList[i].children[o].hazardCheckPro1 = maxList[i].id
+								maxList[i].children[o].hazardCheckCode1 = maxList[i].code
+								maxList[i].children[o].hazardCheckName1 = maxList[i].name
+								//三级
+								minList[x].level = 3;
+								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].hazardCheckPointList = minList[x].mainPoint.split('#')
+								if (maxList[i].children[o].children) {
+									maxList[i].children[o].children.push(minList[x])
+								} else {
+									maxList[i].children[o].children = [minList[x]]
+								}
+							}
+						}
+					}
+				}
+				let list = this.getCascaderData(JSON.parse(JSON.stringify(maxList)), 3)
+				this.$nextTick(() => {
+					this.$set(this, 'levelListOne', JSON.parse(JSON.stringify({
+						level: 0,
+						children: list
+					})));
+					this.$set(this, 'dataList', JSON.parse(JSON.stringify(list)));
+					this.$set(this, 'checkList', JSON.parse(JSON.stringify(list)));
+					console.log('dataList',this.dataList)
+					console.log('checkList',this.checkList)
+				})
+			},
 			/********************** 检查项格式处理 **********************/
 			getCascaderData(list, type) {
 				let self = this
@@ -577,6 +657,13 @@
 						background-color: #fff;
 						border-bottom: 1rpx solid #E0E0E0;
 					}
+					.for-box-n-b {
+						margin: 0 21rpx;
+						font-size: 32rpx;
+						line-height: 40rpx;
+						padding: 20rpx 0;
+						background-color: #fff;
+					}
 				}
 			}
 		}

pages_safetyCheck/views/inspectManage/conductInspections.vue

@@ -137,7 +137,6 @@
 		},
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
-			console.log('开展检查',optionData)
 			uni.setNavigationBarTitle({
 				title: optionData.subName + '(' + (optionData.pageType == 0 ? (optionData.roomNum ? optionData
 					.roomNum : '-') : (optionData
@@ -190,9 +189,20 @@
 					if(data.data.hazardDescribe){
 						this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe);
 					}else{
-						let list=[];
-						list=data.data.hazardCheckPoint.split('#');
-						this.$set(this.form, 'hazardDescribe', list[0]);
+						this.$set(this.newData,'hazardCheckPro',this.optionData.hazardCheckPro);
+						this.$set(this.newData,'hazardCheckCode',this.optionData.hazardCheckCode);
+						this.$set(this.newData,'hazardCheckName',this.optionData.hazardCheckName);
+						this.$set(this.newData,'hazardCheckPro2',this.optionData.hazardCheckPro2);
+						this.$set(this.newData,'hazardCheckCode2',this.optionData.hazardCheckCode2);
+						this.$set(this.newData,'hazardCheckName2',this.optionData.hazardCheckName2);
+						this.$set(this.newData,'hazardCheckPro3',this.optionData.hazardCheckPro3);
+						this.$set(this.newData,'hazardCheckCode3',this.optionData.hazardCheckCode3);
+						this.$set(this.newData,'hazardCheckName3',this.optionData.hazardCheckName3);
+						this.$set(this.newData,'hazardCheckPoint',this.optionData.hazardCheckPoint);
+						this.$set(this.form,'hazardDescribe',this.optionData.hazardCheckPoint);
+						// let list=[];
+						// list=data.data.hazardCheckPoint.split('#');
+						// this.$set(this.form, 'hazardDescribe', list[0]);
 					}
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
@@ -234,6 +244,7 @@
 					if (this.pageType == 0) {
 						//检查
 						obj.manageId = this.optionData.manageId
+						obj.planSetId = this.optionData.planSetId
 					}
 					this.$set(this, 'propsData', obj);
 					this.$set(this, 'checkItemModuleType', true);
@@ -242,13 +253,20 @@
 					this.$set(this, 'propsData', {});
 				} else if (type == 'submit') {
 					//this.itemsClick(item);
+					console.log('item',item)
+					console.log('keyPoint',keyPoint)
+					this.$set(this.newData, 'hazardCheckPro', item.hazardCheckPro);
 					this.$set(this.newData, 'hazardCheckCode', item.hazardCheckCode);
 					this.$set(this.newData, 'hazardCheckName', item.hazardCheckName);
+					this.$set(this.newData, 'hazardCheckPro2', item.hazardCheckPro2);
 					this.$set(this.newData, 'hazardCheckCode2', item.hazardCheckCode2);
 					this.$set(this.newData, 'hazardCheckName2', item.hazardCheckName2);
+					this.$set(this.newData, 'hazardCheckPro3', item.hazardCheckPro3);
+					this.$set(this.newData, 'hazardCheckCode3', item.hazardCheckCode3);
+					this.$set(this.newData, 'hazardCheckName3', item.hazardCheckName3);
 					this.$set(this.newData, 'hazardCheckPoint', item.hazardCheckPoint);
 					this.$set(this.form, 'hazardDescribe', keyPoint);
-					this.$set(this.optionData, 'setOptionId', item.setOptionId);
+					// this.$set(this.optionData, 'setOptionId', item.setOptionId);
 					this.$set(this.optionData, 'hazardCheckPro', item.hazardCheckPro);
 					this.$set(this, 'checkItemModuleType', false);
 					this.securityAppCheckPhotoGetCheckNumBySub();
@@ -288,14 +306,22 @@
 					checkFlag: this.form.checkFlag,
 					checkStatus: 1,
 					hazardDescribe: this.form.hazardDescribe,
-					setOptionId: this.optionData.setOptionId,
 					photoList: this.form.photoList,
 					voiceList: this.form.voiceList,
+          manageId: this.optionData.manageId,
+          hazardCheckPro: this.newData.hazardCheckPro,
+          hazardCheckCode: this.newData.hazardCheckCode,
+          hazardCheckName: this.newData.hazardCheckName,
+          hazardCheckPro2: this.newData.hazardCheckPro2,
+          hazardCheckCode2: this.newData.hazardCheckCode2,
+          hazardCheckName2: this.newData.hazardCheckName2,
+          hazardCheckPro1: this.newData.hazardCheckPro1,
+          hazardCheckCode1: this.newData.hazardCheckCode1,
+          hazardCheckName1: this.newData.hazardCheckName1,
+          hazardCheckPoint: this.form.hazardDescribe,
 				}
-				if(this.optionData.editStatus){
-					if(this.optionData.setOptionId!=this.newData.setOptionId){
-						obj.delSetOptionId=this.newData.setOptionId;
-					}
+				if(this.optionData.setOptionId){
+					obj.setOptionId = this.optionData.setOptionId;
 				}
 				const {
 					data

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -96,6 +96,8 @@
 		securityAppCheckDangerGetCheckDangerSubList,
 		securityAppCheckDangerReviewSubList,
 		securityAppCheckManageList,
+		securityAppCheckPlanSetGetOptionList,
+		securityCheckOptionSelAllList,
 	} from '@/pages_safetyCheck/api/index.js'
 	import {
 		checkItemModule
@@ -136,6 +138,7 @@
 				inspectRemporary: false, //待检查
 				inspectRemporaryList: [], //待检查
 				optionData: {},
+				checkPlanList:[],
 			}
 		},
 		onLoad(option) {
@@ -155,10 +158,12 @@
 				optionData.pageType == 0 ? (optionData.manageStatus == 2 ? [{
 					value: '1',
 					label: '已检查'
-				}] : [{
-					value: '0',
-					label: '待检查'
-				}, {
+				}] : [
+				// 	{
+				// 	value: '0',
+				// 	label: '待检查'
+				// }, 
+				{
 					value: '1',
 					label: '已检查'
 				}]) : (
@@ -188,7 +193,7 @@
 					this.$set(this, 'curTabTow', '1');
 				}else{
 					this.$set(this, 'curTabTow', 
-					optionData.pageType == 0 ? (optionData.curTabTow == 1 ? '1' : '0') : (
+					optionData.pageType == 0 ? (optionData.curTabTow == 1 ? '1' : '1') : (
 						optionData.pageType == 1 ? '0' : (
 						optionData.pageType == 2 ? '2' : '')));
 				}
@@ -215,6 +220,7 @@
 					this.securityAppCheckSetOptionList(this.optionData, 0)
 				}
 			}
+			this.securityCheckOptionSelAllList();
 		},
 		methods: {
 			//滚动事件
@@ -636,11 +642,14 @@
 			async submitBtn(status) {
 				if (status == 1) {
 					//开展检查
-					let infoData = this.inspectRemporaryList[0];
+					let infoData = this.checkPlanList[0];
+					infoData.manageId = this.optionData.manageId;
+					infoData.hazardCheckPro = this.checkPlanList[0].hazardCheckPro;
 					infoData.pageType = this.pageType;
 					infoData.itemsStatus = this.curTabTow;
 					infoData.checkCategory = this.optionData.checkCategory;
 					infoData.checkPlanSetVoList = this.optionData.checkPlanSetVoList;
+					infoData.subId = this.optionData.subId;
 					infoData.subName = this.optionData.subName;
 					infoData.roomNum = this.optionData.roomNum;
 					infoData.subRoom = this.optionData.subRoom;
@@ -652,7 +661,134 @@
 					});
 				}
 			},
-
+			//基础检查项检查
+			async securityCheckOptionSelAllList() {
+				let self = this;
+				const {
+					data
+				} = await securityCheckOptionSelAllList({});
+				if (data.code == 200) {
+					let maxList = this.getCascaderData(JSON.parse(JSON.stringify(data.data)), 2)
+					this.$nextTick(() => {
+							this.securityAppCheckPlanSetGetOptionList(maxList);
+					})
+				}
+			},
+			//查询批次下-检查项
+			async securityAppCheckPlanSetGetOptionList(maxList){
+				let self = this;
+				const {
+					data
+				} = await securityAppCheckPlanSetGetOptionList({
+					planSetId:this.optionData.planSetId,
+					searchValue: this.searchValue
+				});
+				if (data.code == 200) {
+					if (data.data[0]) {
+						let minList = JSON.parse(JSON.stringify(data.data))
+						this.newCascadeData(maxList, minList);
+					}
+				}
+			},
+			newCascadeData(maxList, minList) {
+				let list = [];
+				for (let i = 0; i < maxList.length; i++) {
+					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) {
+								//一级
+								maxList[i].hazardCheckPro = minList[x].id
+								maxList[i].hazardCheckCode = minList[x].code
+								maxList[i].hazardCheckName = minList[x].name
+								maxList[i].hazardCheckPro2 = maxList[i].children[o].id
+								maxList[i].hazardCheckCode2 = maxList[i].children[o].code
+								maxList[i].hazardCheckName2 = maxList[i].children[o].name
+								maxList[i].hazardCheckPro1 = maxList[i].id
+								maxList[i].hazardCheckCode1 = maxList[i].code
+								maxList[i].hazardCheckName1 = maxList[i].name
+								//二级
+								maxList[i].children[o].hazardCheckPro = minList[x].id
+								maxList[i].children[o].hazardCheckCode = minList[x].code
+								maxList[i].children[o].hazardCheckName = minList[x].name
+								maxList[i].children[o].hazardCheckPro2 = maxList[i].children[o].id
+								maxList[i].children[o].hazardCheckCode2 = maxList[i].children[o].code
+								maxList[i].children[o].hazardCheckName2 = maxList[i].children[o].name
+								maxList[i].children[o].hazardCheckPro1 = maxList[i].id
+								maxList[i].children[o].hazardCheckCode1 = maxList[i].code
+								maxList[i].children[o].hazardCheckName1 = maxList[i].name
+								//三级
+								minList[x].level = 3;
+								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].hazardCheckPoint = minList[x].mainPoint.split('#')[0]
+								if (maxList[i].children[o].children) {
+									list.push(minList[x])
+								} else {
+									list = [minList[x]]
+								}
+							}
+						}
+					}
+				}
+				this.$set(this, 'checkPlanList', JSON.parse(JSON.stringify(list)));
+			},
+			/********************** 检查项格式处理 **********************/
+			getCascaderData(list, type) {
+				let self = this
+				for (let i = 0; i < list.length; i++) {
+					if (list[i].level == type) {
+						delete list[i].children
+					} else if (list[i].children) {
+						if (list[i].children[0]) {
+							list[i].children = self.getCascaderData(list[i].children, type)
+						} else {
+							list.splice(i, 1)
+							i--
+						}
+					} else {
+						list.splice(i, 1)
+						i--
+					}
+				}
+				for (let i = 0; i < list.length; i++) {
+					if (list[i].level == type) {
+						delete list[i].children
+					} else if (list[i].children) {
+						if (list[i].children[0]) {
+							list[i].children = self.getCascaderData(list[i].children, type)
+						} else {
+							list.splice(i, 1)
+							i--
+						}
+					} else {
+						list.splice(i, 1)
+						i--
+					}
+				}
+				for (let i = 0; i < list.length; i++) {
+					if (list[i].level == type) {
+						delete list[i].children
+					} else if (list[i].children) {
+						if (list[i].children[0]) {
+							list[i].children = self.getCascaderData(list[i].children, type)
+						} else {
+							list.splice(i, 1)
+							i--
+						}
+					} else {
+						list.splice(i, 1)
+						i--
+					}
+				}
+				return list
+			},
 		}
 	}
 </script>

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -476,6 +476,16 @@
 					if (this.pageType == 0) {
 						//检查
 						let infoData = this.optionData;
+						infoData.hazardCheckPro = this.newData.hazardCheckPro;
+						infoData.hazardCheckCode = this.newData.hazardCheckCode;
+						infoData.hazardCheckName = this.newData.hazardCheckName;
+						infoData.hazardCheckPro2 = this.newData.hazardCheckPro2;
+						infoData.hazardCheckCode2 = this.newData.hazardCheckCode2;
+						infoData.hazardCheckName2 = this.newData.hazardCheckName2;
+						infoData.hazardCheckPro1 = this.newData.hazardCheckPro1;
+						infoData.hazardCheckCode1 = this.newData.hazardCheckCode1;
+						infoData.hazardCheckName1 = this.newData.hazardCheckName1;
+						infoData.hazardCheckPoint = this.newData.hazardCheckPoint;
 						infoData.editStatus = true;
 						uni.redirectTo({
 							url: '/pages_safetyCheck/views/inspectManage/conductInspections?infoData=' +