From b32952362184f56fc0eca8c420798dc8c9591931 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@192.168.11.154>
Date: Wed, 26 Dec 2018 13:58:04 +0800
Subject: [PATCH] =?UTF-8?q?home.*=E4=B8=BA=E5=A4=87=E4=BB=BD=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=96=B0=E5=A2=9E=E5=88=97=E9=80=89=E6=8B=A9=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E6=9B=B4=E6=96=B0=EF=BC=9B=20login.jsp=5Fnew?=
 =?UTF-8?q?=E4=B8=BA=E5=8A=A8=E6=80=81=E7=99=BB=E9=99=86=E4=B9=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A4=87=E4=BB=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/home.jsp.bak  | 2 +-
 src/main/webapp/WEB-INF/views/home.jsp.new  | 9 +++++----
 src/main/webapp/WEB-INF/views/login.jsp_new | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/home.jsp.bak b/src/main/webapp/WEB-INF/views/home.jsp.bak
index 8d0336c8b..2a4c6448f 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp.bak
+++ b/src/main/webapp/WEB-INF/views/home.jsp.bak
@@ -342,7 +342,7 @@ background:#3d3d3d;
 			</div>
 			<!-- END MEGA MENU -->
 
-
+			<input type="hidden"  id="tb_custom" value="<spring:message code='cfg_custom'/>"/>
 			<!-- BEGIN TOP NAVIGATION MENU -->
 			<div class="top-menu">
 				<ul class="nav navbar-nav pull-right">
diff --git a/src/main/webapp/WEB-INF/views/home.jsp.new b/src/main/webapp/WEB-INF/views/home.jsp.new
index 274323d77..aa81d17b6 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp.new
+++ b/src/main/webapp/WEB-INF/views/home.jsp.new
@@ -16,8 +16,9 @@
 	var indexLogServiceId = "16,17,20,129,33";
 	var indexLogServiceIdArr = [16,17,20,129,33];
 	var indexLogServiceNameArr = ["IP BLK", "HTTP BLK", "MAIL BLK", "HTTP MON", "APP MON"];
-	var baseNum = 10000;
-	var dropBaseNum = 30000;
+	       var baseNum = 9073741824000000;
+	   var dropBaseNum = 3073741824000;
+	var serviceBaseNum = 1073741824000;
 /* 	var indexLogServiceId = "128,131,149,16,33";
 	var indexLogServiceIdArr = [128,131,149,16,33];
 	var indexLogServiceNameArr = ["IP Mon", "SSL Mon", "ASN Mon", "IP Blk", "APP Mon"]; */
@@ -28,7 +29,7 @@
 		sessionStorage.setItem("log_total","${log_total}");
 		sessionStorage.setItem("log_time_start","${log_time_start}");
 		sessionStorage.setItem("log_time_range","${log_time_range}");
-		window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&hour=2&baseNum=" + baseNum;
+		window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&hour=2&baseNum=" + baseNum + "&dropBaseNum=" + dropBaseNum + "&serviceBaseNum=" + serviceBaseNum;
 		//window.frames['mainFrame'].location="${ctx}/dashboard/logChart";
 		//国际化切换
 		var lang = "${cookie.Language.value }".toLowerCase();
@@ -372,7 +373,7 @@ background:#3d3d3d;
 			</div>
 			<!-- END MEGA MENU -->
 
-
+			<input type="hidden"  id="tb_custom" value="<spring:message code='cfg_custom'/>"/>
 			<!-- BEGIN TOP NAVIGATION MENU -->
 			<div class="top-menu">
 				<ul class="nav navbar-nav pull-right">
diff --git a/src/main/webapp/WEB-INF/views/login.jsp_new b/src/main/webapp/WEB-INF/views/login.jsp_new
index 3511cbfd2..124a385bc 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp_new
+++ b/src/main/webapp/WEB-INF/views/login.jsp_new
@@ -14,7 +14,7 @@
         <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.ico" />
+        <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 -->
@@ -59,6 +59,7 @@
 				padding: 0px;
 			}
 			body{
+				font-family: inherit;
 				max-height:1080px;
 				max-width:1920px;
 				height:864px;
@@ -95,7 +96,7 @@
 				 
 			}
 			.main_right{
-				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/login_06.png");
+				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/login_06-K.png");
 				 background-repeat:no-repeat;
 				 background-size: 100% 100%;
 				 max-height: 501px;