Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

src/main/webapp/WEB-INF/views/login.jsp

@@ -44,8 +44,6 @@
 				padding: 0px;
 			}
 			body{
-				max-height:864px;
-				max-width:1518px;
 				
 				background-color:rgba(255,255,255,0);
 				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/backimg.png");
@@ -69,15 +67,19 @@
 			 }
 			
 			.main_left{
-				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/two/login_03.png");
-				 background-repeat:no-repeat;
-				 background-size:contain;
 				 max-height: 695px;
 				 max-width: 905px;
-				 
 			}
+			#left_img{
+				position: absolute;
+				z-index: -1;
+				display: inline-block;
+  				height: auto;
+ 				 max-width: 100%;
+			}
+			
 			.main_right{
-				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/login_06-K.png");
+				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/login_06.png");
 				 background-repeat:no-repeat;
 				 background-size: 100% 100%;
 				 max-height: 501px;
@@ -93,6 +95,7 @@
 				width: 300px;
 				height: 260px;
 			}
+			
 			.foot{
 				position: absolute;
 				bottom: 0px;
@@ -107,6 +110,7 @@
 					<div class="col-sm-12" style="height: 100%">
 						<div class="col-sm-7" style="height: 100%;padding-top: 6%;">
 							<div class="main_left" style="height: 100%">
+								<img id="left_img"  alt="" src="${pageContext.request.contextPath}/static/login/assets/images/login/two/login_03.png">
 								<div class="box_chart">
 									<div id="ntc_chart">
 									</div>
@@ -123,19 +127,19 @@
 											<label class="block clearfix">
 												<span class="block input-icon input-icon-left" style="border-bottom:1px solid #565656;">
 													<i class="icon-user" style="padding-top: 4px;"></i>
-													<input id="username" type="text" name="username" class="form-control" value="${username}" placeholder="<spring:message code='fill_loginName'/>" style="padding-left: 30px;"/>
+													<input id="username" type="text" name="username" class="form-control" value="${username}" placeholder="<spring:message code='fill_loginName'/>" style="padding-left: 30px;font-family:微软雅黑;"/>
 												</span>
 											</label>
 											<label class="block clearfix" style="margin-top: 35px;">
 												<span class="block input-icon input-icon-left" style="border-bottom:1px solid #565656;">
 													<i class="icon-lock" style="padding-top: 4px;"></i>
-													<input id="password" type="password" name="password" class="form-control" placeholder="<spring:message code='fill_loginPassWord'/>" style="padding-left: 30px;"/>
+													<input id="password" type="password" name="password" class="form-control" placeholder="<spring:message code='fill_loginPassWord'/>" style="padding-left: 30px;font-family:微软雅黑;"/>
 												</span>
 											</label>
 
 											<div class="space"></div>
 
-											<div class="clearfix" style="text-align: center;margin-top: 24%;">
+											<div class="clearfix" style="text-align: center;margin-top: 24%;font-family:微软雅黑;">
 												<button type="submit" style="background-color: #4697d7!important;border-radius: 5px;" class="width-40 btn btn-sm btn-primary">
 													<spring:message code='login'/>
 												</button>
@@ -214,8 +218,18 @@
 		var bodyHeight = window.screen.height;
 		var bodyWidth = window.screen.width;
 		var b_width = $("body").width();
+		var b_height = $("body").height();
 		console.log(bodyWidth);
-			console.log($("body").width());
+		console.log(b_width);
+		console.log(bodyHeight);
+		console.log(b_height);
+		console.log("----------");
+		
+		var img_height = $("#left_img").height();
+		var img_width = $("#left_img").width();
+		console.log(img_height);
+		console.log(img_width);
+		
 		$("body").height(bodyHeight+"px");
 		$("#ntc_chart").height($(".main_left").height()+"px");
 		$("#ntc_chart").width($(".main_left").width()+"px");
@@ -225,13 +239,13 @@
 		lineheight_y2 = 739;
 		lineheight_x2 = 767;
 		
-			lineheight_y += (bodyWidth - b_width)/2 +30;
+		lineheight_y = 1050 - img_height;
-			lineheight_y2 += (bodyWidth - b_width)/4;
+		lineheight_y2 = 1050 -  img_height/2.2
+		
 		var lines_Chart_chu = echarts.init(document.getElementById('ntc_chart'));
 		
 		/* 数据流出 */
 		var lines_chu = [
-				    
 			    /* 出端 */
 				{
 			    	coords: [
@@ -530,17 +544,14 @@
 			var url = window.location.href;
 			var parm = parseInt(Math.random() * 10);
 			if (url.lastIndexOf('?') > -1) {
-			　　url = url + parm;
+				url = url + parm;
 			} else {
-			　　url = url + "?" + parm; 
+				url = url + "?" + parm;
 			}
 			
 			$(window).resize(function(){
 				window.location.href = url;
 			});
-		/* 	$(window).resize(function(){
-				window.location.reload();
-			}); */
 		</script>
 </body>
 </html>