From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/battM.html | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/battM.html b/gx_tieta/WebRoot/mobil/battM.html
index f5adaf4..671441e 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>
@@ -33,11 +33,8 @@
var battinlist = new Array(); //鎵�鏈夌數姹犵粍鐨勬暟缁�
var temp = getCookie("battselect");
$(document).ready(function(){
- setCookie('batt', '');
- //temp = JSON.parse(temp);
- //console.info(temp);
+ setCookie('batt', '');
init();
- //searchkBattByStationid();
});
function init(){
@@ -47,10 +44,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);
@@ -66,12 +63,13 @@
function searchkBattByStationid(){
loadshow();
var data = {
- StationName1: temp.StationName1,
- StationName2: temp.StationName2,
- StationName5: temp.StationName5,
- StationName: temp.StationName,
- StationId: temp.StationId
- };
+ StationName1: temp.StationName1,
+ StationName2: temp.StationName2,
+ StationName5: temp.StationName5,
+ StationName: temp.StationName,
+ StationId: temp.StationId
+ };
+ console.log(data);
$.ajax({
type: "post",
url: "BattInfAction!serchBattByStation",
--
Gitblit v1.9.1