heyang

pages_safetyCheck/api/index.js

@@ -1,5 +1,71 @@
 import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,apiResquestTimer } from '@/api/request/request.js'
 
+//项目检查库-树状列表
+export const securityCheckOptionList = (data) => {
+    return apiResquest({
+        url: '/security/checkOption/list',
+       method: 'POST',
+       data: { ...data }
+    })
+};
+//随手拍-上报
+export const securityAppCheckPhotoMyAdd = (data) => {
+	return apiResquest({
+		url: `/security/appCheckPhoto/myAdd`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//随手拍上报记录-列表
+export const securityAppCheckPhotoMyList = (data) => {
+	return apiResquest({
+		url: `/security/appCheckPhoto/myList`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//随手拍隐患整改-列表
+export const securityAppCheckPhotoRectifyList = (data) => {
+	return apiResquest({
+		url: `/security/appCheckPhoto/rectifyList`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//随手拍-详情
+export const securityAppCheckPhotoDetail = (data) => {
+	return apiResquest({
+		url: `/security/appCheckPhoto/detail`,
+		method: 'GET',
+		data: data,
+	})
+};
+//随手拍-整改
+export const securityAppCheckPhotoUpdate = (data) => {
+	return apiResquest({
+		url: `/security/appCheckPhoto/update`,
+		method: 'GET',
+		data: data,
+	})
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 //实验室-列表-获取学院列表下拉列表
 export const systemDeptDropList = (data) => {
 	return apiResquest({
@@ -114,14 +180,7 @@ export const subjectFindSubjectInfo = (data) => {
         data: data
     })
 };
-//项目检查库-树状列表
-export const checkOptionListNew = (data) => {
-    return apiResquestForm({
-        url: '/zd-security/checkOption/list',
-        method: 'GET',
-        data: data
-    })
-};
+
 
 //专项检查-根据选择的设备id生成检查项
 export const getHazardInfoByJoinIds  = (data) => {

pages_safetyCheck/views/itemsManage/hiddenDangerItemsSearch.vue

@@ -4,16 +4,16 @@
 		<view class="header">
 			<view class="search">
 				<view class="search-r">
-					<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
-					模糊搜索检查项
+					<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png" @click="searchBtn">
+					<input type="text" v-model="searchValue" placeholder="模糊搜索检查项" name="search" @confirm='searchBtn'
+						confirm-type='search' maxlength="50" placeholder-style="color: #333333;font-size:24rpx;">
 				</view>
-				<view class="cancel">取消</view>
+				<view class="cancel" @click="cancelBtn">取消</view>
 			</view>
 		</view>
 		<view class="list">
-			<view class="list-li" v-for="(item,index) in dataList">
-				<view class="list-li-t">{{item.one}}</view>
-				<view class="list-li-b">{{item.tow}}</view>
+			<view class="list-li" v-for="(item,index) in dataList" @click="confirm(item)">
+				{{item.hazardCheckCode}}{{item.hazardCheckName}}
 			</view>
 		</view>
 	</view>
@@ -24,6 +24,9 @@
 	import {
 		config
 	} from '@/api/request/config.js'
+	import {
+		securityCheckOptionList,
+	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "hiddenDangerItemsSearch",
 		components: {
@@ -33,79 +36,116 @@
 			return {
 				baseUrl: config.base_url,
 				pageType: 1,
-				tabTextTow: ['待整改', '已整改', '暂无法整改'],
-				curTabTow: 0,
-				form: {
-					imgDtoList: [],
-				},
-				newData: {
-
-				},
-				dialogVisible: false,
-				dataList: [
-					{
-						one: '1.1.1实验室安全工作纳入学校决策研究事项',
-						tow: '三级检查项目条款全显示三级检查项目条款检查项目条款检查项目条款全显示三级检查项目检查项目条款'
-					},
-					{
-						one: '1.1.1实验室安全工作纳入学校决策研究事项',
-						tow: '三级检查项目条款全显示三级检查项目条款检查项目条款检查项目条款全显示三级检查项目检查项目条款'
-					},
-				],
+				checkOptionList: [],
+				dataList: [],
+				searchValue: '',
+				form: {},
 
 			}
 		},
-		onLoad(option) {},
+		onLoad(option) {
+			if (option.form) {
+				this.form = JSON.parse(decodeURIComponent(option.form));
+			}
+		},
 		onShow() {
 
 		},
 		mounted() {
-
+			this.treeselect();
 		},
 		methods: {
 			//滚动事件
 			scrollGet() {},
-			//顶部tab点击
-			tabClickTow(index) {
-				this.curTabTow = index;
+			//实验室搜索
+			searchBtn() {
+				this.dataList = [];
+				this.treeselect();
 			},
-			dialogOpen(){
-				this.dialogVisible = true;
+			//取消
+			cancelBtn() {
+				this.searchValue = '';
+				this.dataList = [];
+				this.treeselect();
 			},
-			dialogClose() {
-				this.dialogVisible = false;
-			},
-			quotaClick(index){
-				this.quotaIndex=index
+			confirm(row) {
+				this.$set(this.form, "hazardCheckId1", row.hazardCheckId1)
+				this.$set(this.form, "hazardCheckName1", row.hazardCheckName1)
+				this.$set(this.form, "hazardCheckCode1", row.hazardCheckCode1)
+				this.$set(this.form, "hazardCheckId2", row.hazardCheckId2)
+				this.$set(this.form, "hazardCheckName2", row.hazardCheckName2)
+				this.$set(this.form, "hazardCheckCode2", row.hazardCheckCode2)
+				this.$set(this.form, "hazardCheckId", row.hazardCheckId)
+				this.$set(this.form, "hazardCheckName", row.hazardCheckName)
+				this.$set(this.form, "hazardCheckCode", row.hazardCheckCode)
+				this.$set(this.form, "hazardCheckPoint", row.hazardCheckPoint)
+				uni.redirectTo({
+					url: '/pages_safetyCheck/views/snapshotManage/snapshotList?form=' + encodeURIComponent(JSON.stringify(this.form))
+				});
 			},
 
+			async treeselect() {
+				let self = this;
+				const {
+					data
+				} = await securityCheckOptionList({
+					searchValue: this.searchValue
+				});
+				if (data.code == 200) {
+					let list = [];
+					data.data.forEach(function(item) {
+						item.children.forEach(function(item2) {
+							item2.children.forEach(function(item3) {
+								list.push({
+									hazardCheckId1: item.id,
+									hazardCheckName1: item.name,
+									hazardCheckCode1: item.code,
+									hazardCheckId2: item2.id,
+									hazardCheckName2: item2.name,
+									hazardCheckCode2: item2.code,
+									hazardCheckId: item3.id,
+									hazardCheckName: item3.name,
+									hazardCheckCode: item3.code,
+									hazardCheckPoint: item3.mainPoint
+								})
+							})
+						})
+					})
+					this.dataList = list
+				}
+			},
 		}
 	}
 </script>
 
 <style lang="stylus" scoped>
-	.hiddenDangerItemsSearch{
+	.hiddenDangerItemsSearch {
 		height: 100%;
 		display flex;
 		box-sizing: border-box;
-		#totalColor-A{
+
+		#totalColor-A {
 			color: #0183FA;
-			background: rgba(1,131,250,0.2);
+			background: rgba(1, 131, 250, 0.2);
 		}
-		#totalColor-B{
+
+		#totalColor-B {
 			color: #16B531;
-			background: rgba(22,181,49,0.2);
+			background: rgba(22, 181, 49, 0.2);
 		}
-		#totalColor-C{
+
+		#totalColor-C {
 			color: #FF8C00;
-			background: rgba(255,140,0,0.2);
+			background: rgba(255, 140, 0, 0.2);
 		}
+
 		.header {
 			width: 100%;
 			position: fixed;
 			top: 0rpx;
 			z-index: 100;
 			background: #fff;
+
 			.search {
 				width: 750rpx;
 				height: 100rpx;
@@ -114,6 +154,7 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
+
 				.search-r {
 					width: 610rpx;
 					height: 60rpx;
@@ -129,14 +170,20 @@
 					align-items: center;
 					padding: 0 20rpx;
 					box-sizing: border-box;
-					>img{
+
+					>img {
 						width: 30rpx;
 						height: 30rpx;
 						margin-right: 20rpx;
 					}
+
+					>input {
+						width: 500rpx;
+					}
 				}
 			}
-			.cancel{
+
+			.cancel {
 				font-size: 28rpx;
 				color: #0183FA;
 				line-height: 30rpx;
@@ -149,31 +196,20 @@
 			width: 750rpx;
 			background: #FFFFFF;
 			margin-top: 110rpx;
-			padding-top:12rpx;
+			padding-top: 12rpx;
 			box-sizing: border-box;
-			.list-li {
-				margin: 0 30rpx 20rpx;
-				.list-li-t {
-					font-size: 24rpx;
-					color: #3D3D3D;
-					line-height: 34rpx;
-					text-align: left;
-					margin-bottom: 20rpx;
-				}
-
-				.list-li-b {
-					width: 690rpx;
-					background: #F5F5F5;
-					border-radius: 10rpx 10rpx 10rpx 10rpx;
-					display: flex;
-					justify-content: flex-start;
-					padding: 12rpx 20rpx 14rpx 14rpx;
-					box-sizing: border-box;
-				}
 
+			.list-li {
+				min-height: 80rpx;
+				margin: 0 30rpx;
+				font-size: 29rpx;
+				color: #3D3D3D;
+				line-height: 80rpx;
+				text-align: left;
+				border-bottom: 1rpx solid #E0E0E0;
 			}
 		}
 
-		
+
 	}
 </style>

pages_safetyCheck/views/snapshotManage/snapshotDetail.vue

@@ -5,67 +5,67 @@
 			<view class="items" v-if="inspectionItems==0">
 				<view class="items-li">
 					<view>实验室</view>
-					<view>{{newData.data1}}</view>
+					<view>{{newData.subName}}({{newData.subRoom}})</view>
 				</view>
 				<view class="items-li">
 					<view>学院单位</view>
-					<view>{{newData.data2}}</view>
+					<view>{{newData.deptName}}</view>
 				</view>
-				<view class="items-t">
-					<view class="items-t-r">{{newData.data3}}</view>
+				<view class="items-t" v-if="newData.hazardCheckName!=''">
+					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
 				</view>
-				<view class="items-b">＜ {{newData.data4}} ＜</view>
+				<view class="items-b" v-if="newData.hazardCheckName!=''">＜ {{newData.hazardCheckCode2}} {{newData.hazardCheckName2}} ＜ {{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
 			</view>
-			<view class="items-number" v-if="inspectionItems==0">此检查项在当前实验室累计出现<text>{{newData.data5}}</text>次隐患</view>
+			<view class="items-number" v-if="newData.hazardCheckName!=''">此检查项在当前实验室累计出现<text>{{newData.hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
-				<view class="list-li" v-if="inspectionItems==1">
-					<view>实验室</view>
-					<view>{{newData.data1}}</view>
-				</view>
-				<view class="list-li" v-if="inspectionItems==1">
-					<view>学院单位</view>
-					<view>{{newData.data2}}</view>
-				</view>
-				<view class="list-li" v-if="inspectionItems==0">
+				<view class="list-li" v-if="newData.hazardCheckName!=''">
 					<view>检查要点</view>
 					<view>
 						<img src="@/pages_safetyCheck/images/icon_06.png">
 					</view>
 				</view>
-				<view v-if="inspectionItems==0" class="hidden-content">{{newData.data6}}
+				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
 				</view>
 				<view class="list-li">
 					<view>检查隐患</view>
 				</view>
-				<view class="hidden-content">{{newData.data7}}
+				<view class="hidden-content">{{newData.hazardDescribe}}
 				</view>
 				<view class="photo">
-					<img src="@/pages_safetyCheck/images/img_ssp_pz@1x.png">
+					<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
 				</view>
 				<view class="list-li">
 					<view>隐患整改</view>
-					<view :id="newData.rectificationStatus==0?'fontColor-A':(newData.rectificationStatus==1?'fontColor-B':'fontColor-C')">
-						{{newData.rectificationStatus==0?'待整改':(newData.rectificationStatus==1?'已整改':'暂无法整改')}}
+					<view :id="newData.rectifyStatus==0?'fontColor-A':(newData.rectifyStatus==1?'fontColor-B':'fontColor-C')">
+						{{newData.rectifyStatus==0?'待整改':(newData.rectifyStatus==1?'已整改':'暂无法整改')}}
 						<img src="@/pages_safetyCheck/images/icon_06.png">
 					</view>
 				</view>
-				<view class="hidden-content">{{newData.data7}}
+				<view class="hidden-content" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">{{newData.data7}}
 				</view>
-				<view class="photo">
+				<view class="photo" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<img src="@/pages_safetyCheck/images/img_ssp_pz@1x.png">
 				</view>
-				<view class="list-li">
+				<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
+					<view>整改方案</view>
+					<view></view>
+				</view>
+				<view class="file-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
+					<img src="@/pages_safetyCheck/images/icon_djc_wj.png">
+					<view>文件标题文件标题文件标题文件标题</view>
+				</view>
+				<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<view>姓名：</view>
 					<view>{{newData.data8}}</view>
 				</view>
-				<view class="list-li">
+				<view class="list-li" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 					<view>时间：</view>
 					<view>{{newData.data9}}</view>
 				</view>
 				
 			</view>
 		</scroll-view>
-		<view class="sub-btn">整改</view>
+		<view class="sub-btn" @click="rectificationBtn">{{newData.rectifyStatus==0?'整改':'继续整改'}}</view>
 	</view>
 
 </template>
@@ -74,6 +74,9 @@
 	import {
 		config
 	} from '@/api/request/config.js'
+	import {
+		securityAppCheckPhotoDetail,
+	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "snapshotDetail",
 		components: {
@@ -83,31 +86,39 @@
 			return {
 				baseUrl: config.base_url,
 				inspectionItems:0,//0有检查项 1无检查项
-				newData: {
-					data1:'实验室名称（房间号）',
-					data2:'学院单位名称',
-					data3:'1.1.1 检查项检查项检查项检查',
-					data4:'1.1 检查项检查项检查项检查项检查项检查项',
-					data5:'19',
-					data6:'（1）有学校相关会议（校务会议、党委常委会会议等）纪要，内容包含实验室安全工作。',
-					data7:'内容内容内容内容内容内容内容内容内容内容内容内内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容',
-					data8:'李瑶瑶',
-					data9:'2024-01-01',
-					rectificationStatus:0,//整改状态 0待整改 1暂无法整改 2已整改
-				},
+				newData: {},
+				photoId:'',
+				
 			}
 		},
-		onLoad(option) {},
+		onLoad(option) {
+			this.$set(this, 'photoId', JSON.parse(decodeURIComponent(option.infoData)).photoId);
+		},
 		onShow() {
 
 		},
 		mounted() {
-
+			this.securityAppCheckPhotoDetail();
 		},
 		methods: {
 			//滚动事件
 			scrollGet() {},
-			
+			async securityAppCheckPhotoDetail() {
+				let self = this;
+				const {
+					data
+				} = await securityAppCheckPhotoDetail({photoId:this.photoId});
+				if (data.code == 200) {
+					this.$set(this, 'newData', data.data);
+				}
+			},
+			//整改页面
+			rectificationBtn(){
+				let infoData=this.newData;
+				uni.navigateTo({
+					url: '/pages_safetyCheck/views/itemsManage/snapshotRectification?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+				});
+			},
 		}
 	}
 </script>
@@ -265,6 +276,32 @@
 				}
 
 			}
+			.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;

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -12,39 +12,34 @@
 					@click="tabClickTow(index)">{{item}}</view>
 			</view>
 			<view v-if="pageType==0">
-				<view class="srearch">
-					<view class="srearch-n">
-						<view class="srearch-l" @click="popupClick(1)">
-							<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
-						</view>
-						<input class="srearch-c" type="text" v-model="form.searchValue" placeholder="实验室/房间号" />
-						<view class="srearch-r" @click="saoCode()">
-							<img src="@/pages_safetyCheck/images/icon_aqjc_sm.png">
-						</view>
-					</view>
-				</view>
 				<view class="list">
-					<view class="list-li">
-						<view>实验室名称（房间号）</view>
-						<view></view>
+					<view class="list-li srearch">
+						<view>{{form.subName?form.subName:'实验室名称'}}（{{form.subRoom?form.subRoom:'房间号'}}）</view>
+						<view>
+							<view class="srearch-l" @click="popupClick(1)">
+								<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
+							</view>
+							<view class="srearch-r" @click="saoCode()">
+								<img src="@/pages_safetyCheck/images/icon_aqjc_sm.png">
+							</view>
+						</view>
 					</view>
 					<view class="list-li">
 						<view>学院单位名称</view>
-						<view>化工学院</view>
+						<view>{{form.deptName}}</view>
 					</view>
 					<view class="list-li">
 						<view>检查项目</view>
-						<uni-data-picker :ellipsis="false" :localdata="checkOptionList[0]"
-							:map="{text:'name',value:'id'}" popup-title="请选择所属目录" @change="(e)=>onchange('',e,index)"
-							@nodeclick="onnodeclick()" ref="uniDataPicker" :addType="true" :addIndex="index">
-							<view class="project_r">{{form.hazardCheckName?form.hazardCheckName:'请选择检查项 >'}}</view>
-						</uni-data-picker>
+						<view @click="inspectionItemsClick()">
+							{{form.hazardCheckCode?form.hazardCheckCode:''}}{{form.hazardCheckName?form.hazardCheckName:'模糊搜索检查项'}}
+							<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
+						</view>
 					</view>
 					<view class="list-li">
 						<view>隐患描述</view>
 						<view></view>
 					</view>
-					<textarea class="describe" type="text" v-model="form.rectifyDescribe" maxlength="200"
+					<textarea class="describe" type="text" v-model="form.hazardDescribe" maxlength="200"
 						placeholder="请填写隐患描述" placeholder-style="font-size:24rpx;color:#999;"></textarea>
 					<view class="check-for-img-max-box">
 						<view class="left-title-p"></view>
@@ -59,41 +54,41 @@
 						</view>
 					</view>
 				</view>
-				<view class="subBtn">提交</view>
+				<view class="subBtn" @click="submitForm">提交</view>
 			</view>
 			<!-- 上报记录 -->
 			<view class="escalation" v-if="pageType==1">
-				<view class="escalation-li" v-for="(item,index) in escalationList">
+				<view class="escalation-li" @click="recordClick(item)" v-for="(item,index) in dataList">
 					<view class="escalation-li-t">
-						<view>{{item.subName}}</view>
-						<view :id="item.status==0?'color-A':(item.status==1?'color-B':(item.status==2?'color-C':''))">
-							待整改
-							<img  src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
+						<view>{{item.subName}} ({{item.subRoom}})</view>
+						<view :id="item.rectifyStatus==0?'color-A':(item.rectifyStatus==1?'color-B':(item.rectifyStatus==2?'color-C':''))">
+							{{item.rectifyStatus==0?'待整改':(item.rectifyStatus==1?'已完成':(item.rectifyStatus==1?'暂无法整改':''))}}
+							<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 						</view>
 					</view>
 					<view class="escalation-li-b">
 						<view>上报时间</view>
-						<view>{{item.time}}</view>
+						<view>{{item.createTime}}</view>
 					</view>
 				</view>
 			</view>
 			<!-- 隐患整改 -->
 			<view class="hidden" v-if="pageType==2">
-				<view class="hidden-li" v-for="(item,index) in hiddenList">
-					<img class="hidden-li-l"  src="@/pages_safetyCheck/images/icon_sys_xz@1x.png">
+				<view class="hidden-li" v-for="(item,index) in dataList">
+					<img class="hidden-li-l" src="@/pages_safetyCheck/images/icon_sys_xz@1x.png">
 					<view class="hidden-li-c">{{item.subName}}</view>
-					<view class="hidden-li-r">待检查{{item.num}}项
-						<img  src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
+					<view class="hidden-li-r">待整改{{item.stayhRectifyCheckNum}}项
+						<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 					</view>
 				</view>
 			</view>
-
+			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</scroll-view>
 		<view class="popup-max-box" v-if="popupType">
 			<view class="popup-null" @click="popupClick(2)"></view>
 			<view class="popup-big-box">
 				<view class="popup-input-box">
-					<input type="text" maxlength="10" v-model="room" placeholder="请输入关键字">
+					<input type="text" maxlength="10" v-model="form.searchValue" placeholder="请输入关键字">
 					<view @click="buildBySub">搜索</view>
 				</view>
 				<view class="popup-for-max-box">
@@ -115,7 +110,9 @@
 	import {} from '@/pages/api/index.js'
 	import {
 		laboratorySubRelInfoGetRelList,
-		checkOptionListNew,
+		securityAppCheckPhotoMyAdd,
+		securityAppCheckPhotoMyList,
+		securityAppCheckPhotoRectifyList,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "snapshotList",
@@ -137,47 +134,26 @@
 				form: {
 					rectifyDescribe: '',
 					imgDtoList: [],
-					hazardCheckName:'',
+					hazardCheckName: '',
 				},
 				popupType: false,
 				roomList: [],
 				checkOptionList: [],
-				escalationList:[
-					{
-						subName:'实验室名称（房间号）',
-						status:0,
-						time:'2024-01-01',
-					},
-					{
-						subName:'实验室名称（房间号）',
-						status:1,
-						time:'2024-01-01',
-					},
-					{
-						subName:'实验室名称（房间号）',
-						status:2,
-						time:'2024-01-01',
-					},
-				],
-				hiddenList:[
-					{
-						subName:'实验室名称实验室名称实验室名称实验室名称',
-						num:3,
-					},
-					{
-						subName:'实验室名称实验室名称实验室名称实验室名称',
-						num:3,
-					},
-					{
-						subName:'实验室名称实验室名称实验室名称实验室名称',
-						num:3,
-					},
-				],
+				getDataType: false,
+				// 查询参数
+				queryParams: {
+					page: 1,
+					pageSize: 10,
+				},
+				total: 0,
+				dataList:[],
 			}
 		},
 		onLoad(option) {
 
-
+			if (option.form) {
+				this.form = JSON.parse(decodeURIComponent(option.form));
+			}
 		},
 		onShow() {
 
@@ -187,14 +163,89 @@
 		},
 		methods: {
 			//滚动事件
-			scrollGet() {},
+			scrollGet() {
+				let self = this;
+				if (self.total / self.queryParams.pageSize <= self.queryParams.page) {
+					this.$set(this, 'getDataType', true);
+				} else {
+					this.queryParams.page += 1;
+					this.$nextTick(() => {
+						if(this.pageType==1){
+							this.getList();
+						}else if(this.pageType==2){
+							this.getListTow();
+						}
+					})
+				}
+			},
+			//上报记录
+			async getList() {
+				let self = this;
+				const {
+					data
+				} = await securityAppCheckPhotoMyList(this.queryParams);
+				if (data.code == 200) {
+					if (self.queryParams.page == 1) {
+						this.dataList = data.data.records;
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					} else {
+						this.dataList = [...this.dataList, ...data.data.records]
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					}
+				}
+			},
+			//隐患整改
+			async getListTow() {
+				let self = this;
+				const {
+					data
+				} = await securityAppCheckPhotoRectifyList(this.queryParams);
+				if (data.code == 200) {
+					if (self.queryParams.page == 1) {
+						this.dataList = data.data.records;
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					} else {
+						this.dataList = [...this.dataList, ...data.data.records]
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					}
+				}
+			},
+			//上报记录跳转详情
+			recordClick(row){
+				let infoData=row;
+				uni.navigateTo({
+					url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+				});
+			},
 			tabClick(index) {
 				this.tabIndex = index;
 				this.pageType = index;
+				if(index==1){
+					this.getList();
+				}else if(index==2){
+					this.getListTow();
+				}
 			},
 			tabClickTow(index) {
 				this.tabIndexTow = index;
 				this.pageType = index;
+				if(index==1){
+					this.getList();
+				}else if(index==2){
+					this.getListTow();
+				}
 			},
 			/******图片上传******/
 			selectImage() {
@@ -299,12 +350,18 @@
 				console.log(item)
 				this.$set(this.form, "subId", item.subId)
 				this.$set(this.form, "subName", item.subName)
+				this.$set(this.form, "subRoom", item.roomNum)
 				this.$set(this.form, "deptId", item.deptId)
-				for (let i = 0; i < this.collegeList.length; i++) {
-					if (item.deptId == this.collegeList[i].deptId) {
-						this.$set(this.form, "deptName", this.collegeList[i].deptName)
-					}
-				}
+				this.$set(this.form, "deptName", item.deptName)
+				this.$set(this.form, "buildId", item.buildId)
+				this.$set(this.form, "buildName", item.buildName)
+				this.$set(this.form, "floorId", item.floorId)
+				this.$set(this.form, "floorName", item.floorName)
+				this.$set(this.form, "typeId", item.typeId)
+				this.$set(this.form, "classTypeNames", item.classTypeNames)
+				this.$set(this.form, "levelId", item.levelId)
+				this.$set(this.form, "classLevelName", item.classLevelName)
+
 				this.popupType = false;
 			},
 			/******调用摄像头******/
@@ -332,106 +389,23 @@
 					}
 				});
 			},
-			/**************************搜索项***************************/
-			//获取检查项
-			async getCheckOptionList() {
-				const {
-					data
-				} = await checkOptionListNew();
-				if (data.code == 200) {
-					let list = this.getTreeData(data.data);
-					console.log(list)
-					this.checkOptionList.push(JSON.parse(JSON.stringify(list)));
-
-				}
-			},
-			getTreeData(data) {
-				for (var i = 0; i < data.length > 0; i++) {
-					if (data[i].children == null || data[i].children.length <= 0) {
-						// children若为空数组，则将children设为undefined
-						data[i].children = undefined;
-					} else {
-						if (this.form.checkCategory == 1 && data[i].level == 3) {
-							if (data[i].children[0]) {
-								let mainPoint = []
-								for (let b = 0; b < data[i].children.length; b++) {
-									mainPoint.push(data[i].children[b].name)
-									data[i].mainPoint = mainPoint.join(',')
-								}
-							} else {
-								data[i].mainPoint = '';
-							}
-							data[i].children = [];
-						}
-						// children若不为空数组，则继续 递归调用 本方法
-						this.getTreeData(data[i].children);
-					}
-				}
-				return data;
-			},
-			/**************************搜索项***************************/
-			//搜索特定检查项
-			async searchClick(text, index) {
-				console.log("搜索text", text);
-				console.log("搜索index", index);
-				const {
-					data
-				} = await checkOptionListNew({
-					'searchValue': text
+			//搜索项跳转
+			inspectionItemsClick() {
+				uni.navigateTo({
+					url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsSearch?form=' + encodeURIComponent(
+						JSON.stringify(this.form))
 				});
-				if (data.code == 200) {
-					if (data.data[0]) {
-						let list = [];
-						list[0] = this.getTreeData(data.data)
-						this.$set(this, 'checkOptionList', JSON.parse(JSON.stringify(list)))
-
-						console.log(this.checkOptionList)
-
-						this.$refs.uniDataPicker[index].show();
-					} else {
-						uni.showToast({
-							title: '未找到相关检查项',
-							icon: "none",
-							mask: true,
-							duration: 2000
-						});
-					}
-				}
 			},
-			//重置检查项
-			async resetClick(index) {
-				console.log("重置index", index);
+			//上报
+			async submitForm() {
+				let self = this;
+				console.log(self.form)
 				const {
 					data
-				} = await checkOptionListNew();
+				} = await securityAppCheckPhotoMyAdd(self.form);
 				if (data.code == 200) {
-					let list = [];
-					list[0] = this.getTreeData(data.data);
-					this.$set(this, 'checkOptionList', JSON.parse(JSON.stringify(list)))
-					this.$refs.uniDataPicker[index].show();
-				}
-			},
-			//选中固有检查项(新)
-			onchange(indexAll, e, index) {
-				let self = this;
-				//hazardCheckCode:'', //检查项目code序号
-				//hazardCheckName:'', //检查项目名称
-				//hazardCheckPro:'', //最后一级的id
-				if (this.getTreeName(this.checkOptionList[0], e.detail.value[e.detail.value.length - 1].value).level ==
-					3) {
-					let jcxSstkNum = this.getTreeName(this.checkOptionList[0], e.detail.value[e.detail.value.length -
-						1].value).code
-					this.$set(this.form.checkHazardDtoList[index], 'hazardCheckPro', e.detail.value[e.detail.value
-						.length - 1].value);
-					this.$set(this.form.checkHazardDtoList[index], 'hazardCheckCode', jcxSstkNum);
-					this.$set(this.form.checkHazardDtoList[index], 'hazardCheckName', e.detail.value[e.detail.value
-						.length - 1].text);
-					this.$set(this.form.checkHazardDtoList[index], 'hazardCheckPoint', this.getTreeName(this
-						.checkOptionList[0], e.detail.value[e.detail.value.length - 1].value).mainPoint);
-							
-				} else {
 					uni.showToast({
-						title: '暂无数据',
+						title: '提交成功',
 						icon: "none",
 						mask: true,
 						duration: 2000
@@ -439,6 +413,7 @@
 				}
 			},
 
+
 		}
 	}
 </script>
@@ -526,58 +501,6 @@
 			}
 		}
 
-		.srearch {
-			width: 750rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-			overflow: hidden;
-			margin-top: 20rpx;
-
-			.srearch-n {
-				width: 690rpx;
-				height: 60rpx;
-				border-radius: 50rpx 50rpx 50rpx 50rpx;
-				border: 1rpx solid #E0E0E0;
-				margin: 20rpx 0 0 30rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-
-				.srearch-l {
-					width: 60rpx;
-					height: 60rpx;
-
-					>img {
-						width: 20rpx;
-						height: 20rpx;
-						margin: 20rpx 0 0 26rpx;
-					}
-				}
-
-				.srearch-c {
-					flex: 1;
-					height: 58rpx;
-					font-size: 24rpx;
-					color: #999999;
-					line-height: 30rpx;
-					text-align: left;
-				}
-
-				.srearch-r {
-					width: 60rpx;
-					height: 60rpx;
-
-					>img {
-						width: 30rpx;
-						height: 30rpx;
-						margin: 14rpx 22rpx 0 0;
-					}
-
-
-				}
-			}
-		}
 
 		.list {
 			width: 690rpx;
@@ -629,6 +552,31 @@
 
 			}
 
+			.srearch {
+				.srearch-l {
+					width: 60rpx;
+					height: 60rpx;
+					margin-right: 40rpx;
+
+					>img {
+						width: 30rpx;
+						height: 30rpx;
+						margin: 15rpx 0 0 15rpx;
+					}
+				}
+
+				.srearch-r {
+					width: 60rpx;
+					height: 60rpx;
+
+					>img {
+						width: 30rpx;
+						height: 30rpx;
+						margin: 15rpx 0 0 15rpx;
+					}
+				}
+			}
+
 			.describe {
 				width: 636rpx;
 				height: 120rpx;
@@ -692,6 +640,9 @@
 			}
 		}
 
+
+
+
 		/* 实验室弹框 */
 		.popup-max-box {
 			z-index: 10;
@@ -785,10 +736,11 @@
 			left: 30rpx;
 			bottom: 10rpx;
 		}
+
 		/* 上报记录 */
-		.escalation{
-			
-			.escalation-li{
+		.escalation {
+
+			.escalation-li {
 				width: 690rpx;
 				height: 162rpx;
 				background: #FFFFFF;
@@ -796,11 +748,13 @@
 				margin: 20rpx 30rpx;
 				padding: 0 30rpx;
 				box-sizing: border-box;
-				.escalation-li-t{
+
+				.escalation-li-t {
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 					border-bottom: 1rpx solid #E0E0E0;
+
 					>view:nth-of-type(1) {
 						font-weight: 400;
 						font-size: 30rpx;
@@ -808,6 +762,7 @@
 						line-height: 80rpx;
 						text-align: left;
 					}
+
 					>view:nth-of-type(2) {
 						font-weight: 400;
 						font-size: 28rpx;
@@ -817,23 +772,27 @@
 						display: flex;
 						justify-content: flex-start;
 						align-items: center;
-						>img{
+
+						>img {
 							width: 24rpx;
 							height: 24rpx;
 						}
 					}
 				}
-				.escalation-li-b{
+
+				.escalation-li-b {
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
+
 					>view:nth-of-type(1) {
 						font-weight: 400;
 						font-size: 30rpx;
 						color: #333333;
-						line-height: 80rpx;	
+						line-height: 80rpx;
 						text-align: left;
 					}
+
 					>view:nth-of-type(2) {
 						font-weight: 400;
 						font-size: 30rpx;
@@ -842,28 +801,32 @@
 						text-align: left;
 					}
 				}
-				
+
 			}
 		}
+
 		/* 隐患整改 */
-		.hidden{
+		.hidden {
 			width: 690rpx;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			background: #FFFFFF;
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			margin: 20rpx 30rpx;
-			.hidden-li{
+
+			.hidden-li {
 				height: 80rpx;
 				border-bottom: 1rpx solid #E0E0E0;
 				display: flex;
 				justify-content: flex-start;
 				align-items: center;
-				.hidden-li-l{
+
+				.hidden-li-l {
 					width: 34rpx;
 					height: 34rpx;
 				}
-				.hidden-li-c{
+
+				.hidden-li-c {
 					font-size: 28rpx;
 					color: #333333;
 					line-height: 30rpx;
@@ -874,7 +837,8 @@
 					white-space: nowrap;
 					margin: 0 84rpx 0 12rpx;
 				}
-				.hidden-li-r{
+
+				.hidden-li-r {
 					font-size: 28rpx;
 					color: #0183FA;
 					line-height: 80rpx;
@@ -882,24 +846,36 @@
 					display: flex;
 					justify-content: flex-start;
 					align-items: center;
-					>img{
+
+					>img {
 						width: 24rpx;
 						height: 24rpx;
 					}
 				}
 			}
-			.hidden-li:last-of-type{
+
+			.hidden-li:last-of-type {
 				border: none;
 			}
 		}
-		#color-A{
+
+		#color-A {
 			color: #0183FA;
 		}
-		#color-B{
+
+		#color-B {
 			color: #FF8C00;
 		}
-		#color-C{
+
+		#color-C {
 			color: #16B531;
 		}
+		.get-data-null-p {
+			text-align: center;
+			height: 100rpx;
+			line-height: 100rpx;
+			color: #999;
+			padding-bottom:200rpx;
+		}
 	}
 </style>