Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-xcx

pages/views/dataBoard/dataBoard.vue

@@ -196,10 +196,9 @@
 
 			.header-t {
 				width: 100%;
-				height: 50rpx;
 				position: absolute;
 				left: 0;
-				top: 154rpx;
+				top: 164rpx;
 				z-index: 200;
 
 				.header-t-l {
@@ -213,7 +212,7 @@
 				.header-t-r {
 					position: absolute;
 					right: 0;
-					top: 0;
+					top: 20rpx;
 					font-weight: 400;
 					font-size: 28rpx;
 					color: #FFFFFF;

pages/views/teacherPage/teacherHome.vue

@@ -279,7 +279,6 @@
 		display: flex;
 		flex-direction: column;
 		overflow: hidden;
-		padding-bottom: 200rpx;
 
 		.data-board {
 			flex: 1;