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

81041

2019-01-11 68dfe47cf6a32ac3560fc4b64e11eaa47c3bb6e7

 gx_tieta/WebRoot/Top.jsp

@@ -64,24 +64,24 @@
         <div class="batt-state">

         

            <div class="list">

               <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div>      <!-- 机房停电数 -->

               <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span></a></div>      <!-- 机房停电数 -->

            </div>

            <div class="list">

               <div class="list-contain">续航不足机房数:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span>/<span class="dev-num">0</span></a></div>      <!-- 机房续航不足数 -->

               <div class="list-contain">续航不足机房数:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span></a></div>      <!-- 机房续航不足数 -->

            </div>

            <div class="list">

               <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div>                        <!-- 电池告警数 -->

               <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num"><span class="num">0</span></a></div>                        <!-- 电池告警数 -->

            </div>

            <div class="list">

               <div class="list-contain"><s:text name="Capacity"/><s:text name="Behind_number_monomer"/>:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div>                                             <!-- 落后单体数 -->

               <div class="list-contain"><s:text name="Capacity"/>落后单体数:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span></a></div>                                             <!-- 落后单体数 -->

            </div>

            <div class="list">

               <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div>                  <!-- 设备告警数 -->

               <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span></a></div>                  <!-- 设备告警数 -->

            </div>

            

            <div class="list">

               <div class="list-contain">

                  核容测试设备数:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span>/<span class="dev-num">0</span></a>

                  核容测试设备数:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span></a>

               </div>

            </div>

         </div>

@@ -136,6 +136,10 @@
            </div>

            <div class="cell-list server-time" style="white-space: nowrap">               

               2018-11-26 00:00:00

            </div>

            <div class="cell-list batt-count" style="white-space: nowrap; color: #FF0000;">

               电池总数：<span class="batt-num">0</span>&nbsp;,&nbsp;机房总数：<span class="dev-num">0</span>

					
            </div>         

         </div>

         <div class="international">

@@ -192,6 +196,35 @@
      </div>

   </div>

  </body>

  <script type="text/javascript">

   // 检测页面是否被访问

   var pageIsVisit = false;

   ;(function($) {

      // 隐藏的原型

       var hiddenProperty = 'hidden' in document ? 'hidden' :    
          'webkitHidden' in document ? 'webkitHidden' :    
          'mozHidden' in document ? 'mozHidden' :    
          null;

	       
          // 页面初始化

          if (!document[hiddenProperty]) {    
              pageIsVisit = true;

          }else{

              pageIsVisit = false;

          }

	       
	       
       var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');

       var onVisibilityChange = function(){

           if (!document[hiddenProperty]) {    
               pageIsVisit = true;

           }else{

               pageIsVisit = false;

           }

       }

         document.addEventListener(visibilityChangeEvent, onVisibilityChange);

   })(jQuery);

  </script>

  <script src="pages/js/base.js"></script>

  <script src="pages/js/common.js"></script>

  <script src="js/dev.js"></script>

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

  <script type="text/javascript">

     $(document).ready(function(){

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

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

      

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

      

@@ -220,7 +253,7 @@
            });

         }

      });

      searchAlm();            //查询电池告警总数(我在base.js里)

      searchAlm(pageIsVisit);            //查询电池告警总数(我在base.js里)

      searchlowmon();            //查询落后单体总数

      searchpoweroff();         //查询机房停电总数

      searchdevalarm();         //查询设备实时告警总数

@@ -239,6 +272,13 @@
   

   //查询落后单体总数

   function searchlowmon(){

		
      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchlowmon, 5000);

         return;

      }

	
      $.ajax({    

             type: "post",             

           url: "BadBatt_monAction!searchNums",            

@@ -259,6 +299,12 @@
   

   //查询机房停电总数

   function searchpoweroffOld(){

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchpoweroffOld, 5000);

         return;

      }

	
      $.ajax({    

             type: "post",             

           url: "BattPower_offAction!serchPowerOff",            

@@ -279,6 +325,11 @@
   

   //查询机房停电总数

   function searchpoweroff(){

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchpoweroff, 5000);

         return;

      }

      $.ajax({    

             type: "post",             

           url: "Bts_station_stateAction_action_serchByState",            

@@ -299,6 +350,11 @@
   

   //查询设备告警总数

   function searchdevalarm(){

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchdevalarm, 5000);

         return;

      }

      $.ajax({    

             type: "post",             

           url: "Batt_devalarm_dataAction!searchNums",            

@@ -319,6 +375,11 @@
   

   //查询放电计划延迟总数

   function searchnotcomplan(){

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchnotcomplan, 5000);

         return;

      }

      $.ajax({    

             type: "post",             

           url: "BattDischarge_planAction!searchNums",            

@@ -339,6 +400,11 @@
   

   // 机房续航不足个数

   function searchWeakHome() {

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchWeakHome, 5000);

         return;

      }

      $.ajax({

         type: 'post'

         ,async: true

@@ -357,6 +423,11 @@
   // 查询所有的设备数

   searchAllDevNum();

   function searchAllDevNum() {

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchAllDevNum, 5000);

         return;

      }

      $.ajax({

         type: 'post'

         ,async: true

@@ -367,7 +438,8 @@
            var rs = JSON.parse(res.result);

            if(rs.code == 1) {

               var sum = rs.sum;

               $('.batt-state .dev-num').text(sum);

               $('.cell-list.batt-count .dev-num').text(sum);

               // $('.batt-state .dev-num').text(sum);

            }

            

            // 延时执行

@@ -379,6 +451,11 @@
   // 查询所有的电池组数

   searchAllEleGroupNum();

   function searchAllEleGroupNum() {

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchAllEleGroupNum, 5000);

         return;

      }

      $.ajax({

         type: 'post'

         ,async: true

@@ -389,7 +466,8 @@
            var rs = JSON.parse(res.result);

            if(rs.code == 1) {

               var sum = rs.sum;

               $('.batt-state .batt-num').text(sum);

               $('.cell-list.batt-count .batt-num').text(sum);

               //$('.batt-state .batt-num').text(sum);

            }

            // 延时执行

            setTimeout(searchAllEleGroupNum, 5000);

@@ -548,6 +626,11 @@
    * 实时查询告警信息

    */

   function searchBattAndDevAlarm(){

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchBattAndDevAlarm, 3000);

         return;

      }

      $.ajax({    

           type:"post",             

           url: "Battalarm_dataAction!serchTopAlmTen",            

@@ -591,7 +674,12 @@
   

   seachServerTime();

   //获取服务器上的时间

   function seachServerTime(){	
   function seachServerTime(){

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(seachServerTime, 1000);

         return;

      }	
      $.ajax({    

           type:"post",             

           url: "User_infAction!searchServerTime",            

@@ -710,6 +798,11 @@
   

   //查询最近30内的设备和电池告警并播报语音

   function searchRecentlyAlarm(){

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchRecentlyAlarm, 5000);

         return;

      }

      $.ajax({    

             type: "post",             

           url: "Battalarm_dataAction!serchIn30",            

@@ -913,7 +1006,7 @@
      

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

      if(!loginPatt.test(url)) {

         checkServer();

         //checkServer();

      }

      

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

@@ -924,17 +1017,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('网络连接异常，请检查网络连接是否正常！');

@@ -948,5 +1041,56 @@
          });

      }

   })(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>