From 41524b28fcc561c59ec0ef09ee6b62537a4fac4b Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@nismail.iie.ac.cn>
Date: Wed, 26 Dec 2018 17:45:56 +0800
Subject: [PATCH] =?UTF-8?q?login=E9=A1=B5=EF=BC=8C=E5=BD=93=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E6=97=B6=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/login.jsp | 122 +++++-------------------
 1 file changed, 24 insertions(+), 98 deletions(-)
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index 124a385bc..132b8641b 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -3,26 +3,16 @@
 <%@ page import="org.apache.shiro.web.filter.authc.FormAuthenticationFilter"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <!DOCTYPE html>
-<!--[if IE 8]> <html class="ie8 no-js"> <![endif]-->
-<!--[if IE 9]> <html class="ie9 no-js"> <![endif]-->
-<!--[if !IE]><!-->
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-        <title>Login</title>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta content="width=device-width, initial-scale=1" name="viewport" />
-        <meta content="" name="description" />
-        <meta content="" name="author" />
-        <link rel="shortcut icon" href="${pageContext.request.contextPath}/static/pages/img/logo-K.ico" />
 		<title>NTC</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<!-- basic styles -->
-
+		<link rel="shortcut icon" href="${pageContext.request.contextPath}/static/pages/img/logo-K.ico" />
 		<link href="${pageContext.request.contextPath}/static/login/assets/css/bootstrap.min.css" rel="stylesheet" />
 		<link rel="stylesheet" href="${pageContext.request.contextPath}/static/login/assets/css/font-awesome.min.css" />
 
-<!-- 		<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300" /> -->
+		<!-- <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300" /> -->
 		<!-- ace styles -->
 
 		<link rel="stylesheet" href="${pageContext.request.contextPath}/static/login/assets/css/ace.min.css" />
@@ -44,11 +34,6 @@
 				border-radius: 0;
 				background: rgba(0,0,0,0.1);
 			}
-			body::-webkit-scrollbar-corner{
-				width: 0px; 
-				height: 0px;
-				background: rgba(255,255,255,0);
-			}
 			
 			.row{
 				margin-left: 0px;
@@ -59,18 +44,14 @@
 				padding: 0px;
 			}
 			body{
-				font-family: inherit;
-				max-height:1080px;
-				max-width:1920px;
-				height:864px;
-				width:1518px;
+				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");
 				background-repeat:no-repeat;
 				background-size: cover;
 				color: white;
-				/* width: 1920px;
-				height: 1080px; */
 				
 			}
 			.input-icon input{
@@ -117,12 +98,10 @@
 				bottom: 0px;
 				left: 45%;
 			}
-			#messageBox{
-			    border-radius: 10px;
-			}
+			
 		</style>
 	</head>
-	<body class="login-layout" style="overflow-y: hidden;">
+	<body class="login-layout">
 		<div class="main-container" style="height: 100%">
 				<div class="row" style="height: 100%">
 					<div class="col-sm-12" style="height: 100%">
@@ -185,16 +164,12 @@
 		<div class="foot">
 			<span>CEIEC All Rights Reserved, CEIEC © </span>
 		</div>
-	 <!--[if lt IE 9]>
-<script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/excanvas.min.js"></script> 
-<![endif]-->
-        <!-- BEGIN CORE PLUGINS -->
-        <script src="${pageContext.request.contextPath}/static/global/plugins/jquery.min.js" type="text/javascript"></script>
+		<script src="${pageContext.request.contextPath}/static/global/plugins/jquery.min.js" type="text/javascript"></script>
         <script src="${pageContext.request.contextPath}/static/global/plugins/js.cookie.min.js" type="text/javascript"></script>
         <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
 		<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script>
-        <!-- END CORE PLUGINS --> <script type="text/javascript">
+		<!-- inline scripts related to this page -->
+		<script type="text/javascript">
             $(document).ready(function(){
             	$("#loginForm").validate({
     				rules: {
@@ -228,36 +203,30 @@
                 
             });
         </script>
-		<script type="text/javascript">
+        <script type="text/javascript">
 			window.jQuery || document.write("<script src='${pageContext.request.contextPath}/static/login/assets/js/jquery-2.0.3.min.js'>"+"<"+"/script>");
 		</script>
-
-
-		<!-- dynamic_add -->
 		<script src="${pageContext.request.contextPath}/static/login/echarts/echarts.min.js"></script>
 		<script type="text/javascript">
 			if("ontouchend" in document) document.write("<script src='${pageContext.request.contextPath}/static/login/assets/js/jquery.mobile.custom.min.js'>"+"<"+"/script>");
 		</script>
-		<!-- inline scripts related to this page -->
 		<script type="text/javascript">
-			/*var bodyHeight = window.screen.height;*/
-			var bodyHeight = 864;
+			var bodyHeight = window.screen.height;
+			var bodyWidth = window.screen.width;
+			var b_width = $("body").width();
+			console.log(bodyWidth);
+			console.log($("body").width());
 			$("body").height(bodyHeight+"px");
-			$("#ntc_chart").height((bodyHeight-200)+"px");
+			$("#ntc_chart").height($(".main_left").height()+"px");
 			$("#ntc_chart").width($(".main_left").width()+"px");
-			lineheight_y = 364;
-			lineheight_x = 362;
-			lineheight_y2 = 739;
-			lineheight_x2 = 767;
-			console.log(bodyHeight);
-			if(bodyHeight >800){
+			
 				lineheight_y = 364;
 				lineheight_x = 362;
 				lineheight_y2 = 739;
 				lineheight_x2 = 767;
-			}
-			
 			
+			lineheight_y += (bodyWidth - b_width)/2 +30;
+			lineheight_y2 += (bodyWidth - b_width)/4;
 			var lines_Chart_chu = echarts.init(document.getElementById('ntc_chart'));
 			
 			/* 数据流出 */
@@ -557,53 +526,10 @@
 				    ],
 				};
 			lines_Chart_chu.setOption(line_chu_option);
+			
+			$(window).resize(function(){
+				window.location.reload();
+			});
 		</script>
-
-		<script type="text/javascript">
-		var fullflag = false;
-	// 全屏代码
-	function fullScreen() {
-		if(fullflag){
-			exitFullScreen();
-		}else{
-			fullflag = true;
-		    var elem = document.body;
-		    if (elem.webkitRequestFullScreen) {
-		        elem.webkitRequestFullScreen();
-		    } else if (elem.mozRequestFullScreen) {
-		        elem.mozRequestFullScreen();
-		    } else if (elem.requestFullScreen) {
-		        elem.requestFullscreen();
-		    } else {
-		        //notice.notice_show("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
-		    }
-		}
-	}
-	function exitFullScreen() {
-		fullflag = false;
-	    var elem = document;
-	    if (elem.webkitCancelFullScreen) {
-	        elem.webkitCancelFullScreen();
-	    } else if (elem.mozCancelFullScreen) {
-	        elem.mozCancelFullScreen();
-	    } else if (elem.cancelFullScreen) {
-	        elem.cancelFullScreen();
-	    } else if (elem.exitFullscreen) {
-	        elem.exitFullscreen();
-	    } else {
-	        //notice.notice_show("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
-	    }
-	}
-	
-	//document.addEventListener("fullscreenchange", function( event ) {
-	//  if (document.fullscreenElement) {
-	//    console.log('进入全屏');
-	//  } else {
-	//    console.log('退出全屏');
-    //}});
-	//window.onload = function() {
-	//	fullScreen();//直接执行onclick中的函数就行
-	//}
-	</script>
 </body>
 </html>
