From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/base.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index ee1c917..6e0c50b 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -19,8 +19,8 @@
function exitUser(){
$.post("LoginAction!exitUser",null,function(data){
//console.info(data);
- window.location.replace("login.jsp");
});
+ window.location.replace("login.jsp");
}
@@ -623,6 +623,11 @@
}
totalAlm_num=model.sum;
+ // 5绉掑悗鍏抽棴闈㈡澘
+ setTimeout(function() {
+ $('body').children('#eleWarning').remove();
+ }, 5000);
+
self.setTimeout("searchAlm()",10000);
}
});
--
Gitblit v1.9.1