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

星伟

2018-09-27 3f5f75f280b70a2d02f89aafbf22d8e5323e33f1

 gx_tieta/WebRoot/index.jsp

@@ -1989,7 +1989,7 @@
            console.log(list.length);

            allStation = new Array();

            if(list!=undefined && list.length>0){

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

               for(var i=0;i<10;i++){

                  var tmp = {

                     binformation:list[i].data,

                     alarm_num:list[i].code,      //告警数目