From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@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