zc

pages/views/dataBoard/dataBoard.vue

@@ -339,8 +339,7 @@
 					height: 4rpx;
 					background: #0183FA;
 					border-radius: 2rpx;
-					margin-left: 33%;
-					margin-top: 16rpx;
+					margin:6rpx auto 0;
 					display none;
 
 					&.on {

pages/views/dataBoard/securityHidden.vue

@@ -734,8 +734,7 @@
 					height: 4rpx;
 					background: #0183FA;
 					border-radius: 2rpx;
-					margin-left: 33%;
-					margin-top: 16rpx;
+					margin:6rpx auto 0;
 					display none;
 
 					&.on {

pages/views/login/accountLogin.vue

@@ -29,6 +29,7 @@
 			<view class="button-box" @click="login()">登录</view>
 			<view class="passwrod-button-box" @click="forgotPasswordButton()">忘记密码?</view>
 		</view>
+		<view class="loginButton" @click="backButton()">账号密码登录</view>
 	</view>
 </template>
 
@@ -79,6 +80,9 @@
 			this.getConfigInfo();
 		},
 		methods: {
+			backButton(){
+				uni.navigateBack();
+			},
 			//顶部tab点击
 			tabClick(index) {
 				this.curTab = index;
@@ -486,7 +490,17 @@
 				}
 			}
 		}
-
+		.loginButton{
+			position: absolute;
+			bottom:40rpx;
+			left:295rpx;
+			width:200;
+			height:80rpx;
+			line-height:80rpx;
+			text-align: center;
+			color:#0183fa;
+			font-size:28rpx;
+		}
 		.top-back {
 			z-index: 2;
 			position: absolute;

pages/views/login/login.vue

@@ -3,8 +3,11 @@
 		<view class="title-1">欢迎使用</view>
 		<view class="title-2">实验室安全智慧化管控系统</view>
 		<view class="null-p"></view>
+		<img class="login-img" :src="imagesUrl('commonality/img_tyrzdl_ch%402x.png')">
 		<view class="ssoButton" @click="goPage('ssoLogin')">统一身份认证登录</view>
 		<view class="accountButton" @click="goPage('accountLogin')">账号密码登录</view>
+		<view class="position-top-right-box"></view>
+		<view class="position-bottom-left-box"></view>
 	</view>
 </template>
 
@@ -43,28 +46,54 @@
 	#login{
 		height: 100%;
 		width: 100%;
-		background #f5f5f5;
+		background #fff;
 		position relative;
 		display: flex;
 		flex-direction: column;
+		position: relative;
+		.position-top-right-box{
+			position: absolute;
+			top:0;
+			right:0;
+			width:230rpx;
+			height:230rpx;
+			border-bottom-left-radius: 100%;
+			background-color: #E5F2FE;
+			filter: blur(4px);
+		}
+		.position-bottom-left-box{
+			position: absolute;
+			bottom:0;
+			left:0;
+			width:230rpx;
+			height:230rpx;
+			border-top-right-radius: 100%;
+			background-color: #E5F2FE;
+			filter: blur(4px);
+		}
 		.title-1{
 			font-size:38rpx;
-			line-height:38rpx;
-			height:38rpx;
+			line-height:55rpx;
+			height:55rpx;
 			text-align: center;
 			color:#333;
-			margin:200rpx 0 60rpx;
+			margin:200rpx 0 31rpx;
 		}
 		.title-2{
-			font-size:40rpx;
-			line-height:40rpx;
-			height:40rpx;
+			font-size:38rpx;
+			line-height:55rpx;
+			height:55rpx;
 			text-align: center;
 			color:#0183fa;
 		}
 		.null-p{
 			flex:1;
 		}
+		.login-img{
+			width:600rpx;
+			height:408rpx;
+			margin:0 auto 125rpx;
+		}
 		.ssoButton{
 			width:650rpx;
 			height:80rpx;
@@ -73,7 +102,7 @@
 			background-color:#0183fa;
 			color:#fff;
 			font-size:32rpx;
-			margin:0 auto 200rpx;
+			margin:0 auto 175rpx;
 			border-radius:50rpx;
 		}
 		.accountButton{
@@ -83,7 +112,7 @@
 			text-align: center;
 			color:#0183fa;
 			font-size:28rpx;
-			margin:0 auto 50rpx;
+			margin:0 auto 40rpx;
 		}
 	}
 </style>

pages_basics/views/earlyWarningManage/videoMonitoring.vue

@@ -402,7 +402,7 @@
 						height: 4rpx;
 						background: #0183FA;
 						border-radius: 2rpx;
-						margin-left: 33%;
+						margin:0 auto 0;
 						display none;
 
 						&.on {

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -732,7 +732,7 @@
 						height: 4rpx;
 						background: #0183FA;
 						border-radius: 2rpx;
-						margin-left: 38%;
+						margin:0 auto 0;
 						display none;
 
 						&.on {

pages_safetyCheck/views/snapshotManage/snapshotItems.vue

@@ -309,7 +309,7 @@
 						height: 4rpx;
 						background: #0183FA;
 						border-radius: 2rpx;
-						margin-left: 38%;
+						margin:0 auto 0;
 						display none;
 
 						&.on {