From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control.html | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index f7861fb..71920ff 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">
@@ -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,12 @@
var batt = JSON.parse(temp);
console.info(batt);
if(batt.install_user||batt.install_user==0){
- window.location.href="batt-approve-index.html";
+ //console.info(batt);
+ if(batt.address||batt.address==""){
+ window.location.href="wcheckAccept-index.html";
+ }else{
+ window.location.href="batt-approve-index.html";
+ }
}else{
window.location.href="testdata.html";
}
@@ -151,7 +156,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