未审批可更改

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

2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a

 gx_tieta/WebRoot/eleHistoryWarn.jsp

@@ -303,14 +303,6 @@
      }

      

      

      $(function(){

         //点击查询按钮

         $('#paging .search').click(function(){

            searchHistalm();

         });

      });

		
		
      var formjson;

      //查询历史告警记录

      function searchHistalm(){      

@@ -320,7 +312,7 @@
         $.post("Battalarm_data_historyAction!serchByInfo","json="+json,function(data){

            data=data.result;

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

            console.info(data);

            //console.info(data);

            if(data.code==1 && data.data.length>0){

               data=data.data;

               ArrWarnTb = new Array(); // 用于存放表格数据

@@ -403,7 +395,7 @@
               master_audit:$('#master_audit').is(':checked')?$('#master_audit').attr('class'):0,      //三级告警

               num:$('#num').is(':checked')?$('#num').attr('class'):0,                           //一级告警

               BattGroupId:$('#BattGroupId').is(':checked')?$('#BattGroupId').attr('class'):0,         //二级告警

               usr_id:$('#usr_id').val(),                                                //在线电压  119001

               usr_id:$('#usr_id').is(':checked')?$('#usr_id').attr('class'):0,                  //在线电压  119001

               fault_type_id:$('#fault_type_id').is(':checked')?$('#fault_type_id').attr('class'):0,   //组端电压  119002

               fault_level:$('#fault_level').is(':checked')?$('#fault_level').attr('class'):0,         //充电电流   119003

               record_uid:$('#record_uid').is(':checked')?$('#record_uid').attr('class'):0,         //放电电流   119004

@@ -422,6 +414,7 @@
               Record_Id:$('#Record_Id').val()                                             //容量更换告警

            }

         };

         //console.info(temp);

         return temp;

      }

      

@@ -593,7 +586,7 @@
               }

               

               // 根据数据生成下拉列表

               createOptions($select, optsList, true);

               createOptions($select, optsList, false);

            }else{

               $("#station_name").text('').html('<option>暂无可测机房站点</option>');

            }

@@ -652,7 +645,7 @@
               createOptions($select, optsList, true);

               $select.find('option').eq(0).val(0);

               

               searchHistalm();   // 查询历史告警

               //searchHistalm();   // 查询历史告警

            }else{

               $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');

            }