zc

pages/views/pupilPage/pupilHome.vue

@@ -333,8 +333,8 @@
 			position: fixed;
 			bottom: 210rpx;
 			right: 0rpx;
-			width: 130rpx;
-			height: 130rpx;
+			width: 140rpx;
+			height: 140rpx;
 		}
 	}
 </style>

pages/views/saoCode/saoCode.vue

@@ -33,10 +33,11 @@
 				list.forEach((item) => {
 					codeData[item.split("=")[0]] = item.split("=")[1];
 				})
+				console.log(codeData)
 				if (!uni.getStorageSync('token')) {
 					uni.setStorageSync('codeData', codeData);
 					uni.reLaunch({
-						url: '/pages/login/login',
+						url: '/pages/views/login/login',
 					});
 				} else {
 					//二维码功能识别

pages/views/teacherPage/teacherHome.vue

@@ -427,8 +427,8 @@
 				position: fixed;
 				bottom: 210rpx;
 				right: 0rpx;
-				width: 130rpx;
-				height: 130rpx;
+				width: 140rpx;
+				height: 140rpx;
 			}
 		}
 	}

pages_manage/views/laboratory/safetyCardScan.vue

@@ -84,10 +84,8 @@
 		</view>
 		<view class="position-button-box">
 			<view class="position-button-p-null"></view>
-			<view class="position-button-p-1">检查</view>
-			<view class="position-button-p-2">整改</view>
-			<view class="position-button-p-3">复查</view>
-			<view class="position-button-p-4">随手拍</view>
+			<view class="position-button-p-1" @click="goPage('securityCheck')">安全检查</view>
+			<view class="position-button-p-4" @click="goPage('snapshot')">随手拍</view>
 			<view class="position-button-p-null"></view>
 		</view>
 		<!-- 物联控制 -->
@@ -99,6 +97,9 @@
 </template>
 
 <script>
+	import {
+		pageRestrictVerify
+	} from '@/utils/index'
 	import {
 		iotControl
 	} from '@/pages_manage/views/laboratory/iotControl.vue'
@@ -141,19 +142,8 @@
 					safeUserList: [],
 					labInfoBrandModels: [],
 				},
-				//语音广播弹窗
-				broadcastPage: false,
-				//空调弹窗
-				conditioningPage: false,
-				// 查询参数
-				queryParams: {
-					page: 1,
-					pageSize: 20,
-				},
 				subjectData: null,
-				// 空调弹窗
-				airConditioningData: null,
-				saoCodeType: false,
+				identityData: uni.getStorageSync('identityData'),
 
 			}
 		},
@@ -189,18 +179,12 @@
 		methods: {
 			//展开/收起操作
 			unfoldPackUp(type, index) {
-				console.log('type', type)
-				console.log('item', index)
 				if (type == 'subAdminShowType') {
-					console.log('1')
 					this.$set(this.newData, 'subAdminShowType', !this.newData.subAdminShowType);
 				} else if (type == 'adminShowType') {
-					console.log('2')
 					this.$set(this.newData, 'adminShowType', !this.newData.adminShowType);
 				} else if (type == 'list') {
-					console.log('3')
-					this.$set(this.newData.labInfoBrandModels[index], 'showType', !this.newData.labInfoBrandModels[index]
-					.showType);
+					this.$set(this.newData.labInfoBrandModels[index], 'showType', !this.newData.labInfoBrandModels[index].showType);
 				}
 			},
 			//顶部tab点击
@@ -209,42 +193,38 @@
 					this.$set(this, 'pageType', index);
 				}
 			},
-			goVideoPage() {
-				console.log('视频')
-				let obj = {
-					type: 4,
-					subId: this.newData.subId
+			goPage(type){
+				if (!pageRestrictVerify(type)) {
+					uni.showToast({
+						title: '没有相关权限,请联系管理员',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
 				}
-				uni.navigateTo({
-					url: '/pages_manage/views/laboratory/videoPlayer?item=' + encodeURIComponent(JSON.stringify(
-						obj))
-				});
-			},
-			getIotControlData() {
-				this.$refs['iotControl'].iotAppHardwareFindByType();
-			},
-			buttonClick(type, row) {
-				let self = this;
-				if (type == 'subDetail') {
-					//实验室详情
-				} else if (type == 'broadcastOpen') {
-					//语音弹窗开启
-					this.$set(this, 'broadcastPage', true);
-				} else if (type == 'broadcastClose') {
-					//语音弹窗关闭
-					this.$set(this, 'broadcastPage', false);
-				} else if (type == 'conditioningOpen') {
-					//空调弹窗开启
-					this.$set(this, 'airConditioningData', row);
-					this.$set(this, 'conditioningPage', true);
-				} else if (type == 'conditioningClose') {
-					//空调弹窗关闭
-					this.$set(this, 'conditioningPage', false);
-				} else if (type == 'back') {
-					this.$set(this, 'pageType', 2);
+				if (type == 'securityCheck') {
+					//安全检查
+					if(this.identityData){
+						uni.navigateTo({
+							url: "/pages_safetyCheck/views/safetyCheck",
+						});
+					}else{
+						uni.showToast({
+							mask: true,
+							icon: "none",
+							position: "center",
+							title: '您不是校/院级管理员或督导组成员,无法使用该功能.',
+							duration: 2000
+						});
+					}
+				} else if (type == 'snapshot') {
+					//随手拍
+					uni.navigateTo({
+						url: "/pages_safetyCheck/views/snapshotManage/snapshotList",
+					});
 				}
 			},
-
 		}
 	}
 </script>
@@ -255,6 +235,7 @@
 		display: flex;
 		flex-direction: column;
 		overflow: hidden;
+
 		#fontColor-A {
 			color: #00DEDE;
 		}
@@ -354,11 +335,13 @@
 
 		/* 安全信息牌 */
 		.safetyCard {
-			flex:1;
+			flex: 1;
 			overflow-y: scroll;
-			padding-bottom:150rpx;
+			padding-bottom: 150rpx;
+
 			.lab-info {
 				background: #FFFFFF;
+
 				.lab-info-t {
 					width: 750rpx;
 					height: 80rpx;
@@ -643,51 +626,59 @@
 				}
 			}
 		}
-		.position-button-box{
-			position:absolute;
-			bottom:25rpx;
-			left:60rpx;
-			width:640rpx;
-			height:100rpx;
+
+		.position-button-box {
+			position: absolute;
+			bottom: 25rpx;
+			left: 60rpx;
+			width: 640rpx;
+			height: 100rpx;
 			display: flex;
-			color:#fff;
+			color: #fff;
 			overflow: hidden;
-			view:nth-child(2){
-				border-top-left-radius: 10rpx
-				border-bottom-left-radius: 10rpx
+
+			view:nth-child(2) {
+				border-top-left-radius: 10rpx;
+				border-bottom-left-radius: 10rpx;
 			}
-			view:nth-last-child(2){
-				border-top-right-radius: 10rpx
-				border-bottom-right-radius: 10rpx
+
+			view:nth-last-child(2) {
+				border-top-right-radius: 10rpx;
+				border-bottom-right-radius: 10rpx;
 			}
-			.position-button-p-null{
-				flex:1;
+
+			.position-button-p-null {
+				flex: 1;
 			}
-			.position-button-p-1{
-				width:160rpx;
-				line-height:100rpx;
-				font-size: 30rpx
+
+			.position-button-p-1 {
+				width: 160rpx;
+				line-height: 100rpx;
+				font-size: 30rpx;
 				text-align: center;
 				background-color: #0183FA;
 			}
-			.position-button-p-2{
-				width:160rpx;
-				line-height:100rpx;
-				font-size: 30rpx
+
+			.position-button-p-2 {
+				width: 160rpx;
+				line-height: 100rpx;
+				font-size: 30rpx;
 				text-align: center;
 				background-color: #16B531;
 			}
-			.position-button-p-3{
-				width:160rpx;
-				line-height:100rpx;
-				font-size: 30rpx
+
+			.position-button-p-3 {
+				width: 160rpx;
+				line-height: 100rpx;
+				font-size: 30rpx;
 				text-align: center;
 				background-color: #00DEDE;
 			}
-			.position-button-p-4{
-				width:160rpx;
-				line-height:100rpx;
-				font-size: 30rpx
+
+			.position-button-p-4 {
+				width: 160rpx;
+				line-height: 100rpx;
+				font-size: 30rpx;
 				text-align: center;
 				background-color: #FF8C00;
 			}