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

军

2018-09-29 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6

 gx_tieta/WebRoot/batt-life-manage.jsp

@@ -86,14 +86,14 @@
                                </select>

                            </td>

                            <td>

                                <select id="">

                                <select id="is_stand">

                                   <option value=100>全部</option>

                                   <option value=1>是</option>

                                   <option value=0>否</option>

                                </select>

                            </td>

                             <td>

                                <select id="">

                                <select id="actual_timelong">

                                   <option value =0>全部</option>

                                   <option value=60>实际续航时间小于1小时</option>

                                   <option value=120>实际续航时间小于2小时</option>

@@ -378,7 +378,7 @@
                  var _attr = {

                     StationId: __data.StationId

                  };

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

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

                  optsList.push(tmp);

               }

               

@@ -393,20 +393,66 @@
      //构造查询条件

      function createSearchParam(){

         //alert($('#endu_type').val());

         var temp = {			
            num:3,                                       //电池状态

            BattGroupId:$("#endu_type").val(),                  //查询数据 				
            StationName:$('#station_name').val(),               //机房名

            StationName2:$('#city').val(),                     //市

            StationName1:$('#station_name1').val(),               //维护区

            BattProductDate:$('#starttime').val()+" 00:00:00",

            BattProductDate1:$('#endtime').val()+" 23:59:59",      //生产日期段

         //Page.pageCurr = $('#number').val();

         var temp = {							
            page:{

               pageSize:$('#number').val(),

               pageCurr:Page.pageCurr,

            },

            stationName:$('#station_name').val(),               //机房名

            stationName2:$('#city').val(),                     //市

            stationName1:$('#station_name1').val(),               //省

            is_out_stand:$('#is_stand').val(),                           //是否掉站

            endurance_actual_timelong:$('#actual_timelong').val(),                  //实际

         };

         //console.info(temp);

         return temp;

      }

      

	
      function searchBattLife(){

      var temp = createSearchParam();

      var json = JSON.stringify(temp);

      var arr = new Array();

         $.ajax({

            type:"post",

            url:"Batt_enduranceAction!serchByCondition",

            async:true,

            datatype:'json',

            data:"json="+json,

            success:function(data){

               //console.info(data);

               var data = JSON.parse(data.result);					
               //console.info(data);

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

                  data=data.data;

                  var index = 0;

                  var ArryTb= new Array();

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

                     arrTd[index++]=data[i].deviceId;

                     arrTd[index++]=data[i].stationName;

                     arrTd[index++]=data[i].real_cap;

                     arrTd[index++]=data[i].moncapstd;

                     arrTd[index++]=data[i].real_curr;

                     arrTd[index++]=data[i].endurance_actual_timelong;

                     arrTd[index++]=data[i].endurance_theory_timelong;

                     if(data[i].is_out_stand==0){  //未掉站(绿色)

                        arrTd[index++]='<div class="status effect" ></div>';

                     }

                     else if(data[i].is_out_stand==1){

                        arrTd[index++]='<div class="status no-effect"></div>';	
                     } 
                     //arrTd[index++]=data[i].is_out_stand;

                  } 
                  Page.pageAll = data[data.length-1].page.pageAll;

                  var pageNum=Math.ceil(Page.pageAll/Page.pageSize);

                  $('#total').text(Page.pageAll);

                  $('#current').text(Page.pageCurr+"/"+pageNum);

                  createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);

               }

					
            }

         })

      }

      //首页

      $('#home').click(function(){

         if(Page!=undefined){

@@ -507,6 +553,7 @@
      function exprotTable(eleTh,eleTd,eleform,eleTh_Text,eleTd_Text){

         //alert("导出");

         var ArrTh=new Array();

         var a=0;

         for(var i=0;i<eleTh.length;i++)

         {

             ArrTh[i]=eleTh.eq(i).text();

@@ -514,7 +561,17 @@
         var ArrTd="";

         for(var i=0;i<eleTd.length;i++)

         {

                ArrTd+=eleTd.eq(i).text()+"&";

             if((i+1)%eleTh.length==0){

                //console.info(eleTd.eq(i).text());

                if(eleTd.eq(i).find('div class').is('status no-effect')){

                   ArrTd+="已掉站";

                }else{

                   ArrTd+="未掉站";

                }

                ArrTd+=eleTd.eq(i).text()+"&";

             }else{

                ArrTd+=eleTd.eq(i).text()+"&";

             }

         }

         eleTh_Text.attr('value',ArrTh);

         eleTd_Text.attr('value',ArrTd);