From b8f449dca8e53bbd5c0e424befe07c8207c10032 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 11 十二月 2018 13:48:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/battM.html | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/battM.html b/gx_tieta/WebRoot/mobil/battM.html
index f5adaf4..368df1b 100644
--- a/gx_tieta/WebRoot/mobil/battM.html
+++ b/gx_tieta/WebRoot/mobil/battM.html
@@ -14,7 +14,7 @@
<!-- 涓夌骇鑿滃崟鍐呭 -->
<div data-role="page">
<div data-role="header" data-position="fixed">
- <a href="machineroomM.html" 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>
+ <a href="selectbatt.html" 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>
</div>
@@ -35,7 +35,7 @@
$(document).ready(function(){
setCookie('batt', '');
//temp = JSON.parse(temp);
- //console.info(temp);
+ console.info(temp);
init();
//searchkBattByStationid();
});
@@ -47,10 +47,10 @@
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'javascript:JumpFirstPage();', txt: '鐪�'},
- {url: 'javascript:JumpcityPage();', txt: '甯�'},
- {url: 'machineroomM.html', txt: '鍖�/鍘�' },
- {url: 'selectbatt.html', txt: '鏈烘埧'},
+ {url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
+ {url: 'javascript:JumpcityPage();', txt: temp.StationName2},
+ {url: 'selectcounty.html', txt: temp.StationName5 },
+ {url: 'selectbatt.html', txt: temp.StationName3},
{url: 'javascript:;', txt: '钃勭數姹犵粍'}
];
addBreadCrumb($('.breadcrumb').eq(0),data);
--
Gitblit v1.9.1