bug
Administrator
2018-10-24 282692023273e6bf237b613ef6c39ef08ebc4c49
bug
2个文件已修改
84 ■■■■ 已修改文件
gx_tieta/WebRoot/batt-state-manage.jsp 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-state-statistical.jsp 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-state-manage.jsp
@@ -116,10 +116,11 @@
                    </table>
                    <table class="condi-opt">
                <tr>
                    <td><input type="checkbox" id="" name=""  value="" class="" />停电</td>        <!-- 停电 -->
                    <td><input type="checkbox" id="" name=""  value="" class="" />发电</td>    <!-- 发电 -->
                    <td><input type="checkbox" id="" name=""  value="" class="">掉站</td>        <!-- 掉站 -->
                    <td><input type="checkbox" id=""    name="" value="" class="" >开门异常</td><!-- 开门,开关电源异常 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name=""  value=2 class="" />停电</td>        <!-- 停电 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name=""  value=4 class="">续航</td>        <!-- 掉站 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name=""  value=8 class="" />发电</td>    <!-- 发电 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError"    name="" value=16 class="" >开门异常</td>
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name=""  value=32 class="">掉站</td>        <!-- 掉站 -->
                    
                </tr>
            </table>
@@ -449,6 +450,7 @@
        function createSearchParam(){
            //alert($('#endu_type').val());
            var stationid = $('#station_name3').find("option:selected").attr('Stationid');
            var battgroupid = batt_condition();
            var temp = {            
                page:{
                    pageSize:$('#number').val(),
@@ -458,10 +460,41 @@
                StationName2:$('#city').val(),    
                StationName3:$('#station_name3').val(),                
                StationId: stationid?stationid:0,
                BattGroupNum:battgroupid,
            };
            //console.info(temp);
            console.info(temp);
            return temp;
        }
            function batt_condition(){
                var POFF_ComError = 0;
                var XUHANG_ComError = 0;
                var FADIAN_ComError = 0;
                var DIAOZHAN = 0;
                var DOOROPEN_ComError = 0;
                var condition = 0;
                if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
                    POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
                    condition+=parseInt(POFF_ComError);
                }
                if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
                    XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
                    condition+=parseInt(XUHANG_ComError);
                }
                if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
                    FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
                    condition+=parseInt(FADIAN_ComError);
                }
                if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
                    DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
                    condition+=parseInt(DIAOZHAN);
                }
                if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
                    DOOROPEN_ComError =    $('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
                    condition+=parseInt(DOOROPEN_ComError);
                }
                //condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
                //console.info(condition);
                return condition;
        }
        var myTimeOut;
@@ -552,6 +585,11 @@
                        var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
                        $('#total').text(Page.pageAll);
                        $('#current').text(Page.pageCurr+"/"+pageNum);
                    }else{
                        Page.pageAll = 0;
                        var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
                        $('#total').text(Page.pageAll);
                        $('#current').text(Page.pageCurr+"/"+pageNum);
                    }
                    createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
                    
gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -270,7 +270,6 @@
            // 构造查询条件
            function createSearchForm(){
                var stationid = $('#station_name3').find("option:selected").attr('Stationid');
                var battgroupid = batt_condition();
                var temp={
                        StationName1:$('#station_name1').val(),                                                    // 省
                        StationName2:$('#city').val(),                                                            // 市
@@ -279,43 +278,12 @@
                        BattInUseDate:$('#startalm').val()+" 00:00:00",
                        BattInUseDate1:$('#endTalm').val()+" 23:59:59",
                        BattGroupNum:$('#statistics').val(),
                        BattGroupId:battgroupid,
                };
                //console.info(temp);
                return temp;
            }
            
            function batt_condition(){
                var POFF_ComError = 0;
                var XUHANG_ComError = 0;
                var FADIAN_ComError = 0;
                var DIAOZHAN = 0;
                var DOOROPEN_ComError = 0;
                var condition = 0;
                if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
                    POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
                    condition+=parseInt(POFF_ComError);
                }
                if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
                    XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
                    condition+=parseInt(XUHANG_ComError);
                }
                if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
                    FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
                    condition+=parseInt(FADIAN_ComError);
                }
                if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
                    DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
                    condition+=parseInt(DIAOZHAN);
                }
                if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
                    DOOROPEN_ComError =    $('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
                    condition+=parseInt(DOOROPEN_ComError);
                }
                //condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
                //console.info(condition);
                return condition;
            }
            //点击查询按钮
            $('#paging .search').click(function(){
                serachBattStatistical();