heyang 2 years ago
parent
commit
72c302fafb

BIN
images/Version3.3.3/icon_jcjh_cy.png


BIN
images/Version3.3.3/icon_xyxc_sm.png


+ 26 - 3
pages.json

@@ -1,5 +1,30 @@
 {
 	"pages": [
+		
+		{
+			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanAdd",
+			"style": {
+				"navigationBarTitleText": "发起巡查计划"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab",
+			"style": {
+				"navigationBarTitleText": "选择实验室"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember",
+			"style": {
+				"navigationBarTitleText": "选择巡查组"
+			}
+		},
+		{
+			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanList",
+			"style": {
+				"navigationBarTitleText": "校院巡查计划"
+			}
+		},
 		{
 			"path": "pages/safetyExamineWorkbench",//安全检查
 			"style": {
@@ -19,9 +44,6 @@
 			}
 		},
 
-
-
-
 		{
 			"path": "pages/supplierWorkbench",
 			"style": {
@@ -120,6 +142,7 @@
 
 	"subPackages": [
 		{
+			
 			/* 供应商端分包 */
 			"root": "pages_supplier",  //分包根路径
 			"name": "supplier", //分包名字可写可不写

+ 733 - 0
pages/pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -0,0 +1,733 @@
+<!-- 安全检查-发起巡查计划 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view class="basics">
+			<view class="title">
+				<view class="title_t">计划标题</view>
+				<textarea class="title_b" type="text" v-model="form.name" maxlength="200" placeholder="请输入检查计划标题" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
+			</view>
+			<view class="type">
+				<view class="type_l">检查类型</view>
+				<input class="type_r" type="text" v-model="form.type" placeholder="" disabled maxlength="20">
+			</view>
+			<view class="period">		
+				<view class="period_l">检查周期</view>
+				<view class="period_r">
+					<picker mode="date" @change="startChange(form,$event)">
+						<input class="picker-text"  disabled type="text" v-model="form.startTime" placeholder="开始时间">
+					</picker>
+					<view>至</view>
+					<picker mode="date"  @change="endChange(form,$event)">
+						<input class="picker-text2" disabled type="text" v-model="form.endTime" placeholder="结束时间">
+					</picker>
+				</view>
+			</view>
+			<view class="tiem_quick">
+				<view @click="tiemQuick(index)" :class="item.type?'tiem_quick_a':'tiem_quick_b'" v-for="(item,index) in tiemQuickList">{{item.name}}</view>
+			</view>
+			<view class="scope">
+				<view class="scope_l">检查范围</view>
+				<picker @change="scopeChange" :value="scopeIndex" :range="scopeArray" class="scope_r">
+					<view class="scope_r_n">
+						<view>{{scopeArray[scopeIndex]}}</view>
+						<img src="@/images/Version3.3.3/icon_06.png">
+					</view>
+				</picker>
+			</view>
+			<view class="scope_btn" v-if="scopeIndex==1 || scopeIndex==2" @click="collegeOrLab()">{{scopeIndex==1?'选择学院':'选择实验室'}}</view>
+			<view class="scope_text" v-if="scopeIndex==0 || scopeIndex==1">已选择<text>{{form.inspectScope.length}}</text>个学院,共<text>0</text>间实验室</view>
+			<view class="scope_text" v-if="scopeIndex==2">已选择<text>{{form.seleteListLab.length}}</text>间实验室</view>
+		</view>
+		<view class="patrol_group">
+			<view class="patrol">
+				<view class="patrol_l">巡查组</view>
+				<picker @change="patrolChange" :value="patrolIndex" :range="patrolArray" class="patrol_r">
+					<view class="patrol_r_n">
+						<view>{{patrolArray[patrolIndex]}}</view>
+						<img src="@/images/Version3.3.3/icon_06.png">
+					</view>
+				</picker>
+			</view>
+			<view class="list">
+				<view class="list_title"><img src="@/images/Version3.3.3/icon_jcjh_cy.png">成员</view>
+				<view class="list_header"><text>工号</text><text>姓名</text></view>
+				<view class="list_li"><text>12345678</text><text>刘洋</text></view>
+				<view class="list_li"><text>12345678</text><text>刘洋</text></view>
+				<view class="list_li"><text>12345678</text><text>刘洋</text></view>
+				<view class="list_bottom">无数据</view>
+			</view>
+		</view>
+	</scroll-view>	
+	<view class="bottom_btn" @click="handleClick('subBtn')">保存</view>
+	 <!-- 选择学院-->
+	<view class="shade" v-if="dialogVisible">
+		<view class="null-box" @click="dialogClose()"></view>
+		<view class="shade_n">
+			<view class="shade_n_title"><text>选择学院</text><text @click="collegeConfirm">确定</text></view>
+			<view class="shade_n_b">
+				<view class="shade_n_b_li" v-for="(item,index) in  collegeList" :key="index" @click="collegeSelete(index)">
+					<text :class="item.type?'color_B':'color_A'">{{item.name}}</text>
+					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
+				</view>
+			</view>
+		</view>
+	  </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,
+		},
+		form:{
+			name:'',
+			type:'校院巡查',
+			startTime:'',
+			endTime:'',
+			inspectScope:[],
+			tiemQuickList:[],
+			scopeIndex:'',
+			seleteListLab:[],
+			patrolIndex:'',
+			seleteListMember:[],
+		},
+		tiemQuickList:[{name:'本月',type:false},{name:'本季度',type:false},{name:'全年',type:false}],
+		scopeIndex:0,
+		scopeArray:['全校','学院','实验室'],
+		patrolIndex:0,
+		patrolArray:['请选择巡查组','校级巡查组','院级巡查组'],
+		dialogVisible:false,
+		collegeList:[{name:'学院名称',type:false},{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)); 
+		this.tiemQuickList=this.form.tiemQuickList//时间快捷
+		this.scopeIndex=this.form.scopeIndex//检查范围
+		this.patrolIndex=this.form.patrolIndex//巡查组
+		console.log(this.form)
+	 }
+  },
+  onShow() {
+	  
+  },
+  mounted(){
+	  
+  },
+  methods: {
+		//滚动事件
+		scrollGet(){
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.curTab = index;
+		},
+	    //开始时间选中事件
+		startChange(form,e){
+			if(new Date(e.target.value).getTime()>=new Date(form.endTime).getTime()){
+				 uni.showToast({
+					title: '结束时间不能小于开始时间',
+					icon:"none",
+					mask:true,
+					duration: 2000
+				});
+			}else{
+				form.startTime=e.target.value
+			}
+		},
+	    //结束时间选中事件
+		endChange(form,e){
+			if(new Date(form.startTime).getTime()>=new Date(e.target.value).getTime()){
+				 uni.showToast({
+					title: '结束时间不能小于开始时间',
+					icon:"none",
+					mask:true,
+					duration: 2000
+				});
+			}else{
+				form.endTime=e.target.value
+			}
+		},
+		//检查周期快捷
+		tiemQuick(index){
+			this.tiemQuickList[index].type = !this.tiemQuickList[index].type
+			let _this = this;
+			if (_this.tiemQuickList[index].type == true) {
+				_this.tiemQuickList.forEach(function(item2) {
+				  if (item2.name == _this.tiemQuickList[index].name) {
+					item2.type = true
+				  } else {
+					item2.type = false
+				  }
+				})
+				//快捷本月-本季度-全年
+				_this.timeSlotChange(_this.tiemQuickList[index].name)
+			}else{
+				console.log('取消选中')
+				_this.form.startTime='';
+				_this.form.endTime='';
+			}
+			
+		},
+		//检查范围
+		scopeChange(e){
+			uni.showModal({
+				content: '重新选择会删除现有选择的实验室,是否重选?',
+				cancelColor:"#999",
+				confirmColor:"#0183FA",
+				success: function (res) {
+				  if (res.confirm) {
+					this.scopeIndex = e.target.value;
+					this.form.inspectScope=[]
+				  } else if (res.cancel) {
+					  
+				  }
+				}
+			});
+		},
+		timeSlotChange (val) {
+			  let _this=this;	
+		      let startTime, endTime;
+		      let now = new Date(); //当前日期 
+		      let nowDayOfWeek = now.getDay(); //今天本周的第几天 
+		      let nowDay = now.getDate(); //当前日 
+		      let nowMonth = now.getMonth(); //当前月 
+		      let nowYear = now.getFullYear(); //当前年 
+		      let jd=Math.ceil((nowMonth + 1) / 3)
+		      switch (val) {
+		        case "本周":
+		          startTime = new Date(nowYear, nowMonth, nowDay - nowDayOfWeek)
+		          endTime = new Date(nowYear, nowMonth, nowDay + 6 - nowDayOfWeek)
+		          break;
+		        case "本月":
+		          startTime = new Date(nowYear, nowMonth, 1)
+		          endTime = new Date(nowYear, nowMonth + 1, 0)
+		          break;
+		        case "本季度":
+		          startTime = new Date(nowYear, (jd-1)*3, 1)
+		          endTime = new Date(nowYear, jd*3, 0)
+		          break
+		          case "全年":
+		          startTime = new Date(nowYear, 0, 1)
+		          endTime = new Date(nowYear, 11, 31)
+		          break
+		      }
+			  _this.form.startTime=_this.formatDateTime(startTime)
+			  _this.form.endTime=_this.formatDateTime(endTime)
+		},
+		// 中国标准时间 转换成 年月日
+		 formatDateTime (date) {
+		  var y = date.getFullYear();
+		  var m = date.getMonth() + 1;
+		  m = m < 10 ? ('0' + m) : m;
+		  var d = date.getDate();
+		  d = d < 10 ? ('0' + d) : d;
+		  var h = date.getHours();
+		  var minute = date.getMinutes();
+		  minute = minute < 10 ? ('0' + minute) : minute;
+		  // return y + '-' + m + '-' + d+' '+h+':'+minute;
+		  return y + '-' + m + '-' + d
+		},
+		//巡查组
+		patrolChange(e){
+			console.log(e)
+			this.patrolIndex = e.target.value;
+			this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
+			this.form.scopeIndex=this.scopeIndex//检查范围
+			this.form.patrolIndex=this.patrolIndex//巡查组
+			if(this.patrolIndex==1){//校级巡查组
+				uni.navigateTo({
+				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))
+				});
+			}else if(this.patrolIndex==2){//院级巡查组
+				uni.navigateTo({
+				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))
+				});
+			}
+		},
+		//选择学院或者实验室
+		collegeOrLab(){
+			console.log(this.scopeIndex)
+			if(this.scopeIndex==1){//学院
+				this.dialogVisible=true;
+			}else if(this.scopeIndex==2){//实验室
+			    this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
+			    this.form.scopeIndex=this.scopeIndex//检查范围
+				uni.navigateTo({
+				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))
+				});
+			}
+		},
+		//选择学院弹窗关闭
+		dialogClose(){
+		   this.dialogVisible=false;
+	    },
+		//选择学院确定
+		collegeConfirm(){
+			let _this=this;
+			this.dialogVisible=false;
+			let list=[];
+			_this.collegeList.forEach(function(item){
+				if(item.type==true){
+					list.push(item)
+				}
+			})
+			_this.form.inspectScope=list;
+		},
+		//学院选择
+		collegeSelete(index){
+			this.collegeList[index].type = !this.collegeList[index].type
+		},
+	    handleClick(doType){
+		  let self=this;
+		  
+		  if( doType=='subBtn'){//	
+			  console.log(11)
+		  }
+		  
+	    },
+	  
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.examine{
+	height:100%;
+	display flex;
+	// padding: 0 30rpx;
+	// box-sizing: border-box;
+	padding-bottom: 126rpx;
+	box-sizing: border-box;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+	.basics{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 20rpx;
+		padding: 60rpx 26rpx 32rpx;
+		box-sizing: border-box;
+		.title{
+			.title_t{
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 42rpx;
+				margin-bottom: 12rpx;
+			}
+			.title_b{
+				width: 636rpx;
+				height: 150rpx;
+				border-radius: 10rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				padding: 26rpx 23rpx;
+				box-sizing: border-box;
+			}
+		}
+		.type{
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin-top: 20rpx;
+			.type_l{
+				width: 146rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+			}
+			.type_r{
+				width: 490rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+				padding-left:22rpx;
+				box-sizing: border-box;
+                background: #F5F5F5;				
+			}
+		}
+		.period{
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin-top: 26rpx;
+			.period_l{
+				width: 146rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+			}
+			.period_r{
+				width: 490rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+				border: 1rpx solid #E0E0E0;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				.picker-text{
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					line-height: 80rpx;
+					width: 230rpx;
+					text-align: center;
+				}
+				.picker-text2{
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					line-height: 80rpx;
+					width: 230rpx;
+					text-align: center;
+				}
+			}
+		}
+		.tiem_quick{
+			margin-left: 146rpx;
+			display: flex;
+			justify-content: flex-start;
+			margin-top: 20rpx;
+			>view{
+				width: 130rpx;
+				height: 80rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				line-height: 80rpx;
+				text-align: center;
+			}
+			>view:nth-of-type(1){
+				border-radius: 10rpx 0rpx 0rpx 10rpx;
+			}
+			>view:nth-of-type(3){
+				border-radius: 0rpx 10rpx 10rpx 0rpx;
+			}
+			.tiem_quick_a{
+				background: #0183FA;
+				color: #FFFFFF;
+				
+			}
+			.tiem_quick_b{
+				background: #F5F5F5;
+				color: #333333;
+			}
+		}
+		.scope{
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin-top: 26rpx;
+			.scope_l{
+				width: 146rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+			}
+			.scope_r{
+				flex: 1;
+				.scope_r_n{
+					width: 490rpx;
+					height: 80rpx;
+					border-radius: 10rpx;
+					border: 1rpx solid #E0E0E0;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					>view{
+						flex:1;
+						line-height:80rpx;
+						margin-left:20rpx;
+						color: #999999;
+						font-size:28rpx;
+					}
+					>img{
+						width: 14rpx;
+						height: 8rpx;
+						margin-right: 30rpx;
+					}
+				}
+			}
+		}
+		.scope_btn{
+			display: inline-block;
+			background: #0183FA;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 80rpx;
+			text-align: center;
+			padding: 0 16rpx;
+			box-sizing: border-box;
+			margin-top: 40rpx;
+			margin-left: 146rpx;
+		}
+		.scope_text{
+			margin-left: 146rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			margin-top: 32rpx;
+			line-height: 42rpx;
+			>text{
+				color: #0183FA;
+			}
+		}
+	}
+	.patrol_group{
+		width: 690rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 20rpx;
+		padding: 40rpx 30rpx 64rpx;
+		box-sizing: border-box;
+		.patrol{
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin-top: 26rpx;
+			.patrol_l{
+				width: 146rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+			}
+			.patrol_r{
+				flex: 1;
+				.patrol_r_n{
+					width: 490rpx;
+					height: 80rpx;
+					border-radius: 10rpx;
+					border: 1rpx solid #E0E0E0;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					>view{
+						flex:1;
+						line-height:80rpx;
+						margin-left:20rpx;
+						color: #999999;
+						font-size:28rpx;
+					}
+					>img{
+						width: 14rpx;
+						height: 8rpx;
+						margin-right: 30rpx;
+					}
+				}
+			}
+		}
+		.list{
+			margin-top: 42rpx;
+			.list_title{
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				height: 80rpx;
+				background: #F5F5F5;
+				border-radius: 10rpx 10rpx 0rpx 0rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 80rpx;
+				>img{
+					width: 30rpx;
+					height: 30rpx;
+					margin: 0 20rpx;
+				}
+			}
+			.list_header{
+				display: flex;
+				justify-content: flex-start;
+				>text{
+					flex: 1;
+					height: 80rpx;
+					background: #F5F5F5;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 80rpx;
+					text-align: center;
+					border: 1rpx solid #E0E0E0;
+				}
+				>text:nth-of-type(1){
+					border-right: none;
+				}
+			}
+			.list_li{
+				display: flex;
+				justify-content: flex-start;
+				>text{
+					flex: 1;
+					height: 80rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 80rpx;
+					text-align: center;
+					border: 1rpx solid #E0E0E0;
+				}
+				>text:nth-of-type(1){
+					border-right: none;
+					border-top: none;
+				}
+				>text:nth-of-type(2){
+					border-top: none;
+				}
+			}
+			.list_bottom{
+				flex: 1;
+				height: 80rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				line-height: 80rpx;
+				text-align: center;
+				border: 1rpx solid #E0E0E0;
+				border-top: none;
+			}
+		}
+	}
+	.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>

+ 282 - 0
pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab.vue

@@ -0,0 +1,282 @@
+<!-- 安全检查-发起巡查计划-选择实验室 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<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 class="list">
+				<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="labSelete(index)">
+					<text :class="item.type?'color_B':'color_A'">{{item.name}}</text>
+					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
+				</view>
+			</view>
+		</view>
+	</scroll-view>	
+	<view class="bottom_btn" @click="handleClick('subBtn')">保存</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,
+		name:'',
+      },
+	  total:0,
+	  collegeIndex :0,
+	  collegeArray:['选择学院','学院名称1','学院名称2','学院名称3',],
+	  dataList:[{name:'实验室名称-房间号',type:false,id:1},{name:'实验室名称-房间号',type:false,id:2},{name:'实验室名称-房间号',type:false,id:3}],
+	  seleteListLab:[],//临时存储选中的 
+	  form:{},
+	}
+  },
+  onLoad(option) {
+      this.form=JSON.parse(decodeURIComponent(option.form));
+	  if(this.form.seleteListLab.length>0){
+		  this.seleteListLab=this.form.seleteListLab;
+	  }
+  },
+  onShow() {
+      this.getList(); 
+  },
+  mounted(){
+	  
+  },
+  methods: {
+	  //滚动事件
+	  scrollGet(){
+		  let self=this;
+	      if(self.total<=self.getData.pageNum){
+	          console.log('没有更多数据!')
+	      }else{
+			  setTimeout(function(){
+				  self.getData.pageNum += 1;
+				  self.getList(); 
+			  },1000)
+			 
+		  }
+	  },
+	  //选择学院
+	  collegeChange(e){
+		  this.collegeIndex = e.target.value;
+		  this.dataList=[];
+		  this.getList();
+		  
+	  },
+	  //点击选择实验室
+	  labSelete(index){
+	  	this.dataList[index].type = !this.dataList[index].type
+		
+		if(this.dataList[index].type){//判断是选中还是取消
+			if(this.seleteListLab.length>0){
+				//console.log(this.seleteListLab.findIndex((item)=>item.id===this.dataList[index].id))
+				if(this.seleteListLab.findIndex((item)=>item.id===this.dataList[index].id) ==-1){//等于-1说明数组里没有当前选中元素,可以添加
+					this.seleteListLab.push(this.dataList[index])
+				}
+			}else{
+				this.seleteListLab.push(this.dataList[index])
+			}
+		}else{
+			this.seleteListLab.splice(this.seleteListLab.indexOf(this.dataList[index]),1);
+		}
+	  },
+	  //实验室搜索
+	  searchBtn(){
+		  this.dataList=[];
+		  this.getList();
+	  },
+	  handleClick(doType){
+		  let self=this;
+		  if( doType=='subBtn'){//保存数据
+			  this.$set(this.form,'seleteListLab',this.seleteListLab)
+			  uni.redirectTo({
+			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?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]
+		  if(this.seleteListLab.length>0){//如果有选中的数据
+			  for(let i=0;i<this.dataList.length;i++){
+				  if(this.seleteListLab.findIndex((item)=>item.id===this.dataList[i].id) !=-1){//不等于-1说明数组里有当前元素,可以改为选中
+				  	 this.dataList[i].type=true;
+				  }else{
+					  
+				  }
+			  }
+		  }
+		
+		  
+	   //    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;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		padding: 120rpx 0rpx 30rpx;
+		box-sizing: border-box;
+	}
+	.lab_title{
+		width: 750rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		padding: 10rpx 30rpx;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: flex-start;
+		
+		.lab_title_l{
+			width: 250rpx;
+			height: 80rpx;
+			margin-right: 20rpx;
+			.lab_title_l_n{
+				width: 250rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+				border: 1rpx solid #E0E0E0;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				>view{
+					flex:1;
+					line-height:80rpx;
+					margin-left:20rpx;
+					color: #999999;
+					font-size:28rpx;
+				}
+				>img{
+					width: 14rpx;
+					height: 8rpx;
+					margin-right: 30rpx;
+				}
+			}
+		}
+		.lab_title_r{
+			width: 420rpx;
+			height: 80rpx;
+			position:relative;
+			border-radius: 10rpx;
+			border: 1rpx solid #E0E0E0;
+			.lab_title_r_btn{
+				width: 60rpx;
+				height: 80rpx
+				position: absolute;
+				top: 0rpx;
+				left:0rpx;
+				>img{
+					width: 20rpx;
+					height: 20rpx;
+					position: absolute;
+					top: 30rpx;
+					left: 24rpx;
+				}
+			}
+			>input{
+				width: 360rpx;
+				height: 80rpx;
+				position: absolute;
+				top: 0rpx;
+				left: 60rpx;
+			}
+		}
+	}
+	.list{
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 0rpx 0rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin: 0 30rpx;
+		.list_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;
+			} 
+		}
+		.list_li:last-child{
+			border: none;
+		}
+		.color_A{
+			color: #333333;
+		}
+		.color_B{
+			color: #0183FA;
+		}
+	}
+	.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>

+ 242 - 0
pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember.vue

@@ -0,0 +1,242 @@
+<!-- 安全检查-发起巡查计划-巡查组 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view>
+			<view class="lab_title">
+				<view class="lab_title_n">
+					<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 class="list">
+				<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="labSelete(index)">
+					<text :class="item.type?'color_B':'color_A'">{{item.name}}</text>
+					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
+				</view>
+			</view>
+		</view>
+	</scroll-view>	
+	<view class="bottom_btn" @click="handleClick('subBtn')">保存</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,
+		name:'',
+      },
+	  total:0,
+	  dataList:[{name:'巡查组名称',type:false,id:1},{name:'巡查组名称',type:false,id:2},{name:'巡查组名称',type:false,id:3}],
+	  
+	  seleteListMember:[],//临时存储选中的 
+	  form:{},
+	}
+  },
+  onLoad(option) {
+	  if(option.form){
+		  this.form=JSON.parse(decodeURIComponent(option.form));
+		  if(this.form.seleteListMember.length>0){
+		  	 this.seleteListMember=this.form.seleteListMember;
+		  }
+	  }
+  },
+  onShow() {
+      this.getList(); 
+  },
+  mounted(){
+	  
+  },
+  methods: {
+	  //滚动事件
+	  scrollGet(){
+		  let self=this;
+	      if(self.total<=self.getData.pageNum){
+	          console.log('没有更多数据!')
+	      }else{
+			  setTimeout(function(){
+				  self.getData.pageNum += 1;
+				  self.getList(); 
+			  },1000)
+			 
+		  }
+	  },
+	  //点击选择实验室
+	  labSelete(index){
+		let _this = this;
+	  	this.dataList[index].type = !this.dataList[index].type
+		if (_this.dataList[index].type == true) {
+			_this.dataList.forEach(function(item2) {
+			  if (item2.id == _this.dataList[index].id) {
+				item2.type = true
+			  } else {
+				item2.type = false
+			  }
+			})
+		}
+		if(this.dataList[index].type){//判断是选中还是取消
+			this.seleteListMember.push(this.dataList[index])
+		}else{
+			this.seleteListMember=[];
+		}
+	  },
+	  //实验室搜索
+	  searchBtn(){
+		  this.dataList=[];
+		  this.getList();
+	  },
+	  handleClick(doType){
+		  let self=this;
+		  if( doType=='subBtn'){//保存数据
+			  this.$set(this.form,'seleteListMember',this.seleteListMember)
+			  uni.redirectTo({
+			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?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]
+		  //如果有选中的数据
+		  if(this.seleteListMember.length>0){
+			  for(let i=0;i<this.dataList.length;i++){
+				  if(this.seleteListMember[0].id==this.dataList[i].id){
+					  this.dataList[i].type=true;
+				  }
+			  }
+		  }
+		
+		  
+	   //    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;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		padding: 120rpx 0rpx 30rpx;
+		box-sizing: border-box;
+	}
+	.lab_title{
+		width: 750rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		padding: 10rpx 30rpx;
+		box-sizing: border-box;
+		.lab_title_n{
+			width: 690rpx;
+			height: 80rpx;
+			position:relative;
+			border-radius: 10rpx;
+			border: 1rpx solid #E0E0E0;
+			.lab_title_r_btn{
+				width: 60rpx;
+				height: 80rpx
+				position: absolute;
+				top: 0rpx;
+				left:0rpx;
+				>img{
+					width: 20rpx;
+					height: 20rpx;
+					position: absolute;
+					top: 30rpx;
+					left: 24rpx;
+				}
+			}
+			>input{
+				width: 360rpx;
+				height: 80rpx;
+				position: absolute;
+				top: 0rpx;
+				left: 60rpx;
+			}
+		}
+	}
+	.list{
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 0rpx 0rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin: 0 30rpx;
+		.list_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;
+			} 
+		}
+		.list_li:last-child{
+			border: none;
+		}
+		.color_A{
+			color: #333333;
+		}
+		.color_B{
+			color: #0183FA;
+		}
+	}
+	.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>

+ 393 - 0
pages/pages_safetyExamine/patrolPlan/patrolPlanList.vue

@@ -0,0 +1,393 @@
+<!-- 安全检查-发起巡查计划 -->
+<template>
+  <view class="examine">
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view>
+			<view class="tabTitle">
+				<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="search">
+				<view class="search_btn">
+					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+				</view>
+				<input type="text" v-model="name" placeholder="计划标题" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
+			</view>
+			<view class="list">
+				<view class="list_li" v-for="(item,index) in  dataList" :key="index">
+					<view class="list_li_t">
+						<view class="list_li_t_l">
+							<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+							<text></text>
+						</view>
+						<view class="list_li_t_c">{{item.name}}</view>
+						<view class="list_li_t_c2">已逾期</view>
+						<view class="list_li_t_r"></view>
+					</view>
+					<view class="list_li_m">
+						<view class="list_li_m_t">计划周期:2023-03-12至2023-03-15</view>
+						<view class="list_li_m_b">
+							<text class="blue_color">未开始</text>
+							<text>校院巡查</text>
+						</view>
+					</view>
+					<view class="list_li_b">
+						<img src="@/images/Version3.3.3/icon_djcsys.png"/>
+						<text>待检查实验室:</text>
+						<text>22间</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</scroll-view>	
+	<view class="bottom_btn" @click="handleClick('subBtn')">发起巡查计划</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,
+      },
+	  total:0,
+	  tabText:['全部','未开始','进行中','已结束'],
+	  curTab:0,
+	  dataList:[{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',}],
+    }
+  },
+  onLoad() {
+
+  },
+  onShow() {
+      this.getList(); 
+  },
+  mounted(){
+	  
+  },
+  methods: {
+	  //滚动事件
+	  scrollGet(){
+		  let self=this;
+	      if(self.total<=self.getData.pageNum){
+	          console.log('没有更多数据!')
+	      }else{
+			  setTimeout(function(){
+				  self.getData.pageNum += 1;
+				  self.getList(); 
+			  },1000)
+			 
+		  }
+	  },
+	  //顶部tab点击
+	  tabClick(index) {
+	  	this.curTab = index;
+	  },
+	  handleClick(doType){
+		  let self=this;
+		  
+		  if( doType=='subBtn'){//发起巡查计划	
+			  console.log(11)
+		  }
+		  
+	  },
+	  async getList(){
+		  console.log('getList')
+		  let list=[{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',}]
+		  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;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		padding-bottom: 128rpx;
+		padding-top: 100rpx;
+	}
+	.blue_color{
+		color: #0183FA;
+		border: 1rpx solid #0183FA;
+	}
+	.red_color{
+		color: #FF4545;
+		border: 1rpx solid #FF4545;
+	}
+	.green_color{
+		color: #1FA50D;
+		border: 1rpx solid #1FA50D;
+	}
+	/* 切换按钮 */
+	.tabTitle{
+		width:100%;
+		height: 100rpx;
+		background: #fff;
+		display flex;
+		justify-content: flex-start;
+		align-items: center;
+		position: fixed;
+		top: 0;
+		z-index: 100;
+		.tabTitle_li{
+			position: relative;
+			width:146rpx;
+			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;
+				&.on{
+					color:#0183FA;
+				}
+			}
+			.tabTitle_across{
+				width: 50rpx;
+				height: 4rpx;
+				background: #0183FA;
+				border-radius: 2rpx;
+				margin-left: 46rpx;
+				display none;
+				&.on{
+					display block;
+				}
+			}
+	
+		}
+	}
+	.search{
+		width: 750rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		padding: 20rpx 30rpx;
+		box-sizing: border-box;
+		position: relative;
+		margin-top: 20rpx;
+		.search_btn{
+			width: 70rpx;
+			height: 60rpx;
+			position: absolute;
+			top: 20rpx;
+			left: 30rpx;
+			>img{
+				width: 20rpx;
+				height: 20rpx;
+				position: absolute;
+				top: 20rpx;
+				left: 24rpx;
+			}
+		}
+		
+		>input{
+			position: absolute;
+			top: 20rpx;
+			left: 30rpx;
+			width: 690rpx;
+			height: 60rpx;
+			border-radius: 50rpx;
+			opacity: 1;
+			border: 1rpx solid #E0E0E0;
+			padding-left: 74rpx;
+			box-sizing: border-box;
+		}
+	}
+	.list{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		.list_li{
+			position: relative;
+			width: 690rpx;
+			height: 360rpx;
+			background: #fff;
+			border-radius: 10rpx;
+			overflow: hidden;
+			margin-bottom: 20rpx;
+			.list_li_t{
+				width: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				.list_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_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_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_li_t_r{
+					position: absolute;
+					right:-15rpx;
+					top: 76rpx;
+					width: 30rpx;
+					height: 30rpx;
+					background:#F5F5F5;
+					border-radius: 15rpx;
+				}
+			}
+			.list_li_m{
+				position: absolute;
+				top: 110rpx;
+				left: 0;
+				width: 690rpx;
+				height: 168rpx;
+				border-bottom: 1rpx solid #E0E0E0;
+				padding-left: 30rpx;
+				box-sizing: border-box;
+				.list_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_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);
+					}
+				}
+			}
+			.list_li_b{
+				height: 80rpx;
+				position: absolute;
+				top: 278rpx;
+				left: 0;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				>img{
+					width: 24rpx;
+					height: 30rpx;
+					margin-right: 26rpx;
+					margin-left: 30rpx;
+				}
+				>text:nth-of-type(1){
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 28rpx;
+				}
+				>text:nth-of-type(2){
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #0183FA;
+					line-height: 28rpx;
+				}
+			}
+		}
+	}
+	
+	.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>

+ 757 - 52
pages/safetyExamineWorkbench.vue

@@ -1,60 +1,144 @@
 <!-- 安全检查-工作台 -->
 <template>
   <view class="examine">
-    <view v-if="pageType==0">
-		<view class="statistics">
-			<view class="statistics_li" v-for="(item,index) in  statisticsList" :key="index">
-				<text>{{item.name}}</text>
-				<text>{{item.value}}</text>
-			</view>
-		</view>
-		<viwe class="inspect_btn">
-			<view class="inspect_btn_li">
-				<img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
-				<text>校院巡查</text>
-			</view>
-			<text class="line"></text>
-			<view class="inspect_btn_li">
-				<img src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
-				<text>实验室自查</text>
-			</view>
-			<text class="line"></text>
-			<view class="inspect_btn_li">
-				<img src="@/images/Version3.3.3/icon_xyxc_aqyh.png"/>
-				<text>安全隐患</text>
-			</view>
-		</viwe>
-		<view class="tabTitle">
-			<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
-				<view :class="{on:curTab==index}" class="tabTitle_text">{{item}}<text>2</text></view>
-			    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
-			</view>
-		</view>
-		<view class="list">
-			<view class="list_li">
-				<view class="list_li_t">
-					<view class="list_li_t_l">
-						<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
-						<text></text>
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view>
+			<view class="statistics" v-if="pageType==0 || pageType==1">
+					<view class="statistics_li" v-for="(item,index) in  statisticsList" :key="index">
+						<text>{{item.name}}</text>
+						<text>{{item.value}}</text>
 					</view>
-					<view class="list_li_t_c">计划标题计划标题计划标题计划标题</view>
-					<view class="list_li_t_r"></view>
 				</view>
-				<view class="list_li_m">
-					<view class="list_li_m_t">计划周期:2023-03-12至2023-03-15</view>
-					<view class="list_li_m_b">
-						<text>未开始</text>
+				<viwe class="inspect_btn" v-if="pageType==0 || pageType==1">
+					<view class="inspect_btn_li" @click="handleClick('patrolPlan')">
+						<img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
 						<text>校院巡查</text>
 					</view>
+					<text class="line"></text>
+					<view class="inspect_btn_li"  @click="handleClick('selfPlan')">
+						<img src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
+						<text>实验室自查</text>
+					</view>
+					<text class="line"></text>
+					<view class="inspect_btn_li"  @click="handleClick('dangerPlan')">
+						<img src="@/images/Version3.3.3/icon_xyxc_aqyh.png"/>
+						<text>安全隐患</text>
+					</view>
+				</viwe>
+				<!--管理员------------- -->
+				<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}}<text>2</text></view>
+					    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
+					</view>
+				</view>
+				<view class="list" v-if="pageType==0">
+					<view class="list_li" v-for="(item,index) in  dataList" :key="index">
+						<view class="list_li_t">
+							<view class="list_li_t_l">
+								<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<text></text>
+							</view>
+							<view class="list_li_t_c">{{item.name}}</view>
+							<view class="list_li_t_r"></view>
+						</view>
+						<view class="list_li_m">
+							<view class="list_li_m_t">计划周期:2023-03-12至2023-03-15</view>
+							<view class="list_li_m_b">
+								<text class="blue_color">未开始</text>
+								<text>校院巡查</text>
+							</view>
+						</view>
+						<view class="list_li_b">
+							<img src="@/images/Version3.3.3/icon_djcsys.png"/>
+							<text>待检查实验室:</text>
+							<text>22间</text>
+						</view>
+					</view>
+				</view>
+				<!--检查者------------- -->
+				<view class="tabTitle_tow" v-if="pageType==1">
+					<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}}<text>2</text></view>
+					    <view :class="{on:curTabTow==index}" class="tabTitle_tow_across"></view>
+					</view>
+				</view>
+				<view class="list_tow" v-if="pageType==1">
+					<view class="list_tow_li" v-for="(item,index) in  dataList" :key="index">
+						<view class="list_tow_li_t">
+							<view class="list_tow_li_t_l">
+								<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<text></text>
+							</view>
+							<view class="list_tow_li_t_c">实验室名称-房间号</view>
+							<view class="list_tow_li_t_c2">已逾期</view>
+							<view class="list_tow_li_t_r"></view>
+						</view>
+						<view class="list_tow_li_m">
+							<view class="list_tow_li_m_t">计划标题计划标题计划标题计划标题计划标题计划...</view>
+							<view class="list_tow_li_m_b">
+								<text class="blue_color">未开始</text>
+								<text>校院巡查</text>
+								<text>环境与测绘学院</text>
+							</view>
+						</view>
+						<view class="list_tow_li_b">
+							<text>开始检查</text>
+						</view>
+					</view>
+				</view>
+				<!-- 整改人----------- -->
+				<view class="statistics_three" v-if="pageType==2">
+					<view class="statistics_three_li" v-for="(item,index) in  statisticsListThree" :key="index">
+						<text>{{item.name}}</text>
+						<text>{{item.value}}</text>
+					</view>
+				</view>
+				<view 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')">
+						<img src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
+						<text>实验室自查隐患</text>
+					</view>
 				</view>
-				<view class="list_li_b">
-					<img src="@/images/Version3.3.3/icon_djcsys.png"/>
-					<text>待检查实验室:</text>
-					<text>22间</text>
+				<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>
+					    <view :class="{on:curTabThree==index}" class="tabTitle_three_across"></view>
+					</view>
+				</view>
+				<view class="list_three" v-if="pageType==2">
+					<view class="list_three_li" v-for="(item,index) in  dataList" :key="index">
+						<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">
+							<text>整改期限:2023-01-01</text>
+						</view>
+					</view>
 				</view>
-			</view>
 		</view>
-    </view>
+	</scroll-view>	
+	<view class="bottom_btn">开展检查</view>
+	<img class="scan_btn" src="@/images/Version3.3.3/icon_xyxc_sm.png"/>
+	
   </view>
 
 </template>
@@ -75,6 +159,7 @@ export default {
         pageNum:1,
         pageSize:20,
       },
+	  total:0,
 	  statisticsList:[
 		  {name:'本月已检查',value:'20'},
 		  {name:'本月检查隐患',value:'10'},
@@ -83,31 +168,117 @@ export default {
 		  {name:'本月已检查',value:'20'},
 		  {name:'本月复核通过率',value:'30%'},
 	  ],
+	  statisticsListThree:[
+		  {name:'本月已检查',value:'20'},
+		  {name:'本月已整改',value:'60%'},
+		  {name:'本月复核通过率',value:'30%'},
+	  ],
 	  tabText:['未开始','进行中'],
 	  curTab:0,
+	  tabTextTow:['待检查','检查中','待复核'],
+	  curTabTow:0,
+	  tabTextThree:['隐患待整改','随手拍整改'],
+	  curTabThree:0,
+	  dataList:[{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',}],
     }
   },
   onLoad() {
 
   },
   onShow() {
-
+      this.getList(); 
   },
   mounted(){
+	  
   },
   methods: {
+	  //滚动事件
+	  scrollGet(){
+		  let self=this;
+	      if(self.total<=self.getData.pageNum){
+	          console.log('没有更多数据!')
+	      }else{
+			  setTimeout(function(){
+				  self.getData.pageNum += 1;
+				  self.getList(); 
+			  },1000)
+			 
+		  }
+	  },
 	  //顶部tab点击
 	  tabClick(index) {
 	  	this.curTab = index;
-	  	
 	  },
-    
+	  tabClickTow(index) {
+	  	this.curTabTow = index;
+	  },
+	  tabClickThree(index) {
+	  	this.curTabThree = index;
+	  },
+	  handleClick(doType){
+		  let self=this;
+		  
+		  if(self.pageType==0 && doType=='patrolPlan'){//校院巡查-计划
+			  console.log(11)
+		  }else if(self.pageType==0 && doType=='selfPlan'){//实验室自查-计划
+			  
+		  }else if(self.pageType==0 && doType=='dangerPlan'){//安全隐患-计划
+			  
+		  }else if(self.pageType==1 && doType=='patrolPlan'){//校院巡查-检查
+			  
+		  }else if(self.pageType==1 && doType=='selfPlan'){//实验室自查-检查
+			  
+		  }else if(self.pageType==1 && doType=='dangerPlan'){//安全隐患-检查
+			  
+		  }else if(self.pageType==2 && doType=='schoolDanger'){//校院巡查隐患
+			  
+		  }else if(self.pageType==2 && doType=='labDanger'){//实验室自查隐患
+			  
+		  }
+		  
+	  },
+	  async getList(){
+		  console.log('getList')
+		  let list=[{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',}]
+		  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;
+	.info-max-box{
+		flex: 1;
+		overflow: scroll;
+		padding-bottom: 128rpx;
+	}
+	.blue_color{
+		color: #0183FA;
+		border: 1rpx solid #0183FA;
+	}
+	.red_color{
+		color: #FF4545;
+		border: 1rpx solid #FF4545;
+	}
+	.green_color{
+		color: #1FA50D;
+		border: 1rpx solid #1FA50D;
+	}
 	.statistics{
 		background: #fff;
 		display: flex;
@@ -230,6 +401,7 @@ export default {
 		position: sticky;
 		top: 0;
 		z-index: 100;
+		box-shadow: 0rpx 3rpx 8rpx 0rpx rgba(0,0,0,0.16);
 		.tabTitle_li{
 			position: relative;
 			width:372rpx;
@@ -367,9 +539,7 @@ export default {
 						font-size: 26rpx;
 						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 400;
-						color: #0183FA;
 						line-height: 40rpx;
-						border: 1rpx solid #0183FA;
 						border-radius: 6rpx;
 						padding: 0 20rpx;
 						margin-right: 14rpx;
@@ -417,5 +587,540 @@ export default {
 			}
 		}
 	}
+	/* 检查者 */
+	.tabTitle_tow{
+		width:100%;
+		height: 100rpx;
+		background: #fff;
+		display flex;
+		justify-content: flex-start;
+		align-items: center;
+		margin-top: 20rpx;
+		position: sticky;
+		top: 0;
+		z-index: 100;
+		box-shadow: 0rpx 3rpx 8rpx 0rpx rgba(0,0,0,0.16);
+		.tabTitle_tow_li{
+			position: relative;
+			width:162rpx;
+			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;
+				>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_tow_across{
+				width: 50rpx;
+				height: 4rpx;
+				background: #0183FA;
+				border-radius: 2rpx;
+				margin-left 56rpx;
+				display none;
+				&.on{
+					display block;
+				}
+			}
+	
+		}
+	}
+	.list_tow{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		.list_tow_li{
+			position: relative;
+			width: 690rpx;
+			height: 360rpx;
+			background: #fff;
+			border-radius: 10rpx;
+			overflow: hidden;
+			margin-bottom: 20rpx;
+			.list_tow_li_t{
+				width: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				.list_tow_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_tow_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_tow_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_tow_li_t_r{
+					position: absolute;
+					right:-15rpx;
+					top: 76rpx;
+					width: 30rpx;
+					height: 30rpx;
+					background:#F5F5F5;
+					border-radius: 15rpx;
+				}
+			}
+			.list_tow_li_m{
+				position: absolute;
+				top: 110rpx;
+				left: 0;
+				width: 690rpx;
+				height: 168rpx;
+				border-bottom: 1rpx solid #E0E0E0;
+				padding-left: 30rpx;
+				box-sizing: border-box;
+				.list_tow_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_tow_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_tow_li_b{
+				height: 80rpx;
+				width: 100%;
+				position: absolute;
+				top: 278rpx;
+				left: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				>text:nth-of-type(1){
+					font-size: 26rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 26rpx;
+					
+				}
+			}
+		}
+	}
+	/* 整改人 */
+	.statistics_three{
+		background: #fff;
+		display: flex;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+		padding: 38rpx 30rpx;
+		box-sizing: border-box;
+		.statistics_three_li{
+			width: 230rpx;
+			position: relative;
+			>text{
+				display: block;
+				text-align: center;
+			}
+			>text:nth-of-type(1){
+				font-size: 26rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 26rpx;
+			}
+			>text:nth-of-type(2){
+				font-size: 34rpx;
+				font-family: PingFang SC-Heavy, PingFang SC;
+				font-weight: 400;
+				color: #1FA50D;
+				line-height: 34rpx;
+				margin-top: 28rpx;
+			}
+		}
+		.statistics_three_li::after{
+			content:'';
+			position: absolute;
+			top: 20rpx;
+			right:0rpx;
+			width: 1rpx;
+			height: 60rpx;
+			background: #D8D8D8;
+		}
+		.statistics_three_li:nth-of-type(3)::after{
+			display: none;
+		}
+		>view:nth-of-type(1){
+			>text:nth-of-type(2){
+				color: #1FA50D;
+			}
+		}
+		>view:nth-of-type(2){
+			>text:nth-of-type(2){
+				color: #FA8201;
+			}
+		}
+		>view:nth-of-type(3){
+			>text:nth-of-type(2){
+				color: #0183FA;
+			}
+		}
+	}
+	.inspect_btn_three{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		.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;
+			}
+			>text{
+				font-size: 28rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				line-height: 28rpx;
+			}
+		}
+	}
+	/* 切换按钮 */
+	.tabTitle_three{
+		width:100%;
+		height: 100rpx;
+		background: #fff;
+		display flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 20rpx;
+		position: sticky;
+		top: 0;
+		z-index: 100;
+		box-shadow: 0rpx 3rpx 8rpx 0rpx rgba(0,0,0,0.16);
+		.tabTitle_three_li{
+			position: relative;
+			width:372rpx;
+			text-align center;
+			.tabTitle_three_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_three_across{
+				width: 50rpx;
+				height: 4rpx;
+				background: #0183FA;
+				border-radius: 2rpx;
+				margin-left 162rpx;
+				display none;
+				&.on{
+					display block;
+				}
+			}
+	
+		}
+		.tabTitle_three_li:nth-of-type(1)::after{
+			content: '';
+			position: absolute;
+			top: 0rpx;
+			right:  0rpx;
+			width: 1rpx;
+			height: 50rpx;
+			background: #E0E0E0;
+		}
+	}
+	.list_three{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		.list_three_li{
+			position: relative;
+			width: 690rpx;
+			height: 348rpx;
+			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: 80rpx;
+				width: 100%;
+				position: absolute;
+				top: 268rpx;
+				left: 0;
+				padding-left: 30rpx;
+				box-sizing: border-box;
+				>text:nth-of-type(1){
+					font-size: 26rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 26rpx;
+					
+				}
+			}
+		}
+	}
+	.bottom_btn{
+		position: fixed;
+		bottom: 0;
+		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;
+		
+	}
+	.scan_btn{
+		position: fixed;
+		bottom: 210rpx;
+		right: 0rpx;
+		width: 130rpx;
+		height: 130rpx;
+	}
 }
 </style>

+ 5 - 5
pages_manage/workbench/securityCheck/inspectionRecords.vue

@@ -9,7 +9,7 @@
 		</view>
 		<view class="top-button-box" :style="userType==1?'margin-top: 116rpx;':'margin-top: 0rpx;'">
 		    <view class="left-title">检查状态</view>
-		    <picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray" class="right-button-big-box">
+		    <picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray" class="right-button-big-boxright-button-big-box">
 		        <view class="right-button-box">
 		            <view class="uni-input">{{pickerArray[pickerIndex]}}</view>
 		            <img src="@/pages_manage/images/icon_06.png">
@@ -87,12 +87,12 @@
 			this.getList();
         },
 		mounted(){
-			
+
 		},
         methods: {
 			//顶部tab点击
 			tabClick(index) {
-				
+
 				if(index==1){
 					uni.redirectTo({
 					    url: '/pages_manage/workbench/problemRectification/rectifyList',//问题整改
@@ -159,7 +159,7 @@
 			//获取列表数据
 			async getList(){
 			    let self = this;
-				
+
 				let obj = {
 					pageNum : this.getData.pageNum,
 					pageSize : this.getData.pageSize,
@@ -338,7 +338,7 @@
 		                    margin-right:20rpx;
 		                }
 		                .min-for-name-p{
-		                    
+
 							width: 400rpx;
 		                    font-size:28rpx;
 							display:block;