From 5f155618a479d7a5456404a4893cc928e97a702c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 09:55:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/machineroomM.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/machineroomM.html b/gx_tieta/WebRoot/mobil/machineroomM.html
index c771bae..d32aa37 100644
--- a/gx_tieta/WebRoot/mobil/machineroomM.html
+++ b/gx_tieta/WebRoot/mobil/machineroomM.html
@@ -64,8 +64,8 @@
station = getbatt(stationlist,aLi);
var json=window.JSON.stringify(station);
- setCookie("station",json);
- window.location.href="battM.html";
+ setCookie("StationName1",json);
+ window.location.href="selectcity.html";
});
});
@@ -79,7 +79,7 @@
addBreadCrumb($('.breadcrumb').eq(0),data);
});
- //鏌ヨ鎵�鏈夋満鎴�
+ //鏌ヨ鎵�鏈夊競
function seachAllStation(){
loadshow();
$.ajax({
@@ -124,7 +124,7 @@
for (var i = 0; i < dataList.length; i++){
var _li = $('<li></li');
- var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName+'</a>');
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName1+'</a>');
// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
_li.append(_a);
--
Gitblit v1.9.1