From fd77d548a62649faabcecd1c33352aa28cf8fead Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 12:03:30 +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 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/battM.html b/gx_tieta/WebRoot/mobil/battM.html
index ea2dbf0..2112e4d 100644
--- a/gx_tieta/WebRoot/mobil/battM.html
+++ b/gx_tieta/WebRoot/mobil/battM.html
@@ -56,7 +56,7 @@
 			}
 		}*/
 		
-		var temp = getCookie("county");
+		var temp = getCookie("battselect");
 		temp = JSON.parse(temp);
 		console.info(temp);
 		//鏍规嵁鏈烘埧id鏌ヨ鐢垫睜缁�
@@ -65,11 +65,13 @@
 			var data = {
 						StationName1: temp.StationName1,
 						StationName2: temp.StationName2,
-						StationName5: temp.StationName5
+						StationName5: temp.StationName5,
+						StationName: temp.StationName,
+						StationId: temp.StationId
 					};
 			$.ajax({ 	
 		        type: "post", 				
-		        url: "BattInfAction!serchStationName3",				
+		        url: "BattInfAction!serchBattByStation",				
 		        async:true,				
 		        dataType:'text',
 		        data:"json = "+JSON.stringify(data),
@@ -105,7 +107,7 @@
 			for (var i = 0; i < dataList.length; i++){
 				var _li = $('<li></li');
 				
-				var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value=""  data-transition="slide">'+dataList[i].StationName3+'</a>');
+				var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value=""  data-transition="slide">'+dataList[i].BattGroupName+'</a>');
 				// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
 				_li.append(_a);
 				_ul.append(_li);

--
Gitblit v1.9.1