From eeb0546f66c233f7e5d24c018fda7227a80c391b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 21 十二月 2018 10:38:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
index 2dd6000..327889b 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>鐢垫睜缁勪俊鎭厤缃ā鏉�</title>
+ <title>鐢垫睜缁勫畨瑁呮彁浜ょ敵璇�</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
@@ -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