From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/eleMonomer.jsp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/eleMonomer.jsp b/gx_tieta/WebRoot/eleMonomer.jsp
index 368bec8..21478ba 100644
--- a/gx_tieta/WebRoot/eleMonomer.jsp
+++ b/gx_tieta/WebRoot/eleMonomer.jsp
@@ -712,7 +712,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);
}
@@ -737,7 +737,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
@@ -1070,6 +1070,7 @@
//$('#eleInforTab').scrollTop(0); //璁╀腑闂磋〃鏍肩殑婊氳疆瀹氫綅鍒颁笂绔�
}).error(function(){
noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺�");
+ loading.hideLoading($('#main'));
});
}else{
createTableByStatue();
--
Gitblit v1.9.1