未审批可更改

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

2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a

 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,13 +414,16 @@
               Record_Id:$('#Record_Id').val()                                             //容量更换告警

            }

         };

         //console.info(temp);

         return temp;

      }

      

      var isNewLoad = true;

      // 省-市-机房-电池组

      var filterLoad;

      $(document).ready(function(){

         filterLoad = layer.load();

         var pre_province = getQueryString('province');

         //页面加载时查询维护区中的枢纽类型

         $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){

            data=data.result;

@@ -444,6 +440,9 @@
                  }else{

                     $option.text(data.data[i-1]);

                     $option.attr("value",data.data[i-1]);   

                     if(pre_province == data.data[i-1] && isNewLoad){

                        $option.attr('selected',true);

                     }

                  }               

                  $select.append($option);

               }

@@ -463,6 +462,7 @@
         if(isLoad) {

            filterLoad = layer.load();

         }

         var pre_city = getQueryString("city");

         // 请求获取当前省下的市

         $.ajax({    

              type: "post",             

@@ -480,6 +480,9 @@
                  for(var i=0;i<_data.length;i++){

                     var __data = _data[i];

                     var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);

                     if(pre_city == __data.StationName2 && isNewLoad){

                        tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);

                     }

                     optsList.push(tmp);

                  }

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

@@ -502,6 +505,7 @@
         if(isLoad) {

            filterLoad = layer.load();

         }

         var pre_county = getQueryString('county');

         // 查询区县

         $.ajax({

            type: 'post',

@@ -521,6 +525,9 @@
                        StationId: __data.StationId

                     };

                     var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                     if(pre_county == __data.StationName5 && isNewLoad){

                        tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                     }

                     optsList.push(tmp);

                  }

                  

@@ -556,6 +563,7 @@
            StationName2:$("#city").val(),

            StationName5:$("#county").val()

         };

         var pre_home = getQueryString('home');

         //var selectvalue=$("#station_name1 option:selected").val();

         //alert(selectvalue);

         $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){

@@ -571,11 +579,14 @@
                     StationId: __data.StationId

                  };

                  var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                  if(pre_home == __data.StationName && isNewLoad){

                     tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);

                  }

                  optsList.push(tmp);

               }

               

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

               createOptions($select, optsList, true);

               createOptions($select, optsList, false);

            }else{

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

            }

@@ -605,7 +616,7 @@
         }

         //var station_name1=$("#station_name1 option:selected").val();

         //var station_name=$("#station_name option:selected").val();

			
         var pre_battid = getQueryString('battid');

         $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){

            data=data.result;

            //console.info(data);

@@ -624,6 +635,9 @@
                  };

                  var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";

                  var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);

                  if(pre_battid ==  _data.BattGroupId && isNewLoad){

                     tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr,{},true);

                  }

                  optsList.push(tmp);

               }

               

@@ -631,11 +645,11 @@
               createOptions($select, optsList, true);

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

               

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

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

            }else{

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

            }

				
            isNewLoad = false;

            layer.close(filterLoad);

         });

      }