修改内容

霍东伟

2019-03-04 fa9da36421ef9368d726e818300f710cf4ece216

修改内容

 gx_tieta/WebRoot/endure.jsp

@@ -220,7 +220,7 @@
        var tblOptsHd = new Array();    // 表格选项头部

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

        //arrTh = ['维护区', '机房名称', '电池组名称', '标称容量', '实际容量','剩余容量','实时电流', '续航时间'];

        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"/>'];

        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="real_time"/><s:text name="Current"/>(53)(A)', '<s:text name="real_time"/><s:text name="Current"/>(45)(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];

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

        tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];

        var tblHd = $('#tbHead');

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

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

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

                    console.info(model);

                    //console.info(model);

                    if(model.code==1){

                        if(temp.BattGroupId == 0){

                            setRealdate(model.data,arrTd);

@@ -656,7 +656,7 @@
        

        //设置实时数据的表格数据

        function setRealdate(data,arr){

            // console.info(data);

            console.info(data);

            var alldata = new Array();

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

                var moncapstd = data[i].binf.MonCapStd;

@@ -675,9 +675,9 @@
                    alldata.push({

                        StationName1:data[i].binf.StationName1,

                        StationName:data[i].binf.StationName,

                        moncapstd:moncapstd,

                        actionvalue:parseInt(actionvalue),

                        restvalue:parseInt(restvalue),

                        moncapstd: moncapstd,

                        actionvalue: parseInt(actionvalue),

                        restvalue: parseInt(restvalue),

                        test_curr:test_curr,

                    });

                }else{

@@ -686,15 +686,22 @@
                }

            }

            for(var i = (Page.pageCurr-1)*Page.pageSize;i<alldata.length && i<Page.pageCurr*Page.pageSize;i++){

                arr.push(alldata[i].StationName1);

                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));

                arr.push(alldata[i].StationName1);        // 维护区

                arr.push(alldata[i].StationName);        // 机房名称

                arr.push(alldata[i].moncapstd);            // 标称容量

                arr.push(alldata[i].actionvalue);        // 实际容量

                arr.push(alldata[i].test_curr);            // 实际电流（53）

                arr.push(getRealCurr45(alldata[i].test_curr));            //实际电流（45）

                arr.push(alldata[i].test_curr==0?

                        formartTime(0):

                        formartTime(alldata[i].restvalue*60/alldata[i].test_curr));    // 停电续航时间

            }

            Page.pageAll = alldata.length;

        }

		
        // 根据实际电流53的值获取实际电流45的值

        function getRealCurr45(loadCurr) {

            return (loadCurr*53/45).toFixed(1);

        }

        

        //设置历史数据的表格数据

@@ -720,7 +727,7 @@
                //console.info(temp);

                if(temp == undefined){

                    alldata.push({

                        stationid:stationid,

                        stationid:stationid,			
                        StationName1:data[i].binf.StationName1,

                        StationName:data[i].binf.StationName,

                        moncapstd:moncapstd,

@@ -735,13 +742,15 @@
                

                //sconsole.info(alldata);

               }

       		
               alldata = ascSort(alldata);

            for(var i = (Page.pageCurr-1)*Page.pageSize;i<alldata.length && i<Page.pageCurr*Page.pageSize;i++){

                arr.push(alldata[i].StationName1);

                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].StationName1);        // 维护区

                arr.push(alldata[i].StationName);        // 机房名称

                arr.push(0);            // 电池组标称容量

                arr.push(alldata[i].actionvalue);        // 实际容量

                arr.push((alldata[i].test_curr).toFixed(1));            // 实时电流（53）

                arr.push(getRealCurr45(alldata[i].test_curr));    // 实时电流（45）

                arr.push(alldata[i].test_curr==0?formartTime(0):formartTime(alldata[i].actionvalue*60/alldata[i].test_curr));

            }

            Page.pageAll = alldata.length;

@@ -893,6 +902,33 @@
            //console.info(ArrTd);

            eleform.submit();

        }

        // 升序排序

        function ascSort(data) {

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

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

                    var val1 = getTime(data[j]);

                    var val2 = getTime(data[j+1]);

                    data[j].val = val1;

                    data[j+1].val = val2;

                    if(val1>val2) {

                        var temp = $.extend({}, data[j]);

                        data[j] = data[j+1];

                        data[j+1] = temp;

                    }

                }

            }

			
            //console.log(data);

            // 获取数据

            function getTime(data) {

                var rs = 0;

                //console.log(data);

                rs = data.test_curr==0?0:data.actionvalue*60/data.test_curr;

                return rs;

            }

			
            return data;

        }

        </script>

    </body>

</html>