Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 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); 

      }

   });