zc

pages/views/pupilPage/pupilHome.vue

@@ -6,30 +6,30 @@
 			<img class="position-img" :src="rectangleLogo">
 		</view>
 		<view class="button-one-box">
-			<view class="button-min" @click="goPage('securityExaminationPupil')">
+			<view class="button-min" @click="goPage('securityExaminationPupil')" style="margin:23rpx 0 0 20rpx;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqks@1x.png')">
-				<view class="button-name">安全考试</view>
+				<view class="button-name">教育考试</view>
 			</view>
-			<view class="button-min" @click="goPage('securityAdmittancePupil')">
+			<view class="button-min" @click="goPage('securityAdmittancePupil')" style="margin:23rpx 65rpx 0;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqzr@1x.png')">
 				<view class="button-name">安全准入</view>
 			</view>
-			<view class="button-min" @click="goPage('hierarchicalControlPupil')">
+			<!-- <view class="button-min" @click="goPage('hierarchicalControlPupil')" style="margin:23rpx 20rpx 0 0;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_fjgk@1x.png')">
 				<view class="button-name">分级管控</view>
-			</view>
-			<view class="button-min" @click="goPage('securityCheck')">
+			</view> -->
+			<view class="button-min" @click="goPage('securityCheck')" style="margin:23rpx 20rpx 0 0;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqjc@1x.png')">
-				<view class="button-name">安全检查</view>
+				<view class="button-name">隐患整改</view>
 			</view>
-			<view class="button-min" @click="goPage()">
+			<!-- <view class="button-min" @click="goPage()" style="margin:23rpx 65rpx 0;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 				<view class="button-name">化学品</view>
 			</view>
-			<view class="button-min" @click="goPage('cageSiteSubscribePupil')">
+			<view class="button-min" @click="goPage('cageSiteSubscribePupil')" style="margin:23rpx 20rpx 0 0;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
 				<view class="button-name">笼位预约</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="button-two-box">
 			<view class="button-big-box" @click="goPage('snapshotPupil')"
@@ -37,26 +37,44 @@
 				<img :src="imagesUrl('home/icon_sy_ssp@1x.png')">
 				<view class="button-min-box">
 					<view>随手拍</view>
-					<view>发现隐患</view>
+					<view>隐患上报</view>
 				</view>
 			</view>
 			<view class="button-big-box" @click="goPage('leaveCheckPupil')" style="background-color: #D6EBDA;">
-				<img :src="imagesUrl('home/img_sy_lkjc@1x.png')">
+				<img :src="imagesUrl('home/home_button_01.png')">
 				<view class="button-min-box">
 					<view>离开检查</view>
-					<view>拍照检查</view>
+					<view>拍照上传</view>
 				</view>
 			</view>
 		</view>
-		<view class="button-three-box">
+		<view class="button-two-box">
+			<view class="button-big-box" @click="goPage('violationRecordPupil')"
+				style="background-color: #FFF0DD;margin-right:20rpx;">
+				<img :src="imagesUrl('home/home_button_02.png')">
+				<view class="button-min-box">
+					<view>违规记录</view>
+					<view>安全违规行为</view>
+				</view>
+			</view>
+			<view class="button-big-box" @click="goPage('cageSiteSubscribePupil')" 
+			style="background-color: #ced4f8;">
+				<img :src="imagesUrl('home/home_button_03.png')">
+				<view class="button-min-box">
+					<view>笼位预约</view>
+					<view>动物实验中心</view>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="button-three-box">
 			<view class="button-big-box" @click="goPage('violationRecordPupil')">
 				<img :src="imagesUrl('home/img_wd_wgjl@1x.png')">
 				<view class="button-min-box">
 					<view>违规记录</view>
-					<view>实验室安全违规行为查询</view>
+					<view>安全违规行为</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<img class="scan_btn" @click.stop="saoCode" :src="imagesUrl('commonality/icon_xyxc_sm.png')">
 		<tab-bar></tab-bar>
 	</view>
@@ -139,7 +157,9 @@
 
 				} else if (type == 'cageSiteSubscribePupil') {
 					//笼位预约
-
+					uni.navigateTo({
+						url: "/pages_basics/views/deviceCageSitePage?pageType=2",
+					});
 				} else if (type == 'snapshotPupil') {
 					//随手拍
 					uni.navigateTo({

pages/views/teacherPage/teacherHome.vue

@@ -9,38 +9,38 @@
 				<img class="position-img" :src="rectangleLogo">
 			</view>
 			<view class="button-one-box">
-				<view class="button-min" @click="goPage('securityCheck')">
-					<img class="button-img" :src="imagesUrl('home/icon_sy_aqjc@1x.png')">
-					<view class="button-name">安全检查</view>
-				</view>
-				<view class="button-min" @click="goPage('securityExamination')">
+				<view class="button-min" @click="goPage('securityExamination')" style="margin:23rpx 0 0 20rpx;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqks@1x.png')">
-					<view class="button-name">安全考试</view>
+					<view class="button-name">教育考试</view>
 				</view>
-				<view class="button-min" @click="goPage('securityAdmittance')">
+				<view class="button-min" @click="goPage('securityAdmittance')" style="margin:23rpx 65rpx 0;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqzr@1x.png')">
 					<view class="button-name">安全准入</view>
 				</view>
-				<view class="button-min" @click="goPage('hierarchicalControl')">
+				<view class="button-min" @click="goPage('hierarchicalControl')" style="margin:23rpx 20rpx 0 0;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_fjgk@1x.png')">
 					<view class="button-name">分级管控</view>
 				</view>
-				<view class="button-min" @click="goPage('securityResponsibility')">
+				<view class="button-min" @click="goPage('securityCheck')" style="margin:23rpx 0 0 20rpx;">
+					<img class="button-img" :src="imagesUrl('home/icon_sy_aqjc@1x.png')">
+					<view class="button-name">安全检查</view>
+				</view>
+				<!-- <view class="button-min" @click="goPage('securityResponsibility')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqzrr@1x.png')">
 					<view class="button-name">安全责任</view>
-				</view>
-				<view class="button-min" @click="goPage('deviceManagement')">
+				</view> -->
+				<view class="button-min" @click="goPage('deviceManagement')" style="margin:23rpx 65rpx 0;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_sbgl@1x.png')">
 					<view class="button-name">设备管理</view>
 				</view>
-				<view class="button-min" @click="goPage('emergencyDisposal')">
+				<view class="button-min" @click="goPage('emergencyDisposal')" style="margin:23rpx 20rpx 0 0;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_yjcz@1x.png')">
 					<view class="button-name">应急处置</view>
 				</view>
-				<view class="button-min" @click="goPage('cageSiteManagement')">
+				<!-- <view class="button-min" @click="goPage('cageSiteManagement')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
 					<view class="button-name">笼位管理</view>
-				</view>
+				</view> -->
 			</view>
 			<topWarn></topWarn>
 			<view class="button-two-box">
@@ -49,14 +49,14 @@
 					<img :src="imagesUrl('home/icon_sy_ssp@1x.png')">
 					<view class="button-min-box">
 						<view>随手拍</view>
-						<view>发现隐患</view>
+						<view>隐患上报</view>
 					</view>
 				</view>
 				<view class="button-big-box" @click="goPage('remoteDoorOpening')" style="background-color: #D6EBDA;">
 					<img :src="imagesUrl('home/img_sy_yckm@1x.png')">
 					<view class="button-min-box">
 						<view>远程开门</view>
-						<view>立即开门</view>
+						<view>打开门禁</view>
 					</view>
 				</view>
 			</view>
@@ -65,7 +65,16 @@
 					<img :src="imagesUrl('home/img_lkjc@1x.png')">
 					<view class="button-min-box">
 						<view>离开检查</view>
-						<view>拍照检查</view>
+						<view>拍照上传</view>
+					</view>
+				</view>
+			</view>
+			<view class="button-three-box">
+				<view class="button-big-box" @click="goPage('cageSiteManagement')">
+					<img :src="imagesUrl('home/img_lwgl@1x.png')">
+					<view class="button-min-box">
+						<view>笼位管理</view>
+						<view>实验动物中心</view>
 					</view>
 				</view>
 			</view>

pages_manage/views/accessQualification/accessQualification.vue

@@ -2,11 +2,13 @@
 <template>
 	<view id="accessQualification">
 		<view class="top-picker-max-box">
-			<view class="top-picker-left-box">审核状态</view>
-			<picker class="top-picker-right-box" @change="buttonChange" :range-key="'name'" :value="id"
-				:range="buttonArray">
+			<input class="top-picker-input-box" type="text" 
+			v-model="queryParams.searchValue" placeholder="申请人/实验室名称/房间号" maxlength="20">
+			<picker class="top-picker-right-box" @change="buttonChange" 
+				:range-key="'name'" :value="id" :range="buttonArray">
 				<view>{{buttonArray[buttonArrayIndex].name}}</view>
 			</picker>
+			<view class="top-picker-left-box" @click="getButton()">搜索</view>
 		</view>
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="for-big-box" v-for="(item,index) in dataList" :key="index">
@@ -65,6 +67,7 @@
 				auditStatus: "",
 				//列表请求参数
 				queryParams: {
+					searchValue:'',
 					page: 1,
 					pageSize: 20,
 				},
@@ -84,6 +87,10 @@
 
 		},
 		methods: {
+			getButton(){
+				this.clearData();
+				this.getList();
+			},
 			//清除
 			clearData() {
 				this.dataList = [];
@@ -112,10 +119,10 @@
 			},
 			//选择
 			buttonChange(e) {
-				this.clearData()
+				// this.clearData()
 				this.buttonArrayIndex = e.detail.value;
 				this.$set(this, 'auditStatus', this.buttonArray[this.buttonArrayIndex].id);
-				this.getList();
+				// this.getList();
 			},
 			//获取列表数据
 			async getList() {
@@ -177,18 +184,38 @@
 
 			.top-picker-left-box {
 				margin-top: 34rpx;
-				line-height: 82rpx;
-				width: 145rpx;
-				text-align center;
+				line-height: 84rpx;
+				height:84rpx;
+				text-align: center;
+				width: 120rpx;
+				border-radius:6rpx;
+				background-color: #0183fa;
+				color:#fff;
+				margin-left:20rpx;
 			}
 
+			.top-picker-input-box {
+				margin-top: 34rpx;
+				width: 350rpx;
+				height: 82rpx;
+				border: 1rpx solid #A2A2A2;
+				line-height: 82rpx;
+				border-radius: 6rpx;
+				margin-left:30rpx;
+				padding:0 20rpx;
+				view {
+					padding: 0 20rpx;
+					color: #999999;
+				}
+			}
 			.top-picker-right-box {
 				margin-top: 34rpx;
-				width: 586rpx;
+				width: 140rpx;
 				height: 82rpx;
 				border: 1rpx solid #A2A2A2;
 				line-height: 82rpx;
 				border-radius: 6rpx;
+				margin-left:20rpx;
 
 				view {
 					padding: 0 20rpx;

pages_student/views/accessApplication/newApplication.vue

@@ -425,6 +425,7 @@
 					deptName: this.subjectData.sysUser.deptName, //NULL部门名称
 					subId: this.subject.subId, //NULL实验室id
 					subName: this.subject.subName, //NULL实验室名称
+					roomNum: this.subject.roomNum, //NULL实验室名称
 					auditStatus: "0", //NULL审核状态 0待审核 1驳回 2通过
 					//validLength: this.validLength, //NULL有效期 月份时长
 					relList: [], //上传资料