From cfa12a50f8e6de09a2e57fa8359dbec5e2b07628 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期二, 23 十月 2018 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 62da258..692e91d 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -2675,9 +2675,12 @@
// 瀹炴椂-鍘嗗彶鍒囨崲瀹氫綅鍒板叿浣撶數姹犵粍
$(function() {
- $('body').on('click', '#nav a[href="charge-test.jsp"]', function() {
+ $('body').on('click', '#nav a[href="charge-test.jsp"]', function(event) {
var batt = getBatt();
- $(this).attr('href', 'charge-test.jsp?battgroupId='+BattGroupId+"&stationId="+batt.StationId);
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var home = batt.StationName;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&home='+home);
});
});
--
Gitblit v1.9.1