修改内容

霍东伟

2019-03-06 4f03f89b6e5184ec3e6f0afa42d15240b0d6e6b0

修改内容

 gx_tieta/WebRoot/batt-life-manage.jsp

@@ -230,7 +230,7 @@
        var tblStatus = new Array();    // 表格状态数组

        var tblOptsHd = new Array();    // 表格选项头部

        var tblOptsBd = new Array();  // 表格选项数组

        arrTh = ['设备ID', '机房名称', '实际容量（AH）', '电池组标称容量（AH）','负载电流（53）（A）', '负载电流（45）（A）','预估续航时间(min)', '核容开始时间','续航大于3小时'];

        arrTh = ['设备ID', '机房名称', '实际容量（AH）', '电池组标称容量（AH）','53V负载电流（A）', '45V负载电流（A）','预估续航时间(min)', '核容开始时间','续航大于3小时'];

        //arrTh = ['设备ID', '机房名称', '实际容量', '标称容量','负载电流', '最小实际续航时间(min)','平均实际续航时间(min)', '最大实际续航时间(min)', '理论续航时间(min)', '是否掉站'];

        //arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>',  '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];

        //tblOptsHd = ['编号', '选项', '是否选择'];


 gx_tieta/WebRoot/endure.jsp

@@ -295,14 +295,15 @@
            ,toolbar: false

            ,defaultToolbar: []

            ,cellMinWidth: 80

            ,width: "100%"

            ,cols: [[

                {field:'stationName', title:'机房名称', align:'center',minWidth: 500}

                ,{field:'batts_moncapstd', title:'电池组标称容量(AH)', align:'center', width: 210}

                {field:'stationName', title:'机房名称', align:'center',minWidth: 500, width: 500}

                ,{field:'batts_moncapstd', title:'电池组标称容量(AH)', align:'center', width: 220}

                ,{field:'batts_realcapstd', title:'电池组实际容量(AH)', templet: '#batts_realcapstd', align:'center', width: 210}

                ,{field: 'real_curr', title: '实时电流(53)(A)', align: 'center', width: 200}

                ,{field:'real_curr45', title:'实时电流(45)(A)', templet: '#real_curr45',align:'center', width: 200}

                ,{field:'batts_teststarttime', title:'核容时间', align:'center', width: 300}

                ,{field:'endur_time_long', title:'停电续航时间(min)', align:'center', minWidth: 200, width: 210}

                ,{field: 'real_curr', title: '53V实时电流(A)', align: 'center', width: 220}

                ,{field:'real_curr45', title:'45V实时电流(A)', templet: '#real_curr45',align:'center', width: 220}

                ,{field:'batts_teststarttime', title:'核容时间', align:'center', minWidth: 300, width: 300}

                ,{field:'endur_time_long', title:'停电续航时间(min)', align:'center', width: 220}

            ]]

            ,data:[]

            ,limit: 10000

@@ -318,15 +319,14 @@
            ,defaultToolbar: []

            ,cellMinWidth: 80

            ,cols: [[

                {field:'StationName', title:'机房名称', align:'center',minWidth: 500}

                {field:'StationName', title:'机房名称', align:'center',minWidth: 500, width:500}

                ,{field:'BattGroupName', title:'电池组名称', align:'center', width: 210}

                ,{field:'MonCapStd', title:'电池组标称容量(AH)', align:'center', width: 210}

                ,{field:'batts_realcapstd', title:'电池组实际容量(AH)', align:'center', width: 210}

                ,{field:'batt_real_cap', title:'电池组实际容量(AH)', align:'center', width: 210}

                ,{field:'res_cap', title:'剩余容量(AH)',align:'center', width: 200}

                ,{field: 'real_curr', title: '实时电流(53)(A)', align: 'center', width: 200}

                ,{field:'real_curr45', title:'实时电流(45)(A)',align:'center', width: 200}

                ,{field:'batts_teststarttime', title:'核容时间', align:'center', width: 300}

                ,{field:'endur_time_long', title:'停电续航时间(min)', align:'center', minWidth: 200,width: 210}

                ,{field: 'group_curr', title: '53V实时电流(A)', align: 'center', width: 200}

                ,{field:'group_curr_45', title:'45V实时电流(A)',align:'center', width: 200}

                ,{field:'endur_time_long', title:'停电续航时间(min)', align:'center', width: 210}

            ]]

            ,data:[]

            ,limit: 10000

@@ -429,11 +429,29 @@
                        console.log(data);

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

                            var _data = data[i];

                            // 实际容量

                            var realCap = Math.abs(_data.bstate.batt_real_cap);

                            // 测试容量

                            var testCap = Math.abs(_data.bstate.batt_test_cap);

                            //  剩余容量 = 实际容量-测试容量

                            var resCap = realCap - testCap;

                            // 53V实时电流

                            var groupCurr53 = _data.bstate.group_curr;

                            // 45V实时电流

                            var groupCurr45 = groupCurr53*53/45;

							
                            // 续航时间

                            var endurTimeLong = getGruopEndurTimeLong(_data.binf.MonCapStd, realCap, groupCurr53);

                            endurTimeLong = endurTimeLong*60;

                            var _temp = {

                                StationName: _data.binf.StationName,

                                BattGroupName: _data.binf.BattGroupName,

                                MonCapStd: _data.binf.MonCapStd,

								
                                batt_real_cap: realCap.toFixed(1),

                                res_cap: resCap.toFixed(1),

                                group_curr: groupCurr53,

                                group_curr_45: groupCurr45.toFixed(1),

                                endur_time_long: endurTimeLong?endurTimeLong.toFixed(0):0

                            }

                            // 设置分页信息

                            if(_data.binf.MonNum) {

@@ -470,7 +488,7 @@
        

        // 获取停电续航时间

        function getEndurTimeLong(data) {

            var endurTimeLongs = "";

            var endurTimeLongs = 0;

            var battsMoncapstd = data.batts_moncapstd.split("/");

            var real_curr53 = data.real_curr; 

            // 遍历电池组标称容量

@@ -481,11 +499,7 @@
                realcap = data[realCapStr];

                var endurTimeLong = getGruopEndurTimeLong(moncapstd, realcap, real_curr53);

                endurTimeLong = (endurTimeLong*60).toFixed(0);

                if(i==0) {

                    endurTimeLongs += endurTimeLong;

                }else {

                    endurTimeLongs += "/"+endurTimeLong;

                }

                endurTimeLongs += Number(endurTimeLong);

            }

            

            return endurTimeLongs;


 gx_tieta/WebRoot/js/base.js

@@ -262,9 +262,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;

}