修改范围电流范围内容

hdw

2018-11-22 aa39b7fa5eb2eb2f65e00d134c82eaa958900813

修改范围电流范围内容

 gx_tieta/WebRoot/control.jsp

@@ -120,6 +120,19 @@
        .mr250 {

            margin-left: -250px;

        }

        .page-link {

            cursor: pointer;

        }

        .page-link:hover {

            color: #1495E7;

        }

        .page-link:active {

            color: #FF0000;

        }

        i.fa.f-size16 {

            font-size: 16px;

            vertical-align: middle;

        }

    </style>

    

  </head>  

@@ -660,7 +673,7 @@
                        </tr>

                        <tr>

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

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

                            <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 充电电流 -->（<span class="val-range"></span>A）<i class="fa fa-edit page-link f-size16" title="修改充电电流范围"></i></th>

                        </tr>

                        <tr>

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

@@ -1161,6 +1174,9 @@
    <script type="text/javascript" src="js/elecircle.js"></script>

    <script type="text/javascript" src="js/elecircle.content.js"></script>

    <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>

    <script type="text/html" id="setChargeCurrTpl">

		
    </script>

    <script type="text/javascript">

    var permits;

    <%    Object obj=session.getAttribute("permits");

@@ -1271,6 +1287,69 @@
                sysSet_popup.hidePopup();    // 隐藏sysSet_popup弹出框和遮罩层

            });

            

            // bts面板充电电流编辑

            $('#ChargeCurrSetLabel .fa-edit').click(function() {

                var batt =getBatt();

                //console.log(batt);

                // 设置面板

                layer.open({

                    type: 1

                    ,title: '设置充电电流阀值'

                    , content: '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px;">'+

                                '<input type="text" style="width: 100%; height:32px; border: 1px solid #ccc;" id="setChargeCurrVal" value="">'+

                                '</div></div>'

                    ,btn:['设置', '取消']

                    ,yes: function(index) {

                        var chargeCurrVal = $('#setChargeCurrVal').val();

                        var num = Number(chargeCurrVal);

                        if(isNaN(num) || num==0) {

                            layer.msg('请输入数字');

                            return;

                        }

                        var tmp = {

                            charge_curr_max: num

                            ,BattGroupId: batt.BattGroupId

                        }; 
                        var load;

                        // 请求设置电流的后台

                        $.ajax({

                            type: 'post'

                            ,async: true

                            ,url: 'BattInfAction!update_charge'

                            ,data: 'json='+JSON.stringify(tmp)

                            ,dataType: 'json'

                            ,beforeSend: function(){

                                load = layer.load(1);

                            }

                            ,success: function(res) {

                                var rs = JSON.parse(res.result);

                                // 关闭等待框

                                layer.close(load);

                                //console.log(rs);

                                if(rs.code == 1) {

                                    // 设置弹出框信息

                                    layer.msg('设置成功！');

                                    layer.close(index);

                                    // 充电电流

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

                                        regVal: true

                                        ,update: true

                                        ,min: 0

                                        ,max: num

                                        ,msg: '取值范围0~'+num+'A'

                                    });

									
                                    // 设置文本值

                                    $('#ChargeCurrSetLabel .val-range').text('0~'+num);

                                }else {

                                    layer.msg('设置失败!请重新设置');

                                }

                            }

							
                        });

                    } 
                });

            });

            

            // 窗口大小改变

            $(window).resize(function() {


 gx_tieta/WebRoot/dischargetest.jsp

@@ -67,6 +67,19 @@
            outline: none !important;

            border: 1px solid #FF0000 !important;

        }

        .page-link {

            cursor: pointer;

        }

        .page-link:hover {

            color: #1495E7;

        }

        .page-link:active {

            color: #FF0000;

        }

        i.fa.f-size16 {

            font-size: 16px;

            vertical-align: middle;

        }

    </style>

  </head> 

  <body>

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

                        <tr>

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

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

                            <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 充电电流 -->（<span class="val-range"></span>A）<i class="fa fa-edit page-link f-size16" title="修改充电电流范围"></i></th>

                        </tr>

                        <tr>

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

@@ -819,6 +832,71 @@
                msg: '输入的数据格式不正确'

            });

            

			
            // bts面板充电电流编辑

            $('#ChargeCurrSetLabel .fa-edit').click(function() {

                var battGroupId = $('#battgroupname').find('option:selected').attr('battgroupid');

                //console.log(batt);

                // 设置面板

                layer.open({

                    type: 1

                    ,title: '设置充电电流阀值'

                    , content: '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px;">'+

                                '<input type="text" style="width: 100%; height:32px; border: 1px solid #ccc;" id="setChargeCurrVal" value="">'+

                                '</div></div>'

                    ,btn:['设置', '取消']

                    ,yes: function(index) {

                        var chargeCurrVal = $('#setChargeCurrVal').val();

                        var num = Number(chargeCurrVal);

                        if(isNaN(num) || num==0) {

                            layer.msg('请输入数字');

                            return;

                        }

                        var tmp = {

                            charge_curr_max: num

                            ,BattGroupId: battGroupId

                        }; 
                        var load;

                        // 请求设置电流的后台

                        $.ajax({

                            type: 'post'

                            ,async: true

                            ,url: 'BattInfAction!update_charge'

                            ,data: 'json='+JSON.stringify(tmp)

                            ,dataType: 'json'

                            ,beforeSend: function(){

                                load = layer.load(1);

                            }

                            ,success: function(res) {

                                var rs = JSON.parse(res.result);

                                // 关闭等待框

                                layer.close(load);

                                //console.log(rs);

                                if(rs.code == 1) {

                                    // 设置弹出框信息

                                    layer.msg('设置成功！');

                                    layer.close(index);

                                    // 充电电流

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

                                        regVal: true

                                        ,update: true

                                        ,min: 0

                                        ,max: num

                                        ,msg: '取值范围0~'+num+'A'

                                    });

									
                                    // 设置文本值

                                    $('#ChargeCurrSetLabel .val-range').text('0~'+num);

                                }else {

                                    layer.msg('设置失败!请重新设置');

                                }

                            }

							
                        });

                    } 
                });

            });

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

                $.checkTestInfor();

            });

@@ -1187,7 +1265,7 @@
                        });

                        

                        // 设置文本值

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

                        $('#ChargeCurrSetLabel .val-range').text('0~'+list[0].binf.charge_curr_max);

                    }                

                }

            }


 gx_tieta/WebRoot/js/dischargetest/bts.js

@@ -241,14 +241,15 @@
    

    // 充电电流

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

        regVal: true,

        min: 0,

        max: list[0].binf.charge_curr_max,

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

        regVal: true

        ,update: 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）');

    $('#ChargeCurrSetLabel .val-range').text('0~'+list[0].binf.charge_curr_max);

}



// 更新BTS设备测试信息


 gx_tieta/WebRoot/js/whyc-jqueryui.js

@@ -601,7 +601,7 @@
            opts.event = "error";

            opts.msg = '请输入正确的正则表达式格式！！！'

        }

		
        //console.log(opts);

        var testVal = new TestVal(this, opts);

        this.data('testVal', testVal.opts);