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

hdw

2019-01-11 b66ed691935b9369cb93c5397d562128591b09d7

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

@@ -461,8 +461,8 @@
      }else{

         editParm();

      }     

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

              setTimeout(backpage,500); 
    //     function backpage(){window.location.href="ele-param1.html";}

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

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

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