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

81041

2018-12-25 1cd67d97e505e5c09f2d4a3a5d436f9ec1d2a4d8

 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";