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

81041

2018-10-11 5de347e1a4dc3b32b230e092cd12cac9af75bda0

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

 gx_tieta/WebRoot/charge-test.jsp

@@ -4648,7 +4648,7 @@
            var tmp = {

                StationName1: home.StationName1,

                StationName2: home.StationName2,

                StationName3: home.StationName3,

                StationName: home.StationName,

                StationId: home.StationId

            };

            fourth(treeView, $(this).parent(), tmp);


 gx_tieta/WebRoot/css/charge_test_style.css

@@ -61,17 +61,16 @@
#ele_content .batt-listen {

    width: 100%;

    height: 300px;

    background-color: #FFFFFF;

    background-color: #272822;

}

#ele_content .batt-listen .count-num {

    width:100%;

    height:30px;

    font-size:14px;

    color:gray;

    border-bottom:1px solid #dddddd;

    color:rgba(255,255,255,.7);

    line-height:30px;

    text-align:center;

    background:url(../image/table_th_bg.gif) repeat-x;	
    background-color: #3c3f4a;	
}

#ele_content .batt-listen .batt-list {

    width: 100%;


 gx_tieta/WebRoot/css/control_style.css

@@ -61,17 +61,16 @@
#ele_content .batt-listen {

    width: 100%;

    height: 300px;

    background-color: #FFFFFF;

    background-color: #272822;

}

#ele_content .batt-listen .count-num {

    width:100%;

    height:30px;

    font-size:14px;

    color:gray;

    border-bottom:1px solid #dddddd;

    color:rgba(255,255,255,.7);

    line-height:30px;

    text-align:center;

    background:url(../image/table_th_bg.gif) repeat-x;	
    background-color: #3c3f4a;

}

#ele_content .batt-listen .batt-list {

    width: 100%;


 gx_tieta/WebRoot/set-match-group.jsp

@@ -141,6 +141,8 @@
                    tOptions.data = [{}];

                    table.render(tOptions);

                }else {

                    tOptions.data = [];

                    table.render(tOptions);

                    layer.msg('请选择一组电池');

                }

            });