diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index adb6d01c5..49acd702c 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -192,14 +192,26 @@
     			});
                 
              // 如果在框架或在对话框中，则弹出提示并跳转到首页
-        		if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
-        			top.$.jBox.alert("<spring:message code='login_timeout'/>","<spring:message code='info'/>",function(v,h,f){
-        			top.location = "${pageContext.request.contextPath }";
+        		/* if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
+        			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');
+        		} */
+            	if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
+        			top.$.jBox.prompt("<spring:message code='login_timeout'/>", "<spring:message code='info'/>", 'info', {
+                		closed: function () { 
+                			top.location = "${pageContext.request.contextPath }"; 
+                		} 
+                	});
+        			top.$('.jbox-body .jbox-icon').css('top','55px');
         		}
                 
-                
             });
         </script>
         <script type="text/javascript">