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

hdw

2018-11-12 0edab78d73d975663da8ce2596a0a00c1b6a6db1

 gx_tieta/WebRoot/batt-traffic-statistics1.jsp

@@ -569,6 +569,7 @@
            

            // 获取生成折线图的配置项

            function getlineGraphOpts(data, type) {

               console.log(data);

               var rs = {

                  xdata:[],

                  sdata: [],