dedsudiyu 1 week ago
parent
commit
e8143e458e
2 changed files with 31 additions and 31 deletions
  1. 18 18
      pages/views/pupilPage/pupilHome.vue
  2. 13 13
      pages/views/teacherPage/teacherHome.vue

+ 18 - 18
pages/views/pupilPage/pupilHome.vue

@@ -6,11 +6,11 @@
 			<img class="position-img" :src="rectangleLogo">
 			<img class="position-img" :src="rectangleLogo">
 		</view>
 		</view>
 		<view class="button-one-box">
 		<view class="button-one-box">
-			<view class="button-min" @click="goPage('securityExaminationPupil')" style="margin:23rpx 0 0 20rpx;">
+			<!-- <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')">
 				<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')" style="margin:23rpx 65rpx 0;">
+			</view> -->
+			<view class="button-min" @click="goPage('securityAdmittancePupil')" style="margin:23rpx 0 0 20rpx;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqzr@1x.png')">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqzr@1x.png')">
 				<view class="button-name">安全准入</view>
 				<view class="button-name">安全准入</view>
 			</view>
 			</view>
@@ -18,7 +18,7 @@
 				<img class="button-img" :src="imagesUrl('home/icon_sy_fjgk@1x.png')">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_fjgk@1x.png')">
 				<view class="button-name">分级管控</view>
 				<view class="button-name">分级管控</view>
 			</view> -->
 			</view> -->
-			<view class="button-min" @click="goPage('securityCheck')" style="margin:23rpx 20rpx 0 0;">
+			<view class="button-min" @click="goPage('securityCheck')" style="margin:23rpx 65rpx 0;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqjc@1x.png')">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqjc@1x.png')">
 				<view class="button-name">隐患整改</view>
 				<view class="button-name">隐患整改</view>
 			</view>
 			</view>
@@ -30,12 +30,12 @@
 				<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
 				<view class="button-name">笼位预约</view>
 				<view class="button-name">笼位预约</view>
 			</view> -->
 			</view> -->
-			<view class="button-min" @click="goPage('hazardousWasteRecyclingPupil')" style="margin:23rpx 0 0 20rpx;">
+			<view class="button-min" @click="goPage('hazardousWasteRecyclingPupil')" style="margin:23rpx 20rpx 0 0;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 				<view class="button-name">危废回收</view>
 				<view class="button-name">危废回收</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view class="button-two-box">
+		<!-- <view class="button-two-box">
 			<view class="button-big-box" @click="goPage('facilityReservationPupil')" 
 			<view class="button-big-box" @click="goPage('facilityReservationPupil')" 
 				style="background-color: #D6EBDA;margin-right:20rpx;">
 				style="background-color: #D6EBDA;margin-right:20rpx;">
 				<img :src="imagesUrl('home/icon_sy_ssyy@1x.png')">
 				<img :src="imagesUrl('home/icon_sy_ssyy@1x.png')">
@@ -52,6 +52,15 @@
 					<view>动物实验中心</view>
 					<view>动物实验中心</view>
 				</view>
 				</view>
 			</view>
 			</view>
+		</view> -->
+		<view class="button-three-box">
+			<view class="button-big-box button-big-box-1" @click="goPage('leaveCheckPupil')">
+				<img :src="imagesUrl('home/img_lkjc@1_1x.png')">
+				<view class="button-min-box">
+					<view>离开检查</view>
+					<view>拍照上传</view>
+				</view>
+			</view>
 		</view>
 		</view>
 		<view class="button-two-box">
 		<view class="button-two-box">
 			<view class="button-big-box" @click="goPage('snapshotPupil')"
 			<view class="button-big-box" @click="goPage('snapshotPupil')"
@@ -62,23 +71,14 @@
 					<view>隐患上报</view>
 					<view>隐患上报</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="button-big-box" @click="goPage('violationRecordPupil')"
+			<!-- <view class="button-big-box" @click="goPage('violationRecordPupil')"
 				style="background-color: #FFF0DD;">
 				style="background-color: #FFF0DD;">
 				<img :src="imagesUrl('home/home_button_02.png')">
 				<img :src="imagesUrl('home/home_button_02.png')">
 				<view class="button-min-box">
 				<view class="button-min-box">
 					<view>违规记录</view>
 					<view>违规记录</view>
 					<view>安全违规行为</view>
 					<view>安全违规行为</view>
 				</view>
 				</view>
-			</view>
-		</view>
-		<view class="button-three-box">
-			<view class="button-big-box button-big-box-1" @click="goPage('leaveCheckPupil')">
-				<img :src="imagesUrl('home/img_lkjc@1_1x.png')">
-				<view class="button-min-box">
-					<view>离开检查</view>
-					<view>拍照上传</view>
-				</view>
-			</view>
+			</view> -->
 		</view>
 		</view>
 		<!-- <view class="button-three-box">
 		<!-- <view class="button-three-box">
 			<view class="button-big-box" @click="goPage('violationRecordPupil')">
 			<view class="button-big-box" @click="goPage('violationRecordPupil')">
@@ -425,7 +425,7 @@
 			width: 690rpx;
 			width: 690rpx;
 			height: 120rpx;
 			height: 120rpx;
 			display: flex;
 			display: flex;
-			margin: 20rpx 30rpx 0;
+			margin: 0 30rpx 0;
 
 
 			.button-big-box {
 			.button-big-box {
 				width: 335rpx;
 				width: 335rpx;

+ 13 - 13
pages/views/teacherPage/teacherHome.vue

@@ -9,19 +9,19 @@
 				<img class="position-img" :src="rectangleLogo">
 				<img class="position-img" :src="rectangleLogo">
 			</view>
 			</view>
 			<view class="button-one-box">
 			<view class="button-one-box">
-				<view class="button-min" @click="goPage('securityExamination')" style="margin:23rpx 0 0 20rpx;">
+				<!-- <view class="button-min" @click="goPage('securityExamination')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqks@1x.png')">
 					<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')" style="margin:23rpx 65rpx 0;">
+				</view> -->
+				<view class="button-min" @click="goPage('securityAdmittance')"  style="margin:23rpx 0 0 20rpx;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqzr@1x.png')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqzr@1x.png')">
 					<view class="button-name">安全准入</view>
 					<view class="button-name">安全准入</view>
 				</view>
 				</view>
-				<view class="button-min" @click="goPage('hierarchicalControl')" style="margin:23rpx 20rpx 0 0;">
+				<view class="button-min" @click="goPage('hierarchicalControl')" style="margin:23rpx 65rpx 0;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_fjgk@1x.png')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_fjgk@1x.png')">
 					<view class="button-name">分级管控</view>
 					<view class="button-name">分级管控</view>
 				</view>
 				</view>
-				<view class="button-min" @click="goPage('securityCheck')" style="margin:23rpx 0 0 20rpx;">
+				<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')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqjc@1x.png')">
 					<view class="button-name">安全检查</view>
 					<view class="button-name">安全检查</view>
 				</view>
 				</view>
@@ -29,15 +29,15 @@
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqzrr@1x.png')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqzrr@1x.png')">
 					<view class="button-name">安全责任</view>
 					<view class="button-name">安全责任</view>
 				</view> -->
 				</view> -->
-				<view class="button-min" @click="goPage('deviceManagement')" style="margin:23rpx 65rpx 0;">
+				<!-- <view class="button-min" @click="goPage('deviceManagement')" style="margin:23rpx 65rpx 0;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_sbgl@1x.png')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_sbgl@1x.png')">
 					<view class="button-name">设备管理</view>
 					<view class="button-name">设备管理</view>
-				</view>
-				<view class="button-min" @click="goPage('emergencyDisposal')" style="margin:23rpx 20rpx 0 0;">
+				</view> -->
+				<view class="button-min" @click="goPage('emergencyDisposal')" style="margin:23rpx 0 0 20rpx;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_yjcz@1x.png')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_yjcz@1x.png')">
 					<view class="button-name">应急处置</view>
 					<view class="button-name">应急处置</view>
 				</view>
 				</view>
-				<view class="button-min" @click="goPage('hazardousWasteRecycling')" style="margin:23rpx 0 0 20rpx;">
+				<view class="button-min" @click="goPage('hazardousWasteRecycling')"  style="margin:23rpx 65rpx 0;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 					<view class="button-name">危废回收</view>
 					<view class="button-name">危废回收</view>
 				</view>
 				</view>
@@ -73,16 +73,16 @@
 						<view>拍照上传</view>
 						<view>拍照上传</view>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="button-big-box" @click="goPage('cageSiteManagement')" 
+				<!-- <view class="button-big-box" @click="goPage('cageSiteManagement')" 
 					style="background-color: rgba(201,159,255,0.2);">
 					style="background-color: rgba(201,159,255,0.2);">
 					<img :src="imagesUrl('home/home_button_03.png')">
 					<img :src="imagesUrl('home/home_button_03.png')">
 					<view class="button-min-box">
 					<view class="button-min-box">
 						<view>笼位管理</view>
 						<view>笼位管理</view>
 						<view>实验动物中心</view>
 						<view>实验动物中心</view>
 					</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			</view>
-			<view class="button-three-box">
+			<!-- <view class="button-three-box">
 				<view class="button-big-box button-big-box-1" @click="goPage('facilityReservation')">
 				<view class="button-big-box button-big-box-1" @click="goPage('facilityReservation')">
 					<img :src="imagesUrl('home/img_ssyy@1x.png')">
 					<img :src="imagesUrl('home/img_ssyy@1x.png')">
 					<view class="button-min-box">
 					<view class="button-min-box">
@@ -90,7 +90,7 @@
 						<view>预约审批 | 设施确认 | 费用结算</view>
 						<view>预约审批 | 设施确认 | 费用结算</view>
 					</view>
 					</view>
 				</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- <view class="button-three-box-1">
 			<!-- <view class="button-three-box-1">
 				<view class="button-big-box" @click="goPage('leaveCheckPupilTeacher')">
 				<view class="button-big-box" @click="goPage('leaveCheckPupilTeacher')">
 					<img :src="imagesUrl('home/img_lkjc@1x.png')">
 					<img :src="imagesUrl('home/img_lkjc@1x.png')">