whychw
2020-05-06 a2b990be79ed59c4c9fb903fff78a71f5d1eb845
电池组续航查询 页面修改
5个文件已修改
358 ■■■■■ 已修改文件
gx_tieta/WebRoot/endure.jsp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/count-report.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/css/tbl.css 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/endure.html 343 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/mobilJs/base.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/endure.jsp
@@ -426,6 +426,7 @@
                            }
                        }
                        tOptions.data =data;
            debugger;
                    }else {
                        hisPage.setAll(0);
                    }
gx_tieta/WebRoot/mobil/count-report.html
@@ -38,7 +38,7 @@
                        <a href="elestatus.html"  target="_top" data-transition="slidefade">电池实时状态查询</a>
                    </li>
                    <li>
                        <a href="endure.html"  target="_top" data-transition="slidefade">机房续航能力历史查询</a>
                        <a href="endure.html"  target="_top" data-transition="slidefade">电池组续航能力查询</a>
                    </li>
                    <li>
                        <a href="batt-life-manage.html"  target="_top" data-transition="slidefade">机房续航能力查询</a>
gx_tieta/WebRoot/mobil/css/tbl.css
@@ -20,6 +20,7 @@
    border: 1px solid #ccc;
    line-height: 1.8em;
    /*white-space: nowrap;*/
    white-space: normal;
    width: 30%;
    background-color: #ddd;
}
@@ -27,6 +28,7 @@
.tbl-container td{
    border: 1px solid #ccc;
    /*white-space: nowrap;*/
    white-space: normal;
    line-height: 1.8em;
    padding: 4px;
}
@@ -99,6 +101,7 @@
    top: 50%;
    margin-top: -15px;
    z-index:99;
    display: none;
}
.next-page  {
    right: 0;
gx_tieta/WebRoot/mobil/endure.html
@@ -37,28 +37,28 @@
                    <select id="homeName" data-mini="true">
                        <option value="">全部</option>
                    </select>
                    <p>蓄电池组</p>
                    <!-- <p>蓄电池组</p>
                    <select id="battgroup_name" data-mini="true">
                        <option value="0">全部</option>
                    </select>
                    </select> -->
                    <p>续航能力类型</p>
                    <select id="endu_type" data-mini="true">
                        <option value="0">实时续航能力数据</option>
                           <option value="1">历史续航能力数据</option>
                     <option value="1">历史续航能力数据</option>
                    </select>
                    <p>系统类型</p>
                    <select name="monvolstd" id="monvolstd" lay-filter="monvolstd">
                    <select name="monvolstd" id="monvolstd" data-mini="true" lay-filter="monvolstd">
+                        <option value =0>全部</option>
+                        <option value=2>2V设备</option>
+                        <option value=12>12V设备</option>
+                    </select>
                    <fieldset data-role="collapsible" data-collapsed="false">
                    <!-- <fieldset data-role="collapsible" data-collapsed="false">
                        <legend><strong>电池组放电时间段:</strong></legend>
                        <label for="startTimeselect"><strong>开始时间:</strong></label>
                        <input type="text" name="startTimeselect" id="startTimeselect" value="1970-07-06">
                        <label for="endTimeselect"><strong>结束时间:</strong></label>
                        <input type="text" name="endTimeselect" id="endTimeselect" value="2017-05-04">
                    </fieldset>
                    </fieldset> -->
                </div>
                <div class="fg-panel-btn">
                    <a href="javascript:panel.hide(true);" data-role="button" id="search" class="ui-btn ui-mini ui-btn-b ui-shadow">确定</a>
@@ -68,7 +68,7 @@
        <!-- 头部内容 -->
        <div data-role="header" data-position="fixed">
            <a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>
            <h1>电池续航能力历史查询</h1>
            <h1 id="page_title">电池续航能力查询</h1>
            <a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">筛选</a>
        </div>
        <!-- 主体内容 -->
@@ -119,8 +119,11 @@
    $(document).ready(function() {
        $("#endTimeselect").attr("value", new Date().format("yyyy-MM-dd"));
        
    });
    var arrTh = ['机房名称','标称容量', '实际容量','剩余容量', '实时电流', '停电续航时间'];
    });
        // 历史
    var arrTh_his = ['机房名称','电池组标称容量(AH)', '电池组实际容量(AH)', '53V实时电流(A)', '45V实时电流(A)', '核容时间', '停电续航时间(min)'];
        // 实时
    var arrTh = ['机房名称', '电池组名称', '电池组标称容量(AH)', '电池组实际容量(AH)', '剩余容量(AH)', '53V实时电流(A)', '45V实时电流(A)', '停电续航时间(min)'];
    var dataArr = new Array();
    
    var arrTd = new Array();
@@ -130,43 +133,56 @@
    
      
    $(document).ready(function(){
        $("#search").click(function(){
            serchBattLife();
        });
            $("#search").click(function(){
                if (1 == $("#endu_type").val()) {
                    $('#page_title').text('电池续航(历史)查询');
                } else {
                    $('#page_title').text('电池续航(实时)查询');
                }
                serchBattLife();
            });
    });      
        
        
        
    function serchBattLife(){
        loadshow();
        var temp = createSearchForm();
         console.info(temp);
        var isHis = 1 == $("#endu_type").val();
            var temp = createSearchForm1();
         // console.info(temp);
         arrTd = new Array();
         var url = "Batttestdata_infAction!serchBattLife";
         if (!isHis) {
                temp = createSearchForm();
             url = "Batttestdata_infAction!serchBattLifeNow";
         }
        //$.post('Batttestdata_infAction!serchBattLife',"result="+JSON.stringify(temp),
        $.ajax({
                type: "post",
                async: true,
                url: "Batttestdata_infAction!serchBattLife",
                url: url,
                data: "json="+JSON.stringify(temp),
                dataType: "json",
                success:function(data){
               data=data.result;
               var model=eval("("+data+")");
               console.info(model);
               data = data.result;
               var model = JSON.parse(data);
               // console.info(model);
               //console.info(data.data[1].page);
               if(model.code==1 && model.data.length>0){
                  data = model.data;
                  if(temp.BattGroupId == 0){
                      setRealdate(model.data, arrTd);
                  }else if(temp.BattGroupId == 1){
                      sethistorydata(model.data, arrTd);
                  }
            }else{
                   Page.pageAll = 0;
                   $('#searchNull').popup('open');
               }
               setPage();
               createTbl(tblCon, arrTh, arrTd);
               if (model.code == 1 && model.data.length > 0) {
                          data = model.data;
                          if (!isHis) {
                              setRealdate(data, arrTd);
                       createTbl(tblCon, arrTh, arrTd);
                          } else {
                              sethistorydata(data, arrTd);
                       createTbl(tblCon, arrTh_his, arrTd);
                          }
            } else {
                           Page.pageAll = 0;
                           $('#searchNull').popup('open');
                       }
                       setPage();
               loadclose();
           }
        }).error(function(){
@@ -175,107 +191,125 @@
        });
    }
    
    //设置实时数据的表格数据
    function setRealdate(data,arr){
        var alldata = new Array();
  //设置实时数据的表格数据
    function setRealdate (data, arr){
        for(var i = 0;i<data.length;i++){
            var moncapstd = data[i].moncapstd;
            var monvolstd = data[i].monvolstd;
            var maxvol = data[i].bdata.mon_vol;
            var minvol = data[i].bdata.mon_tmp;
            var test_cap = data[i].bstate.batt_test_cap;
            var moncapstd = data[i].binf.MonCapStd;
            // 测试容量
            var test_cap = Math.abs(data[i].bstate.batt_test_cap);
            // 实际容量
            var real_cap = Math.abs(data[i].bstate.batt_real_cap);
            var test_curr = data[i].bstate.group_curr.toFixed(1);
            var actionvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Real)).toFixed(0);
            var restvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Rest)).toFixed(0);
            var percent = (restvalue*100/moncapstd).toFixed(1);
            var restTime = test_curr==0?formartTime(0):formartTime(restvalue*60/test_curr);
            var temp = getObjByStationName(alldata, data[i].binf.StationName);
            console.info(actionvalue+"=="+restvalue);
            if(temp == undefined){
                alldata.push({
                    StationName1:data[i].binf.StationName1,
                    StationName:data[i].binf.StationName,
                    moncapstd:moncapstd,
                    actionvalue:parseInt(actionvalue),
                    restvalue:parseInt(restvalue),
                    test_curr:test_curr,
                });
            }else{
                temp.actionvalue +=parseInt(actionvalue);
                temp.restvalue += parseInt(restvalue);
            //  剩余容量 = 实际容量-测试容量
            var res_cap = (real_cap - test_curr).toFixed(1);
            var endur_time_long = getGruopEndurTimeLong(data[i].binf.MonCapStd, real_cap, data[i].bstate.group_curr) * 60;
            arr.push(
                // 机房名称
                data[i].binf.StationName,
                // 电池组名称
                data[i].binf.BattGroupName,
                // 电池组标称容量(AH)
                moncapstd,
                // 电池组实际容量(AH)
                parseInt(real_cap),
                // 剩余容量(AH)
                res_cap,
                // 53V实时电流(A)
                data[i].bstate.group_curr,
                // 45V实时电流(A)
                (data[i].bstate.group_curr*53/45).toFixed(1),
                // 停电续航时间(min)
                endur_time_long ? endur_time_long.toFixed(0) : 0
            );
            if (data[i].binf.MonNum) {
                Page.pageAll = data[i].binf.MonNum;
            }
        }
        for(var i = (Page.pageCurr-1)*Page.pageSize;i<alldata.length && i<Page.pageCurr*Page.pageSize;i++){
            arr.push(alldata[i].StationName);
            arr.push(alldata[i].moncapstd);
            arr.push(alldata[i].actionvalue);
            arr.push(alldata[i].restvalue);
            arr.push((alldata[i].test_curr));
            arr.push(alldata[i].test_curr==0?formartTime(0):formartTime(alldata[i].restvalue*60/alldata[i].test_curr));
        }
        Page.pageAll = alldata.length;
    }
    
    //设置历史数据的表格数据
    function sethistorydata(data,arr){
        console.info(data);
        var alldata = new Array();            //存放所有数据机房的数据
    function sethistorydata (data, arr){
        for(var i=0;i<data.length;i++){
            var stationid = data[i].binf.StationId;
                  var moncapstd = data[i].binf.MonCapStd;
            var monvolstd = data[i].binf.MonVolStd;
            var maxvol = data[i].tdata.max_monvol;
            var minvol = data[i].tdata.min_monvol;
            var test_cap = data[i].tdata.test_cap;
            var test_curr = data[i].tdata.test_curr;
            var actionvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Real)).toFixed(0);
            var restvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Rest)).toFixed(0);
            //console.info(moncapstd+"==="+actionvalue+"==="+restvalue);
            var percent = (restvalue*100/moncapstd).toFixed(1);
            var restTime = test_curr==0?formartTime(0):formartTime(restvalue*60/test_curr);
            var temp = getObjByStationName(alldata, data[i].binf.StationName);
            //console.info(temp);
            if(temp == undefined){
                alldata.push({
                    stationid:stationid,
                    StationName1:data[i].binf.StationName1,
                    StationName:data[i].binf.StationName,
                    moncapstd:moncapstd,
                    actionvalue:parseInt(actionvalue),
                    restvalue:parseInt(restvalue),
                    test_curr:test_curr,
                });
            }else{
                temp.actionvalue +=parseInt(actionvalue);
                temp.restvalue += parseInt(restvalue);
            }
            //sconsole.info(alldata);
              }
        for(var i = (Page.pageCurr-1)*Page.pageSize;i<alldata.length && i<Page.pageCurr*Page.pageSize;i++){
            arr.push(alldata[i].StationName);
            arr.push(alldata[i].moncapstd);
            arr.push(alldata[i].actionvalue);
            arr.push(alldata[i].restvalue);
            arr.push((alldata[i].test_curr).toFixed(1));
            arr.push(alldata[i].test_curr==0?formartTime(0):formartTime(alldata[i].actionvalue*60/alldata[i].test_curr));
        }
        Page.pageAll = alldata.length;
    }
    //判断station在list中是否存在
    function getObjByStationName(list,StationName){
        var obj = undefined;
        for(var i=0;list!=undefined && i<list.length;i++){
            if(list[i].StationName == StationName){
                obj = list[i];
                break;
            var moncapstd = data[i].batts_moncapstd;
            var endur_time_long = getEndurTimeLong(data[i]);
            arr.push(
                // 机房名称
                data[i].stationName,
                // 电池组标称容量(AH)
                moncapstd,
                // 电池组实际容量(AH)
                getRealCap(data[i].groupcount, data[i]),
                // 53V实时电流(A)
                data[i].real_curr,
                // 45V实时电流(A)
                (data[i].real_curr*53/45).toFixed(1),
                // 核容时间
                data[i].batts_teststarttime,
                // 停电续航时间(min)
                endur_time_long
            );
            if (data[i].page.pageAll) {
                Page.pageAll = data[i].page.pageAll;
            }
        }
        return obj;
    }
    }
    // 历史 电池组实际容量
    function getRealCap (num, d) {
        var rs = "";
        var g1=d.real_cap_group1, g2=d.real_cap_group2, g3=d.real_cap_group3, g4=d.real_cap_group4;
        g1=g1?g1.toFixed(1):0;
        g2=g2?g2.toFixed(1):0;
        g3=g3?g3.toFixed(1):0;
        g4=g4?g4.toFixed(1):0;
        switch(num) {
            case 1:
                rs = g1;
                break;
            case 2:
                rs = g1+"/"+g2;
                break;
            case 3:
                rs = g1+"/"+g2+"/"+g3;
                break;
            case 4:
                rs = g1+"/"+g2+"/"+g3+"/"+g4;
                break;
        }
        return rs;
    }
    //   废弃
    //判断station在list中是否存在
    // function getObjByStationName(list,StationName){
    //     var obj = undefined;
    //     for(var i=0;list!=undefined && i<list.length;i++){
    //         if(list[i].StationName == StationName){
    //             obj = list[i];
    //             break;
    //         }
    //     }
    //     return obj;
    // }
    // 获取停电续航时间
    function getEndurTimeLong (data) {
        var endurTimeLongs = 0;
        var battsMoncapstd = data.batts_moncapstd.split("/");
        var real_curr53 = data.real_curr;
        // 遍历电池组标称容量
        for(var i=0; i<battsMoncapstd.length; i++) {
            var moncapstd = Number(battsMoncapstd[i]);
            var realCapStr = "real_cap_group"+(i+1);
            //console.log(realCapStr);
            realcap = data[realCapStr];
            var endurTimeLong = getGruopEndurTimeLong(moncapstd, realcap, real_curr53);
            endurTimeLong = (endurTimeLong*60).toFixed(0);
            endurTimeLongs += Number(endurTimeLong);
        }
        return endurTimeLongs;
    }
        
    //格式化时间 
    function formartTime(value){
@@ -296,23 +330,38 @@
        return day_num+"天"+hour_num+"小时"+min_num+"分";
    }
      function createSearchForm(){
        var temp ={
            num:3,
            stationName1:$('#mainteArea').val(),
             stationName2:$('#city').val(),
             stationName5: $('#country').val(),
             stationName:$('#homeName').val(),
            BattGroupId:$('#battgroup_name').val(),
            BattProductDate:$('#startTimeselect').val()+" 00:00:00",
            BattProductDate1:$('#endTimeselect').val()+" 23:59:59",
            page:Page,
            monvolstd: $('#monvolstd').val()
        };
          return temp;
    }
            var temp ={
                // num:3,
                StationName1: $('#mainteArea').val(),
                 StationName2: $('#city').val(),
                 StationName5: $('#country').val(),
                 StationName: $('#homeName').val(),
                // BattGroupId:$('#battgroup_name').val(),
                // BattProductDate:$('#startTimeselect').val()+" 00:00:00",
                // BattProductDate1:$('#endTimeselect').val()+" 23:59:59",
            page: Page,
            MonVolStd: $('#monvolstd').val()
            };
        return temp;
    }
    function createSearchForm1(){
            var temp ={
                // num:3,
                stationName1: $('#mainteArea').val(),
                 stationName2: $('#city').val(),
                 stationName5: $('#country').val(),
                 stationName: $('#homeName').val(),
                // BattGroupId:$('#battgroup_name').val(),
                // BattProductDate:$('#startTimeselect').val()+" 00:00:00",
                // BattProductDate1:$('#endTimeselect').val()+" 23:59:59",
            page: Page,
            monvolstd: $('#monvolstd').val()
            };
        return temp;
    }
     
    //页面加载时查询省
    $.post("BattInfAction_serchByStation",null,function(data){
@@ -473,13 +522,13 @@
                updataSelStation($Ostation_name1, arr);
            }
           
            findserchByBattGroupNamebystationname();
            // findserchByBattGroupNamebystationname();
        }
        });
    }
 
 //根据机房获取电池组
     function findserchByBattGroupNamebystationname(){
 //根据机房获取电池组     此页面现在不用
/*     function findserchByBattGroupNamebystationname(){
        var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
        var data = {
@@ -525,7 +574,7 @@
            }
        }
        });
    }
    }*/
    
     //当省改变时更新市
     $('#mainteArea').change(function(){
@@ -540,9 +589,9 @@
             findStationNamebyStationname1();     
     });       
    //当机房改变时,更新电池组    
    $('#homeName').change(function(){
        findserchByBattGroupNamebystationname();
    });
    // $('#homeName').change(function(){
    //     findserchByBattGroupNamebystationname();
    // });
    
    //设置页面的跳转链接
    function setPage(){
@@ -552,7 +601,7 @@
            $('.pre-page').show();
        }
        var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
        // debugger;
        if(Page.pageCurr < pageNum){
            $('.next-page').show();
        }else{
gx_tieta/WebRoot/mobil/mobilJs/base.js
@@ -161,10 +161,11 @@
*/
function getGruopEndurTimeLong(moncapstd, realcap, curr53) {
    var endurTimeLong = 0;
    var real_curr45 = curr53*53/45;
    var hourRate = N_TO_10H(GetHourRate(moncapstd, real_curr45));
    endurTimeLong = realcap/(hourRate*real_curr45);
    if(curr53 != 0) {
        var real_curr45 = curr53*53/45;
        var hourRate = N_TO_10H(GetHourRate(moncapstd, real_curr45));
        endurTimeLong = realcap/(hourRate*real_curr45);
    }
    return endurTimeLong;
}