heyang 6 months ago
parent
commit
95b5c16904

+ 2 - 2
api/request/config.js

@@ -1,12 +1,12 @@
 const config = {
 const config = {
 	// base_url: 'http://192.168.1.43/api', //43服务器
 	// 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.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.43/api',//小飞
 	// 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.39:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://demo.zjznai.com/xzgd/',

+ 6 - 1
pages.json

@@ -957,13 +957,18 @@
 						"navigationBarTitleText": "隐患项"
 						"navigationBarTitleText": "隐患项"
 					}
 					}
 				},
 				},
+				{
+					"path": "views/itemsManage/hiddenDangerRectification",
+					"style": {
+						"navigationBarTitleText": "隐患项整改"
+					}
+				},
 				{
 				{
 					"path": "views/itemsManage/hiddenDangerItemsDetail",
 					"path": "views/itemsManage/hiddenDangerItemsDetail",
 					"style": {
 					"style": {
 						"navigationBarTitleText": "检查详情"
 						"navigationBarTitleText": "检查详情"
 					}
 					}
 				},
 				},
-				
 				{
 				{
 					"path": "views/snapshotManage/snapshotDetail",
 					"path": "views/snapshotManage/snapshotDetail",
 					"style": {
 					"style": {

+ 33 - 0
pages_safetyCheck/api/index.js

@@ -136,6 +136,25 @@ export const securityAppCheckDangerGetCheckDangerSubId = (data) => {
        data: { ...data }
        data: { ...data }
     })
     })
 };
 };
+//实验室下-隐患整改-隐患详情
+export const securityAppCheckDangerGetCheckProDetail = (data) => {
+    return apiResquest({
+        url: '/security/appCheckDanger/getCheckProDetail',
+       method: 'POST',
+       data: { ...data }
+    })
+};
+//实验室下-隐患整改-完成整改/暂无法整改
+export const securityAppCheckDangerCheckRectify = (data) => {
+    return apiResquest({
+        url: '/security/appCheckDanger/checkRectify',
+       method: 'POST',
+       data: { ...data }
+    })
+};
+
+
+
 //实验室下-复查验证-检查项查询
 //实验室下-复查验证-检查项查询
 export const securityAppCheckSetOptionGetReviewList = (data) => {
 export const securityAppCheckSetOptionGetReviewList = (data) => {
     return apiResquest({
     return apiResquest({
@@ -214,6 +233,20 @@ export const securityAppCheckSetOptionFinishCheck = (data) => {
 
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
 
 

+ 9 - 3
pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -2,7 +2,7 @@
 <template>
 <template>
 	<view class="inspectAdd">
 	<view class="inspectAdd">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="tip">{{newData.checkName}}</view>
+			<view class="tip">{{optionData.checkPlanSetVoList.checkName}}</view>
 			<view class="items">
 			<view class="items">
 				<view class="items-t">
 				<view class="items-t">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
@@ -183,7 +183,7 @@
 				if (data.code == 200) {
 				if (data.code == 200) {
 					//编辑的时候
 					//编辑的时候
 					this.$set(this, 'newData', data.data);
 					this.$set(this, 'newData', data.data);
-					this.$set(this.newData, 'checkName', this.optionData.checkName);
+					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.form, 'checkFlag', data.data.checkFlag?data.data.checkFlag:false);
 					this.$set(this.form, 'checkFlag', data.data.checkFlag?data.data.checkFlag:false);
 					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe?data.data.hazardDescribe:'');
 					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe?data.data.hazardDescribe:'');
 					this.$set(this.form, 'photoList', data.data.photoList?data.data.photoList:[]);
 					this.$set(this.form, 'photoList', data.data.photoList?data.data.photoList:[]);
@@ -206,6 +206,8 @@
 			},
 			},
 			//提交
 			//提交
 			async submitForm(status) {
 			async submitForm(status) {
+				console.log(this.pageType)
+				console.log(this.itemsStatus)
 				if(!this.form.checkFlag){
 				if(!this.form.checkFlag){
 					if(!this.form.hazardDescribe){
 					if(!this.form.hazardDescribe){
 						uni.showToast({
 						uni.showToast({
@@ -259,7 +261,11 @@
 						subId:this.subId,
 						subId:this.subId,
 						hazardCheckPro:this.hazardCheckPro,
 						hazardCheckPro:this.hazardCheckPro,
 						pageType:this.pageType,
 						pageType:this.pageType,
-						itemsStatus:this.itemsStatus,
+						itemsStatus:status==1?2:0,
+						checkPlanSetVoList:this.optionData.checkPlanSetVoList,
+						subName:this.optionData.subName,
+						roomNum:this.optionData.roomNum,
+						subRoom:this.optionData.subRoom,
 					};
 					};
 					uni.redirectTo({
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' + encodeURIComponent(JSON
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' + encodeURIComponent(JSON

+ 3 - 3
pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -276,7 +276,7 @@
 							//跳转检查项列表页面
 							//跳转检查项列表页面
 							let infoData = data.data.records[0];
 							let infoData = data.data.records[0];
 							infoData.pageType = this.tabIndexTow;
 							infoData.pageType = this.tabIndexTow;
-							infoData.checkName = this.optionData.checkPlanSetVoList.checkName;
+							infoData.checkPlanSetVoList = this.optionData.checkPlanSetVoList;
 							uni.navigateTo({
 							uni.navigateTo({
 								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
 								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
 									JSON.stringify(infoData))
 									JSON.stringify(infoData))
@@ -300,7 +300,7 @@
 							//跳转检查项列表页面
 							//跳转检查项列表页面
 							let infoData = data.data.records[0];
 							let infoData = data.data.records[0];
 							infoData.pageType = this.tabIndexTow;
 							infoData.pageType = this.tabIndexTow;
-							infoData.checkName = this.optionData.checkPlanSetVoList.checkName;
+							infoData.checkPlanSetVoList = this.optionData.checkPlanSetVoList;
 							uni.navigateTo({
 							uni.navigateTo({
 								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
 								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
 									JSON.stringify(infoData))
 									JSON.stringify(infoData))
@@ -324,7 +324,7 @@
 							//跳转检查项列表页面
 							//跳转检查项列表页面
 							let infoData = data.data.records[0];
 							let infoData = data.data.records[0];
 							infoData.pageType = this.tabIndexTow;
 							infoData.pageType = this.tabIndexTow;
-							infoData.checkName = this.optionData.checkPlanSetVoList.checkName;
+							infoData.checkPlanSetVoList = this.optionData.checkPlanSetVoList;
 							uni.navigateTo({
 							uni.navigateTo({
 								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
 								url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
 									JSON.stringify(infoData))
 									JSON.stringify(infoData))

+ 28 - 6
pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -49,10 +49,15 @@
 							<img v-if="item.checkFlag==false" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
 							<img v-if="item.checkFlag==false" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
 							<img v-if="item.checkFlag==true" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
 							<img v-if="item.checkFlag==true" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
 						</view>
 						</view>
+						<view v-if="pageType == 2">
+							<img v-if="curTabTow==2" src="@/pages_safetyCheck/images/icon_zg_zh@1x.png">
+							<img v-if="curTabTow==1" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
+							<img v-if="curTabTow==4" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
+						</view>
 						<view>{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
 						<view>{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
 					</view>
 					</view>
-					<view v-if="item.hazardCheckId" class="list-li-b" @click="hiddenDangerClick(item)">
-						此检查项在当前实验室累计出现<text>{{item.hazardCheckNum}}</text>次隐患
+					<view v-if="pageType == 2 && item.dangerNum" class="list-li-b" @click="hiddenDangerClick(item)">
+						此检查项在当前实验室累计出现<text>{{item.dangerNum}}</text>次隐患
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -63,7 +68,7 @@
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</scroll-view>
 		</scroll-view>
 		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
 		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
-		<view v-if="pageType==0" @click="submitBtn()" class="sub-btn">检查完成</view>
+		<view v-if="pageType==0 && total !=0" @click="submitBtn()" class="sub-btn">检查完成</view>
 	</view>
 	</view>
 
 
 </template>
 </template>
@@ -118,6 +123,7 @@
 		},
 		},
 		onLoad(option) {
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
+			console.log(optionData)
 			uni.setNavigationBarTitle({
 			uni.setNavigationBarTitle({
 				title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
 				title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
 					.subRoom) + ')'
 					.subRoom) + ')'
@@ -242,8 +248,12 @@
 				let infoData = row;
 				let infoData = row;
 				infoData.pageType = this.pageType;
 				infoData.pageType = this.pageType;
 				infoData.itemsStatus = this.curTabTow;
 				infoData.itemsStatus = this.curTabTow;
+				infoData.checkPlanSetVoList = this.newData.checkPlanSetVoList;
 				if (this.pageType == 0 && this.curTabTow == 0) {
 				if (this.pageType == 0 && this.curTabTow == 0) {
 					//待检查
 					//待检查
+					infoData.subName=this.newData.subName;
+					infoData.roomNum=this.newData.roomNum;
+					infoData.subRoom=this.newData.subRoom;
 					uni.redirectTo({
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
 						url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
 							JSON
 							JSON
@@ -252,7 +262,6 @@
 				}
 				}
 				if (this.pageType == 0 && this.curTabTow == 2) {
 				if (this.pageType == 0 && this.curTabTow == 2) {
 					//检查中
 					//检查中
-					infoData.checkName=this.newData.checkPlanSetVoList.checkName;
 					infoData.subName=this.newData.subName;
 					infoData.subName=this.newData.subName;
 					infoData.roomNum=this.newData.roomNum;
 					infoData.roomNum=this.newData.roomNum;
 					infoData.subRoom=this.newData.subRoom;
 					infoData.subRoom=this.newData.subRoom;
@@ -271,8 +280,21 @@
 					});
 					});
 				} else if (this.pageType == 1 && this.curTabTow == 0) {
 				} else if (this.pageType == 1 && this.curTabTow == 0) {
 					//待复查
 					//待复查
-				} else if (this.pageType == 1 && this.curTabTow == 0) {
+				} else if (this.pageType == 2 && this.curTabTow == 2) {
 					//待整改
 					//待整改
+					infoData.checkCategory=this.newData.checkCategory;
+					infoData.subId=this.newData.subId;
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' +
+							encodeURIComponent(JSON
+								.stringify(infoData))
+					});
+				}else if (this.pageType == 2 && this.curTabTow == 1) {
+					//已完成
+					
+				}else if (this.pageType == 2 && this.curTabTow == 4) {
+					//暂无法整改
+					
 				}
 				}
 
 
 			},
 			},
@@ -341,7 +363,7 @@
 					obj.planId = this.newData.checkPlanSetVoList.planId;
 					obj.planId = this.newData.checkPlanSetVoList.planId;
 					obj.planSetId = this.newData.checkPlanSetVoList.planSetId;
 					obj.planSetId = this.newData.checkPlanSetVoList.planSetId;
 					obj.subId = this.newData.subId;
 					obj.subId = this.newData.subId;
-					obj.appReviewStatus = this.curTabTow;
+					obj.rectifyStatus = this.curTabTow;
 					obj.pageFlag = true;
 					obj.pageFlag = true;
 					const {
 					const {
 						data
 						data

+ 5 - 9
pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -2,8 +2,8 @@
 <template>
 <template>
 	<view class="snapshotDetail">
 	<view class="snapshotDetail">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="tip" v-if="pageType==0">{{newData.checkName}}</view>
-			<view class="tip-tow" v-if="pageType==1 || pageType==2">{{newData.checkName}}</view>
+			<view class="tip" v-if="pageType==0">{{optionData.checkPlanSetVoList.checkName}}</view>
+			<view class="tip-tow" v-if="pageType==1 || pageType==2">{{optionData.checkPlanSetVoList.checkName}}</view>
 			<view class="items">
 			<view class="items">
 				<view class="items-t" v-if="newData.hazardCheckName!=''">
 				<view class="items-t" v-if="newData.hazardCheckName!=''">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
@@ -156,7 +156,7 @@
 						title: this.optionData.subName + '(' + (this.pageType == 0 ? this.optionData.roomNum : this.optionData.subRoom) + ')'
 						title: this.optionData.subName + '(' + (this.pageType == 0 ? this.optionData.roomNum : this.optionData.subRoom) + ')'
 					})
 					})
 					this.$set(this, 'newData', data.data);
 					this.$set(this, 'newData', data.data);
-					this.$set(this.newData, 'checkName', this.optionData.checkName);
+					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.newData, 'subName', this.optionData.subName);
 					this.$set(this.newData, 'subName', this.optionData.subName);
 					this.$set(this.newData, 'roomNum', this.optionData.roomNum);
 					this.$set(this.newData, 'roomNum', this.optionData.roomNum);
 					this.$set(this.newData, 'checkTime', parseTime(data.data.checkTime, "{y}-{m}-{d}"));
 					this.$set(this.newData, 'checkTime', parseTime(data.data.checkTime, "{y}-{m}-{d}"));
@@ -188,7 +188,7 @@
 						hazardCheckPro: this.hazardCheckPro,
 						hazardCheckPro: this.hazardCheckPro,
 						pageType: this.pageType,
 						pageType: this.pageType,
 						itemsStatus: this.itemsStatus,
 						itemsStatus: this.itemsStatus,
-						checkName: this.newData.checkName,
+						checkPlanSetVoList: this.optionData.checkPlanSetVoList,
 					};
 					};
 					uni.redirectTo({
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
 						url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
@@ -201,11 +201,7 @@
 						subName: this.newData.subName,
 						subName: this.newData.subName,
 						roomNum: this.newData.roomNum,
 						roomNum: this.newData.roomNum,
 						manageId: this.manageId,
 						manageId: this.manageId,
-						checkPlanSetVoList: {
-							checkName: this.newData.checkName,
-							overdueUnrectify: this.newData.overdueUnrectify,
-							checkStartTime: this.newData.checkStartTime,
-						},
+						checkPlanSetVoList: this.optionData.checkPlanSetVoList,
 						pageType: this.pageType,
 						pageType: this.pageType,
 					};
 					};
 
 

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

@@ -0,0 +1,649 @@
+<!-- 检查项隐患项整改 -->
+<template>
+	<view class="snapshotDetail">
+		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+			<view class="tip">整改期限{{optionData.checkPlanSetVoList.checkStartTime}}(逾期未完成整改关闭实验室)</view>
+			<view class="items" v-if="newData.hazardCheckName!=''">
+				<view class="items-t" >
+					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
+				</view>
+				<view class="items-b" >< {{newData.hazardCheckCode2}}
+					{{newData.hazardCheckName2}} < {{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
+			</view>
+			<view class="items-number" v-if="newData.hazardCheckName!=''">此检查项在当前实验室累计出现<text>{{newData.hazardCheckNum}}</text>次隐患</view>
+			<view class="list">
+				<view class="list-li" v-if="newData.hazardCheckName!=''">
+					<view>检查要点</view>
+					<view>
+						<img src="@/pages_safetyCheck/images/icon_06.png">
+					</view>
+				</view>
+				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
+				</view>
+				<view class="list-li">
+					<view>检查隐患</view>
+					<view style="color: #FF8C00;">
+						<img src="@/pages_safetyCheck/images/icon_06.png">
+					</view>
+				</view>
+				<view class="hidden-content">{{newData.hazardDescribe}}
+				</view>
+				<view class="photo">
+					<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
+				</view>
+				<view class="list-li">
+					<view>姓名:</view>
+					<view>{{newData.createName}}</view>
+				</view>
+				<view class="list-li">
+					<view>检查时间 :</view>
+					<view>{{newData.createTime}}</view>
+				</view>
+				<view class="list-li">
+					<view>隐患整改</view>
+					<view>
+						<img src="@/pages_safetyCheck/images/icon_06.png">
+					</view>
+				</view>
+				<textarea class="describe" type="text" v-model="form.rectifyDescribe" maxlength="500"
+					placeholder="立整立改的请填写相关文字及整改前后照片对比等,不能立整立改的请说明原因并附整改计划、措施等" placeholder-style="font-size:24rpx;color:#999;"></textarea>
+				<view class="check-for-img-max-box">
+					<view class="left-title-p"></view>
+					<view class="right-img-box">
+						<view class="img-box" v-for="(imgUrl,imgIndex) in form.imgDtoList" :key="imgIndex">
+							<img class="img-data" :src="baseUrl+imgUrl.fileUrl">
+							<img class="position-img" src="@/pages_safetyCheck/images/icon_ssp_closure.png"
+								@click="delImg(imgIndex)">
+						</view>
+						<img class="add-button" src="@/pages_safetyCheck/images/img_ssp_pz@1x.png"
+							@click="selectImage()" v-if="form.imgDtoList.length<6">
+					</view>
+				</view>
+				<!-- <view class="list-li-tow">
+					<view>整改方案(上传文件)</view>
+					<view @click="selectFile()">
+						<img src="@/pages_safetyCheck/images/icon_aqjc_sc.png">
+					</view>
+				</view>
+				<view class="file-li" v-if="form.rectifyProjectName">
+					<img src="@/pages_safetyCheck/images/icon_djc_wj.png">
+					<view>{{form.rectifyProjectName}}</view>
+					<img src="@/pages_safetyCheck/images/icon_yybz_sc.png">
+				</view> -->
+			</view>
+		</scroll-view>
+		<view class="sub-btn">
+			<view @click="submitForm(2)">暂无法整改</view>
+			<view @click="submitForm(1)">完成整改</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		config
+	} from '@/api/request/config.js'
+	import {
+		securityAppCheckPhotoUpdate,
+		securityAppCheckDangerGetCheckProDetail,
+		securityAppCheckDangerCheckRectify,
+	} from '@/pages_safetyCheck/api/index.js'
+	export default {
+		name: "snapshotDetail",
+		components: {
+
+		},
+		data() {
+			return {
+				baseUrl: config.base_url,
+				inspectionItems: 0, //0有检查项 1无检查项
+				form: {
+					imgDtoList: [],
+					rectifyProjectName:'',
+					rectifyProjectUrl:'',
+				},
+				newData: {},
+				optionData:null,
+			}
+		},
+		onLoad(option) {
+			let optionData = JSON.parse(decodeURIComponent(option.infoData));
+			console.log(optionData)
+			this.$set(this, 'optionData', optionData);
+		},
+		onShow() {
+
+		},
+		mounted() {
+			this.securityAppCheckDangerGetCheckProDetail();
+		},
+		methods: {
+			//详情
+			async securityAppCheckDangerGetCheckProDetail(){
+				let obj = {
+					planId: this.optionData.checkPlanSetVoList.planId,
+					planSetId: this.optionData.checkPlanSetVoList.planSetId,
+					checkCategory:  this.optionData.checkCategory,
+					hazardCheckPro: this.optionData.hazardCheckPro,
+					subId: this.optionData.subId,
+				}
+				const {
+					data
+				} = await securityAppCheckDangerGetCheckProDetail(obj);
+				if (data.code == 200) {
+					uni.setNavigationBarTitle({
+						title: data.data.subName + '(' + data.data.roomNum + ')'
+					})
+					this.$set(this, 'newData', data.data);
+					
+				}
+			},
+			//滚动事件
+			scrollGet() {},
+			/******文件上传******/
+			selectFile() {
+				let self = this;
+				wx.chooseMessageFile({
+				  count: 1,
+				  type: 'file',
+				  success (res) {
+					  console.log(res)
+				    // tempFilePath可以作为img标签的src属性显示图片
+				    const tempFilePaths = res.tempFiles[0].path
+					self.form.rectifyProjectName=res.tempFiles[0].name
+					self.uploadFile(tempFilePaths);
+				  }
+				})
+			},
+			async uploadFile(tempFilePaths) {
+				var self = this;
+				uni.showLoading({
+					title: '上传中',
+					mask: true
+				});
+				uni.uploadFile({
+					url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
+					header: {
+						'Authorization': uni.getStorageSync('token')
+					},
+					filePath: tempFilePaths,
+					name: 'file',
+					formData: {
+						'user': 'test'
+					},
+					success: (uploadFileRes) => {
+						let res = JSON.parse(uploadFileRes.data);
+						console.log(res)
+						if (res.code == 200) {
+							self.form.rectifyProjectUrl=res.data.url;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								mask: true,
+								duration: 2000
+							});
+						}
+					},
+					fail: err => {},
+					complete: () => {
+						uni.hideLoading()
+					}
+				});
+			},
+			/******图片上传******/
+			selectImage() {
+				let self = this;
+				if (this.form.imgDtoList.length > 4) {
+					uni.showToast({
+						title: '最多上传5张图片',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
+				wx.chooseImage({
+					count: 1,
+					sizeType: ["original", "compressed"],
+					sourceType: ["album", "camera"],
+					success: function(res) {
+						let tempFilePaths = res.tempFilePaths[0];
+						console.log(tempFilePaths)
+						self.uploadImg(tempFilePaths);
+					}
+				});
+			},
+			async uploadImg(tempFilePaths) {
+				var self = this;
+				uni.showLoading({
+					title: '上传中',
+					mask: true
+				});
+				uni.uploadFile({
+					url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
+					header: {
+						'Authorization': uni.getStorageSync('token')
+					},
+					filePath: tempFilePaths,
+					name: 'file',
+					formData: {
+						'user': 'test'
+					},
+					success: (uploadFileRes) => {
+						let res = JSON.parse(uploadFileRes.data);
+						if (res.code == 200) {
+							this.form.imgDtoList.push({
+								'fileUrl': res.data.url,
+								'fileName': res.data.name,
+								'fileType':2,
+							});
+							console.log(res.data.url)
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								mask: true,
+								duration: 2000
+							});
+						}
+					},
+					fail: err => {},
+					complete: () => {
+						uni.hideLoading()
+					}
+				});
+			},
+			//删除图片
+			delImg(minIndex) {
+				this.form.imgDtoList.splice(minIndex, 1);
+				this.$forceUpdate();
+			},
+			
+			//整改/暂无法整改
+			async submitForm(status) {
+				let self = this;
+				
+				let obj={
+					checkCategory:this.optionData.checkCategory,
+					dangerId:this.newData.dangerId,
+					rectifyMaterialName:'',//待定字段
+					rectifyMaterialUrl:'',//待定字段
+					rectifyMeasure:this.form.rectifyDescribe,
+					rectifyResult:status==1?true:false,//true已整改false暂无法整改
+					rectifyUploadList:this.form.imgDtoList,
+				}
+				console.log(obj)
+				const {
+					data
+				} = await securityAppCheckDangerCheckRectify(obj);
+				if (data.code == 200) {
+					uni.showToast({
+						title: '提交成功',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					let infoData=this.optionData;
+					uni.navigateTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					});
+					
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+	.snapshotDetail {
+		height: 100%;
+		display flex;
+		box-sizing: border-box;
+		padding-bottom: 160rpx;
+		box-sizing: border-box;
+
+		#bgColor-A {
+			color: #FFD400;
+		}
+
+		#bgColor-B {
+			color: #FF8C00;
+		}
+
+		#bgColor-C {
+			color: #E11608;
+		}
+
+		.tip {
+			width: 750rpx;
+			height: 80rpx;
+			background: rgba(255, 140, 0, 0.2);
+			font-weight: normal;
+			font-size: 28rpx;
+			color: #FF8C00;
+			line-height: 80rpx;
+			text-align: center;
+		}
+
+		.items {
+			width: 690rpx;
+			min-height: 165rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			margin: 20rpx 0 0 30rpx;
+
+			.items-li {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				border-bottom: 1rpx solid #E0E0E0;
+
+				>view:nth-of-type(1) {
+					font-size: 30rpx;
+					color: #333333;
+					line-height: 80rpx;
+					text-align: left;
+				}
+
+				>view:nth-of-type(2) {
+					font-size: 28rpx;
+					color: #666666;
+					line-height: 80rpx;
+					text-align: left;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+				}
+			}
+
+			.items-t {
+				border-bottom: 1rpx solid #E0E0E0;
+				height: 80rpx;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+
+				.items-t-l {
+					width: 175rpx;
+					height: 50rpx;
+					background: #E11608;
+					border-radius: 50rpx 50rpx 50rpx 50rpx;
+					font-size: 30rpx;
+					color: #FFFFFF;
+					line-height: 50rpx;
+					text-align: center;
+					margin-right: 14rpx;
+				}
+
+				.items-t-r {
+					font-size: 30rpx;
+					color: #333333;
+					line-height: 42rpx;
+					text-align: left;
+				}
+			}
+
+			.items-b {
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				height: 80rpx;
+				font-size: 28rpx;
+				color: #666666;
+				line-height: 80rpx;
+				text-align: left;
+			}
+		}
+
+		.items-number {
+			font-size: 24rpx;
+			color: #3D3D3D;
+			line-height: 34rpx;
+			text-align: right;
+			margin: 20rpx 60rpx 0 0;
+
+			>text {
+				font-size: 24rpx;
+				color: #FF0000;
+				line-height: 34rpx;
+				text-align: right;
+			}
+		}
+
+		.list {
+			width: 690rpx;
+			margin: 20rpx 30rpx 0;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+			.list-li {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				border-bottom: 1rpx solid #E0E0E0;
+
+				>view:nth-of-type(1) {
+					font-size: 30rpx;
+					color: #333333;
+					line-height: 80rpx;
+					text-align: left;
+				}
+
+				>view:nth-of-type(2) {
+					font-size: 28rpx;
+					color: #666666;
+					line-height: 80rpx;
+					text-align: left;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					>img {
+						width: 24rpx;
+						height: 12rpx;
+						margin-left: 10rpx;
+					}
+				}
+
+			}
+
+			.list-li-tow {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				border-top: 1rpx solid #E0E0E0;
+				border-bottom: 1rpx solid #E0E0E0;
+
+				>view:nth-of-type(1) {
+					font-size: 30rpx;
+					color: #333333;
+					line-height: 80rpx;
+					text-align: left;
+				}
+
+				>view:nth-of-type(2) {
+					font-size: 28rpx;
+					color: #666666;
+					line-height: 80rpx;
+					text-align: left;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					>img {
+						width: 30rpx;
+						height: 28rpx;
+						margin-left: 10rpx;
+					}
+				}
+
+			}
+
+			.file-li {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+
+				>img:nth-of-type(1) {
+					width: 30rpx;
+					height: 30rpx;
+				}
+
+				>view {
+					flex: 1;
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 80rpx;
+					text-align: left;
+					margin: 0 92rpx 0 16rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				>img:nth-of-type(2) {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
+
+			.hidden-content {
+				width: 630rpx;
+				min-height: 200rpx;
+				background: #F5F5F5;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				margin: 20rpx 30rpx 0;
+				padding: 20rpx;
+				box-sizing: border-box;
+				font-size: 28rpx;
+				color: #666666;
+				line-height: 39rpx;
+				text-align: left;
+			}
+
+			.photo {
+				display: flex;
+				justify-content: flex-start;
+				flex-wrap: wrap;
+				margin-top: 20rpx;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+
+				>img {
+					width: 150rpx;
+					height: 150rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					margin: 0 10rpx 10rpx 0;
+				}
+			}
+
+			.describe {
+				width: 636rpx;
+				height: 120rpx;
+				border-radius: 10rpx 10rpx 10rpx 10rpx;
+				border: 1rpx solid #E0E0E0;
+				margin: 20rpx 0 0 28rpx;
+				padding: 12rpx 16rpx;
+				box-sizing: border-box;
+			}
+
+			.check-for-img-max-box {
+				margin: 20px 28rpx;
+
+				.left-title-p {
+					width: 100%;
+					text-align: left;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 80rpx;
+				}
+
+				.right-img-box {
+					.img-box {
+						display inline-block;
+						height: 150rpx;
+						width: 150rpx;
+						position relative;
+						margin: 0 14rpx 20rpx 0;
+						border-radius 10rpx;
+						overflow hidden;
+
+						.img-data {
+							height: 150rpx;
+							width: 150rpx;
+						}
+
+						.position-img {
+							position absolute;
+							right: 0;
+							top: 0;
+							width: 36rpx;
+							height: 36rpx;
+						}
+					}
+
+					.img-box:nth-of-type(3n+3) {
+						margin-right: 0rpx;
+					}
+
+					.add-button {
+						margin: 0 0rpx 20rpx 0;
+						border-radius 10rpx;
+						overflow hidden;
+						display inline-block;
+						height: 150rpx;
+						width: 150rpx;
+					}
+				}
+			}
+
+			.list-li:last-of-type {
+				border: none;
+			}
+		}
+
+	}
+
+	.sub-btn {
+		display: flex;
+		justify-content: center;
+		position: fixed;
+		left: 30rpx;
+		bottom: 30rpx;
+
+		>view:nth-of-type(1) {
+			width: 345rpx;
+			height: 100rpx;
+			background: #FF8C00;
+			border-radius: 50rpx 0rpx 0rpx 50rpx;
+			font-size: 30rpx;
+			color: #FFFFFF;
+			line-height: 100rpx;
+			text-align: center;
+		}
+
+		>view:nth-of-type(2) {
+			width: 345rpx;
+			height: 100rpx;
+			background: #0183FA;
+			border-radius: 0rpx 50rpx 50rpx 0rpx;
+			font-size: 30rpx;
+			color: #FFFFFF;
+			line-height: 100rpx;
+			text-align: center;
+		}
+	}
+</style>