From 041d76e91805deeb79ec9343c72dec19265f2ba9 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 31 Aug 2018 20:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8Fth=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/LoginController.java   |  3 ++
 src/main/webapp/WEB-INF/views/home.jsp        |  3 ++
 .../1.11.0/localization/messages_en.js        |  4 ++-
 .../1.11.0/localization/messages_zh.js        |  4 ++-
 .../webapp/static/global/scripts/common.js    | 30 +++++++++++++++++++
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/LoginController.java b/src/main/java/com/nis/web/controller/LoginController.java
index 6b3735794..ba48acc83 100644
--- a/src/main/java/com/nis/web/controller/LoginController.java
+++ b/src/main/java/com/nis/web/controller/LoginController.java
@@ -151,6 +151,9 @@ public class LoginController extends BaseController {
 		}
 				
 		model.addAttribute("adminPath", adminPath);
+		model.addAttribute("log_time_start",Constants.LOG_TIME_START);
+		model.addAttribute("log_time_range",Constants.LOG_TIME_RANGE);
+		model.addAttribute("log_total",this.getMsgProp().getProperty("log_total"));
 		return "/home";
 	}
 	
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 69ffad4a7..ba5fe6af6 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -14,6 +14,9 @@
 
 <script type="text/javascript">
 	$(document).ready(function() {
+		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}/configure/statistics/configureStateStatistics";
 		//国际化切换
 		var lang = "${cookie.Language.value }".toLowerCase();
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index b99987749..04cd92a2a 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -67,6 +67,8 @@
 		haveInvisibleChar:"The tags {0} have invisible character",
 		httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
 		failed:"Failed",
-		go_back:"Go Back Policies"
+		go_back:"Go Back Policies",
+		log_5_minutes:"Log Five Minutes' Amount",
+		log_1_hour:"Log One Hour's Amount"
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
index 379192842..1706c6575 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -67,6 +67,8 @@
 		haveInvisibleChar:"标签{0}包含不可见字符",
 		httpCheck:"请输入正确的url(http[s]://xxx.xx)",
 		failed:"获取失败",
-		go_back:"返回配置界面"
+		go_back:"返回配置界面",
+		log_5_minutes:"5分钟日志量",
+		log_1_hour:"1小时日志量"
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 6bda5a5b4..720610fdf 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,4 +1,5 @@
 $(function(){
+	
 	//扩展jquery，增加全局函数
 	$.ipcommon=function(){
 		return {};
@@ -438,6 +439,35 @@ $(function(){
 	  var val=$(this).val();
 	  $(this).val(val.trim());
    });
+   var log_total=sessionStorage.getItem("log_total");
+   var log_time_start=sessionStorage.getItem("log_time_start");
+   var log_time_range=sessionStorage.getItem("log_time_range");
+   var log_5_minutes=$.validator.messages.log_5_minutes;
+   var log_1_hour=$.validator.messages.log_1_hour;
+   $('th').each(function(){
+	   if(log_time_start){
+		   if($(this).text()==log_5_minutes){
+			   $(this).text(log_total);
+		   }else if($(this).text()==log_1_hour){
+			   $(this).text(log_total);
+		   }
+	   }else if(log_time_range){
+		   if(log_time_range==300000){
+			   if($(this).text()==log_total){
+				   $(this).text(log_5_minutes);  
+			   }else if($(this).text()==log_1_hour){
+				   $(this).text(log_5_minutes);  
+			   }
+		   }else if(log_time_range=3600000){
+			   if($(this).text()==log_total){
+				   $(this).text(log_1_hour); 
+			   }else if($(this).text()==log_5_minutes){
+				   $(this).text(log_1_hour); 
+			   }
+		   }
+	   }
+	   
+   })
 });
 window.onload=function(){
 	// 配置id的搜索下拉框选择切换