D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore
2019-01-21 35fefed0792c40cb99b8d15fa5811bbb5992bff9
gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -71,7 +71,7 @@
                  </table>
                  <table class="condi-opt">
                     <tr>
                        <input type="hidden" id="usr_id" name="bmd.mainf.usr_id" value="0" class="119001" /><!-- <s:text name="On-line_voltage" />      在线电压 -->
                        <td><input type="checkbox" id="usr_id" name="bmd.mainf.usr_id"  checked="checked"  value="0" class="119001" /> <s:text name="On-line_voltage" /></td>   <!--   在线电压 -->
                        <td>
                           <input type="checkbox" id="fault_type_id" name="bmd.mainf.fault_type_id" checked="checked" value="119002" class="119002" /><s:text name="Group_voltage" />      <!-- 组端电压 -->
                        </td>         
@@ -96,6 +96,7 @@
                        <input type="hidden" id="master_id" name="bmd.mainf.master_id" value="0" class="119008" /><!-- 连接条阻抗-->
                        <td><input type="checkbox" id="maint_close" name="bmd.mainf.maint_close" checked="checked" value="119007" class="119007"><s:text name="Monomer_resistance" /></td>            <!-- 单体内阻 -->
                        <td><input type="checkbox" id='maint_done' name="bmd.mainf.maint_done" checked="checked" value="119006" class="119006"><s:text name="Temperature_monomer" /></td>            <!-- 单体温度 -->
                        <td></td>
                        <!-- <td><input type="checkbox" checked="checked" id="hist_alm" class="1"><s:text name="Historical_alarms" /></td> -->   <!-- 历史告警 -->
                        <td><input type="checkbox" name="bmd.mainf.master_audit" id="master_audit" checked="checked" value="3" class="3"><s:text name="Level_thr_warn" /></td>                           <!-- 三级告警 -->
                        <td><input type="checkbox" name="bmd.mainf.appoint_uid" id="appoint_uid" checked="checked" value="4" class="4"><s:text name="Level_four_warn" /></td>                        <!-- 四级告警 -->
@@ -302,14 +303,6 @@
      }
      
      
      $(function(){
         //点击查询按钮
         $('#paging .search').click(function(){
            searchHistalm();
         });
      });
      var formjson;
      //查询历史告警记录
      function searchHistalm(){      
@@ -319,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(); // 用于存放表格数据
@@ -402,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
@@ -421,6 +414,7 @@
               Record_Id:$('#Record_Id').val()                                             //容量更换告警
            }
         };
         //console.info(temp);
         return temp;
      }
      
@@ -592,7 +586,7 @@
               }
               
               // 根据数据生成下拉列表
               createOptions($select, optsList, true);
               createOptions($select, optsList, false);
            }else{
               $("#station_name").text('').html('<option>暂无可测机房站点</option>');
            }
@@ -651,7 +645,7 @@
               createOptions($select, optsList, true);
               $select.find('option').eq(0).val(0);
               
               searchHistalm();   // 查询历史告警
               //searchHistalm();   // 查询历史告警
            }else{
               $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');
            }