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

81041

2018-12-26 94c3b603ae4fd3f26e23a33e3eabc781d9c08846

 gx_tieta/WebRoot/Top.jsp

@@ -205,7 +205,7 @@
  <script type="text/javascript" src="js/rightmenu.js"></script>

  <script type="text/javascript">

     $(document).ready(function(){

      setUserName();            //设置用户名称

      //setUserName();            //设置用户名称

      

      searchRecentlyAlarm();      //查询最近30秒的设备和电池告警

      

@@ -919,7 +919,7 @@
      

      // 判断当前页面不是登陆页面开始执行检测服务器状态

      if(!loginPatt.test(url)) {

         checkServer();

         //checkServer();

      }

      

      var linkNum = 0;    // 测试服务器连接计数 =3 跳转到登陆页面

@@ -930,17 +930,17 @@
              async: true,

              success: function(rs) {

                  linkNum = 0;    // 初始化测试连接

                  setTimeout(checkServer, 500);

                  setTimeout(checkServer, 200);

              },

              error:function() {

                   // 网络连接不正常

                  // 网络连接不正常

                  if(!navigator.onLine) {

                       linkNum = 0;

                       setTimeout(checkServer, 500);

                       setTimeout(checkServer, 200);

                  }else{

                      linkNum++;

                       // 服务器连接不正常

                       if(linkNum == 2) {

                       if(linkNum == 3) {

                          console.info('出现第'+linkNum+"次测试服务器连接失败！跳转到登陆");

                          // 网络正常但服务器连续多次检测不正常跳转到登陆页面

                         alert('网络连接异常，请检查网络连接是否正常！');

@@ -954,5 +954,57 @@
          });

      }

   })(jQuery);

	
   // 监测后台session是否存判断当前用户连接是否合法

   ;(function ($) {

      var url = window.location.href;

      var loginPatt = /\/login.jsp/;

		
      // 判断当前页面不是登陆页面开始执行检测服务器状态

      if(!loginPatt.test(url)) {

         checkServer();

      }

		
      var linkNum = 0;    // 测试服务器连接计数 =3 跳转到登陆页面

      function checkServer() {

         $.ajax({

              url:'LoginAction_check',

              type: 'post',

              async: true,

              success: function(res) {

                 //console.log(res);

                 var rs = JSON.parse(res.result);

                 if(rs.code==0) {

                    linkNum = 0;    // 初始化测试连接

                     setTimeout(checkServer, 100);

                 }else {

                    alert(rs.msg);

                     window.location.replace("login.jsp");

                 }

		        	
              },

              error: function() {

                 // 网络连接不正常

                  if(!navigator.onLine) {

                       linkNum = 0;

                       setTimeout(checkServer, 100);

                  }else{

                      linkNum++;

                       // 服务器连接不正常

                       if(linkNum == 3) {

                          console.info('出现第'+linkNum+"次测试服务器连接失败！跳转到登陆");

                          // 网络正常但服务器连续多次检测不正常跳转到登陆页面

                         alert('网络连接异常，请检查网络连接是否正常！');

                          window.location.replace("login.jsp");

                       }else {

                          console.info('出现第'+linkNum+"次测试服务器连接失败！");

                          checkServer();

                       }

                  }

              }

           });

      }

   })(jQuery);

	
  </script>

</html>