From daf105a4c7cfd299d6473939b4d678a3e9f91f23 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 17:37:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/charge-test.jsp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 9544be3..05ce9c9 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -4940,7 +4940,8 @@
function findHome() {
var tmp = {
StationName1:'',
- StationName2: ''
+ StationName2: '',
+ StationName5: ''
};
// 鏌ヨ灏嗕俊鎭�
@@ -4955,6 +4956,7 @@
label: _data.StationName+'('+_data.StationId+')',
province: _data.StationName1,
city: _data.StationName2,
+ county: _data.StationName5,
home: _data.StationName,
homeid: _data.StationId,
battid: undefined
--
Gitblit v1.9.1