dedsudiyu hai 7 meses
pai
achega
b026cc9d1f

BIN=BIN
pages_safetyCheck/images/icon_aqjc_sl.png


+ 20 - 5
pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -17,14 +17,16 @@
 			</view>
 			<view>
 				<view class="srearch">
-					<view class="college">学院
-						<img src="@/pages_safetyCheck/images/icon_06.png">
-					</view>
+					<picker @change="deptChange" :value="deptIndex" :range="deptArray">
+						<view class="college">{{!deptIndex?'学院':deptArray[deptIndex]}}
+							<img src="@/pages_safetyCheck/images/icon_06.png">
+						</view>
+					</picker>
 					<view class="srearch-n">
 						<view class="srearch-l" @click="popupClick(1)">
 							<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
 						</view>
-						<input class="srearch-c" type="text" v-model="form.searchValue" placeholder="实验室/房间号" />
+						<input class="srearch-c" type="text" @confirm="carriageReturnRequest" v-model="form.searchValue" placeholder="实验室/房间号" />
 						<view class="srearch-r" @click="saoCode()">
 							<img src="@/pages_safetyCheck/images/icon_aqjc_sm.png">
 						</view>
@@ -86,6 +88,10 @@
 				userType: 1,
 				tabListTow: ['自查任务', '复查验证', '隐患整改'],
 				tabIndexTow: 0,
+				//学院选择
+				deptIndex:null,
+				deptArray:['学院A','学院B'],
+				deptList:[{deptId:1,deptName:'学院A'},{deptId:2,deptName:'学院B'},],
 				newData: {
 					data10: '计划标题计划标题计划标题计划标题计划标题计标题计划标题计划标题',
 					data11: ['校级检查', '全面检查', '交叉检查'],
@@ -230,7 +236,16 @@
 					}
 				});
 			},
-
+			//学院选择
+			deptChange(e){
+				if (this.deptList[0]) {
+					this.deptIndex = parseInt(e.target.value);
+				}
+			},
+			//回车触发
+			carriageReturnRequest(){
+				console.log('123123')
+			},
 
 		}
 	}

+ 2 - 2
pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -27,7 +27,7 @@
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="list">
 				<view class="total">待整改共{{total}}项</view>
-				<view class="list-li" v-for="(item,index) in dataList">
+				<view class="list-li" v-for="(item,index) in dataList" :key="index">
 					<view class="list-li-t" @click="itemsClick(item)">
 						<img v-if="item.rectifyStatus==0" src="@/pages_safetyCheck/images/icon_zg_zh@1x.png">
 						<img v-if="item.rectifyStatus==1" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
@@ -82,7 +82,7 @@
 					searchValue: '',
 				},
 				total: 0,
-				dataList: [],
+				dataList: [{}],
 				getDataType: false,
 				//检查项
 				checkOptionList: [],

+ 233 - 143
pages_safetyCheck/views/safetyCheck.vue

@@ -1,27 +1,25 @@
 <!-- 计划详情 -->
 <template>
 	<view class="planDetail">
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="header">
-				<img class="header-bg" src="@/pages_safetyCheck/images/img_banner@1x.png">
-				<view class="tabTitle">
-					<view class="tabTitle_li" @tap="tabClick(index)" :key="index" v-for="(item,index) in tabText">
-						<view class="tabTitle_text">
-							<img :src="item.img">
-							<view
-								:id="curTab==index && curTab==0?'fontColor-A':(curTab==index && curTab==1?'fontColor-B':'')">
-								{{item.name}}
-							</view>
-							<view>{{item.title}}</view>
-						</view>
-						<view class="line"></view>
-						<view :class="{on:curTab==index}" class="tabTitle_across">
-							<img src="@/pages_safetyCheck/images/img_xyzc_bg@1x.png">
+		<view class="header">
+			<img class="header-bg" src="@/pages_safetyCheck/images/img_banner@1x.png">
+			<view class="tabTitle">
+				<view class="tabTitle_li" @tap="tabClick(index)" :key="index" v-for="(item,index) in tabText">
+					<view class="tabTitle_text">
+						<img :src="item.img">
+						<view :id="curTab==index && curTab==0?'fontColor-A':(curTab==index && curTab==1?'fontColor-B':'')">
+							{{item.name}}
 						</view>
+						<view>{{item.title}}</view>
+					</view>
+					<view class="line"></view>
+					<view :class="{on:curTab==index}" class="tabTitle_across">
+						<img src="@/pages_safetyCheck/images/img_xyzc_bg@1x.png">
 					</view>
-				
 				</view>
 			</view>
+		</view>
+		<scroll-view scroll-y @scrolltolower="scrollGet" class="for-max-box">
 			<view class="list">
 				<view class="list-li" @click="planClick(item)" v-for="(item,index) in dataList">
 					<view :id="item.status==0?'bgColor-A':'bgColor-B'">{{item.status==0?'全部检查':'专项检查'}}</view>
@@ -29,7 +27,11 @@
 					<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 				</view>
 			</view>
-
+			<view class="get-data-p" v-if="!getDataType">
+				<img class="get-data-img" src="@/pages_safetyCheck/images/icon_aqjc_sl.png">
+				<view class="get-data-text">上拉加载</view>
+			</view>
+			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</scroll-view>
 		<view class="shade" v-if="dialogVisible">
 			<view class="null-box" @click="dialogClose()"></view>
@@ -79,11 +81,11 @@
 						title: '学院自查计划',
 						img: require('@/pages_safetyCheck/images/icon_aqjc_xxzc@1x.png'),
 					},
-					{
-						name: '现场检查',
-						title: '检查隐患草稿',
-						img: require('@/pages_safetyCheck/images/icon_aqjc_xcjc@1x.png'),
-					},
+					// {
+					// 	name: '现场检查',
+					// 	title: '检查隐患草稿',
+					// 	img: require('@/pages_safetyCheck/images/icon_aqjc_xcjc@1x.png'),
+					// },
 					{
 						name: '随手拍',
 						title: '隐患上报整改',
@@ -91,41 +93,87 @@
 					},
 				],
 				curTab: 0,
-				dataList: [{
+				queryParams:{
+					page:1,
+					pageSize:20,
+				},
+				total:0,
+				dataList: [
+					{
 						status: 0,
 						title: '计划标题计划标题计划标题计划标题计划标题计划标题计划标题计划标题',
 					},
 					{
 						status: 1,
 						title: '计划标题计划标题计划标题计划标题',
-					}
+					},
+					{
+						status: 0,
+						title: '计划标题计划标题计划标题计划标题计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 1,
+						title: '计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 0,
+						title: '计划标题计划标题计划标题计划标题计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 1,
+						title: '计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 0,
+						title: '计划标题计划标题计划标题计划标题计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 1,
+						title: '计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 0,
+						title: '计划标题计划标题计划标题计划标题计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 1,
+						title: '计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 0,
+						title: '计划标题计划标题计划标题计划标题计划标题计划标题计划标题计划标题',
+					},
+					{
+						status: 1,
+						title: '计划标题计划标题计划标题计划标题',
+					},
 				],
+				getDataType: false,
 				dialogVisible: false,
-				batchList:[
-					{
-						title:'第3次检查',
-						time:'2024-04-01',
-						schedule:'0%',
+				batchList: [{
+						title: '第3次检查',
+						time: '2024-04-01',
+						schedule: '0%',
 					},
 					{
-						title:'第3次检查',
-						time:'2024-04-01',
-						schedule:'0%',
+						title: '第3次检查',
+						time: '2024-04-01',
+						schedule: '0%',
 					},
 					{
-						title:'第3次检查',
-						time:'2024-04-01',
-						schedule:'0%',
+						title: '第3次检查',
+						time: '2024-04-01',
+						schedule: '0%',
 					},
 					{
-						title:'第3次检查',
-						time:'2024-04-01',
-						schedule:'0%',
+						title: '第3次检查',
+						time: '2024-04-01',
+						schedule: '0%',
 					},
 					{
-						title:'第3次检查',
-						time:'2024-04-01',
-						schedule:'0%',
+						title: '第3次检查',
+						time: '2024-04-01',
+						schedule: '0%',
 					},
 				],
 			}
@@ -141,36 +189,46 @@
 
 		},
 		methods: {
-			//滚动事件
-			scrollGet() {},
+			//滚动加载事件
+			scrollGet() {
+				let self = this;
+				if (self.total / self.queryParams.pageSize <= self.queryParams.page) {
+					this.$set(this, 'getDataType', true);
+				} else {
+					console.log('滚动加载触发')
+					// this.queryParams.page += 1;
+					// this.$nextTick(() => {
+					// 	this.getList();
+					// })
+				}
+			},
 			//顶部tab点击
 			tabClick(index) {
-				this.curTab = index;
-				if(index==0){
-					//校级检查
-					
-				}else if(index==1){
-					//学院自查
-					
-				}else if(index==2){
-					//现场检查
-					
-				}else if(index==3){
-					//随手拍
-					uni.navigateTo({
-						url: "/pages_safetyCheck/views/snapshotManage/snapshotList",
-					});
+				if(this.curTab != index){
+					if (index == 0) {
+						//校级检查
+						this.$set(this,'curTab',index);
+					} else if (index == 1) {
+						//学院自查
+						this.$set(this,'curTab',index);
+					}else if (index == 2) {
+						//随手拍
+						uni.navigateTo({
+							url: "/pages_safetyCheck/views/snapshotManage/snapshotList",
+						});
+					}
 				}
 			},
 			//检查批次点击
-			batchClick(row){
-				let infoData=row;
-				infoData.pageType=this.curTab;
+			batchClick(row) {
+				let infoData = row;
+				infoData.pageType = this.curTab;
 				uni.navigateTo({
-					url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' + encodeURIComponent(JSON.stringify(
+						infoData))
 				});
 			},
-			planClick(row){
+			planClick(row) {
 				//如果只有1个检查批次不弹窗
 				this.dialogVisible = true;
 			},
@@ -185,39 +243,22 @@
 <style lang="stylus" scoped>
 	.planDetail {
 		height: 100%;
-		display flex;
-		box-sizing: border-box;
-
-		#fontColor-A {
-			color: #0040C1;
-		}
-
-		#fontColor-B {
-			color: #009519;
-		}
-
-		#bgColor-A {
-			color: #0183FA;
-			background: rgba(1, 131, 250, 0.2);
-		}
-
-		#bgColor-B {
-			color: #16B531;
-			background: rgba(22, 181, 49, 0.2);
-		}
-
-
+		display:flex;
+		flex-direction: column;
 		.header {
 			width: 100%;
-			position: fixed;
-			top: 0rpx;
-			z-index: 100;
-			.header-bg{
+			height:235px;
+			// position: fixed;
+			// top: 0rpx;
+			// z-index: 100;
+
+			.header-bg {
 				width: 750rpx;
 				height: 336rpx;
 				position: absolute;
-				
+
 			}
+
 			.tabTitle {
 				width: 690rpx;
 				height: 250rpx;
@@ -229,13 +270,14 @@
 				position: absolute;
 				left: 30rpx;
 				top: 208rpx;
-				
+
 				.tabTitle_li {
 					height: 250rpx;
 					flex: 1;
 					position: relative;
 					text-align center;
-					.line{
+
+					.line {
 						width: 2rpx;
 						height: 30rpx;
 						background: #D8D8D8;
@@ -243,6 +285,7 @@
 						position: absolute;
 						top: 40%;
 					}
+
 					.tabTitle_text {
 						display: flex;
 						justify-content: center;
@@ -297,53 +340,76 @@
 					}
 
 				}
-				
+
 			}
 		}
-
-		.list {
-			margin-top: 482rpx;
-            width: 690rpx;
-			margin-left: 30rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			.list-li {
-				border-bottom: 1rpx dashed #E0E0E0;
-				height: 80rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-
-				>view:nth-of-type(1) {
-					width: 120rpx;
-					height: 40rpx;
-					background: rgba(1, 131, 250, 0.2);
-					border-radius: 10rpx 10rpx 10rpx 10rpx;
-					font-size: 24rpx;
-					color: #0183FA;
-					line-height: 40rpx;
-					text-align: center;
+		.for-max-box{
+			flex: 1;
+			overflow-y scroll;
+			.list {
+				width: 690rpx;
+				margin-left: 30rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				.list-li:nth-child(1){
+					border-top:none;
 				}
-
-				>view:nth-of-type(2) {
-					flex: 1;
-					font-size: 28rpx;
-					color: #333333;
-					line-height: 39rpx;
-					text-align: left;
-					margin: 0 52rpx 0 20rpx;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
+				.list-li {
+					border-top: 1rpx dashed #E0E0E0;
+					height: 80rpx;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					padding: 0 30rpx;
+					box-sizing: border-box;
+			
+					>view:nth-of-type(1) {
+						width: 120rpx;
+						height: 40rpx;
+						background: rgba(1, 131, 250, 0.2);
+						border-radius: 10rpx 10rpx 10rpx 10rpx;
+						font-size: 24rpx;
+						color: #0183FA;
+						line-height: 40rpx;
+						text-align: center;
+					}
+			
+					>view:nth-of-type(2) {
+						flex: 1;
+						font-size: 28rpx;
+						color: #333333;
+						line-height: 39rpx;
+						text-align: left;
+						margin: 0 52rpx 0 20rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+			
+					>img {
+						width: 24rpx;
+						height: 24rpx;
+					}
+			
 				}
-
-				>img {
-					width: 24rpx;
-					height: 24rpx;
+			}
+			.get-data-p{
+				height:100rpx;
+				text-align: center;
+				.get-data-img{
+					width:30rpx;
+					height:30rpx;
+					margin:0 auto;
+					margin-top:15rpx;
+				}
+				.get-data-text{
+					text-align: center;
 				}
-
+			}
+			.get-data-null-p{
+				height:100rpx;
+				line-height:100rpx;
+				text-align: center;
 			}
 		}
 
@@ -390,25 +456,29 @@
 						height: 12rpx;
 					}
 				}
-				.batch{
+
+				.batch {
 					padding: 0 30rpx;
 					box-sizing: border-box;
-					.batch-li{
+
+					.batch-li {
 						display: flex;
 						justify-content: space-between;
 						align-items: center;
 						border-bottom: 1rpx solid #E0E0E0;
 						padding: 20rpx 0 16rpx 0rpx;
 						box-sizing: border-box;
-						.batch-li-l{
-							>text:nth-of-type(1){
+
+						.batch-li-l {
+							>text:nth-of-type(1) {
 								display: block;
 								font-size: 30rpx;
 								color: #333333;
 								line-height: 42rpx;
 								text-align: left;
 							}
-							>text:nth-of-type(2){
+
+							>text:nth-of-type(2) {
 								display: block;
 								font-size: 28rpx;
 								color: #666666;
@@ -417,7 +487,8 @@
 								margin-top: 6rpx;
 							}
 						}
-						.batch-li-r{
+
+						.batch-li-r {
 							font-size: 28rpx;
 							color: #666666;
 							line-height: 39rpx;
@@ -425,7 +496,8 @@
 							display: flex;
 							justify-content: flex-start;
 							align-items: center;
-							>img{
+
+							>img {
 								width: 24rpx;
 								height: 24rpx;
 								margin-left: 9rpx;
@@ -435,5 +507,23 @@
 				}
 			}
 		}
+		
+		#fontColor-A {
+			color: #0040C1;
+		}
+		
+		#fontColor-B {
+			color: #009519;
+		}
+		
+		#bgColor-A {
+			color: #0183FA;
+			background: rgba(1, 131, 250, 0.2);
+		}
+		
+		#bgColor-B {
+			color: #16B531;
+			background: rgba(22, 181, 49, 0.2);
+		}
 	}
-</style>
+</style>

+ 2 - 2
pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -3,12 +3,12 @@
 	<view class="snapshotList">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="tabTitle" v-if="userType==0">
-				<view :class="tabIndex==index?'tab-A':'tab-B'" v-for="(item,index) in tabList" @click="tabClick(index)">
+				<view :class="tabIndex==index?'tab-A':'tab-B'" v-for="(item,index) in tabList" :key='index' @click="tabClick(index)">
 					{{item}}
 				</view>
 			</view>
 			<view class="tabTitleTow" v-if="userType==1">
-				<view :class="tabIndexTow==index?'tab-C':'tab-D'" v-for="(item,index) in tabListTow"
+				<view :class="tabIndexTow==index?'tab-C':'tab-D'" v-for="(item,index) in tabListTow" :key='index'
 					@click="tabClickTow(index)">{{item}}</view>
 			</view>
 			<view v-if="pageType==0">