From ed1aa3e700505e9c768c90e17bfbfa8e47b943d4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 14 一月 2019 16:23:02 +0800
Subject: [PATCH] 修改

---
 gx_tieta/WebRoot/mobil/control.html |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 89a59c9..a8de8a7 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -19,7 +19,7 @@
 <div data-role="page">
 	<div data-role="header" data-position="fixed">
 		<a id= "return" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
-		<h1>瀹炴椂鈥旀娴嬫暟鎹�</h1>
+		<h1 id="biaoti">瀹炴椂鈥旀娴嬫暟鎹�</h1>
 	</div>
 
 	<div data-role="content">
@@ -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>
@@ -46,7 +46,7 @@
 			</li> -->
 		</ul>
 		<div data-role="collapsible" data-collapsed="false">
-	      <h1>鐢垫睜缁勭姸鎬�</h1>
+	      <h1 id="zhuangtai">鐢垫睜缁勭姸鎬�</h1>
 	      <div class="tbl-container"></div>
 	    </div>
 	</div>
@@ -66,7 +66,17 @@
 			var batt = JSON.parse(temp);
 			console.info(batt);
 			if(batt.install_user||batt.install_user==0){
-				window.location.href="batt-approved.html";
+				//console.info(batt);
+				if(batt.address||batt.address==""){
+					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";
+				}
 			}else{
 				window.location.href="testdata.html";
 			}
@@ -151,7 +161,7 @@
 						}else{
 							arrTd.push("------");
 						}
-						
+						$("#zhuangtai").find("a").text("鐢垫睜缁勭姸鎬�("+batt.BattGroupName+")");
 						createTbl(tbl, arrTh, arrTd);				
 						window.clearTimeout(timeer);
 						timeer = window.setTimeout(function() {

--
Gitblit v1.9.1