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/testdata.html | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/testdata.html b/gx_tieta/WebRoot/mobil/testdata.html
index faf2022..3d4fb43 100644
--- a/gx_tieta/WebRoot/mobil/testdata.html
+++ b/gx_tieta/WebRoot/mobil/testdata.html
@@ -11,7 +11,7 @@
<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
- <script type="text/javascript" src="js/battNav.js"></script>
+ <!-- <script type="text/javascript" src="js/battNav.js"></script> -->
<!--<link rel="stylesheet" type="text/css" href="./styles.css">-->
<style>
span {
@@ -25,9 +25,11 @@
<script type="text/javascript">
var batt;
var temp=getCookie("batt");
+
$(document).on('pagecreate', function() {
if(temp!=null){
batt=eval("("+temp+")");
+ console.info(batt);
$('#battName').text(batt.BattGroupName);
}
});
@@ -49,17 +51,26 @@
<li>
<a href="battinfors.html" target="_top" data-ajax="false">鐢垫睜缁勪俊鎭�</a>
</li>
+ <li>
+ <a href="base-station-info.html" target="_top" data-ajax="false">鍩虹珯淇℃伅</a>
+ </li>
</ul>
</div>
+ <script type="text/javascript" src="js/battNav.js"></script>
<script type="text/javascript">
$(function() {
+ //console.warn(111133);
+ console.info(batt);
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'machineroomM.html', txt: batt.StationName}, // 鏈烘埧
- {url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
+ {url: 'machineroomM.html', txt: batt.StationName1}, // 鐪�
+ {url: 'selectcity.html' , txt:batt.StationName2},//甯�
+ {url: 'selectcounty.html' , txt:batt.StationName5},
+ {url: 'battM.html', txt: batt.StationName3}, // 鐢垫睜缁�
{url: 'javascript:;', txt: '鐢垫睜缁勬暟鎹�'} // 褰撳墠椤甸潰
];
+ console.info(data);
addBreadCrumb($('.breadcrumb').eq(0), data);
});
</script>
--
Gitblit v1.9.1