From 708fceddd9ea708f6380b74b58c8176d08bd2c30 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期一, 22 十月 2018 10:38:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/dischargetest.jsp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 86e3428..10f87bd 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -1217,7 +1217,7 @@
 						var _attr = {
 							StationId: __data.StationId
 						};
-						var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+						var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
 						optsList.push(tmp);
 					}
 					
@@ -1241,7 +1241,7 @@
 			var tmp = {
 				StationName1:$("#station_name1").val(),
 				StationName2:$("#city").val(),
-				StationName3: $("#station_name").val(),
+				StationName: $("#station_name").val(),
 				StationId: stationid
 			};
 		

--
Gitblit v1.9.1