Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git...

81041

2018-12-07 4b8935412d026ae29a104d1a799c6b15e2641381

Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/control.jsp

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

                        <tr>

                            <th>单体数据来源类型</th>

                            <th>停电升压榨干电池数量（1~2）</th>

                            <th>停电升压榨干电池数量（0~2）</th>

                        </tr>

                        <tr>

                            <td>

@@ -1046,7 +1046,7 @@
                            <td><input type="text" id="sysSet_startLimit" value=""></td>

                        </tr>

                        <tr>

                            <th>电池合路器主电池组编号（1~2）</th>

                            <th>电池合路器主电池组编号（0~2）</th>

                            <th>背光时长（0~999分钟）</th>

                        </tr>

                        <tr>


 gx_tieta/WebRoot/css/common.css

@@ -226,6 +226,12 @@
    padding: 4px 0 4px 8px;

}



body .ui-autocomplete {

    height: 200px;

    overflow-y: auto; 
    overflow-x: hidden;

}



/* jquery ui style */

body .ui-front {

    z-index: 999999;


 gx_tieta/WebRoot/js/dischargetest/sysData.js

@@ -86,9 +86,9 @@
    $('#sysSet_groupNum').testVal({

        pattern: /^[0-9]{1,4}$/,

        regVal: true,

        min: 1,

        min: 0,

        max: 2,

        msg: '取值范围1~2（整数）'

        msg: '取值范围0~2（整数）'

    });

    

    // 背光时长（0~999分钟）

@@ -113,9 +113,9 @@
    $('#sysSet_bleedNum').testVal({

        pattern: /^[0-9]{1,4}$/,

        regVal: true,

        min: 1,

        min: 0,

        max: 2,

        msg: '取值范围1~2（整数）'

        msg: '取值范围0~2（整数）'

    });