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

hdw

2018-11-26 5aa4ed18559692206e8cda000587cd3c16d27dc7

Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/mobil/batt-traffic-statistics.html

@@ -110,10 +110,10 @@
                            <option value="">全部</option>

                        </select>

                        <p>统计方式</p>

                        <select id="" data-mini="true">

                            <option value="">按年统计</option>

                            <option value="">按月统计</option>

                            <option value="">按日统计</option>

                        <select id="statistics" data-mini="true">

                            <option value="3">按年统计</option>

                            <option value="1">按月统计</option>

                            <option value="2">按日统计</option>

                        </select>

                         <p>时间段</p>

                         <div class="checkdata">

@@ -205,23 +205,21 @@
         var json = JSON.stringify(temp);

         //console.info(json);

        arrTd = new Array();

        $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){

        $.post("StationtrafficAction!serchByCondition","json="+json,function(data){

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

            //console.info(data);

            console.info(data);

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

                data=data.data;

                //console.info(data);                    

                arr=new Array();

                index=0;

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

                    Page.pageAll=data[i].Size;

                    arr[index++]=data[i].BattGroupId;                //电池组id

                    arr[index++]=data[i].StationName;                //机房名称

                    arr[index++]=data[i].StationIp;                    //机房IP

                    arr[index++]=data[i].BattGroupName;    //电池组名称

                    arr[index++]=data[i].BattGroupNum;                //电池组序号

					
					
                    arr[index++]=data[i].note;

                    arr[index++]=data[i].stationName1;                //电池组id

                    arr[index++]=data[i].stationName2;                //机房名称

                    arr[index++]=data[i].stationName;                    //机房IP

                    arr[index++]=tranfficCount(data[i].dayflow);    //电池组名称

			
                }

               //console.info(Page);

               createTbl(tbl, arrTh, arr);

@@ -239,31 +237,27 @@
        });

     

     }





	
    // 计算流量

    function tranfficCount(value){

        value = (value/1048576).toFixed(2);

        if(value>1024){

            value = (value/1024).toFixed(2);

            return value + "G";

        }else{

            return value + "M";

        }

    }			
    

    function createSearchForm(){

        var temp={

            page:{

                pageCurr:Page.pageCurr,

                pageSize:Page.pageSize,

            },

            binf:{

                StationName1:$('#mainteArea').val(),

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

                StationName5:$('#country').val(),

                StationName:$('#homeName').val(),

				
            },

			
            tdata:{	
				
                record_time:$('#startTestrecord').val(),           //电池测试记录时间段

                record_time1:$('#endTestrecord').val()  
				
            }

			
        var dev_id = $('#homeName').find("option:selected").attr('stationid');

        var temp = {

            dev_id: dev_id?dev_id:0,

            record_time:$('#startTestrecord').val()+" 00:00:00",           //电池测试记录时间段

            record_time1:$('#endTestrecord').val()+" 23:59:59", 						
            num:$('#statistics').val()

        };

        console.info(temp);

        return temp;

    }

    // stringify(createSearchForm());

@@ -400,7 +394,7 @@
            success: function(data){

            data = data.result;

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

            //console.info(data);

            console.info(data);

            //console.info(data.code);       

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

                   var $Ostation_name1=$("#homeName");

@@ -409,16 +403,17 @@
                for(var i=0;i<=data.data.length;i++)

                {

                       if(i == 0){

                           arr.push({

                               val:"",

                               stationid:"",

                               txt:"全部(共"+data.data.length+"个)",

                           });

                           //arr.push({

                               //dev_id:"",

                           //    stationid:"",

                           //    txt:"全部(共"+data.data.length+"个)",

                           //});

                       }else{

                           arr.push({

                               val:data.data[i-1].StationName3,

                               stationid:data.data[i-1].StationId,

                               txt:data.data[i-1].StationName3,

                               stationid:data.data[i-1].FBSDeviceId,

                               //dev_id:data.data[i-1].FBSDeviceId,

                               txt:data.data[i-1].StationName3,	
                           });

                       }

                }


 gx_tieta/WebRoot/mobil/mobilJs/base.js

@@ -368,6 +368,20 @@
        }

    }



function updataSelStationdev(element, opts) {

	  
    element.siblings('span').text(opts[0].txt);    // 设置默认显示的内容



    // 清理element的option

    element.text('');

    //console.warn(opts);

    // 根据vals和txt值生成option

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

        
        var opt = $('<option value="'+opts[i].val+'"dev_id="'+opts[i].dev_id+'" stationid="'+opts[i].stationid+'">'+opts[i].txt+'</option>');

        element.append(opt);

    }

}

/**

*ele    JQuery对象

*input  默认值