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

LiJun

2018-10-19 753315d9e5cca87c776481c9966251f238e59347

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

 gx_tieta/WebRoot/batt-state-manage.jsp

@@ -447,6 +447,7 @@
                StationId: stationid?stationid:0,

                

            };

            console.info(temp);

            return temp;

        }



@@ -464,7 +465,7 @@
                    var index = 0;

                    var data = JSON.parse(data.result);

                    if(data.code==1&&data.data!=null){

                        //console.info(data.data);

                        console.info(data.data);

                        var data = data.data;

                        //console.info(data[0].dev_id);

                        for(i=0;i<data.length;i++){

@@ -675,8 +676,11 @@
            {

                var _index = (i+1)%eleTh.length;

                var _icon = eleTd.eq(i).find('.icon');

                var _fa = eleTd.eq(i).find('.fa');

                if(_icon.length) {

                    ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";

                }else if(_fa.length){

                    ArrTd+=eleTd.eq(i).find('.fa').data('msg')+"&";

                }else {

                    ArrTd+=eleTd.eq(i).text()+"&";

                }