From d00b94b5771112a25971e934a36c86a15e1c475b Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期一, 14 一月 2019 18:03:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control.html | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 71920ff..a8de8a7 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -29,7 +29,7 @@
<a href="voltageM.html" target="_top">1.鍗曚綋鐢靛帇 </a>
</li>
- <li>
+ <!--<li>
<a href="temperatureM.html" target="_top">2.娓╁害 </a>
</li>
<li>
@@ -68,7 +68,12 @@
if(batt.install_user||batt.install_user==0){
//console.info(batt);
if(batt.address||batt.address==""){
- window.location.href="wcheckAccept-index.html";
+ console.info(batt.check_en);
+ if(batt.check_en==1){
+ window.location.href="hcheckAccpet-index.html";
+ }else{
+ window.location.href="wcheckAccept-index.html";
+ }
}else{
window.location.href="batt-approve-index.html";
}
--
Gitblit v1.9.1