heyang

pages.json

@@ -1,29 +1,6 @@
 {
 	"pages": [
-		{
-			"path": "pages/pages_safetyExamine/examineManage/examineAddTow",
-			"style": {
-				"navigationBarTitleText": "开始检查"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/examineManage/examineAdd",
-			"style": {
-				"navigationBarTitleText": "开始检查"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/examineManage/examineList",
-			"style": {
-				"navigationBarTitleText": "校院巡查管理"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/dangerManage/dangerList",
-			"style": {
-				"navigationBarTitleText": "校院巡查隐患"
-			}
-		},
+		
 		
 		
 		{
@@ -34,6 +11,7 @@
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
 		},
+		
 		{
 			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanAdd",
 			"style": {
@@ -70,6 +48,73 @@
 				"navigationBarTitleText": "计划编辑"
 			}
 		},
+		{
+			"path": "pages/pages_safetyExamine/examineManage/examineAddTow",
+			"style": {
+				"navigationBarTitleText": "开始检查"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/examineManage/examineAdd",
+			"style": {
+				"navigationBarTitleText": "开始检查"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/examineManage/examineDetail",
+			"style": {
+				"navigationBarTitleText": "检查详情"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/examineManage/examineList",
+			"style": {
+				"navigationBarTitleText": "校院巡查管理"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/dangerManage/dangerManage",
+			"style": {
+				"navigationBarTitleText": "隐患整改"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/dangerManage/dangerList",
+			"style": {
+				"navigationBarTitleText": "校院巡查隐患"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/dangerManage/dangerDetail",
+			"style": {
+				"navigationBarTitleText": "校院巡查隐患"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/snapshotManage/snapshotDetail",
+			"style": {
+				"navigationBarTitleText": "待整改"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/snapshotManage/snapshotAdd",
+			"style": {
+				"navigationBarTitleText": "随手拍上报"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/snapshotManage/snapshotList",
+			"style": {
+				"navigationBarTitleText": "随手拍上报记录"
+			}
+		},
+		
+		
+		
+		
+		
+		
+		
 		
 		
 		

pages/pages_safetyExamine/dangerManage/dangerDetail.vue

@@ -0,0 +1,923 @@
+<!-- 安全检查-安全隐患 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-x @scrolltolower="scrollGet"  class="header">
+		<view class="tabTitle_tow">
+			<view class="tabTitle_tow_li" @tap="tabClickTow(index)"  :key="index" v-for="(item,index) in tabTextTow">
+				<view :class="{on:curTabTow==index}" class="tabTitle_tow_text">{{item}}</view>
+				<view :class="{on:curTabTow==index}" class="tabTitle_tow_across"></view>
+			</view>
+		</view>
+	</scroll-view>
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<!-- 隐患检查 -->
+		<view v-if="pageType==0">
+			<view class="basics">
+				<view class="basics_li">
+					<text>学院：</text>
+					<text>环测学院</text>
+				</view>
+				<view class="basics_li">
+					<text>实验室：</text>
+					<text>实验室名称-房间号</text>	
+				</view>
+				<view class="basics_li">
+					<text>楼栋：</text>
+					<text>楼栋名称</text>
+				</view>
+				<view class="basics_li">
+					<text>检查类型：</text>
+					<text>校级巡查</text>
+				</view>
+				<view class="basics_li">
+					<text>检查范围：</text>
+					<text>全校</text>
+				</view>
+				<view class="basics_li" style="border:none;">
+					<text>检查计划：</text>
+					<text>2023年3月份校级督导检查</text>
+				</view>
+			</view>
+			<view class="attachment">
+				<view class="attachment_t">
+					<text>材料附件</text>
+					<text>点击文件标题查看</text>
+				</view>
+				<view class="attachment_li">
+					<img src="@/images/Version3.3.3/icon_djc_wj.png"/>
+					<text>文件标题文件标题</text>
+					<img class="attachment_li_del" src="@/images/Version3.3.3/icon_fjgk_sc.png"/>
+				</view>
+			</view>
+			<view class="basics">
+				<view class="basics_li">
+					<text>检查结果：</text>
+					<text>不符合</text>
+				</view>
+				<view class="basics_li">
+					<text>整改期限：</text>
+					<text>2023-04-06</text>	
+				</view>	
+				<view class="basics_li">
+					<text>整改通知：</text>
+					<text style="color: #0183FA;">整改告知书</text>
+				</view>
+				<view class="basics_li">
+					<text>检查者：</text>
+					<text>管理员</text>
+				</view>
+				<view class="basics_li" style="border:none;">
+					<text>检查时间：</text>
+					<text>2023-04-06</text>
+				</view>
+			</view>
+			<view class="danger">
+				<view class="danger_title">不符合项</view>
+				<view class="grade">
+					<text>隐患等级：</text>
+					<text>一般隐患</text>
+				</view>
+				<view class="project">
+					<view class="project_t">检查项目：</view>
+					<view class="project_b">1检查项目名称—1.1检查项目名称名称名称名称—1.1.1检查项目名称名称名称名称名称名称名称名称</view>
+					<view class="project_b2">此检查项在当前实验室累计出现9次隐患</view>
+				</view>
+				<view class="project">
+					<view class="project_t">检查要点：</view>
+					<view class="project_b">检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点</view>
+				</view>
+				<view class="project">
+					<view class="project_t">隐患描述：</view>
+					<view class="project_b">检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点</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"/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 待整改 -->
+		<view v-if="pageType==1">
+			<view class="await">
+				<view class="result">
+					<view class="result_l">整改结果</view>
+					<view class="result_r"> 
+						<view v-for="(item,index) in resultArray" :key="index" @click="tabClick(index)">
+							<text :class="resultIndex==index?'checked':'result_r_l' "></text>
+							<text class="result_r_r">{{item}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="describe">
+					<view class="describe_l">原因描述：</view>
+					<textarea class="describe_r" type="text" v-model="form.yhMs" 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">
+							<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">
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 待复核 -->
+		<view v-if="pageType==2" class="review">
+			<view class="describe">
+				<view class="describe_l">审核意见：</view>
+				<textarea class="describe_r" type="text" v-model="form.opinion" maxlength="50" placeholder="请输入审核意见" placeholder-style="font-size:28rpx;color:#999;"></textarea>
+			</view>
+			<view class="quick">
+				<view class="quick_l">审核意见快捷输入</view>
+				<view class="quick_r">
+					<text @click="quickSelect(index)" :class="item.type?'quick_B':'quick_A'" v-for="(item,index) in quickArray">{{item.name}}</text>
+				</view>
+			</view>
+		</view>
+		<!-- 暂无法整改 -->
+		<view v-if="pageType==3" class="incapable danger">
+			<view class="grade">
+				<text>整改结果：</text>
+				<text style="color: #0183FA;">暂无法整改</text>
+			</view>
+			<view class="project">
+				<view class="project_t">原因描述：</view>
+				<view class="project_b">实验室施工</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"/>
+				</view>
+			</view>
+			<view class="grade">
+				<text>整改人：</text>
+				<text>褚朝朝</text>
+			</view>
+			<view class="grade" style="border:none;">
+				<text>整改时间：</text>
+				<text >2023-04-0114:00</text>
+			</view>
+		</view>
+		<!-- 整改结果 -->
+		<view v-if="pageType==4" class="abarbeitung_result danger">
+			<view class="grade">
+				<text>整改结果：</text>
+				<text style="color: #0183FA;">已整改</text>
+			</view>
+			<view class="project">
+				<view class="project_t">整改措施：</view>
+				<view class="project_b">已更换电池</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"/>
+				</view>
+			</view>
+			<view class="grade">
+				<text>整改人：</text>
+				<text>褚朝朝</text>
+			</view>
+			<view class="grade" style="border:none;">
+				<text>整改时间：</text>
+				<text >2023-04-0114:00</text>
+			</view>
+		</view>
+		<!-- 复核结果 -->
+		<view v-if="pageType==5" class="review_result danger">
+			<view class="audit">
+				<text>审核结果：</text>
+				<img  src="@/images/Version3.3.3/icon_cg.png"/>
+			</view>
+			<view class="project">
+				<view class="project_t">审核意见：</view>
+				<view class="project_b">整改不合格</view>
+			</view>
+			<view class="grade">
+				<text>整改人：</text>
+				<text>褚朝朝</text>
+			</view>
+			<view class="grade" style="border:none;">
+				<text>整改时间：</text>
+				<text >2023-04-0114:00</text>
+			</view>
+		</view>
+	</scroll-view>
+	<view class="bottom_btn" @click="handleClick('subBtn')" v-if="pageType==1">提交</view>
+	<view class="bottom_btn_tow" v-if="pageType==2">
+		<text>驳回</text>
+		<text>通过</text>
+	</view>
+  </view>
+
+</template>
+
+<script>
+import { config } from '@/api/request/config.js'
+import { } from '@/api/index.js'
+export default {
+  name: "rectifyList",
+  components: {
+   
+  },
+  data() {
+    return {
+		pageType:0,
+		configURL:config.base_url,
+		//列表请求参数
+		getData:{
+		 pageNum:1,
+		 pageSize:20,
+		},
+		tabTextTow:['隐患检查','隐患整改','整改复核','暂无法整改','整改结果','复核结果'],
+		curTabTow:0,
+		resultIndex:0,
+		resultArray:['已整改','暂无法整改'],
+		form:{
+			yhMs:'',
+			yhImg:[],
+			opinion:'',
+		},
+		quickIndex:0,
+		quickArray:[{name:'复核驳回',type:false},{name:'驳回在整改',type:false},{name:'请补充材料',type:false},{name:'请补充描述',type:false},{name:'未解决',type:false}],
+		
+		
+	}
+  },
+  onLoad(option) {
+	 if(option.form){
+		//this.form=JSON.parse(decodeURIComponent(option.form)); 
+		//console.log(this.form)
+	 }
+  },
+  onShow() {
+	  
+  },
+  mounted(){
+	  
+  },
+  methods: {
+	    //整改结果
+	    tabClick(index) {
+	  	  this.resultIndex = index;
+	    },
+		//顶部tab点击
+		tabClickTow(index) {
+			this.curTabTow = index;
+			this.pageType=index;
+		},
+		//滚动事件
+		scrollGet(){},
+	    handleClick(doType){
+		  let self=this;
+		  if( doType=='subBtn'){//	
+			  console.log(11)
+		  }
+	    },
+		//快捷选择
+		quickSelect(index) {
+		      this.quickArray[index].type = !this.quickArray[index].type
+			  this.form.opinion=this.quickArray[index].name
+		      let _this = this;
+		      if (_this.quickArray[index].type == true) {
+		        _this.quickArray.forEach(function(item2) {
+		          if (item2.name == _this.quickArray[index].name) {
+		            item2.type = true
+		          } else {
+		            item2.type = false
+		          }
+		        })
+		      }else{
+				  this.form.opinion='';
+			  }
+		    },
+		// 图片上传
+		selectImage(item) {
+		    let self = this;
+		    if(this.form.yhImg.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];
+		            self.uploadImg(tempFilePaths);
+		        }
+		    });
+		},
+		async uploadImg(tempFilePaths){
+		    var self = this;
+		    uni.showLoading({
+		        title: '上传中',
+		        mask: true
+		    });
+		    uni.uploadFile({
+		        url: config.base_url+'/base/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.yhImg.push(res.data.url);
+						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.yhImg.splice(minIndex,1);
+			this.$forceUpdate();
+		},
+	  
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.examine{
+	height:100%;
+	display flex;
+	// padding: 0 30rpx;
+	// box-sizing: border-box;
+	padding-bottom: 20rpx;
+	box-sizing: border-box;
+	
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		
+		padding: 120rpx 0rpx 0;
+		box-sizing: border-box;
+	}
+	/* 隐患检查 */
+	.header{
+		width:750rpx;
+		height: 100rpx;
+		position: fixed;
+		top: 0rpx;
+		z-index: 100;
+		background: #fff;
+		.tabTitle_tow{
+			height: 100rpx;
+			 white-space: nowrap;
+			display: inline-flex;	
+			.tabTitle_tow_li{
+				
+				position: relative;
+				width:152rpx;
+				height: 100rpx;
+				text-align center;
+				padding-top: 26rpx;
+				box-sizing: border-box;
+				.tabTitle_tow_text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					line-height: 46rpx;
+					position: relative;
+					&.on{
+						color:#0183FA;
+					}
+				}
+				.tabTitle_tow_across{
+					width: 50rpx;
+					height: 4rpx;
+					background: #0183FA;
+					border-radius: 2rpx;
+					margin-left: 33%;
+					display none;
+					&.on{
+						display block;
+					}
+				}
+		
+			}
+		}
+		
+	}
+	.basics{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		.basics_li{
+			height: 80rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 80rpx;
+				width: 140rpx;
+			}
+			>text:nth-of-type(2){
+				flex: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+				text-align: right;
+			}
+		}
+	}
+	.attachment{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 20rpx 30rpx 0;
+		padding-bottom: 32rpx;
+		box-sizing: border-box;
+		.attachment_t{
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 110rpx;
+				margin-left: 28rpx;
+			}
+			>text:nth-of-type(2){
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				line-height: 110rpx;
+				margin-left: 24rpx;
+			}
+		}
+		.attachment_li{
+			height: 40rpx;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin-top: 32rpx;
+			>img{
+				width: 30rpx;
+				height: 26rpx;
+				margin-right: 20rpx;
+				margin-left: 50rpx;
+			}
+			>text{
+				flex: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #0183FA;
+				line-height: 40rpx;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+			.attachment_li_del{
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+	}
+	.danger{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		.danger_title{
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height:80rpx;
+			border-bottom: 1rpx solid #D8D8D8;
+		}
+		.grade{
+			height: 80rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 80rpx;
+				width: 140rpx;
+			}
+			>text:nth-of-type(2){
+				flex: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+				text-align: right;
+			}
+		}
+		.project{
+			.project_t{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.project_b{
+				min-height: 158rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 40rpx;
+				padding: 20rpx 14rpx;
+				box-sizing: border-box;
+				background: #F5F5F5;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+			}
+			.project_b2{
+				font-size: 26rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 26rpx;
+				margin-top: 14rpx;
+				text-align: right;
+			}
+		}
+		.picture{
+			.picture_t{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.picture_b{
+				display: flex;
+				justify-content: flex-start;
+				flex-wrap: wrap;
+				>img{
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					margin-right: 14rpx;
+					margin-bottom: 10rpx;
+				}
+				>img:nth-of-type(3n+3){
+					margin-right: 0rpx;
+				}
+			}
+		}
+	}
+	/* 待整改 */
+	.await{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		/* 整改结果 */
+		.result{
+			display: flex;
+			justify-content: flex-start;
+			border-bottom: 1rpx solid #D8D8D8;
+			.result_l{
+				width: 146rpx;
+				text-align: left;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.result_r{
+				width: 486rpx;
+				height: 80rpx;
+				padding-left: 20rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+				>view{
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					margin-right: 24rpx;
+					.result_r_l{
+						display: inline-block;
+						width: 30rpx;
+						height: 30rpx;
+						border-radius: 50%;
+						border: 1rpx solid #E0E0E0;
+						margin-right: 14rpx;
+					}
+					.result_r_r{
+						font-size: 30rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #333333;
+						line-height: 80rpx;
+					}
+					.checked{
+						display: inline-block;
+						width: 30rpx;
+						height: 30rpx;
+						border-radius: 50%;
+						border: 1rpx solid #0183FA;
+						margin-right: 14rpx;
+						position: relative;
+					}
+					.checked::after{
+						content: '';
+						position: absolute;
+						top: 5rpx;
+						left:5rpx;
+						width: 20rpx;
+						height: 20rpx;
+						border-radius: 50%;
+						background: #0183FA;
+					}
+				}
+			}
+		}
+		/* 原因描述 */
+		.describe{
+			.describe_l{
+				width: 158rpx;
+				text-align: left;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.describe_r{
+				width: 630rpx;
+				height: 158rpx;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				padding: 20rpx 14rpx;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 34rpx;
+			}
+		}
+		/* 上传照片 */
+		.check-for-img-max-box{
+			.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:200rpx;
+					width:200rpx;
+					position relative
+					margin:0 14rpx 20rpx 0;
+					border-radius 10rpx;
+					overflow hidden;
+					.img-data{
+						height:200rpx;
+						width:200rpx;
+					}
+					.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:200rpx;
+					width:200rpx;
+				}
+			}
+		}
+	}
+	/* 待复核 */
+	.review{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		/* 审核意见 */
+		.describe{
+			.describe_l{
+				width: 158rpx;
+				text-align: left;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666;
+				line-height: 80rpx;
+			}
+			.describe_r{
+				width: 630rpx;
+				height: 158rpx;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				padding: 20rpx 14rpx;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 34rpx;
+			}
+		}
+		/* 快捷输入 */
+		.quick{
+			.quick_l{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 80rpx;
+			}
+			.quick_r{
+				
+				>text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					
+					line-height: 60rpx;
+					padding: 0 24rpx;
+					box-sizing: border-box;
+					
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					margin-right: 20rpx;
+					margin-bottom: 30rpx;
+				}
+				.quick_A{
+					color: #666666;
+					background: #F5F5F5;
+				}
+				.quick_B{
+					color: #0183FA;
+					background: rgba(1,131,250,0.2);
+				}
+				
+			}
+		}
+	}
+	/* 暂无法整改 */
+	.incapable{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+	}
+	/* 整改结果 */
+	.abarbeitung_result{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+	}
+	/* 审核结果 */
+	.review_result{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		.audit{
+			height: 80rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 80rpx;
+				width: 140rpx;
+			}
+			>img{
+				width: 80rpx;
+				height: 70rpx;
+			}
+		}
+	}
+	
+	
+	.bottom_btn{
+		position: fixed;
+		bottom: 26rpx;
+		left: 30rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 90rpx;
+		width: 690rpx;
+		height: 90rpx;
+		background: #0183FA;
+		border-radius: 20rpx;
+		text-align: center;
+	}
+	.bottom_btn_tow{
+		display: flex;
+		justify-content: center;
+		position: fixed;
+		bottom: 26rpx;
+		left: 30rpx;
+		width: 690rpx;
+		height: 90rpx;
+		>text{
+			flex: 1;
+			display: inline-block;
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 90rpx;
+			text-align: center
+		}
+		>text:nth-of-type(1){
+			background: #FA8201;
+			border-radius: 45rpx 0rpx 0rpx 45rpx;
+		}
+		>text:nth-of-type(2){
+			background: #0183FA;
+			border-radius: 0rpx 45rpx 45rpx 0rpx;
+		}
+	}
+}
+</style>

pages/pages_safetyExamine/dangerManage/dangerList.vue

@@ -26,7 +26,7 @@
 	
 	<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">
+			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick('','detail')">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l">
 						<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
@@ -44,12 +44,10 @@
 						<text>环境与测绘学院</text>
 					</view>
 				</view>
-				<!-- 开始检查 -->
 				<view class="list_three_li_b">整改期限：2023-01-01</view>
 			</view>
 		</view>
-	</scroll-view>	
-	<view class="bottom_btn" @click="handleClick('subBtn')">开始检查</view>
+	</scroll-view>
   </view>
 
 </template>
@@ -95,6 +93,15 @@ 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:'实验室自查隐患'
+	 		  })
+	 }
   },
   onShow() {
 	  
@@ -136,11 +143,14 @@ export default {
 		collegeSelete(index){
 			this.collegeList[index].type = !this.collegeList[index].type
 		},
-	    handleClick(doType){
+	    handleClick(item,doType){
 		  let self=this;
-		  
 		  if( doType=='subBtn'){//	
-			  console.log(11)
+		  
+		  }else if(doType=='detail'){//详情
+			  uni.navigateTo({
+			  	 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?form='+encodeURIComponent(JSON.stringify(this.form))
+			  })
 		  }
 		  
 	    },
@@ -172,7 +182,7 @@ export default {
 	display flex;
 	// padding: 0 30rpx;
 	// box-sizing: border-box;
-	padding-bottom: 126rpx;
+	padding-bottom: 20rpx;
 	box-sizing: border-box;
 	.blue_color{
 		color: #0183FA;
@@ -457,101 +467,6 @@ export default {
 			
 		}
 	}
-	.bottom_btn{
-		position: fixed;
-		bottom: 26rpx;
-		left: 30rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
-		font-weight: 400;
-		color: #FFFFFF;
-		line-height: 90rpx;
-		width: 690rpx;
-		height: 90rpx;
-		background: #0183FA;
-		border-radius: 20rpx;
-		text-align: center;
-		
-	}
-	/* 指纹采集 */
-	.shade {
-	  height: 100%;
-	  width: 100%;
-	  position: fixed;
-	  display: flex;
-	  flex-direction: column;
-	  z-index: 10;
-	  background: rgba(0, 0, 0, 0.2);
-	  .null-box {
-		flex: 1;
-	  }
-	  .shade_n {
-		  position: absolute;
-		  bottom: 0;
-		  left: 0;
-		  width: 750rpx;
-		  height: 560rpx;
-		  background: #FFFFFF;
-		  border-radius: 20rpx 20rpx 0rpx 0rpx;
-		  .shade_n_title{
-			  height: 100rpx;
-			  padding: 0 30rpx;
-			  box-sizing: border-box;
-			  display: flex;
-			  justify-content:space-between;
-			  border-bottom: 1rpx solid #E0E0E0;
-			  >text:nth-of-type(1){
-				  font-size: 30rpx;
-				  font-family: PingFang SC-Medium, PingFang SC;
-				  font-weight: 400;
-				  color: #333333;
-				  line-height: 100rpx;
-			  }
-			  >text:nth-of-type(2){
-				  font-size: 30rpx;
-				  font-family: PingFang SC-Medium, PingFang SC;
-				  font-weight: 400;
-				  color: #0183FA;
-				  line-height: 100rpx;
-				  
-			  }
-		  }
-		  .shade_n_b{
-			  height: 460rpx;
-			  padding: 0 30rpx;
-			  box-sizing: border-box;
-			  overflow-y: auto;
-			  .shade_n_b_li{
-				   display: flex;
-				   justify-content:space-between;
-				   align-items: center;
-				   height: 80rpx;
-				   border-bottom: 1rpx solid #E0E0E0;
-				 >text{
-					font-size: 28rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 400;
-					line-height: 80rpx;
-					overflow: hidden;
-					text-overflow:ellipsis;
-					white-space: nowrap;
-				 }
-				 >img{
-					 width: 24rpx;
-					 height: 16rpx;
-					 margin-right: 14rpx;
-				 } 
-			  }
-			  .color_A{
-				  color: #333333;
-			  }
-			  .color_B{
-				  color: #0183FA;
-			  }
-			  
-			 
-		  }
-	  }
-	}
+	
 }
 </style>

pages/pages_safetyExamine/dangerManage/dangerManage.vue

@@ -0,0 +1,546 @@
+<!-- 安全检查-安全隐患 -->
+<template>
+  <view class="examine">
+	<view class="header">
+		<view class="tabTitle" v-if="pageType==0">
+			<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
+				<view :class="{on:curTab==index}" class="tabTitle_text">{{item}}</view>
+			    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
+			</view>
+		</view>
+		<view class="tabTitle_tow">
+			<view class="tabTitle_tow_li" @tap="tabClickTow(index)"  :key="index" v-for="(item,index) in tabTextTow">
+				<view :class="{on:curTabTow==index}" class="tabTitle_tow_text">{{item}}</view>
+			    <view :class="{on:curTabTow==index}" class="tabTitle_tow_across"></view>
+			</view>
+		</view>
+		<view class="lab_title">
+			<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
+				<view class="lab_title_l_n">
+					<view>{{collegeArray[collegeIndex]}}</view>
+					<img src="@/images/Version3.3.3/icon_06.png">
+				</view>
+			</picker>
+			<view class="lab_title_r">
+				<view class="lab_title_r_btn" @click="searchBtn">
+					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+				</view>
+				<input type="text" v-model="getData.name" placeholder="实验室/房间号" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
+			</view>
+		</view>
+	</view>
+	
+	<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_t">
+					<view class="list_three_li_t_l">
+						<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+						<text></text>
+					</view>
+					<view class="list_three_li_t_c">实验室名称-房间号</view>
+					<view class="list_three_li_t_c2">已逾期</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_b">
+						<text class="blue_color">待整改</text>
+						<text>校院巡查</text>
+						<text>环境与测绘学院</text>
+					</view>
+				</view>
+				<view class="list_three_li_b">整改期限：2023-01-01</view>
+			</view>
+		</view>
+	</scroll-view>
+  </view>
+
+</template>
+
+<script>
+import { config } from '@/api/request/config.js'
+import { } from '@/api/index.js'
+export default {
+  name: "rectifyList",
+  components: {
+   
+  },
+  data() {
+    return {
+		pageType:0,
+		//列表请求参数
+		getData:{
+		 pageNum:1,
+		 pageSize:20,
+		},
+		tabText:['校院巡查隐患','实验室自查隐患'],
+		curTab:0,
+		tabTextTow:['全部','待检查','待复核','已完成','暂无法整改'],
+		curTabTow:0,
+		form:{
+			name:'',
+			type:'校院巡查',
+			startTime:'',
+			endTime:'',
+			inspectScope:[],
+			tiemQuickList:[],
+			scopeIndex:'',
+			seleteListLab:[],
+			patrolIndex:'',
+			seleteListMember:[],
+		},
+		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:'计划标题计划标题计划标题计划标题',}],
+	}
+  },
+  onLoad(option) {
+	 if(option.form){
+		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:'实验室自查隐患'
+	 		  })
+	 }
+  },
+  onShow() {
+	  
+  },
+  mounted(){
+	  
+  },
+  methods: {
+		tabClick(index) {
+			this.curTab = index;
+		},
+		//顶部tab点击
+		tabClickTow(index) {
+			this.curTabTow = index;
+		},
+		//选择学院
+		collegeChange(e){
+			this.collegeIndex = e.target.value;
+			this.dataList=[];
+			this.getList();  
+		},
+		//实验室搜索
+		searchBtn(){
+			this.dataList=[];
+			this.getList();
+		},
+		//滚动事件
+		scrollGet(){
+			let self=this;
+			if(self.total<=self.getData.pageNum){
+			    console.log('没有更多数据!')
+			}else{
+					setTimeout(function(){
+						self.getData.pageNum += 1;
+						self.getList(); 
+					},1000)
+						 
+			}
+		},
+	    
+		//学院选择
+		collegeSelete(index){
+			this.collegeList[index].type = !this.collegeList[index].type
+		},
+	    handleClick(item,doType){
+		  let self=this;
+		  if( doType=='subBtn'){//	
+		  
+		  }else if(doType=='detail'){//详情
+			  uni.navigateTo({
+			  	 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?form='+encodeURIComponent(JSON.stringify(this.form))
+			  })
+		  }
+		  
+	    },
+		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]
+				  // }
+		},
+	  
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.examine{
+	height:100%;
+	display flex;
+	// padding: 0 30rpx;
+	// box-sizing: border-box;
+	padding-bottom: 20rpx;
+	box-sizing: border-box;
+	.blue_color{
+		color: #0183FA;
+		border: 1rpx solid #0183FA;
+	}
+	.red_color{
+		color: #FF4545;
+		border: 1rpx solid #FF4545;
+	}
+	.green_color{
+		color: #1FA50D;
+		border: 1rpx solid #1FA50D;
+	}
+	.orange_color{
+		color: #FA8E1B;
+		border: 1rpx solid #FA8E1B;
+	}
+	.gray_color{
+		color: #A2A2A2;
+		border: 1rpx solid #A2A2A2;
+	}
+	
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		
+		padding: 340rpx 0rpx 0;
+		box-sizing: border-box;
+	}
+	/* 切换按钮 */
+	.header{
+		width:100%;
+		position: fixed;
+		top: 0rpx;
+		z-index: 100;
+		.tabTitle{
+			width:100%;
+			height: 100rpx;
+			background: #fff;
+			display flex;
+			justify-content: center;
+			align-items: center;
+			margin-bottom:20rpx;
+			.tabTitle_li{
+				position: relative;
+				width:372rpx;
+				text-align center;
+				.tabTitle_text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					line-height: 46rpx;
+					position: relative;
+					>text{
+						position:absolute;
+						min-width: 30rpx;
+						min-height: 30rpx;
+						border-radius:54%;
+						background: #E80000;
+						font-size: 18rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #FFFFFF;
+						text-align: center;
+						line-height: 30rpx;
+						margin-left: 6rpx;
+						padding:2rpx;
+						box-sizing: border-box;
+					}
+					&.on{
+						color:#0183FA;
+					}
+				}
+				.tabTitle_across{
+					width: 50rpx;
+					height: 4rpx;
+					background: #0183FA;
+					border-radius: 2rpx;
+					margin-left 162rpx;
+					display none;
+					&.on{
+						display block;
+					}
+				}
+		
+			}
+			.tabTitle_li:nth-of-type(1)::after{
+				content: '';
+				position: absolute;
+				top: 0rpx;
+				right:  0rpx;
+				width: 1rpx;
+				height: 50rpx;
+				background: #E0E0E0;
+			}
+		}
+		.tabTitle_tow{
+			width:100%;
+			height: 100rpx;
+			background: #fff;
+			display flex;
+			justify-content: flex-start;
+			align-items: center;
+			border-bottom: 1rpx solid #E0E0E0;
+			.tabTitle_tow_li{
+				position: relative;
+				width:152rpx;
+				text-align center;
+				.tabTitle_tow_text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					line-height: 46rpx;
+					position: relative;
+					&.on{
+						color:#0183FA;
+					}
+				}
+				.tabTitle_tow_across{
+					width: 50rpx;
+					height: 4rpx;
+					background: #0183FA;
+					border-radius: 2rpx;
+					margin-left: 50rpx;
+					display none;
+					&.on{
+						display block;
+					}
+				}
+		
+			}
+		}
+		.lab_title{
+			width: 750rpx;
+			height: 100rpx;
+			background: #FFFFFF;
+			padding: 20rpx 30rpx;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: flex-start;
+			
+			.lab_title_l{
+				width: 250rpx;
+				height: 60rpx;
+				margin-right: 20rpx;
+				.lab_title_l_n{
+					width: 250rpx;
+					height: 60rpx;
+					border-radius: 10rpx;
+					border: 1rpx solid #E0E0E0;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					>view{
+						flex:1;
+						line-height:60rpx;
+						margin-left:20rpx;
+						color: #999999;
+						font-size:28rpx;
+					}
+					>img{
+						width: 14rpx;
+						height: 8rpx;
+						margin-right: 30rpx;
+					}
+				}
+			}
+			.lab_title_r{
+				width: 420rpx;
+				height: 60rpx;
+				position:relative;
+				border-radius: 10rpx;
+				border: 1rpx solid #E0E0E0;
+				.lab_title_r_btn{
+					width: 60rpx;
+					height: 60rpx
+					position: absolute;
+					top: 0rpx;
+					left:0rpx;
+					>img{
+						width: 20rpx;
+						height: 20rpx;
+						position: absolute;
+						top: 20rpx;
+						left: 24rpx;
+					}
+				}
+				>input{
+					width: 360rpx;
+					height: 60rpx;
+					position: absolute;
+					top: 0rpx;
+					left: 60rpx;
+				}
+			}
+		}
+		
+	}
+	.list_three{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		.list_three_li{
+			position: relative;
+			width: 690rpx;
+			height: 320rpx;
+			background: #fff;
+			border-radius: 10rpx;
+			overflow: hidden;
+			margin-bottom: 20rpx;
+			.list_three_li_t{
+				width: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				.list_three_li_t_l{
+					>img{
+						width: 70rpx;
+						height: 70rpx;
+					}
+					>text{
+						position: absolute;
+						left: -15rpx;
+						top: 76rpx;
+						display: inline-block;
+						width: 30rpx;
+						height: 30rpx;
+						background: #F5F5F5;
+						border-radius: 15rpx;
+					}
+				}
+				.list_three_li_t_c{
+					width: 630rpx;
+					height: 110rpx;
+					position: absolute;
+					left: 30rpx;
+					top: 0;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 110rpx;
+					border-bottom: 1rpx dashed #D8D8D8;
+					overflow: hidden;
+					text-overflow:ellipsis;
+					white-space: nowrap;
+					padding-right: 60rpx;
+					box-sizing: border-box;
+				}
+				.list_three_li_t_c2{
+					position: absolute;
+					right: 20rpx;
+					top: 38rpx;
+					width: 120rpx;
+					height: 40rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #FF5757;
+					line-height: 40rpx;
+					border: 1rpx solid #FF5757;
+					border-radius: 6rpx;
+					text-align: center;
+				}
+				.list_three_li_t_r{
+					position: absolute;
+					right:-15rpx;
+					top: 76rpx;
+					width: 30rpx;
+					height: 30rpx;
+					background:#F5F5F5;
+					border-radius: 15rpx;
+				}
+			}
+			.list_three_li_m{
+				position: absolute;
+				top: 110rpx;
+				left: 0;
+				width: 690rpx;
+				height: 158rpx;
+				padding-left: 30rpx;
+				box-sizing: border-box;
+				.list_three_li_m_t{
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #666666;
+					line-height: 40rpx;
+					margin-top:22rpx;
+				}
+				.list_three_li_m_b{
+					margin-top:26rpx;
+					>text:nth-of-type(1){
+						font-size: 26rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						line-height: 40rpx;
+						border-radius: 6rpx;
+						padding: 0 20rpx;
+						margin-right: 14rpx;
+					}
+					>text:nth-of-type(2){
+						font-size: 26rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #0183FA;
+						line-height: 40rpx;
+						padding: 0 8rpx;
+						border-radius: 6rpx;
+						background: rgba(1,131,250,0.1);
+						margin-right: 24rpx;
+					}
+					>text:nth-of-type(3){
+						display: inline-block;
+						width: 380rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #333333;
+						line-height: 26rpx;
+						overflow: hidden;
+						text-overflow:ellipsis;
+						white-space: nowrap;
+						
+					}
+				}
+			}
+			.list_three_li_b{
+				height: 60rpx;
+				width: 100%;
+				position: absolute;
+				top: 258rpx;
+				left: 0;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 60rpx;
+				padding-left: 28rpx;
+				box-sizing: border-box;
+			}
+			
+		}
+	}
+	
+}
+</style>

pages/pages_safetyExamine/examineManage/examineAdd.vue

@@ -163,7 +163,9 @@ export default {
 	    handleClick(doType){
 		  let self=this;
 		  if( doType=='nextStep'){//下一步	
-		  
+			  uni.redirectTo({
+				  url: '/pages/pages_safetyExamine/examineManage/examineAddTow'
+			  });
 		  }else if(doType=='subBtn'){//提交
 			  
 		  }

pages/pages_safetyExamine/examineManage/examineAddTow.vue

@@ -1,62 +1,64 @@
 <!-- 开始检查 -->
 <template>
     <view id="startChecking">
-		<view class="title">不符合项</view>
-		<viwe class="list">
-			<view class="check-for-big-box" v-for="(item,index) in form.detailsList" :key="index">
-				<view class="grade">
-					<view class="grade_l">隐患等级：</view>
-					<picker @change="gradeChange(item,$event)" :value="gradeIndex" :range="gradeArray" class="scope_r">
-						<view class="grade_r">
-							<view>{{item.grade}}</view>
-							<img src="@/images/Version3.3.3/icon_06.png">
+		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+			<viwe class="list">
+				<view class="title">不符合项</view>
+				<view class="check-for-big-box" v-for="(item,index) in form.detailsList" :key="index">
+					<view class="grade">
+						<view class="grade_l">隐患等级：</view>
+						<picker @change="gradeChange(item,$event)" :value="gradeIndex" :range="gradeArray" class="scope_r">
+							<view class="grade_r">
+								<view>{{item.grade}}</view>
+								<img src="@/images/Version3.3.3/icon_06.png">
+							</view>
+						</picker>
+					</view>
+					<view class="project" v-if="checkOptionList.length>0">
+						<view class="project_l">检查项目：</view>
+						<uni-data-picker :ellipsis="false" :localdata="checkOptionList[index]" :map="{text:'name',value:'id'}"
+						popup-title="请选择所属目录" @change="(e)=>onchange(e,index)" @nodeclick="onnodeclick"
+						ref="uniDataPicker" :addType="true" :addIndex="index">
+							<view  class="project_r">{{item.jcxName?item.jcxName:'请选择检查项'}}</view>
+						</uni-data-picker>
+					</view>
+					<view class="point">
+						<view class="point_l">检查要点：</view>
+						<textarea class="point_r" type="text" v-model="item.yhMs" maxlength="50" placeholder="未查到此项检查要点，可在此输入添加" placeholder-style="font-size:28rpx;color:#999;"></textarea>
+					</view>
+					<view class="check-for-input-max-box">
+						<view class="left-title-p">隐患描述：</view>
+						<textarea type="text" v-model="item.yhMs" 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 item.yhImg" :key="imgIndex">
+								<img class="img-data" :src="configURL+imgUrl">
+								<img class="position-img" src="@/pages_manage/images/icon_ssp_closure.png" @click="delImg(index,imgIndex)">
+							</view>
+							<img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage(item)" v-if="item.yhImg.length<5">
 						</view>
-					</picker>
-				</view>
-				<view class="project" v-if="checkOptionList.length>0">
-					<view class="project_l">检查项目：</view>
-					<uni-data-picker :ellipsis="false" :localdata="checkOptionList[index]" :map="{text:'name',value:'id'}"
-					popup-title="请选择所属目录" @change="(e)=>onchange(e,index)" @nodeclick="onnodeclick"
-					ref="uniDataPicker" :addType="true" :addIndex="index">
-						<view  class="project_r">{{item.jcxName?item.jcxName:'请选择检查项'}}</view>
-					</uni-data-picker>
-				</view>
-				<view class="point">
-				    <view class="point_l">检查要点：</view>
-				    <textarea class="point_r" type="text" v-model="item.yhMs" maxlength="50" placeholder="未查到此项检查要点，可在此输入添加" placeholder-style="font-size:28rpx;color:#999;"></textarea>
-				</view>
-				<view class="check-for-input-max-box">
-				    <view class="left-title-p">隐患描述：</view>
-				    <textarea type="text" v-model="item.yhMs" 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 item.yhImg" :key="imgIndex">
-			                <img class="img-data" :src="configURL+imgUrl">
-			                <img class="position-img" src="@/pages_manage/images/icon_ssp_closure.png" @click="delImg(index,imgIndex)">
-			            </view>
-			            <img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage(item)" v-if="item.yhImg.length<5">
-			        </view>
-			    </view>
-			   <view class="voice">
-			       <view class="voice_t">
-					   <view class="voice_t_l">语音备注：</view>
-					   <img class="voice_t_r" src="@/images/Version3.3.3/icon_ksjc_yysr.png" @longpress.stop="recordButton(item,$event)" @touchmove.stop="cancelButton"  @touchend.stop="sendButton(item,$event)">
+					</view>
+				   <view class="voice">
+					   <view class="voice_t">
+						   <view class="voice_t_l">语音备注：</view>
+						   <img class="voice_t_r" src="@/images/Version3.3.3/icon_ksjc_yysr.png" @longpress.stop="recordButton(item,$event)" @touchmove.stop="cancelButton"  @touchend.stop="sendButton(item,$event)">
+					   </view>
+					   <view class="voice_b" v-for="(voiceItem,voiceIndex) in item.voice" :key="voiceIndex">
+						   <view class="voice_b_l" @tap="voicePlay(voiceItem.url)"><img class="add-button" src="@/pages_manage/images/icon_yyt.png"/>{{voiceItem.times}}″</view>
+						   <img class="voice_b_r" src="@/pages_manage/images/Version2.3/icon_sczl_sc.png" @tap="voiceDele(index,voiceIndex)"/>
+					   </view>
 				   </view>
-				   <view class="voice_b" v-for="(voiceItem,voiceIndex) in item.voice" :key="voiceIndex">
-					   <view class="voice_b_l" @tap="voicePlay(voiceItem.url)"><img class="add-button" src="@/pages_manage/images/icon_yyt.png"/>{{voiceItem.times}}″</view>
-					   <img class="voice_b_r" src="@/pages_manage/images/Version2.3/icon_sczl_sc.png" @tap="voiceDele(index,voiceIndex)"/>
-				   </view>
-			   </view>
-				<view class="check-for-big-box-position-img-box" v-if="form.detailsList.length>1" @click="delDetailsList(index)">
-					<img src="@/pages_manage/images/icon_ssp_closure.png">
+					<view class="check-for-big-box-position-img-box" v-if="form.detailsList.length>1" @click="delDetailsList(index)">
+						<img src="@/pages_manage/images/icon_ssp_closure.png">
+					</view>
 				</view>
-			</view>
-			<view class="add-for-item-p" @click="addDanger()">+ 新增隐患项</view>      
-		</viwe>
+				<view class="add-for-item-p" @click="addDanger()">+ 新增隐患项</view>      
+			</viwe>
+		</scroll-view>
 		<view class="bottom_btn">
-			<view class="bottom_btn_li"  @click="goMinButton(2)" v-for="(item,index) in  bottomBtnList" :key="index">{{item}}</view>
+			<view class="bottom_btn_li"  @click="goMinButton(index)" v-for="(item,index) in  bottomBtnList" :key="index">{{item}}</view>
 		</view>  
 	</view>
 </template>
@@ -495,35 +497,36 @@
 				this.$forceUpdate();
 			},
             //子页面切换
-            goMinButton(type){
+            goMinButton(index){
 				let self = this;
-				if(type == 1){
-					this.minPageType = 1;
-				}else if(type == 2){
-					for(let i=0;i<self.form.detailsList.length;i++){
-						console.log(self.form.detailsList[i])
-						console.log(typeof(self.form.detailsList[i].yhMs))
-						console.log(typeof(self.form.detailsList[i].voice))
-						let num = i+1;
-						if(!self.form.detailsList[i].jcxName){
-							uni.showToast({
-								title: '第'+num+'未选择隐患项',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-							return
-						}else if(!self.form.detailsList[i].yhMs && self.form.detailsList[i].voice.length<=0){
-							uni.showToast({
-								title: '请输入第'+num+'项隐患描述!',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-							return
-						}
-					}
-					this.minPageType = 2;
+				if(index == 0){
+					uni.redirectTo({
+					    url: '/pages/pages_safetyExamine/examineManage/examineAdd?form='+encodeURIComponent(JSON.stringify(this.form))
+					});
+				}else if(index == 2 || index ==3){
+					uni.redirectTo({
+					    url: '/pages/pages_safetyExamine/examineManage/examineList?form='+encodeURIComponent(JSON.stringify(this.form))
+					});
+					// for(let i=0;i<self.form.detailsList.length;i++){
+					// 	let num = i+1;
+					// 	if(!self.form.detailsList[i].jcxName){
+					// 		uni.showToast({
+					// 			title: '第'+num+'未选择隐患项',
+					// 			icon:"none",
+					// 			mask:true,
+					// 			duration: 2000
+					// 		});
+					// 		return
+					// 	}else if(!self.form.detailsList[i].yhMs && self.form.detailsList[i].voice.length<=0){
+					// 		uni.showToast({
+					// 			title: '请输入第'+num+'项隐患描述!',
+					// 			icon:"none",
+					// 			mask:true,
+					// 			duration: 2000
+					// 		});
+					// 		return
+					// 	}
+					// }
 				}
             },
 			
@@ -587,24 +590,28 @@
 
 <style lang="stylus" scoped>
     #startChecking{
-        height: 100%;
-        width: 100%;
-		position: relative;
-		.title{
-			width: 690rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			margin: 20rpx 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 400;
-			color: #333333;
-			line-height: 100rpx;
-			padding-left: 24rpx;
+		height:100%;
+		.info-max-box{
+			flex: 1;
+			overflow: scroll;
+			padding: 20rpx 0rpx 128rpx;
 			box-sizing: border-box;
 		}
 		.list{
+			.title{
+				width: 690rpx;
+				height: 100rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx;
+				margin: 20rpx 30rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 100rpx;
+				padding-left: 24rpx;
+				box-sizing: border-box;
+			}
 			.check-for-big-box{
 				width 690rpx;
 				//padding-top:30rpx;
@@ -743,7 +750,7 @@
 							height:200rpx;
 							width:200rpx;
 							position relative
-							margin:0 20rpx 20rpx 0;
+							margin:0 14rpx 20rpx 0;
 							border-radius 10rpx;
 							overflow hidden;
 							.img-data{
@@ -758,6 +765,9 @@
 								height:36rpx;
 							}
 						}
+						.img-box:nth-of-type(3n+3){
+							margin-right: 0rpx;
+						}
 						.add-button{
 							 margin:0 20rpx 20rpx 0;
 							border-radius 10rpx;

pages/pages_safetyExamine/examineManage/examineDetail.vue

@@ -0,0 +1,428 @@
+<!-- 安全检查-检查详情 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view class="basics">
+			<view class="basics_li">
+				<text>学院：</text>
+				<text>环测学院</text>
+			</view>
+			<view class="basics_li">
+				<text>实验室：</text>
+				<text>实验室名称-房间号</text>	
+			</view>
+			<view class="basics_li">
+				<text>楼栋：</text>
+				<text>楼栋名称</text>
+			</view>
+			<view class="basics_li">
+				<text>检查类型：</text>
+				<text>校级巡查</text>
+			</view>
+			<view class="basics_li">
+				<text>检查范围：</text>
+				<text>全校</text>
+			</view>
+			<view class="basics_li" style="border:none;">
+				<text>检查计划：</text>
+				<text>2023年3月份校级督导检查</text>
+			</view>
+		</view>
+		<view class="attachment">
+			<view class="attachment_t">
+				<text>材料附件</text>
+				<text>点击文件标题查看</text>
+			</view>
+			<view class="attachment_li">
+				<img src="@/images/Version3.3.3/icon_djc_wj.png"/>
+				<text>文件标题文件标题</text>
+				<img class="attachment_li_del" src="@/images/Version3.3.3/icon_fjgk_sc.png"/>
+			</view>
+		</view>
+		<view class="basics">
+			<view class="basics_li">
+				<text>检查结果：</text>
+				<text>不符合</text>
+			</view>
+			<view class="basics_li">
+				<text>整改期限：</text>
+				<text>2023-04-06</text>	
+			</view>
+			<view class="basics_li">
+				<text>整改通知：</text>
+				<text  style="color: #0183FA;">整改告知书</text>
+			</view>
+			<view class="basics_li">
+				<text>检查者：</text>
+				<text>管理员</text>
+			</view>
+			<view class="basics_li" style="border: none;">
+				<text>检查时间：</text>
+				<text>2023-04-06</text>
+			</view>
+		</view>
+		<view class="inconformity" @click="inconformityFun()">不符合项<img v-if="inconformityStatus" src="@/images/Version3.3.3/icon_bfhx_xq.png"/><img v-if="!inconformityStatus" src="@/images/Version3.3.3/icon_bfhx_sq.png"/></view>
+		<view v-for="(item,index) in dangerList">
+			<view class="danger">
+				<view class="sort">{{item.sort}}</view>
+				<view class="grade" :style="item.switch?'border-bottom: 1rpx solid #D8D8D8;':'border:none;'">
+					<text>第一项隐患</text>
+					<text style="color: #0183FA;">待整改 >></text>
+				</view>
+				<view v-if="item.switch">
+					<view class="grade">
+						<text>隐患等级：</text>
+						<text>一般隐患</text>
+					</view>
+					<view class="project">
+						<view class="project_t">检查项目：</view>
+						<view class="project_b">1检查项目名称—1.1检查项目名称名称名称名称—1.1.1检查项目名称名称名称名称名称名称名称名称</view>
+						<view class="project_b2">此检查项在当前实验室累计出现9次隐患</view>
+					</view>
+					<view class="project">
+						<view class="project_t">检查要点：</view>
+						<view class="project_b">检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点</view>
+					</view>
+					<view class="project">
+						<view class="project_t">隐患描述：</view>
+						<view class="project_b">检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点检查要点</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"/>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="pack_up" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/images/Version3.3.3/icon_06_1.png"/><img v-if="!item.switch" src="@/images/Version3.3.3/icon_06.png"/></view>
+		</view>
+	</scroll-view>
+	<view class="report">整改报告</view>	
+  </view>
+
+</template>
+
+<script>
+import { config } from '@/api/request/config.js'
+import { } from '@/api/index.js'
+export default {
+  name: "rectifyList",
+  components: {
+   
+  },
+  data() {
+    return {
+		pageType:0,
+		dangerList:[{sort:1,switch:false,},{sort:2,switch:false,},{sort:3,switch:false,},{sort:4,switch:false,}],
+		inconformityStatus:false,
+	}
+  },
+  onLoad(option) {
+	 if(option.form){
+		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:'实验室自查管理'
+		  })
+	 }
+  },
+  onShow() {
+	  
+  },
+  mounted(){
+	  
+  },
+  methods: {
+		
+		//滚动事件
+		scrollGet(){
+			
+		},
+		//隐患项收起展开
+	    inconformityFun(){
+			this.inconformityStatus=!this.inconformityStatus;
+			if(this.inconformityStatus){
+				this.dangerList.forEach(function(item){
+					item.switch=true;
+				})
+			}else{
+				this.dangerList.forEach(function(item){
+					item.switch=false;
+				})
+			}
+		},
+		//隐患小项收起展开
+		switchFun(item){
+			item.switch=!item.switch
+		}
+	  
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.examine{
+	height:100%;
+	display flex;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+	}
+	.basics{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		.basics_li{
+			height: 80rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 80rpx;
+				width: 140rpx;
+			}
+			>text:nth-of-type(2){
+				flex: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+				text-align: right;
+			}
+		}
+	}
+	.attachment{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 20rpx 30rpx 0;
+		padding-bottom: 32rpx;
+		box-sizing: border-box;
+		.attachment_t{
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 110rpx;
+				margin-left: 28rpx;
+			}
+			>text:nth-of-type(2){
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				line-height: 110rpx;
+				margin-left: 24rpx;
+			}
+		}
+		.attachment_li{
+			height: 40rpx;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin-top: 32rpx;
+			>img{
+				width: 30rpx;
+				height: 26rpx;
+				margin-right: 20rpx;
+				margin-left: 50rpx;
+			}
+			>text{
+				flex: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #0183FA;
+				line-height: 40rpx;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+			.attachment_li_del{
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+	}
+	.inconformity{
+		width: 690rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		margin: 20rpx 30rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		line-height: 100rpx;
+		text-align: center;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		>img{
+			width: 30rpx;
+			height: 26rpx;
+			margin-left: 20rpx;
+		}
+	}
+	.danger{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 15rpx 30rpx 15rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		position: relative;
+		.sort{
+			width: 40rpx;
+			height: 40rpx;
+			background: #0183FA;
+			border-radius: 20rpx 0rpx 10rpx 0rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 40rpx;
+			text-align: center;
+			position: absolute;
+			left: 0;
+			top: 0;
+		}
+		.danger_title{
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height:80rpx;
+			border-bottom: 1rpx solid #D8D8D8;
+		}
+		.grade{
+			height: 80rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 80rpx;
+				width: 140rpx;
+			}
+			>text:nth-of-type(2){
+				flex: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+				text-align: right;
+			}
+		}
+		.project{
+			.project_t{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.project_b{
+				min-height: 158rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 40rpx;
+				padding: 20rpx 14rpx;
+				box-sizing: border-box;
+				background: #F5F5F5;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+			}
+			.project_b2{
+				font-size: 26rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 26rpx;
+				margin-top: 14rpx;
+				text-align: right;
+			}
+		}
+		.picture{
+			.picture_t{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.picture_b{
+				display: flex;
+				justify-content: flex-start;
+				flex-wrap: wrap;
+				>img{
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					margin-right: 14rpx;
+					margin-bottom: 10rpx;
+				}
+				>img:nth-of-type(3n+3){
+					margin-right: 0rpx;
+				}
+			}
+		}
+	}
+	.pack_up{
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 400;
+		color: #666666;
+		line-height: 140rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		>img{
+			width: 14rpx;
+			height: 8rpx;
+			margin-left: 22rpx;
+		}
+	}
+	.report{
+		width: 153rpx;
+		height: 50rpx;
+		background: #0183FA;
+		border-radius: 25rpx 0rpx 0rpx 25rpx;
+		font-size: 26rpx;
+		font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 50rpx;
+		position: fixed;
+		top: 180rpx;
+		right: 0;
+		text-align: center;
+	}
+}
+</style>

pages/pages_safetyExamine/examineManage/examineList.vue

@@ -56,7 +56,7 @@
 			</view>
 		</view>
 	</scroll-view>	
-	<view class="bottom_btn" @click="handleClick('subBtn')">开始检查</view>
+	<view class="bottom_btn" @click="handleClick('startInspect')">开始检查</view>
   </view>
 
 </template>
@@ -102,6 +102,15 @@ 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:'实验室自查管理'
+		  })
+	 }
   },
   onShow() {
 	  
@@ -145,9 +154,10 @@ export default {
 		},
 	    handleClick(doType){
 		  let self=this;
-		  
-		  if( doType=='subBtn'){//	
-			  console.log(11)
+		  if( doType=='startInspect'){//开始检查	
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/examineManage/examineAdd'
+			  });
 		  }
 		  
 	    },

pages/pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -109,7 +109,7 @@
 		</view>
 		<view v-if="pageType==1">
 			<view class="list_three">
-				<view class="list_three_li" v-for="(item,index) in  dataList" :key="index">
+				<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">
 							<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
@@ -138,7 +138,7 @@
 		
 	
 	</scroll-view>	
-	<view class="bottom_btn" @click="handleClick('subBtn')">保存</view>
+	<view class="bottom_btn" @click="handleClick('','subBtn')">保存</view>
 	 <!-- 选择学院-->
 	<view class="shade" v-if="dialogVisible">
 		<view class="null-box" @click="dialogClose()"></view>
@@ -406,11 +406,15 @@ export default {
 		collegeSelete(index){
 			this.collegeList[index].type = !this.collegeList[index].type
 		},
-	    handleClick(doType){
+	    handleClick(item,doType){
 		  let self=this;
 		  
 		  if( doType=='subBtn'){//	
 			  console.log(11)
+		  }else if(doType=='detail'){//详情
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/examineManage/examineDetail'
+			  });
 		  }
 		  
 	    },

pages/pages_safetyExamine/snapshotManage/snapshotAdd.vue

@@ -0,0 +1,569 @@
+<!-- 随手拍-添加 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view class="header"  @click="handleClick('manage')">
+			<text>随手拍管理</text>
+			<img src="@/images/Version3.3.3/icon_04.png">
+		</view>
+		<view class="basics">
+			<view class="basics_li">
+				<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>
+						<img src="@/images/Version3.3.3/icon_06.png">
+					</view>
+				</picker>
+			</view>
+			<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;">
+					<view class="img-box" @click.stop="saoCode">
+						<img src="@/images/Version3.3.3/icon_aqjc_sm.png">
+					</view>
+				</view>
+			</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>
+			</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">
+						<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">
+				</view>
+			</view>
+		</view>
+		<view class="record" ><text  @click="handleClick('self')">随手拍上报记录</text></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="请输入房间号">
+				<view @click="getSelectInfoByRoom">搜索</view>
+			</view>
+			<view class="popup-for-max-box">
+				<view class="popup-for-null" v-if="!roomList[0]">暂无数据</view>
+				<view class="popup-for-box" v-for="(item,index) in roomList" :key="index">
+					<view class="name-p">{{item.name}} ({{item.room}})</view>
+					<view class="button-p" @click="popupClickItem(item)">确定</view>
+				</view>
+			</view>
+		</view>
+	</view>	
+	<view class="bottom_btn" @click="handleClick('subBtn')">提交</view>
+  </view>
+
+</template>
+
+<script>
+import { config } from '@/api/request/config.js'
+import { getSelectInfoByRoom} from '@/api/index.js'
+export default {
+  name: "rectifyList",
+  components: {
+   
+  },
+  data() {
+    return {
+		configURL:config.base_url,
+		pageType:0,
+		//列表请求参数
+		getData:{
+		 pageNum:1,
+		 pageSize:20,
+		},
+		form:{
+			name:'',
+			startTime:'',
+			inspectResult:0,//检查结果
+			yhMs:'',
+			yhImg:[],
+		},
+		collegeIndex :0,
+		collegeArray:['选择学院','学院名称1','学院名称2','学院名称3',],
+		categoryIndex :0,
+		categoryArray:['校级巡查','院级巡查'],
+		planIndex :0,
+		planArray:['请选择巡查计划标题','2023年3月份校级督导检查','2023年4月份校级督导检查'],
+		resultIndex :0,
+		resultArray:['不符合','符合'],
+		informIndex:0,
+		informArray:['整改告知书','整改通知书'],
+		
+		
+		//房间弹层 状态
+		popupType:false,
+		//房间搜索字段
+		room:"",
+		roomList:[],
+		
+	}
+  },
+  onLoad(option) {
+	 
+  },
+  onShow() {
+	  
+  },
+  mounted(){
+	  
+  },
+  methods: {
+		//滚动事件
+		scrollGet(){},
+	    handleClick(doType){
+		  let self=this;
+		  if( doType=='manage'){//随手拍管理
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=1'
+			  });
+		  }else if(doType=='self'){//随手拍上报记录
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
+			  });
+		  }else if(doType=='subBtn'){//提交
+			  
+		  }
+		  
+	    },
+		collegeChange(e){
+			this.collegeIndex = e.target.value;
+		},
+		// 图片上传
+		selectImage() {
+		    let self = this;
+		    if(this.form.yhImg.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];
+		            self.uploadImg(tempFilePaths);
+		        }
+		    });
+		},
+		async uploadImg(tempFilePaths){
+		    var self = this;
+		    uni.showLoading({
+		        title: '上传中',
+		        mask: true
+		    });
+		    uni.uploadFile({
+		        url: config.base_url+'/base/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.yhImg.push(res.data.url);
+						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.yhImg.splice(minIndex,1);
+			this.$forceUpdate();
+		},
+		//搜索房间弹层开关
+		popupClick(type){
+			if(type == 1){
+				this.room = "";
+				this.roomList = [];
+				this.popupType = true;
+			}else if(type == 2){
+				this.popupType = false;
+			}
+		},
+		//搜索房间接口
+		async getSelectInfoByRoom(){
+			let self = this;
+			if(!this.room){
+				uni.showToast({
+					title: '请输入要搜索房间号',
+					icon:"none",
+					mask:true,
+					duration: 2000
+				});
+				return
+			}
+			const {data} = await getSelectInfoByRoom(this.room);
+			if(data.code==200){
+				if(data.data[0]){
+					this.roomList = data.data;
+				}else{
+					uni.showToast({
+						title: '未找到相关房间',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			}
+		},
+		//确认搜索房间
+		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)
+			this.popupType = false;
+		},
+		//调用摄像头
+		saoCode(){
+			let self = this;
+			uni.scanCode({
+				onlyFromCamera: true,
+				success: function (res) {
+					if(res.result.indexOf("code") != -1 && res.result.indexOf("-") != -1 && res.result.indexOf("&") != -1){
+						let codeRoom = "";
+						let newList = res.result.split("?")[1].split("&")
+						let list = newList[0].split("=")[1].split("-")
+						codeRoom = list[1];
+						if(codeRoom){
+							self.roomList = [];
+							self.room = codeRoom;
+							self.getSelectInfoByRoom();
+							self.popupType = true;
+						}else{
+							uni.showToast({
+								title: '请扫描正确的二维码',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+					}else{
+						uni.showToast({
+							title: '请扫描正确的二维码',
+							icon:"none",
+							mask:true,
+							duration: 2000
+						});
+					}
+				}
+			});
+		},
+	  
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.examine{
+	height:100%;
+	display flex;
+	box-sizing: border-box;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		padding: 120rpx 0rpx 128rpx;
+		box-sizing: border-box;
+	}
+	.header{
+		width: 749rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		padding:0 40rpx 0 30rpx;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: fixed;
+		left: 0;
+		top: 0;
+		>text{
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 42rpx;
+		}
+		>img{
+			width: 8rpx;
+			height: 14rpx;
+		}
+	}
+	.basics{
+		margin: 0 30rpx;
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 28rpx 30rpx;
+		box-sizing: border-box;
+		.basics_li{
+			display: flex;
+			justify-content: flex-start;
+			margin-bottom: 24rpx;
+			.basics_li_l{
+				width: 146rpx;
+				text-align: left;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.basics_li_r{
+				width: 486rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				padding-left: 20rpx;
+				box-sizing: border-box;
+				
+				
+			}
+			/* 学院 */
+			.college_r{
+				width: 486rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+				border: 1rpx solid #E0E0E0;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				>view{
+					flex:1;
+					line-height:80rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 80rpx;
+				}
+				>img{
+					width: 14rpx;
+					height: 8rpx;
+					margin-right: 30rpx;
+				}
+			}
+			/* 实验室 */
+			.lab_r{
+				width: 486rpx;
+				height: 80rpx;
+				display: flex;
+				justify-content: flex-start;
+				.picker-text{
+					width: 438rpx;
+					height: 80rpx;
+				}
+				.img-box{
+					width: 48rpx;
+					>img{
+						width:30rpx;
+						height:28rpx;
+						margin:16rpx 18rpx 0 0;
+					}
+				}
+			}
+		}
+		/* 隐患描述 */
+		.check-for-input-max-box{
+			.left-title-p{
+				width:150rpx;
+				line-height:80rpx;
+				text-align right
+				font-size:30rpx;
+			}
+			textarea{
+				width: 630rpx;
+				height: 158rpx;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				border: 1rpx solid #E0E0E0;
+				padding: 20rpx 14rpx;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 34rpx;
+			}
+		}
+		/* 隐患照片 */
+		.check-for-img-max-box{
+			.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:200rpx;
+					width:200rpx;
+					position relative
+					margin:0 14rpx 20rpx 0;
+					border-radius 10rpx;
+					overflow hidden;
+					.img-data{
+						height:200rpx;
+						width:200rpx;
+					}
+					.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:200rpx;
+					width:200rpx;
+				}
+			}
+		}
+	}
+	.record{
+		overflow: hidden;
+		>text{
+			display: block;
+			width: 220rpx;
+			height: 40rpx;
+			background: #E0E0E0;
+			border-radius: 60rpx 60rpx 60rpx 60rpx;
+			margin: 122rpx 0 90rpx 266rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #0183FA;
+			line-height: 40rpx;
+			text-align: center;
+		}
+	}
+	.popup-max-box{
+		z-index:10;
+		height:100%;
+		width:100%;
+		position fixed;
+		background rgba(0,0,0,0.2)
+		display flex;
+		flex-direction column
+		.popup-null{
+			flex:1;
+		}
+		.popup-big-box{
+			border-top-left-radius:20rpx;
+			border-top-right-radius:20rpx;
+			background #fff
+			.popup-input-box{
+				padding:30rpx 20rpx;
+				display:flex;
+				input{
+					flex:1;
+					height:70rpx;
+					border:1rpx solid #e0e0e0;
+					border-radius:10rpx;
+					margin-right:20rpx;
+					padding:0 20rpx;
+				}
+				view{
+					background #0183FA
+					color:#fff;
+					border-radius:10rpx;
+					width:140rpx;
+					line-height:70rpx;
+					text-align center;
+					font-size:28rpx;
+				}
+			}
+			.popup-for-max-box{
+				margin:0 20rpx 30rpx;
+				height:600rpx;
+				overflow-y scroll;
+				.popup-for-null{
+					line-height:100rpx;
+					text-align center
+					color:#999;
+				}
+				.popup-for-box{
+					display:flex;
+					padding:10px 0;
+					.name-p{
+						flex:1;
+						line-height:60rpx;
+					}
+					.button-p{
+						background #0183FA
+						color:#fff;
+						text-align center
+						width:100rpx;
+						line-height:60rpx;
+						height:60rpx;
+						border-radius:10rpx;
+					}
+				}
+			}
+		}
+	}
+	.bottom_btn{
+		position: fixed;
+		bottom: 26rpx;
+		left: 30rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 90rpx;
+		width: 690rpx;
+		height: 90rpx;
+		background: #0183FA;
+		border-radius: 20rpx;
+		text-align: center;
+		
+	}
+}
+</style>

pages/pages_safetyExamine/snapshotManage/snapshotDetail.vue

@@ -0,0 +1,475 @@
+<!-- 随手拍-详情 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view  class="basics">
+			<view class="grade">
+				<text>学院：</text>
+				<text>环测学院</text>
+			</view>
+			<view class="grade">
+				<text>实验室：</text>
+				<text>实验室名称-房间号</text>
+			</view>
+			<view class="project">
+				<view class="project_t">隐患描述：</view>
+				<view class="project_b">隐患描述隐患描述隐患描述隐患描述隐患描述描述隐患描述隐患描述隐患描述隐患描述隐患描述隐患描述</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"/>
+				</view>
+			</view>
+			<view class="grade">
+				<text>上报时间：</text>
+				<text>2023-04-0614:00</text>
+			</view>
+			<view class="grade" style="border:none;">
+				<text>上报人：</text>
+				<text >李腾</text>
+			</view>
+		</view>
+		<!-- 待整改 -->
+		<view v-if="pageType==1">
+			<view class="await">
+				<view class="result">
+					<view class="result_l">整改结果</view>
+					<view class="result_r"> 
+						<view v-for="(item,index) in resultArray" :key="index" @click="tabClick(index)">
+							<text :class="resultIndex==index?'checked':'result_r_l' "></text>
+							<text class="result_r_r">{{item}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="describe">
+					<view class="describe_l">原因描述：</view>
+					<textarea class="describe_r" type="text" v-model="form.yhMs" 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">
+							<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">
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 隐患整改 -->
+		<view  class="basics"  v-if="pageType==2">
+			<view class="small_title">隐患整改</view>
+			<view class="grade">
+				<text>整改结果：</text>
+				<text style="color: #0183FA;">已整改</text>
+			</view>
+			<view class="project">
+				<view class="project_t">整改措施：</view>
+				<view class="project_b">隐患描述隐患描述隐患描述隐患描述隐患描述描述隐患描述隐患描述隐患描述隐患描述隐患描述隐患描述</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"/>
+				</view>
+			</view>
+			<view class="grade">
+				<text>整改时间：</text>
+				<text>2023-04-0614:00</text>
+			</view>
+			<view class="grade" style="border:none;">
+				<text>整改人：</text>
+				<text >李腾</text>
+			</view>
+		</view>
+	</scroll-view>
+	<view v-if="pageType==1" class="bottom_btn" @click="handleClick('subBtn')">提交</view>
+  </view>
+
+</template>
+
+<script>
+import { config } from '@/api/request/config.js'
+import { getSelectInfoByRoom} from '@/api/index.js'
+export default {
+  name: "rectifyList",
+  components: {
+   
+  },
+  data() {
+    return {
+		configURL:config.base_url,
+		pageType:2,
+		form:{
+			yhMs:'',
+			yhImg:[],
+			opinion:'',
+		},
+		resultIndex:0,
+		resultArray:['已整改','暂无法整改'],
+	}
+  },
+  onLoad(option) {
+	 
+  },
+  onShow() {
+	  
+  },
+  mounted(){
+	  
+  },
+  methods: {
+		//整改结果
+		tabClick(index) {
+			this.resultIndex = index;
+		},
+		//滚动事件
+		scrollGet(){},
+	    handleClick(doType){
+		  let self=this;
+		  if(doType=='subBtn'){//提交
+			  
+		  }
+		  
+	    },
+		
+		// 图片上传
+		selectImage() {
+		    let self = this;
+		    if(this.form.yhImg.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];
+		            self.uploadImg(tempFilePaths);
+		        }
+		    });
+		},
+		async uploadImg(tempFilePaths){
+		    var self = this;
+		    uni.showLoading({
+		        title: '上传中',
+		        mask: true
+		    });
+		    uni.uploadFile({
+		        url: config.base_url+'/base/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.yhImg.push(res.data.url);
+						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.yhImg.splice(minIndex,1);
+			this.$forceUpdate();
+		},
+	  
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.examine{
+	height:100%;
+	display flex;
+	box-sizing: border-box;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		padding-bottom: 128rpx;
+		box-sizing: border-box;
+	}
+	.basics{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		.small_title{
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 80rpx;
+			border-bottom: 1rpx solid #D8D8D8;
+		}
+		.grade{
+			height: 80rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #D8D8D8;
+			>text:nth-of-type(1){
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 80rpx;
+				width: 140rpx;
+			}
+			>text:nth-of-type(2){
+				flex: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+				text-align: right;
+			}
+		}
+		.project{
+			.project_t{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.project_b{
+				min-height: 158rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 40rpx;
+				padding: 20rpx 14rpx;
+				box-sizing: border-box;
+				background: #F5F5F5;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+			}
+			.project_b2{
+				font-size: 26rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 26rpx;
+				margin-top: 14rpx;
+				text-align: right;
+			}
+		}
+		.picture{
+			.picture_t{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.picture_b{
+				display: flex;
+				justify-content: flex-start;
+				flex-wrap: wrap;
+				>img{
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					margin-right: 14rpx;
+					margin-bottom: 10rpx;
+				}
+				>img:nth-of-type(3n+3){
+					margin-right: 0rpx;
+				}
+			}
+		}
+	}
+	/* 待整改 */
+	.await{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 32rpx;
+		box-sizing: border-box;
+		margin: 20rpx 30rpx ;
+		/* 整改结果 */
+		.result{
+			display: flex;
+			justify-content: flex-start;
+			border-bottom: 1rpx solid #D8D8D8;
+			.result_l{
+				width: 146rpx;
+				text-align: left;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.result_r{
+				width: 486rpx;
+				height: 80rpx;
+				padding-left: 20rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+				>view{
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					margin-right: 24rpx;
+					.result_r_l{
+						display: inline-block;
+						width: 30rpx;
+						height: 30rpx;
+						border-radius: 50%;
+						border: 1rpx solid #E0E0E0;
+						margin-right: 14rpx;
+					}
+					.result_r_r{
+						font-size: 30rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #333333;
+						line-height: 80rpx;
+					}
+					.checked{
+						display: inline-block;
+						width: 30rpx;
+						height: 30rpx;
+						border-radius: 50%;
+						border: 1rpx solid #0183FA;
+						margin-right: 14rpx;
+						position: relative;
+					}
+					.checked::after{
+						content: '';
+						position: absolute;
+						top: 5rpx;
+						left:5rpx;
+						width: 20rpx;
+						height: 20rpx;
+						border-radius: 50%;
+						background: #0183FA;
+					}
+				}
+			}
+		}
+		/* 原因描述 */
+		.describe{
+			.describe_l{
+				width: 158rpx;
+				text-align: left;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+			}
+			.describe_r{
+				width: 630rpx;
+				height: 158rpx;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				padding: 20rpx 14rpx;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 34rpx;
+			}
+		}
+		/* 上传照片 */
+		.check-for-img-max-box{
+			.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:200rpx;
+					width:200rpx;
+					position relative
+					margin:0 14rpx 20rpx 0;
+					border-radius 10rpx;
+					overflow hidden;
+					.img-data{
+						height:200rpx;
+						width:200rpx;
+					}
+					.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:200rpx;
+					width:200rpx;
+				}
+			}
+		}
+}	
+    .bottom_btn{
+		position: fixed;
+		bottom: 26rpx;
+		left: 30rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 90rpx;
+		width: 690rpx;
+		height: 90rpx;
+		background: #0183FA;
+		border-radius: 20rpx;
+		text-align: center;
+		
+	}
+}
+</style>

pages/pages_safetyExamine/snapshotManage/snapshotList.vue

@@ -0,0 +1,371 @@
+<!-- 随手拍-列表 -->
+<template>
+  <view class="examine">
+	<view class="header">
+		<view class="tabTitle_tow">
+			<view class="tabTitle_tow_li" @tap="tabClickTow(index)"  :key="index" v-for="(item,index) in tabTextTow">
+				<view :class="{on:curTabTow==index}" class="tabTitle_tow_text">{{item}}</view>
+			    <view :class="{on:curTabTow==index}" class="tabTitle_tow_across"></view>
+			</view>
+		</view>
+	</view>
+	
+	<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_t">
+					<view class="list_three_li_t_l"></view>
+					<view class="list_three_li_t_c">实验室名称-房间号</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_b">
+						<text class="blue_color">待整改</text>
+						<text>环境与测绘学院</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>
+					</view>
+					<view class="list_three_li_b_r">刚刚</view>
+				</view>
+			</view>
+		</view>
+	</scroll-view>
+  </view>
+
+</template>
+
+<script>
+import { config } from '@/api/request/config.js'
+import { } from '@/api/index.js'
+export default {
+  name: "rectifyList",
+  components: {
+   
+  },
+  data() {
+    return {
+		pageType:0,
+		//列表请求参数
+		getData:{
+		 pageNum:1,
+		 pageSize:20,
+		},
+		tabTextTow:['待整改','已整改','暂无法整改'],
+		curTabTow:0,
+		form:{
+			name:'',
+			type:'校院巡查',
+			startTime:'',
+			endTime:'',
+			inspectScope:[],
+			tiemQuickList:[],
+			scopeIndex:'',
+			seleteListLab:[],
+			patrolIndex:'',
+			seleteListMember:[],
+		},
+		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:'计划标题计划标题计划标题计划标题',}],
+	}
+  },
+  onLoad(option) {
+	 if(option.form){
+		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:'随手拍上报记录'
+	 		  })
+	 }
+  },
+  onShow() {
+	  
+  },
+  mounted(){
+	 
+  },
+  methods: {
+		//顶部tab点击
+		tabClickTow(index) {
+			this.curTabTow = index;
+		},
+		
+		//滚动事件
+		scrollGet(){
+			let self=this;
+			if(self.total<=self.getData.pageNum){
+			    console.log('没有更多数据!')
+			}else{
+					setTimeout(function(){
+						self.getData.pageNum += 1;
+						self.getList(); 
+					},1000)
+						 
+			}
+		},
+	    handleClick(item,doType){
+		  let self=this;
+		  if( doType=='subBtn'){//	
+		  
+		  }else if(doType=='detail'){//详情
+			  uni.navigateTo({
+			  	 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?form='+encodeURIComponent(JSON.stringify(this.form))
+			  })
+		  }
+		  
+	    },
+		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]
+				  // }
+		},
+	  
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.examine{
+	height:100%;
+	display flex;
+	// padding: 0 30rpx;
+	// box-sizing: border-box;
+	padding-bottom: 20rpx;
+	box-sizing: border-box;
+	.blue_color{
+		color: #0183FA;
+		border: 1rpx solid #0183FA;
+	}
+	.red_color{
+		color: #FF4545;
+		border: 1rpx solid #FF4545;
+	}
+	.green_color{
+		color: #1FA50D;
+		border: 1rpx solid #1FA50D;
+	}
+	.orange_color{
+		color: #FA8E1B;
+		border: 1rpx solid #FA8E1B;
+	}
+	.gray_color{
+		color: #A2A2A2;
+		border: 1rpx solid #A2A2A2;
+	}
+	
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		
+		padding: 120rpx 0rpx 0;
+		box-sizing: border-box;
+	}
+	/* 切换按钮 */
+	.header{
+		width:100%;
+		position: fixed;
+		top: 0rpx;
+		z-index: 100;
+		.tabTitle_tow{
+			width:100%;
+			height: 100rpx;
+			background: #fff;
+			display flex;
+			justify-content: flex-start;
+			align-items: center;
+			border-bottom: 1rpx solid #E0E0E0;
+			.tabTitle_tow_li{
+				flex:1;
+				position: relative;
+				text-align center;
+				.tabTitle_tow_text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					line-height: 46rpx;
+					position: relative;
+					&.on{
+						color:#0183FA;
+					}
+				}
+				.tabTitle_tow_across{
+					width: 50rpx;
+					height: 4rpx;
+					background: #0183FA;
+					border-radius: 2rpx;
+					margin-left: 33%;
+					display none;
+					&.on{
+						display block;
+					}
+				}
+		
+			}
+		}
+	}
+	.list_three{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		.list_three_li{
+			position: relative;
+			width: 690rpx;
+			height: 336rpx;
+			background: #fff;
+			border-radius: 10rpx;
+			overflow: hidden;
+			margin-bottom: 20rpx;
+			.list_three_li_t{
+				width: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				.list_three_li_t_l{
+					position: absolute;
+					left: -15rpx;
+					top: 76rpx;
+					display: inline-block;
+					width: 30rpx;
+					height: 30rpx;
+					background: #F5F5F5;
+					border-radius: 15rpx;
+				}
+				.list_three_li_t_c{
+					width: 630rpx;
+					height: 110rpx;
+					position: absolute;
+					left: 30rpx;
+					top: 0;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 110rpx;
+					border-bottom: 1rpx dashed #D8D8D8;
+					overflow: hidden;
+					text-overflow:ellipsis;
+					white-space: nowrap;
+					padding-right: 60rpx;
+					box-sizing: border-box;
+				}
+				.list_three_li_t_r{
+					position: absolute;
+					right:-15rpx;
+					top: 76rpx;
+					width: 30rpx;
+					height: 30rpx;
+					background:#F5F5F5;
+					border-radius: 15rpx;
+				}
+			}
+			.list_three_li_m{
+				position: absolute;
+				top: 110rpx;
+				left: 0;
+				width: 690rpx;
+				height: 158rpx;
+				padding-left: 30rpx;
+				box-sizing: border-box;
+				.list_three_li_m_t{
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #666666;
+					line-height: 40rpx;
+					margin-top:22rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+				.list_three_li_m_b{
+					margin-top:26rpx;
+					>text:nth-of-type(1){
+						font-size: 26rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						line-height: 40rpx;
+						border-radius: 6rpx;
+						padding: 0 20rpx;
+						box-sizing: border-box;
+						margin-right: 14rpx;
+					}
+					>text:nth-of-type(2){
+						display: inline-block;
+						width: 380rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #333333;
+						line-height: 26rpx;
+						overflow: hidden;
+						text-overflow:ellipsis;
+						white-space: nowrap;
+					}
+				}
+			}
+			.list_three_li_b{
+				height: 76rpx;
+				width: 100%;
+				position: absolute;
+				top: 258rpx;
+				left: 0;
+				padding:0 30rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.list_three_li_b_l{
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					
+					>img{
+						width: 28rpx;
+						height: 30rpx;
+						margin-right: 14rpx;
+					}
+					>text{
+						font-size: 28rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #666666;
+						line-height: 76rpx;
+					}
+				}
+				.list_three_li_b_r{
+					font-size: 24rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					line-height: 76rpx;
+				}
+			}
+			
+		}
+	}
+	
+}
+</style>

pages/safetyExamineWorkbench.vue

@@ -24,6 +24,11 @@
 						<img src="@/images/Version3.3.3/icon_xyxc_aqyh.png"/>
 						<text>安全隐患</text>
 					</view>
+					<text class="line"></text>
+					<view class="inspect_btn_li"  @click="handleClick('','snapshot')">
+						<img src="@/images/Version3.3.3/icon_aqjc_ssp.png"/>
+						<text>随手拍</text>
+					</view>
 				</viwe>
 				<!--管理员------------- -->
 				<view class="tabTitle" v-if="pageType==0">
@@ -94,16 +99,23 @@
 						<text>{{item.value}}</text>
 					</view>
 				</view>
-				<view class="inspect_btn_three" v-if="pageType==2">
+				<viwe class="inspect_btn_three" v-if="pageType==2">
 					<view class="inspect_btn_three_li" @click="handleClick('','schoolDanger')">
 						<img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
 						<text>校院巡查隐患</text>
 					</view>
-					<view class="inspect_btn_three_li" @click="handleClick('','labDanger')">
+					<text class="line"></text>
+					<view class="inspect_btn_three_li"  @click="handleClick('','labDanger')">
 						<img src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
 						<text>实验室自查隐患</text>
 					</view>
-				</view>
+					<text class="line"></text>
+					<view class="inspect_btn_three_li"  @click="handleClick('','snapshot')">
+						<img src="@/images/Version3.3.3/icon_aqjc_ssp.png"/>
+						<text>随手拍</text>
+					</view>
+				</viwe>
+				
 				<view class="tabTitle_three" v-if="pageType==2">
 					<view class="tabTitle_three_li" @tap="tabClickThree(index)"  :key="index" v-for="(item,index) in tabTextThree">
 						<view :class="{on:curTabThree==index}" class="tabTitle_three_text">{{item}}<text>2</text></view>
@@ -136,7 +148,7 @@
 				</view>
 		</view>
 	</scroll-view>	
-	<view class="bottom_btn">开展检查</view>
+	<view class="bottom_btn"  @click="handleClick('','start')">开展检查</view>
 	<img class="scan_btn" src="@/images/Version3.3.3/icon_xyxc_sm.png"/>
 	
   </view>
@@ -227,21 +239,41 @@ export default {
 			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType=2'
 			  });
 		  }else if(self.pageType==0 && doType=='dangerPlan'){//安全隐患-计划
-			  
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/dangerManage/dangerManage?pageType=1'
+			  });
 		  }else if(self.pageType==1 && doType=='patrolPlan'){//校院巡查-检查
-			  
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/examineManage/examineList?pageType=1'
+			  });
 		  }else if(self.pageType==1 && doType=='selfPlan'){//实验室自查-检查
-			  
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/examineManage/examineList?pageType=2'
+			  });
 		  }else if(self.pageType==1 && doType=='dangerPlan'){//安全隐患-检查
-			  
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/dangerManage/dangerManage?pageType=2'
+			  });
 		  }else if(self.pageType==2 && doType=='schoolDanger'){//校院巡查隐患
-			  
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/dangerManage/dangerList?pageType=1'
+			  });
 		  }else if(self.pageType==2 && doType=='labDanger'){//实验室自查隐患
-			  
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/dangerManage/dangerList?pageType=2'
+			  });
 		  }else if(doType=='edit'){//编辑
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit'
 			  });
+		  }else if(doType=='snapshot'){//随手拍
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/snapshotManage/snapshotAdd'
+			  });
+		  }else if(doType=='start'){//开展检查
+			  uni.navigateTo({
+			      url: '/pages/pages_safetyExamine/examineManage/examineAdd'
+			  });
 		  }
 		  
 	  },
@@ -373,7 +405,8 @@ export default {
 		justify-content: space-between;
 		align-items: center;
 		margin-top: 20rpx;
-		padding: 0 74rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
 		.inspect_btn_li{
 			>img{
 				width: 60rpx;
@@ -864,23 +897,19 @@ export default {
 		}
 	}
 	.inspect_btn_three{
-		width: 100%;
+		height: 150rpx;
+		background: #fff;
 		display: flex;
 		justify-content: space-between;
-		padding: 0 30rpx;
-		box-sizing: border-box;
+		align-items: center;
 		margin-top: 20rpx;
+		padding: 0 74rpx;
+		box-sizing: border-box;
 		.inspect_btn_three_li{
-			width: 335rpx;
-			height: 150rpx;
-			background: rgba(255,255,255,0.9);
-			border-radius: 20rpx;
-			text-align: center;
-			
 			>img{
 				width: 60rpx;
 				height: 60rpx;
-				margin: 20rpx auto 18rpx;
+				margin:0 auto;
 			}
 			>text{
 				font-size: 28rpx;
@@ -888,8 +917,16 @@ export default {
 				font-weight: 400;
 				color: #333333;
 				line-height: 28rpx;
+				margin-top: 14rpx;
 			}
 		}
+		.line{
+			display: inline-block;
+			height: 60rpx;
+			width: 1rpx;
+			background: #E0E0E0;
+		}
+		
 	}
 	/* 切换按钮 */
 	.tabTitle_three{
@@ -1109,7 +1146,7 @@ export default {
 	}
 	.bottom_btn{
 		position: fixed;
-		bottom: 0;
+		bottom: 20rpx;
 		left: 30rpx;
 		font-size: 30rpx;
 		font-family: PingFang SC-Medium, PingFang SC;