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

hdw

2018-12-06 a942cb0a9090867a3bf0afc69eb63df0d4b9d762

 gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html

@@ -388,7 +388,7 @@
         editParm();

      }     

         function backpage(){window.location.href="ele-param.html";}

              setTimeout(backpage,3000); 
              setTimeout(backpage,500); 
           });

       $("#cancel").click(function(){

        window.location.href="ele-param.html";