From 0dfba79e68cb8d1294562af286e07e66f008d53f Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Mon, 12 Mar 2018 16:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=B1=E6=95=88=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/login.jsp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index 0e9fbd2f2..44049db97 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -139,8 +139,15 @@
                 
              // 如果在框架或在对话框中，则弹出提示并跳转到首页
         		if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
-        			alertx("<spring:message code='login_timeout'/>");
-        			window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
+        			top.$.jBox.confirm("<spring:message code='login_timeout'/>","<spring:message code='info'/>",function(v,h,f){
+    				
+    				if(v=="ok"){
+    					top.location = "${pageContext.request.contextPath }";
+    				}else{
+    					top.location = "${pageContext.request.contextPath }";
+        				}
+    			},{buttonsFocus:1});
+    			top.$('.jbox-body .jbox-icon').css('top','55px');
         		}