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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 864e4772eea5e0a589b6f6797d0695a3b3dd225e

 gx_tieta/WebRoot/mobil/charge-history.html

@@ -257,12 +257,13 @@
         var record = -1;

         var index = -1;

         var flag = false;

         var start_record_num = list[0].record_num;

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

            //console.info(list[i]);

            if(list[i].record_num != record){

               ALLData[++index] = new Array();

               

               if(list[i].record_num > 1){	
               if(list[i].record_num > start_record_num){	
                  flag = true;

                  ALLData[index] = ALLData[index-1].slice(0);

               }