hdw
2018-11-06 f726209d50bf3260f7399182ee63a6fef7dc3a04
给参数设置添加数据范围和验证
1个文件已添加
1个文件已修改
233 ■■■■ 已修改文件
gx_tieta/WebRoot/control.jsp 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/dischargetest/sysData.js 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp
@@ -245,7 +245,7 @@
                                <br>
                                <a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
                                    <span class="whyc-btn-icon fa fa-gear"></span>
                                    <span class="whyc-btn-txt">设置系统参数</span>
                                    <span class="whyc-btn-txt">系统参数</span>
                                </a>
                            </div>
                        </div>
@@ -955,6 +955,10 @@
        <div class="popup-title"><span>系统参数设置</span> <a href="javascript:;" class="close">X</a></div>
        <div class="popup-content">
            <div class="popup-tbl">
                <input type="hidden" id="sysSet_ip" value="">        <!-- IP地址 -->
                <input type="hidden" id="sysSet_subnet" value="">     <!-- 子网掩码 -->
                <input type="hidden" id="sysSet_netgate" value="">     <!-- 网关地址 -->
                <input type="hidden" id="sysSet_mac" value="">     <!-- 物理地址 -->
                <table>
                    <tbody>
                        <tr>
@@ -966,40 +970,24 @@
                            <td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
                        </tr>
                        <tr>
                            <th>IP地址</th>
                            <th>子网掩码</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_ip" readonly="readonly" value=""></td>
                            <td><input type="text" id="sysSet_subnet" readonly="readonly" value=""></td>
                        </tr>
                        <tr>
                            <th>网关地址</th>
                            <th>物理地址</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_netgate" readonly="readonly" value=""></td>
                            <td><input type="text" id="sysSet_mac" readonly="readonly" value=""></td>
                        </tr>
                        <tr>
                            <th>总续航时间</th>
                            <th>保一次下电续航时间</th>
                            <th>总续航时间(0~9999分钟)</th>
                            <th>保一次下电续航时间(0~9999分钟)</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_endur" value=""></td>
                            <td><input type="text" id="sysSet_firTime" value=""></td>
                        </tr>
                        <tr>
                            <th>电流钳量程</th>
                            <th>一次下电电压(V)</th>
                            <th>电流钳量程(10~9999A)</th>
                            <th>一次下电电压(35.0~65.0V)</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_range" value=""></td>
                            <td><input type="text" id="sysSet_firVol" value=""></td>
                        </tr>
                        <tr>
                            <th>二次下电电压(V)</th>
                            <th>DCDC模块数量</th>
                            <th>二次下电电压(35.0~65.0V)</th>
                            <th>DCDC模块数量(1~10)</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_secVol" value=""></td>
@@ -1007,27 +995,38 @@
                        </tr>
                        <tr>
                            <th>单体数据来源类型</th>
                            <th>停电升压榨干电池数量</th>
                            <th>停电升压榨干电池数量(0~2)</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_sourceStyle" value=""></td>
                            <td>
                                <select id="sysSet_sourceStyle">
                                    <option value="0">从汇集器获取</option>
                                    <option value="1">从一拖24获取</option>
                                </select>
                            </td>
                            <td><input type="text" id="sysSet_bleedNum" value=""></td>
                        </tr>
                        <tr>
                            <th>停电升压榨干电池端电压终止电压下限(V)</th>
                            <th>停电升压榨干电池端电压启动电压下限(V)</th>
                            <th>停电升压榨干电池端电压终止电压下限(35.0~65.0V)</th>
                            <th>停电升压榨干电池端电压启动电压下限(35.0~65.0V)</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_stopLimit" value=""></td>
                            <td><input type="text" id="sysSet_startLimit" value=""></td>
                        </tr>
                        <tr>
                            <th>电池合路器主电池组编号</th>
                            <th>背光时长</th>
                            <th>电池合路器主电池组编号(1~2)</th>
                            <th>背光时长(0~999分钟)</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_groupNum" value=""></td>
                            <td><input type="text" id="sysSet_backLightTime" value=""></td>
                        </tr>
                        <tr>
                            <th>停电充电电流(0~50A)</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="sysSet_powerBreakChargeCurr" value=""></td>
                        </tr>
                    </tbody>
                </table>
@@ -1142,6 +1141,7 @@
    <script type="text/javascript" src="js/dischargetest/9611.js"></script>
    <script type="text/javascript" src="js/dischargetest/bts.js"></script>
    <script type="text/javascript" src="js/dischargetest/4016.js"></script>
    <script type="text/javascript" src="js/dischargetest/sysData.js"></script>
    <script type="text/javascript" src="pages/js/pages/control-common.js"></script>
    <script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
    <!-- 引入电路图 -->
@@ -4509,8 +4509,11 @@
            
            // 设置
            $('#sysSet_en').click(function() {
                // 判断当前按钮是否可以点击
                if($(this).hasClass('whyc-btn-disabled')) {
                    return;
                }
                var tmp = getSysSetData();
                updateSysData(tmp);
            });
            
@@ -4545,6 +4548,8 @@
            function searchSysData(temp, showSU) {
                // 开启等待框
                var load = layer.load(1);
                // 设置按钮无法可点.whyc-btn-disabled
                $('#sysSet_en').addClass('whyc-btn-disabled');
                // 请求后台
                $.ajax({
                    type: "post",
@@ -4558,6 +4563,10 @@
                        if(rs.code == 1){
                            var data = rs.data[0];
                            setSysSetData(data);
                            // 移除不可点击状态
                            initSysDataPopup();
                            $('#sysSet_en').removeClass('whyc-btn-disabled');
                            sysSet_popup.showPopup();
                            if(showSU) {
                                noContent.showNoContent('读取成功', true);
                            }
@@ -4588,7 +4597,7 @@
                    data: "json = " + JSON.stringify(temp),
                    success: function(result) {
                        var rs = JSON.parse(result.result);
                        console.info(rs);
                        //console.info(rs);
                        if(rs.code == 1){
                            noContent.showNoContent('更新成功', true);
                        }else{
@@ -4655,13 +4664,12 @@
                $('#sysSet_secVol').val(data.MonomerOrder);            // 二次下电电压
                $('#sysSet_dcdc').val(data.LoaderCount);            // DCDC模块数量
                $('#sysSet_sourceStyle').val(data.DtCardCount);        // 单体数据来源类型
                $('#sysSet_bleedNum').val(data.PowerBreakChargeCurr);        // 停电升压榨干电池数量
                $('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt);        // 停电升压榨干电池数量
                $('#sysSet_stopLimit').val(data.POF_BG_Boost_VolStop);        // 停电升压榨干电池端电压终止电压下限
                $('#sysSet_startLimit').val(data.POF_BG_Boost_VolStart);        // 停电升压榨干电池端电压启动电压下限
                $('#sysSet_groupNum').val(data.MajorBattGroupNum);    // 电池合路器主电池组编号
                $('#sysSet_backLightTime').val(data.BackLightTime);                    // 背光时间
                sysSet_popup.showPopup();
                $('#sysSet_powerBreakChargeCurr').val(data.PowerBreakChargeCurr);    //  停电充电电流
            }
            
            // 获取面板信息的值
@@ -4684,7 +4692,7 @@
                var startLimit = $('#sysSet_startLimit').val();            // 停电升压榨干电池端电压启动电压下限
                var groupNum = $('#sysSet_groupNum').val();                // 电池合路器主电池组编号
                var backLightTime = $('#sysSet_backLightTime').val();                    // 背光时间
                var powerBreakChargeCurr = $('#sysSet_powerBreakChargeCurr').val();    //  停电充电电流
                
                var rs = {
                    dev_id: dev_id,
@@ -4699,11 +4707,12 @@
                    MonomerOrder: secVol,
                    LoaderCount: dcdc,
                    DtCardCount: sourceStyle,
                    PowerBreakChargeCurr:bleedNum,
                    POF_BG_Boost_Cnt:bleedNum,
                    POF_BG_Boost_VolStop:stopLimit,
                    POF_BG_Boost_VolStart:startLimit,
                    MajorBattGroupNum:groupNum,
                    BackLightTime:backLightTime,
                    PowerBreakChargeCurr: powerBreakChargeCurr,
                    num: sysCMD.set
                };
                
gx_tieta/WebRoot/js/dischargetest/sysData.js
New file
@@ -0,0 +1,152 @@
var sysDataBtn = {
    disabled: function() {
        $('#sysSet_en').addClass('whyc-btn-disabled');
    },
    active:function() {
        $('#sysSet_en').removeClass('whyc-btn-disabled');
    }
};
//61850数据校验
$(function() {
    // 续航时间
    $('#sysSet_endur').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 0,
        max: 9999,
        msg: '取值范围0~9999(整数)'
    });
    // 保一次下电续航时间
    $('#sysSet_firTime').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 0,
        max: 9999,
        msg: '取值范围0~9999(整数)'
    });
    // 电流钳量程
    $('#sysSet_range').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 10,
        max: 9999,
        msg: '取值范围10~9999(整数)'
    });
    // 一次下电电压
    $('#sysSet_firVol').testVal({
        pattern: /^[0-9]{1,2}(\.[0-9]{0,1})?$/,
        regVal: true,
        min: 35.0,
        max: 65.0,
        msg: '取值范围35.0~65.0'
    });
    // 二次下电电压
    $('#sysSet_secVol').testVal({
        pattern: /^[0-9]{1,2}(\.[0-9]{0,1})?$/,
        regVal: true,
        min: 35.0,
        max: 65.0,
        msg: '取值范围35.0~65.0'
    });
    // DCDC模块数量
    $('#sysSet_dcdc').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 1,
        max: 10,
        msg: '取值范围1~10(整数)'
    });
    // 停电升压榨干电池端电压终止电压下限(35.0~65.0V)
    $('#sysSet_stopLimit').testVal({
        pattern: /^[0-9]{1,2}(\.[0-9]{0,1})?$/,
        regVal: true,
        min: 35.0,
        max: 65.0,
        msg: '取值范围35.0~65.0'
    });
    // 停电升压榨干电池端电压启动电压下限(35.0~65.0V)
    $('#sysSet_startLimit').testVal({
        pattern: /^[0-9]{1,2}(\.[0-9]{0,1})?$/,
        regVal: true,
        min: 35.0,
        max: 65.0,
        msg: '取值范围35.0~65.0'
    });
    // 电池合路器主电池组编号(1~2)
    $('#sysSet_groupNum').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 1,
        max: 2,
        msg: '取值范围1~2(整数)'
    });
    // 背光时长(0~999分钟)
    $('#sysSet_backLightTime').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 0,
        max: 999,
        msg: '取值范围0~999(整数)'
    });
    // 停电充电电流(0~50A)
    $('#sysSet_powerBreakChargeCurr').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 0,
        max: 50,
        msg: '取值范围0~50(整数)'
    });
    // 停电升压榨干电池数量(0~2)
    $('#sysSet_bleedNum').testVal({
        pattern: /^[0-9]{1,4}$/,
        regVal: true,
        min: 0,
        max: 2,
        msg: '取值范围0~2(整数)'
    });
    // 获取系统参数面板的所有文本框
    $('#sysSet_popup').on('input propertychange', 'input[type=text]', function() {
        checkSysData();
    });
});
// 初始化系统参数面板
function initSysDataPopup() {
    var textList = sysSet_popup.popup.find('input[type=text]');
    textList.removeClass('error-data');
}
// 检测系统参数是否合法
function checkSysData() {
    var textList = sysSet_popup.popup.find('input[type=text]');
    // 遍历检测文本框是否有错误的
    var allGood = true;
    textList.each(function(i) {
        if($(this).hasClass('error-data')) {
            allGood = false;
        }
    });
    // 设置按钮的状态
    if(allGood) {
        sysDataBtn.active();
    }else {
        sysDataBtn.disabled();
    }
}