首页入口修改

pages/views/pupilPage/pupilHome.vue

@@ -6,36 +6,24 @@
 			<img class="position-img" :src="rectangleLogo">
 		</view>
 		<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')">
 				<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')">
 				<view class="button-name">安全准入</view>
 			</view>
-			<!-- <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')" 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')">
 				<view class="button-name">隐患整改</view>
 			</view>
-			<!-- <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')" 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 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')">
-				<view class="button-name">危废回收</view>
+				<view class="button-name">危险废物管理</view>
 			</view>
 		</view>
-		<view class="button-two-box">
+		<!-- <view class="button-two-box">
 			<view class="button-big-box" @click="goPage('facilityReservationPupil')" 
 				style="background-color: #D6EBDA;margin-right:20rpx;">
 				<img :src="imagesUrl('home/icon_sy_ssyy@1x.png')">
@@ -52,7 +40,7 @@
 					<view>动物实验中心</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="button-two-box">
 			<view class="button-big-box" @click="goPage('snapshotPupil')"
 				style="background-color: #DFF0FF;margin-right:20rpx;">
@@ -80,15 +68,6 @@
 				</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> -->
 		<img class="scan_btn" @click.stop="saoCode" :src="imagesUrl('commonality/icon_xyxc_sm.png')">
 		<tab-bar></tab-bar>
 	</view>

pages/views/teacherPage/teacherHome.vue

@@ -9,42 +9,42 @@
 				<img class="position-img" :src="rectangleLogo">
 			</view>
 			<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')" style="margin:23rpx 0 0 20rpx;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqks@1x.png')">
 					<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')">
 					<view class="button-name">安全准入</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')">
 					<view class="button-name">分级管控</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')">
 					<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')" style="margin:23rpx 65rpx 0;">
+				<!-- <view class="button-min" @click="goPage('deviceManagement')" style="margin:23rpx 0 0 20rpx;">
 					<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')" style="margin:23rpx 20rpx 0 0;">
+				<view class="button-min" @click="goPage('emergencyDisposal')" style="margin:23rpx 65rpx 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('hazardousWasteRecycling')" style="margin:23rpx 0 0 20rpx;">
+				<view class="button-min" @click="goPage('hazardousWasteRecycling')" style="margin:23rpx 20rpx 0 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('cageSiteManagement')">
-					<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
-					<view class="button-name">笼位管理</view>
 				</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')">
+					<view class="button-name">安全预警</view>
+				</view>
+				<view class="button-min" @click="goPage('hazardousWasteRecycling')" style="margin:23rpx 65rpx 0;">
+					<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
+					<view class="button-name">危险废物管理</view>
+				</view>
 			</view>
 			<topWarn></topWarn>
 			<view class="button-two-box">
@@ -73,16 +73,16 @@
 						<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);">
 					<img :src="imagesUrl('home/home_button_03.png')">
 					<view class="button-min-box">
 						<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')">
 					<img :src="imagesUrl('home/img_ssyy@1x.png')">
 					<view class="button-min-box">
@@ -90,33 +90,6 @@
 						<view>预约审批 | 设施确认 | 费用结算</view>
 					</view>
 				</view>
-			</view>
-			<!-- <view class="button-three-box-1">
-				<view class="button-big-box" @click="goPage('leaveCheckPupilTeacher')">
-					<img :src="imagesUrl('home/img_lkjc@1x.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('cageSiteManagement')">
-					<img :src="imagesUrl('home/img_lwgl@1x.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()">
-					<img :src="imagesUrl('home/img_bg_hxpgk@1x.png')">
-					<view class="button-min-box">
-						<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>