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

didiyu

2018-11-29 12c384847af42270e2ba167467173a928a59ded2

 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">0</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>/<span class="dev-num">0</span></a></div>      <!-- 机房停电数 -->

            </div>

            <div class="list">

               <div class="list-contain">续航不足机房数:<a href="javascript:;" class="badge default" id="weak_home">0</a></div>      <!-- 机房续航不足数 -->

               <div class="list-contain">续航不足机房数:<a href="javascript:;" class="badge default" id="weak_home"><span class="num">0</span>/<span class="dev-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">0</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>/<span class="batt-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">0</a></div>                                             <!-- 落后单体数 -->

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

            <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">0</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>/<span class="dev-num">0</span></a></div>                  <!-- 设备告警数 -->

            </div>

            

            <div class="list">

               <div class="list-contain">

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

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

               </div>

            </div>

         </div>

@@ -130,7 +130,7 @@
            <div class="cell-list control">

               <img src="image/webStatus/control_normal.gif" alt="线程监控程序" title="线程监控程序运行：正常">

            </div>

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

            </div>         

         </div>

@@ -216,7 +216,7 @@
            });

         }

      });

      searchAlm();            //查询电池告警总数

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

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

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

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

@@ -244,7 +244,7 @@
           success: function(data){ 

              data = eval("("+data+")");

              var model = eval("("+data.result+")");

              $('#batt_low_num').text(model.sum);

              $('#batt_low_num .num').text(model.sum);

              setTimeout(searchlowmon, 5000);

           },

           error:function() {

@@ -264,7 +264,7 @@
           success: function(data){ 

              data = eval("("+data+")");

              var model = eval("("+data.result+")");

              $('#poweroff_num').text(model.sum);

              $('#poweroff_num .num').text(model.sum);

              setTimeout(searchpoweroff, 5000);

           },

           error:function() {

@@ -284,7 +284,7 @@
           success: function(data){ 

              var model = eval("("+data.result+")");

              //console.info(model);

              $('#poweroff_num').text(model.newsum);

              $('#poweroff_num .num').text(model.newsum);

              setTimeout(searchpoweroff, 5000);

           },

           error:function() {

@@ -304,7 +304,7 @@
           success: function(data){ 

              data = eval("("+data+")");

              var model = eval("("+data.result+")");

              $('#dev_alarm_num').text(model.sum);

              $('#dev_alarm_num .num').text(model.sum);

              setTimeout(searchdevalarm, 5000);

           },

           error:function() {

@@ -343,9 +343,52 @@
         ,dataType: 'json'

         ,success: function(res) {

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

            $('#weak_home').text(rs.sum);

            $('#weak_home .num').text(rs.sum);

            

            setTimeout(searchWeakHome, 5000);

         }

      });

   }

	
   // 查询所有的设备数

   searchAllDevNum();

   function searchAllDevNum() {

      $.ajax({

         type: 'post'

         ,async: true

         ,url: 'BattInfAction!serchByDeviceId'

         ,data: null

         ,dataType: 'json'

         ,success: function(res) {

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

            if(rs.code == 1) {

               var sum = rs.sum;

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

            }

				
            // 延时执行

            setTimeout(searchAllDevNum, 5000);

         }

      });

   }

	
   // 查询所有的电池组数

   searchAllEleGroupNum();

   function searchAllEleGroupNum() {

      $.ajax({

         type: 'post'

         ,async: true

         ,url: 'BattInfAction!serchByInstall_count'

         ,data: null

         ,dataType: 'json'

         ,success: function(res) {

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

            if(rs.code == 1) {

               var sum = rs.sum;

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

            }

            // 延时执行

            setTimeout(searchAllEleGroupNum, 5000);

         }

      });

   }

@@ -597,7 +640,7 @@
   

   //查询电池告警信息

   function searchBattAlarm(data){

      console.info(data);

      //console.info(data);

      $.ajax({    

           type:"post",             

           url: "Battalarm_dataAction!serchBatt_alarm",            

@@ -773,7 +816,7 @@
               var model = eval('('+data.result+')');

               //console.info(model);

               if(model.code == 1){

                  $('#nuclear_test').text(model.data.length);

                  $('#nuclear_test .num').text(model.data.length);

                  if(model.data.length != 0) {

                     if(!$('#navNuclearTest').hasClass('hide') || isNew) {

                        createTblByModel(model);

@@ -781,7 +824,7 @@
                     isNew=false;

                  }

               }else {

                  $('#nuclear_test').text(0);

                  $('#nuclear_test .num').text(0);

                  createFullTbl(eleTh, eleTd, arrTh, []);

               }         

                },