From 5c5ae50b09f3b8eeed1128cb9adc86a11fbb8d3c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.15>
Date: 星期四, 01 十一月 2018 09:29:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/eleAnalyse.jsp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/eleAnalyse.jsp b/gx_tieta/WebRoot/eleAnalyse.jsp
index 233d130..7ae0033 100644
--- a/gx_tieta/WebRoot/eleAnalyse.jsp
+++ b/gx_tieta/WebRoot/eleAnalyse.jsp
@@ -433,11 +433,12 @@
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1(true);
+ findCounty(true);
});
+
//褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#county').change(function(){
- findCounty(true);
+ findStationNamebyStationname1(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
@@ -1027,6 +1028,7 @@
binf:{
StationName1:$('#station_name1').val(),
StationName2:$('#city').val(),
+ StationName5: $('#county').val(),
StationName:$('#station_name').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#batt_producer').val(),
--
Gitblit v1.9.1