2021-3-8-16

App.vue

@@ -14,6 +14,10 @@
 	}
 </script>
 <style lang="scss">
+	html {
+	  box-sizing: border-box;
+	  font-size: 28rpx;
+	}
 	@font-face {
 		font-family: "iconfont";
 		src: url('~@/static/font/iconfont.eot?t=1614322974882');

pages/distribution/index.vue

@@ -8,7 +8,7 @@
 				</view>
 			</view>
 			<view class="page-section page-section-gap">
-				<map style="width: 100%; height: 88vh;" scale="3" :latitude="latitude" :longitude="longitude" :markers="covers"
+				<map style="width: 100%; height: 85vh;" scale="3" :latitude="latitude" :longitude="longitude" :markers="covers"
 				 :enable-zoom="true" @markertap="markertap">
 				</map>
 			</view>
@@ -246,6 +246,8 @@
 			height: 60rpx;
 			padding: 10rpx 20rpx;
 			width: 100%;
+			box-sizing: border-box;
+			font-size: 24rpx;
 		}
 
 		.particulars_ser {
@@ -254,12 +256,14 @@
 			height: 60rpx;
 			padding: 10rpx 20rpx;
 			width: 100%;
+			box-sizing: border-box;
+			font-size: 24rpx;
 		}
 	}
 
 	.distri_ser {
 		position: absolute;
-		bottom: 0px;
+		bottom: 17rpx;
 		right: 0px;
 		width: 100%;
 		height: 400rpx;
@@ -273,7 +277,7 @@
 			height: 60rpx;
 			border-radius: 30rpx;
 			padding: 10rpx 20rpx;
-
+			box-sizing: border-box;
 			input {
 				width: 90%;
 				font-size: 28rpx;
@@ -286,6 +290,7 @@
 			margin: 0 auto;
 			padding-left: 20rpx;
 			border-left: 4rpx solid #57C87B;
+			font-size: 28rpx;
 		}
 
 		.distri_ser_type {
@@ -295,13 +300,13 @@
 			justify-content: space-around;
 
 			.type_items {
-				height: 150rpx;
+				height: 120rpx;
 				width: 120rpx;
 				padding: 20rpx 0;
 			}
 
 			.type_items_bor {
-				height: 150rpx;
+				height: 120rpx;
 				width: 120rpx;
 				border: 2rpx solid #57C87B;
 				padding: 20rpx 0;
@@ -323,13 +328,13 @@
 	.search_btn {
 		width: 100%;
 		display: flex;
-
 		.btn_f,
 		.btn_t {
 			width: 50%;
 			text-align: center;
 			height: 80rpx;
 			line-height: 80rpx;
+			font-size: 28rpx;
 		}
 
 		.btn_f {

pages/environment/index.vue

@@ -71,7 +71,7 @@
 }
 .image{
 	position: fixed;
-	top: 44px;
+	top: 43px;
 	width: 100%;
 	height: 140rpx;
 	z-index: 555;
@@ -86,6 +86,7 @@
 		border-radius: 10rpx;
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding: 20rpx 40rpx 20rpx 80rpx;
+		box-sizing: border-box;
 		position: relative;
 		.prevents_item_img{
 			width: 30rpx;

pages/equipList/index.vue

@@ -133,6 +133,7 @@
 			width: 95%;
 			margin: 20rpx auto;
 			padding: 10rpx 20rpx;
+			box-sizing: border-box;
 			position: relative;
 			background-color: #FFFFFF;
 			box-shadow: 0 0 10rpx #bcb9ca;

pages/equipList/modification.vue

@@ -73,8 +73,9 @@
 		display: flex;
 		justify-content: space-between;
 		background-color: #FFFFFF;
-		padding: 30rpx 10rpx;
+		padding: 20rpx 10rpx;
 		color: #57C77A;
+		line-height: 50rpx;
 		input{
 			text-align: right;
 			font-size: 28rpx;

pages/equipMange/index/addusers.vue

@@ -238,7 +238,7 @@
 				padding: 0 20rpx;
 				margin: 20rpx 0;
 				background-color: #F7F8FA;
-
+				box-sizing: border-box;
 				.u-form-item {
 					padding: 0 10rpx;
 				}
@@ -248,11 +248,15 @@
 	}
 
 	.submitbtn {
-		width: 100%;
+		width: 95%;
 		position: absolute;
 		bottom: 80rpx;
 		background-color: $uni-color-success;
 		color: white;
+		left: 2.5%;
+		height: 70rpx;
+		font-size: 32rpx;
+		line-height: 70rpx;
 	}
 
 	.pop-up {

pages/expertDiagnosis/index.vue

@@ -115,7 +115,7 @@
 	height: 120rpx;
 	display: flex;
 	justify-content: space-around;
-	margin: 20rpx 0;
+	margin: 20rpx 0 30rpx;
 	.details_item{
 		width: 20%;
 		padding: 10rpx 20rpx;
@@ -123,7 +123,7 @@
 		font-size: 24rpx;
 		image{
 			width: 70%;
-			height: 64rpx;
+			height: 84rpx;
 		}
 	}
 }

pages/expertDiagnosis/wormcase.vue

@@ -21,6 +21,7 @@
 		.particulars_item{
 			width: 50%;
 			padding: 20rpx;
+			box-sizing: border-box;
 			.imgs{
 				width: 100%;
 				height: 220rpx;

pages/index/index.vue

@@ -152,9 +152,6 @@
 					uni.navigateTo({
 						url: "../prevention/index"
 					})
-				} else if (index == 2) {
-					console.log(2)
-				} else if (index == 3) {
 				}else if(index==2){
 					uni.navigateTo({
 						url:"/pages/monitor/index"

pages/login/login.vue

@@ -119,6 +119,7 @@
 			justify-content: space-between;
 			p{
 				color: #C0C0C0;
+				font-size: 28rpx;
 			}
 			/deep/.u-checkbox__label{
 				font-size: 28rpx;

pages/prevention/equipmentdetails.vue

@@ -173,14 +173,14 @@
 		width: 100%;
 		position: absolute;
 		top: 44px;
-
+		
 		.info_item {
 			width: 90%;
 			margin: 0 auto;
 			height: 260rpx;
 			padding: 26rpx 50rpx;
 			position: relative;
-
+			box-sizing: border-box;
 			.bgi {
 				width: 100%;
 				height: 260rpx;
@@ -207,7 +207,7 @@
 		justify-content: space-between;
 		text-align: center;
 		padding: 0 30rpx;
-
+		box-sizing: border-box;
 		.control_item {
 			width: 120rpx;
 			height: 120rpx;
@@ -248,7 +248,7 @@
 					margin-top: 20rpx;
 					display: flex;
 					padding: 20rpx 20rpx;
-	
+					box-sizing: border-box;
 					.item_info_img {
 						width: 30%;
 						text-align: center;

pages/prevention/index.vue

@@ -89,6 +89,7 @@
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding: 20rpx 40rpx 20rpx 80rpx;
 		position: relative;
+		box-sizing: border-box;
 		.prevents_item_img{
 			width: 30rpx;
 			height: 50rpx;

pages/prevention/sim.vue

@@ -74,6 +74,7 @@
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding: 30rpx 20rpx 50rpx;
 		border-radius: 20rpx;
+		box-sizing: border-box;
 		.sim_info_title{
 			width: 100%;
 			display: flex;

pages/prevention/ucharts.vue

@@ -485,7 +485,7 @@
 		.newtimes {
 			width: 100%;
 			padding: 20rpx 20rpx;
-
+			box-sizing: border-box;
 			.newtimes_state,
 			.newtimes_end {
 				display: flex;