修改测试数据监测放电监测

hdw

2018-11-21 a5e592639ea731aecc58398327e3644075f3f87b

修改测试数据监测放电监测

 gx_tieta/WebRoot/dischargetest.jsp

@@ -209,7 +209,7 @@
                        </tr>

                        <tr>

                            <th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 升压上限 -->（V）</th>

                            <th><s:text name="Charging_current"/><!-- 充电电流 -->（A）</th>

                            <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 充电电流 -->（A）</th>

                        </tr>

                        <tr>

                            <td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>

@@ -732,46 +732,95 @@
                    };    // 充电电流

                    

                    $('.popup.fbs9100 .popup-tbl td i').removeClass('error-data');

                    $('.popup.fbs9100 .popup-tbl input[type=text]').removeClass('error-data');

                }

            });

        })(jQuery);

        

        // 更改放电面板的值后

        $(function() {

            $('.popup.fbs9100 .popup-tbl td i').tooltip();

            // 监测面板中的input改变触发$.checkTestInfor()事件

            $('.popup.fbs9100 .popup-tbl').on('input propertychange', 'input', function() {

            // 放电电流

            $('#discurr').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: true,

                min: 0,

                max: 1000,

                msg: '取值范围0~1000A'

            });

			
            // 放电小时率

            $('#hourrate').testVal({

                pattern: /^[0-9]+$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 放电电容

            $('#discap').testVal({

                pattern: /^[0-9]+$/,

                regVal: true,

                min: 0,

                max: 90000,

                msg: '取值范围0~90000AH'

            });

			
            // 放电时长

            $('#distime').testVal({

                pattern: /^[0-9]+$/,

                regVal: true,

                min: 0,

                max: 5940,

                msg: '取值范围0~5940分钟'

            });

			
            // 单体下限阀值

            $('#MonomerVol_low').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: true,

                min: 0,

                max: 20,

                msg: '取值范围0~20V'

            });

			
            // 组端下限阀值GroupVol_low

            $('#GroupVol_low').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: true,

                min: 0,

                max: 60,

                msg: '取值范围0~60V'

            });

			
            // 单体下限数量

            $('#MonomerlowCount').testVal({

                pattern: /^[0-9]+$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 升压上限

            $('#MonomerlowCount').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 充电电流

            $('#ChargeCurrSet').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 温度上限

            $('#TempUpHighLimit').testVal({

                pattern: /^[0-9]+$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            $('.popup.fbs9100').on('input propertychange', 'input[type=text]', function() {

                $.checkTestInfor();

                var bool = $.regPositiveNum($(this).val());

                if(bool) {

                    // 读取放电参数成功执行

                    if($.disTestInfor.success) {

                        paramsBtn.ensure(true);

                    }

                    $(this).next('i').removeClass('error-data');

                    $(this).myTooltip('hide');

                }else {

                    paramsBtn.ensure(false);

                    //var errorImg = $('<i class="fa fa-frown-o error-img"></i>');

                    $(this).next('i').addClass('error-data');

                    $(this).myTooltip({

                        position: 'top',

                        thing: 'show',

                        content: '<span style="color:#FF0000">数据格式错误(请输入正数)</span>'

                    });

                }

            });

			
            // 当文本框获取焦点时

            $('.popup.fbs9100 .popup-tbl').on('focus', 'input', function() {

                if($(this).next('i').hasClass('error-data')) {

                    $(this).myTooltip('show');

                }

            });

			
            // 文本框失去焦点

            $('.popup.fbs9100 .popup-tbl').on('blur', 'input', function() {

                $(this).myTooltip('hide');

            });

            

            $('.popup.fbs9100').on('change', 'select', function() {

@@ -1128,6 +1177,17 @@
                        $('#DCVolHighLimit').val(list[i].fsparam.DCVolHighLimit);

                        $('#ChargeCurrSet').val(list[i].fsparam.ChargeCurrSet);

                        $('#TempUpHighLimit').val(list[i].fsparam.MonomerTmp_High);

						
                        // 充电电流

                        $('#ChargeCurrSet').testVal('option', 'allOpts', {

                            regVal: true,

                            min: 0,

                            max: list[0].binf.charge_curr_max,

                            msg: '取值范围0~'+list[0].binf.charge_curr_max+'A'

                        });

						
                        // 设置文本值

                        $('#ChargeCurrSetLabel').text('充电电流（0~'+list[0].binf.charge_curr_max+'A）');

                    }                

                }

            }


 gx_tieta/WebRoot/js/dischargetest/bts.js

@@ -247,6 +247,7 @@
        msg: '取值范围0~'+list[0].binf.charge_curr_max+'A'

    });

    

    // 设置文本值

    $('#ChargeCurrSetLabel').text('充电电流（0~'+list[0].binf.charge_curr_max+'A）');

}