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

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

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 gx_tieta/WebRoot/charge-test.jsp

@@ -3059,6 +3059,7 @@
            }else{ 

               if("Voltage"==units){

                  Titleobj.setAvg((sum/array.length).toFixed(3));         

                  Titleobj.setSum(sum);		
                  var low=getLow(1,1);

                  if(low.low_method==0){

                     //根据标称值计算