电池配组记录区/县添加

hdw

2018-11-02 89cc717e3ccd49d49539b25d7a8554126504b51f

 gx_tieta/WebRoot/Top.jsp

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

         

            <div class="list">

               <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="powercut.jsp?power_state=0" class="badge default" id="poweroff_num">0</a></div>      <!-- 机房停电数 -->

               <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp" class="badge default" id="poweroff_num">0</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>                        <!-- 电池告警数 -->

@@ -193,9 +193,12 @@
  <script src="js/dev.js"></script>

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

  <script type="text/javascript" src="js/scrollBar.js"></script>

  <script type="text/javascript" src="js/VoiceUtil.js"></script>

  <script type="text/javascript">

     $(document).ready(function(){

      setUserName();

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

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

      

      var lanuage=$('#top_cont .international .inter_action').attr('value');

      $('#top_cont .international a').click(function() {

@@ -250,7 +253,7 @@
   }

   

   //查询机房停电总数

   function searchpoweroff(){

   function searchpoweroffOld(){

      $.ajax({    

             type: "post",             

           url: "BattPower_offAction!serchPowerOff",            

@@ -261,6 +264,26 @@
              data = eval("("+data+")");

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

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

              setTimeout(searchpoweroff, 5000);

           },

           error:function() {

              setTimeout(searchpoweroff, 5000);

           }		        	
      });	
   }

	
   //查询机房停电总数

   function searchpoweroff(){

      $.ajax({ 	
             type: "post", 				
           url: "Bts_station_stateAction_action_serchByState",				
           async:true,				
           dataType:'json',

           data:null,		
           success: function(data){ 
              var model = eval("("+data.result+")");

              //console.info(model);

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

              setTimeout(searchpoweroff, 5000);

           },

           error:function() {

@@ -308,6 +331,9 @@
           }   

      });

   }

	
	
	
   

   $(function(){

      $.ajax({    

@@ -594,6 +620,35 @@
      });

   }

   

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

   function searchRecentlyAlarm(){

      $.ajax({ 	
             type: "post", 				
           url: "Battalarm_dataAction!serchIn30",				
           async:true,				
           dataType:'json',

           data:null,		
           success: function(data){ 
              //console.info(data);

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

              //console.info(model);

              if(model.code == 1){

                 var alarm_str = "";

                 for(var i=0;i<model.data.length;i++){

                    var obj = model.data[i];

                    alarm_str += obj.note+";";

                 }

                 voice.play(alarm_str,searchRecentlyAlarm);

              }else{	        	
                 setTimeout(searchRecentlyAlarm, 5000);

              }

           },

           error:function() {

              setTimeout(searchRecentlyAlarm, 5000);

           }	
      });

   }

	
   // 核容测试模块

   $(function() {

      var arrTh = ['机房名称', '设备ID', '设备名称','设备状态', '在线电压（V）', '组端电压（V）', '组端电流（mA）','设备温度（℃）', '已测容量（AH）', '设备告警', '已测时间'];

@@ -661,6 +716,10 @@
         });

       }

       

	    
	    
		
	    
       // 根据数据生成表格

       function createTblByModel(model) {

          //console.log(model);