From c673a0b9ffe1f1239f596dfd88c0a76c735b3d43 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:24:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
index 14af2d2..327889b 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
+++ b/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";

--
Gitblit v1.9.1