From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/charge-test.jsp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 9544be3..4ef382f 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -3413,7 +3413,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
+ var homeid = batt.BattGroupId;
+ $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
});
});
@@ -4940,7 +4941,8 @@
function findHome() {
var tmp = {
StationName1:'',
- StationName2: ''
+ StationName2: '',
+ StationName5: ''
};
// 鏌ヨ灏嗕俊鎭�
@@ -4955,6 +4957,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