heyang

api/index.js

@@ -47,7 +47,7 @@ export const getCheckStatusCount  = (data) => {
 //巡查计划--获取巡查组列表
 export const checkGroupList  = (data) => {
     return apiResquest({
-        url: `/zd-security/checkGroup/list`,
+        url: `/zd-security/checkGroup/findGroupList`,
         method: 'POST',
         data: {...data}
     })
@@ -93,8 +93,39 @@ export const findByCheckPlanId  = (data) => {
     })
 };
 
-
-
+//随手拍-----------------------------------------------------
+//随手拍--添加
+export const checkClapAdd  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/add`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//随手拍--管理列表
+export const checkClapList  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/list`,
+        method: 'GET',
+        data: data,
+    })
+};
+//随手拍--上报记录-列表
+export const checkClapMylist  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/mylist`,
+        method: 'GET',
+        data: data,
+    })
+};
+//随手拍--详情
+export const checkClapById  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/findById`,
+        method: 'GET',
+        data: data,
+    })
+};
 
 
 

api/request/config.js

@@ -1,8 +1,8 @@
 const config = {
-	//base_url: 'http://192.168.1.9:8080',//柴
+	base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	 //base_url: 'http://192.168.1.17:8080',//小飞
-	 base_url: 'http://192.168.1.20:8080',//志伟
+	 //base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
     // base_url: 'http://192.168.1.43:9800',//43服务器

pages/pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -271,7 +271,7 @@ export default {
 			this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			this.form.scopeIndex=this.scopeIndex//检查范围
 			uni.navigateTo({
-			    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))
+			    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=1'
 			});
 		},
 		//选择学院或者实验室
@@ -283,7 +283,7 @@ export default {
 			    this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			    this.form.scopeIndex=this.scopeIndex//检查范围
 				uni.navigateTo({
-				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))
+				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=1'
 				});
 			}
 		},

pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab.vue

@@ -66,6 +66,9 @@ export default {
 	  if(this.form.seleteListLab.length>0){
 		  this.seleteListLab=this.form.seleteListLab;
 	  }
+	  if(option.pageType){//pageType=1添加页面进入2编辑页面进入
+	  	 this.pageType=option.pageType
+	  }
   },
   onShow() {
       
@@ -144,9 +147,16 @@ export default {
 			})
 			this.$set(this.form,'subId', subIds.join(','))
 		}
-		uni.redirectTo({
-			url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
-		});
+		if(this.pageType==1){
+			uni.redirectTo({
+				url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
+			});
+		}else if(this.pageType==2){
+			uni.redirectTo({
+				url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit?form='+encodeURIComponent(JSON.stringify(this.form))
+			});
+		}
+		
 	  		
 	  },
 	 

pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember.vue

@@ -37,8 +37,7 @@ export default {
 	  pageType:0,
       //列表请求参数
       getData:{
-        pageNum:1,
-        pageSize:20,
+		checkLevel:'0',
 		groupName:'',
 		
       },
@@ -56,6 +55,9 @@ export default {
 		  	 this.seleteListMember=this.form.seleteListMember;
 		  }
 	  }
+	  if(option.pageType){//pageType=1添加页面进入2编辑页面进入
+		  this.pageType=option.pageType
+	  }
   },
   onShow() {
       this.getList(); 
@@ -117,9 +119,16 @@ export default {
 	  	const {data} = await checkGroupDetail({id:id});
 	  	if(data.code == 200){
 	  	    this.$set(this.form,'checkGroupMemberList',data.data.checkGroupMemberList)
-			uni.redirectTo({
-			    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
-			});
+			if(this.pageType==1){
+				uni.redirectTo({
+				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
+				});
+			}else if(this.pageType==2){
+				uni.redirectTo({
+				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit?form='+encodeURIComponent(JSON.stringify(this.form))
+				});
+			}
+			
 	  	}
 		
 	  },

pages/pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -35,10 +35,10 @@
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<view v-if="pageType==0" style="padding: 0 30rpx;box-sizing: border-box;">
 			<view class="delay_inspect" >
-				<view class="delay_inspect_l" v-if="inspectState==0">待检查实验室:<text>22间</text></view>
-				<view class="delay_inspect_r" v-if="inspectState==0">未开始</view>
-				<view class="delay_inspect_l" v-if="inspectState==1">检查进度:<text>待检查2/检查中2/已检查1</text></view>
-				<view class="delay_inspect_r_tow" v-if="inspectState==1">进行中</view>
+				<view class="delay_inspect_l" v-if="form.checkStatus==1">待检查实验室:<text>{{form.subjectNum}}间</text></view>
+				<view class="delay_inspect_r" v-if="form.checkStatus==1">未开始</view>
+				<view class="delay_inspect_l" v-if="form.checkStatus==2">检查进度:<text>{{form.checkSchedule}}</text></view>
+				<view class="delay_inspect_r_tow" v-if="form.checkStatus==2">进行中</view>
 			</view>
 			<view class="basics">
 				<view class="title">
@@ -121,9 +121,9 @@
 					<view class="list_three_li_m">
 						<view class="list_three_li_m_t">{{item.title}}</view>
 						<view class="list_three_li_m_b">
-							<text class="blue_color" v-if="item.manageStatus==1">未开始</text>
-							<text class="red_color" v-if="item.manageStatus==2">进行中</text>
-							<text class="green_color" v-if="item.manageStatus==3">已结束</text>
+							<text class="blue_color" v-if="item.manageStatus==0">待检查</text>
+							<text class="red_color" v-if="item.manageStatus==1">检查中</text>
+							<text class="green_color" v-if="item.manageStatus==2">已检查</text>
 							<text>{{item.checkType==1?'校院巡查':'实验室自查'}}</text>
 							<text>{{item.collegeName}}</text>
 						</view>
@@ -145,7 +145,7 @@
 			<view class="shade_n_title"><text>选择学院</text><text @click="collegeConfirm">确定</text></view>
 			<view class="shade_n_b">
 				<view class="shade_n_b_li" v-for="(item,index) in  collegeList" :key="index" @click="collegeSelete(index)">
-					<text :class="item.type?'color_B':'color_A'">{{item.name}}</text>
+					<text :class="item.type?'color_B':'color_A'">{{item.deptName}}</text>
 					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
 				</view>
 			</view>
@@ -180,7 +180,7 @@ export default {
 		inspectState:0,//检查状态 0 未开始 1进行中
 		tabText:['检查计划','检查管理'],
 		curTab:0,
-		tabTextTow:['全部','未开始','进行中','已结束'],
+		tabTextTow:['全部','待检查','检查中','已检查'],
 		curTabTow:0,
 		form:{
 			id:'',
@@ -197,6 +197,8 @@ export default {
 			collegeNum:0,//学院数量
 			subIds:'',//实验室id组
 			subjectNum:0,//实验室数量
+			checkStatus:0,//检查状态
+			checkSchedule:'',//检查进度
 			tiemQuickList:[],
 			scopeIndex:'',
 			seleteListLab:[],
@@ -214,7 +216,6 @@ export default {
 	}
   },
   onLoad(option) {
-	  console.log(option)
 	 if(option.form){
 	 		this.form=JSON.parse(decodeURIComponent(option.form)); 
 	 		this.tiemQuickList=this.form.tiemQuickList//时间快捷
@@ -222,19 +223,12 @@ export default {
 	 		console.log(this.form)
 	 }
 	 if(option.id){
-		 
 		 this.id=option.id
 		 this.getData.checkPlanId=option.id
 		 this.checkPlanById()
-	 }
-	 if(option.pageType){
-	 		 if(option.pageType==1){//校院巡查
-	 			 this.form.checkType=option.pageType;
-	 			 this.form.checkTypeName='校院巡查';
-	 		 }else if(option.pageType==2){//实验室自查
-	 			  this.form.checkType=option.pageType;
-	 			  this.form.checkTypeName='实验室自查';
-	 		 }
+	 }else{
+		 this.id=this.form.id
+		 this.getData.checkPlanId=this.form.id
 	 }
   },
   onShow() {
@@ -292,15 +286,18 @@ export default {
 		//滚动事件
 		scrollGet(){
 			let self=this;
-			if(self.total/self.getData.pageSize<=self.getData.pageNum){
-			    console.log('没有更多数据!')
-			}else{
-					setTimeout(function(){
-						self.getData.pageNum += 1;
-						self.getList(); 
-					},1000)
-						 
+			if(this.pageType==1){//当页面切换到检查管理列表里的时候
+				if(self.total/self.getData.pageSize<=self.getData.pageNum){
+				    console.log('没有更多数据!')
+				}else{
+						setTimeout(function(){
+							self.getData.pageNum += 1;
+							self.getList(); 
+						},1000)
+							 
+				}
 			}
+			
 		},
 	    //开始时间选中事件
 	    startChange(form,e){
@@ -424,7 +421,7 @@ export default {
 			this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			this.form.scopeIndex=this.scopeIndex//检查范围
 			uni.navigateTo({
-			    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))
+			    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=2'
 			});
 		},
 		//选择学院或者实验室
@@ -436,7 +433,7 @@ export default {
 			    this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			    this.form.scopeIndex=this.scopeIndex//检查范围
 				uni.navigateTo({
-				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))
+				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=2'
 				});
 			}
 		},
@@ -510,6 +507,8 @@ export default {
 				this.form.subIds=data.data.subIds;
 				this.form.subjectNum=data.data.subjectNum;
 				this.form.uploadDtoList=data.data.uploadDtoList;
+				this.form.checkStatus=data.data.checkStatus;
+				this.form.checkSchedule=data.data.checkSchedule;
 				
 				this.scopeIndex=Number(data.data.checkRange)-1;//检查范围
 				this.checkGroupDetail(data.data.checkGroupId);
@@ -1322,7 +1321,7 @@ export default {
 					}
 					>text:nth-of-type(3){
 						display: inline-block;
-						width: 380rpx;
+						width: 350rpx;
 						font-size: 26rpx;
 						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 400;

pages/pages_safetyExamine/snapshotManage/snapshotAdd.vue

@@ -11,7 +11,7 @@
 				<view class="basics_li_l">学院</view>
 				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="scope_r">
 					<view class="basics_li_r college_r">
-						<view>{{collegeArray[collegeIndex]}}</view>
+						<view>{{form.deptName?form.deptName:'选择学院'}}</view>
 						<img src="@/images/Version3.3.3/icon_06.png">
 					</view>
 				</picker>
@@ -19,7 +19,7 @@
 			<view class="basics_li">
 				<view class="basics_li_l">实验室</view>
 				<view class="basics_li_r lab_r">
-					<input class="picker-text" @click="popupClick(1)" type="text" disabled v-model="form.fjNumber" placeholder="请选择房间" placeholder-style="font-size: 30rpx;color:#333;">
+					<input class="picker-text" @click="popupClick(1)" type="text" disabled v-model="form.subName" placeholder="请选择房间" placeholder-style="font-size: 30rpx;color:#333;">
 					<view class="img-box" @click.stop="saoCode">
 						<img src="@/images/Version3.3.3/icon_aqjc_sm.png">
 					</view>
@@ -27,16 +27,16 @@
 			</view>
 			<view class="check-for-input-max-box">
 				<view class="left-title-p">隐患描述：</view>
-				<textarea type="text" v-model="form.yhMs" maxlength="50" placeholder="请输入隐患描述" placeholder-style="font-size:28rpx;color:#999;"></textarea>
+				<textarea type="text" v-model="form.hazardDescribe" maxlength="50" placeholder="请输入隐患描述" placeholder-style="font-size:28rpx;color:#999;"></textarea>
 			</view>
 			<view class="check-for-img-max-box">
 				<view class="left-title-p">隐患照片（最多上传5张）：</view>
 				<view class="right-img-box">
-					<view class="img-box" v-for="(imgUrl,imgIndex) in form.yhImg" :key="imgIndex">
-						<img class="img-data" :src="configURL+imgUrl">
+					<view class="img-box" v-for="(imgUrl,imgIndex) in form.imgDtoList" :key="imgIndex">
+						<img class="img-data" :src="configURL+imgUrl.fileUrl">
 						<img class="position-img" src="@/pages_manage/images/icon_ssp_closure.png" @click="delImg(imgIndex)">
 					</view>
-					<img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage()" v-if="form.yhImg.length<5">
+					<img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage()" v-if="form.imgDtoList.length<5">
 				</view>
 			</view>
 		</view>
@@ -59,14 +59,14 @@
 			</view>
 		</view>
 	</view>	
-	<view class="bottom_btn" @click="handleClick('subBtn')">提交</view>
+	<view class="bottom_btn" @click="submitForm()">提交</view>
   </view>
 
 </template>
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getSelectInfoByRoom} from '@/api/index.js'
+import { getSelectInfoByRoom,conditionCollegeInfo,checkClapAdd } from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -82,15 +82,17 @@ export default {
 		 pageSize:20,
 		},
 		form:{
-			name:'',
-			startTime:'',
-			inspectResult:0,//检查结果
-			yhMs:'',
-			yhImg:[],
+			deptId:'',
+			deptName:'',
+			subId:'',
+			subName:'',
+			hazardDescribe:'',
+			imgDtoList:[],
 		},
 		collegeIndex :0,
-		collegeArray:['选择学院','学院名称1','学院名称2','学院名称3',],
+		collegeArray:[],
 		categoryIndex :0,
+		collegeList:[],
 		categoryArray:['校级巡查','院级巡查'],
 		planIndex :0,
 		planArray:['请选择巡查计划标题','2023年3月份校级督导检查','2023年4月份校级督导检查'],
@@ -115,7 +117,7 @@ export default {
 	  
   },
   mounted(){
-	  
+	  this.conditionCollegeInfo();
   },
   methods: {
 		//滚动事件
@@ -137,11 +139,13 @@ export default {
 	    },
 		collegeChange(e){
 			this.collegeIndex = e.target.value;
+			 this.form.deptId=this.collegeList[e.target.value].deptId
+			 this.form.deptName=this.collegeList[e.target.value].deptName
 		},
 		// 图片上传
 		selectImage() {
 		    let self = this;
-		    if(this.form.yhImg.length>4){
+		    if(this.form.imgDtoList.length>4){
 		        uni.showToast({
 		            title: '最多上传5张图片',
 		            icon:"none",
@@ -176,8 +180,9 @@ export default {
 		        },
 		        success: (uploadFileRes) => {
 		            let res = JSON.parse(uploadFileRes.data);
+					console.log(res.data)
 					if(res.code == 200){
-						this.form.yhImg.push(res.data.url);
+						this.form.imgDtoList.push({'fileUrl':res.data.url,'fileName':res.data.name});
 						console.log(res.data.url)
 					}else{
 						uni.showToast({
@@ -196,7 +201,7 @@ export default {
 		},
 		//删除图片
 		delImg(minIndex){
-		    this.form.yhImg.splice(minIndex,1);
+		    this.form.imgDtoList.splice(minIndex,1);
 			this.$forceUpdate();
 		},
 		//搜索房间弹层开关
@@ -237,16 +242,9 @@ export default {
 		},
 		//确认搜索房间
 		popupClickItem(item){
-			this.$set(this.form,"fjNumber",item.room)
-			this.$set(this.form,"deptName",item.deptName)
-			this.$set(this.form,"buildingId",item.building)
-			this.$set(this.form,"deptId",item.deptId)
-			this.$set(this.form,"laboratoryId",item.id)
-			this.$set(this.form,"buildingName",item.buildName)
-			this.$set(this.form,"laboratoryName",item.name)
-			this.$set(this.form,"fzrId",item.userId)
-			this.$set(this.form,"fzrName",item.safeUserName)
-			this.$set(this.form,"fzrLxfs",item.safeUserPhone)
+			console.log(item)
+			this.$set(this.form,"subId",item.id)
+			this.$set(this.form,"subName",item.name)
 			this.popupType = false;
 		},
 		//调用摄像头
@@ -284,6 +282,36 @@ export default {
 				}
 			});
 		},
+		//查询学院列表
+		async conditionCollegeInfo(){
+			let _this = this;
+			const {data} = await conditionCollegeInfo();
+			if(data.code == 200){
+					
+				for(let i=0;i<data.data.length;i++){
+					_this.collegeArray.push(data.data[i].deptName)
+				}
+				_this.collegeList=data.data;
+			}
+		},
+		//添加
+		async submitForm(){
+			let _this = this;
+			const {data} = await checkClapAdd(_this.form);
+			if(data.code == 200){
+			    uni.showToast({
+			        title: '提交成功',
+			        icon:"none",
+			        mask:true,
+			        duration: 2000
+			    });
+				// uni.redirectTo({
+				// 	url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
+				// });
+			   
+			}
+		},
+		
 	  
   }
 }

pages/pages_safetyExamine/snapshotManage/snapshotDetail.vue

@@ -5,36 +5,33 @@
 		<view  class="basics">
 			<view class="grade">
 				<text>学院：</text>
-				<text>环测学院</text>
+				<text>{{item.deptName}}</text>
 			</view>
 			<view class="grade">
 				<text>实验室：</text>
-				<text>实验室名称-房间号</text>
+				<text>{{item.subName}}</text>
 			</view>
 			<view class="project">
 				<view class="project_t">隐患描述：</view>
-				<view class="project_b">隐患描述隐患描述隐患描述隐患描述隐患描述描述隐患描述隐患描述隐患描述隐患描述隐患描述隐患描述</view>
+				<view class="project_b">{{item.hazardDescribe}}</view>
 			</view>
 			<view class="picture">
 				<view class="picture_t">隐患照片：</view>
 				<view class="picture_b">
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
+					<img  :src="item.fileUrl" v-for="(item,index) in item.yhDtoList"/>
 				</view>
 			</view>
 			<view class="grade">
 				<text>上报时间：</text>
-				<text>2023-04-0614:00</text>
+				<text>{{item.createTime}}</text>
 			</view>
 			<view class="grade" style="border:none;">
 				<text>上报人：</text>
-				<text >李腾</text>
+				<text >{{item.createName}}</text>
 			</view>
 		</view>
 		<!-- 待整改 -->
-		<view v-if="pageType==1">
+		<view v-if="rectifyStatus==0">
 			<view class="await">
 				<view class="result">
 					<view class="result_l">整改结果</view>
@@ -62,7 +59,7 @@
 			</view>
 		</view>
 		<!-- 隐患整改 -->
-		<view  class="basics"  v-if="pageType==2">
+		<view  class="basics"  v-if="rectifyStatus==1 || rectifyStatus==2">
 			<view class="small_title">隐患整改</view>
 			<view class="grade">
 				<text>整改结果：</text>
@@ -91,14 +88,14 @@
 			</view>
 		</view>
 	</scroll-view>
-	<view v-if="pageType==1" class="bottom_btn" @click="handleClick('subBtn')">提交</view>
+	<view v-if="pageType==0" class="bottom_btn" @click="handleClick('subBtn')">提交</view>
   </view>
 
 </template>
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getSelectInfoByRoom} from '@/api/index.js'
+import { getSelectInfoByRoom,checkClapById} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -107,24 +104,48 @@ export default {
   data() {
     return {
 		configURL:config.base_url,
+		id:'',
+		rectifyStatus:'',//整改状态，0是待整改，1是已整改，2是暂无法整改
 		pageType:2,
 		form:{
 			yhMs:'',
 			yhImg:[],
 			opinion:'',
 		},
+		item:{},
 		resultIndex:0,
 		resultArray:['已整改','暂无法整改'],
 	}
   },
   onLoad(option) {
+	  console.log(option.id)
+	  if(option.id){
+		   this.id=option.id
+	  }
+	  if(option.rectifyStatus){
+		  this.rectifyStatus=option.rectifyStatus
+		  if(option.rectifyStatus==0){
+			  uni.setNavigationBarTitle({
+			  	 title:'待整改'
+			  })
+		  }else if(option.rectifyStatus==1){
+			  uni.setNavigationBarTitle({
+			  	 title:'已整改'
+			  })
+		  }else if(option.rectifyStatus==2){
+			  uni.setNavigationBarTitle({
+			  	 title:'暂无法整改'
+			  })
+		  }
+	  }
+	
 	 
   },
   onShow() {
 	  
   },
   mounted(){
-	  
+	  this.checkClapById();
   },
   methods: {
 		//整改结果
@@ -202,6 +223,15 @@ export default {
 		    this.form.yhImg.splice(minIndex,1);
 			this.$forceUpdate();
 		},
+		//随手拍详情
+		async checkClapById(){
+			let _this = this;
+			const {data} = await checkClapById({id:this.id});
+			if(data.code == 200){
+					_this.item=data.data;
+			
+			}
+		},
 	  
   }
 }

pages/pages_safetyExamine/snapshotManage/snapshotList.vue

@@ -12,25 +12,27 @@
 	
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<view class="list_three">
-			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick('','detail')">
+			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'detail')">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l"></view>
-					<view class="list_three_li_t_c">实验室名称-房间号</view>
+					<view class="list_three_li_t_c">{{item.subName}}</view>
 					<view class="list_three_li_t_r"></view>
 				</view>
 				<view class="list_three_li_m">
-					<view class="list_three_li_m_t">隐患描述隐患描述隐患描述隐患描述隐患描述隐患描...</view>
+					<view class="list_three_li_m_t">{{item.hazardDescribe}}</view>
 					<view class="list_three_li_m_b">
-						<text class="blue_color">待整改</text>
-						<text>环境与测绘学院</text>
+						<text class="blue_color" v-if="item.rectifyStatus==0">待整改</text>
+						<text class="green_color" v-if="item.rectifyStatus==1">已整改</text>
+						<text class="orange_color" v-if="item.rectifyStatus==2">暂无法整改</text>
+						<text>{{item.deptName}}</text>
 					</view>
 				</view>
 				<view class="list_three_li_b">
 					<view class="list_three_li_b_l">
 						<img src="@/images/Version3.3.3/icon_ssp_ry.png"/>
-						<text>上报人：吴子友</text>
+						<text>上报人：{{item.createName}}</text>
 					</view>
-					<view class="list_three_li_b_r">刚刚</view>
+					<view class="list_three_li_b_r">{{item.createTime}}</view>
 				</view>
 			</view>
 		</view>
@@ -41,7 +43,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { } from '@/api/index.js'
+import {checkClapList,checkClapMylist} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -54,6 +56,7 @@ export default {
 		getData:{
 		 pageNum:1,
 		 pageSize:20,
+		 rectifyStatus:0,
 		},
 		tabTextTow:['待整改','已整改','暂无法整改'],
 		curTabTow:0,
@@ -72,7 +75,7 @@ export default {
 		collegeList:[{name:'学院名称',type:false},{name:'学院名称',type:false},{name:'学院名称',type:false},{name:'学院名称',type:false},{name:'学院名称',type:false},{name:'学院名称',type:false},],
 		collegeIndex :0,
 		collegeArray:['选择学院','学院名称1','学院名称2','学院名称3',],
-		dataList:[{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',}],
+		dataList:[],
 	}
   },
   onLoad(option) {
@@ -80,32 +83,40 @@ export default {
 		this.form=JSON.parse(decodeURIComponent(option.form)); 
 		console.log(this.form)
 	 }
-	 if(option.pageType==1){
-	 		  uni.setNavigationBarTitle({
-	 				title:'随手拍管理'
-	 		  })
-	 }else if(option.pageType==2){
-	 		  uni.setNavigationBarTitle({
-	 				title:'随手拍上报记录'
-	 		  })
+	 if(option.pageType){
+		 this.pageType=option.pageType
+		if(option.pageType==1){
+		  uni.setNavigationBarTitle({
+				title:'随手拍管理'
+		  })
+		}else if(option.pageType==2){
+		  uni.setNavigationBarTitle({
+				title:'随手拍上报记录'
+		  })
+		} 
 	 }
+	 
   },
   onShow() {
 	  
   },
   mounted(){
-	 
+	 this.getList()
   },
   methods: {
 		//顶部tab点击
 		tabClickTow(index) {
+			this.dataList=[];
 			this.curTabTow = index;
+			this.getData.pageNum=1;
+			this.getData.rectifyStatus=index;
+			this.getList()
 		},
 		
 		//滚动事件
 		scrollGet(){
 			let self=this;
-			if(self.total<=self.getData.pageNum){
+			if(self.total/self.getData.pageSize<=self.getData.pageNum){
 			    console.log('没有更多数据!')
 			}else{
 					setTimeout(function(){
@@ -121,25 +132,27 @@ export default {
 		  
 		  }else if(doType=='detail'){//详情
 			  uni.navigateTo({
-			  	 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?form='+encodeURIComponent(JSON.stringify(this.form))
+			  	 url: '/pages/pages_safetyExamine/snapshotManage/snapshotDetail?id='+item.id+'&rectifyStatus='+this.getData.rectifyStatus
 			  })
 		  }
 		  
 	    },
 		async getList(){
-				  let list=[{name:'实验室名称-房间号',type:false,id:4},{name:'实验室名称-房间号',type:false,id:5}]
-				  this.total=5;
-				  this.dataList=[...this.dataList,...list]
-		 //    let self = this;
-		 //    let obj = {
-		 //        pageNum:this.getData.page,
-		 //        pageSize:this.getData.pageSize,
-		 //    };
-		 //    const {data} = await groupList(obj);
-		 //    if(data.code==200){
-					 //  this.total=data.total;
-					 //  this.dataList=[...this.dataList,...data.data]
-				  // }
+		    let _this = this;
+			if(this.pageType==1){//随手拍管理
+				const {data} = await checkClapList(this.getData);
+				if(data.code==200){
+					  this.total=data.total;
+					  this.dataList=[...this.dataList,...data.data.records]
+				}
+			}else if(this.pageType==2){//随手拍记录
+				const {data} = await checkClapMylist(this.getData);
+				if(data.code==200){
+					  this.total=data.total;
+					  this.dataList=[...this.dataList,...data.data.records]
+				}
+			}
+		   
 		},
 	  
   }