From f55be3227bfe7dfa13c45d014d6fc8cfc16dff42 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:08:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/battM.html | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/battM.html b/gx_tieta/WebRoot/mobil/battM.html
index 2112e4d..f5adaf4 100644
--- a/gx_tieta/WebRoot/mobil/battM.html
+++ b/gx_tieta/WebRoot/mobil/battM.html
@@ -31,34 +31,37 @@
<script type="text/javascript">
var battinlist = new Array(); //鎵�鏈夌數姹犵粍鐨勬暟缁�
-
+ var temp = getCookie("battselect");
$(document).ready(function(){
- setCookie('batt', '');
- //init();
- searchkBattByStationid();
+ setCookie('batt', '');
+ //temp = JSON.parse(temp);
+ //console.info(temp);
+ init();
+ //searchkBattByStationid();
});
- /* function init(){
- var temp = getCookie("county");
+ function init(){
+ //var temp = getCookie("county");
if(temp != '' || temp != undefined) {
- temp = eval('('+temp+')');
+ temp = JSON.parse(temp);
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'machineroomM.html', txt: temp.StationName5 },
+ {url: 'javascript:JumpFirstPage();', txt: '鐪�'},
+ {url: 'javascript:JumpcityPage();', txt: '甯�'},
+ {url: 'machineroomM.html', txt: '鍖�/鍘�' },
+ {url: 'selectbatt.html', txt: '鏈烘埧'},
{url: 'javascript:;', txt: '钃勭數姹犵粍'}
];
addBreadCrumb($('.breadcrumb').eq(0),data);
- searchkBattByStationid(temp.StationId);
+ searchkBattByStationid();
}else {
window.location.href="machineroomM.html";
}
- }*/
+ }
- var temp = getCookie("battselect");
- temp = JSON.parse(temp);
- console.info(temp);
+
//鏍规嵁鏈烘埧id鏌ヨ鐢垫睜缁�
function searchkBattByStationid(){
loadshow();
--
Gitblit v1.9.1