From b5a8a42ff6cd628e5ee784da162cba497dd700b6 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期一, 22 十月 2018 16:24:40 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/index.jsp |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 7908d2b..6398208 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -2236,14 +2236,15 @@
 				var rs = JSON.parse(result.result);
 				if(rs.length != 0) {
 					var data = rs[0];
-					console.info(data);
+					//console.info(data);
 					var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
 							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a></div>'+
 							'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
-							'<input type="hidden" class="ipt-hide" value="">'+
-							'<input type="hidden" class="ipt-hide" value="'+data.data.StationId+'">';
+							'<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+
+							'<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
+							'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
 					
 					var list = {
 						title: data.data.StationName,
@@ -2381,16 +2382,18 @@
 	}
 	// 瀹氫綅鍒板疄鏃舵暟鎹〉闈�
 	function loadToRealTime() {
-		var battgroupId = $('.ipt-hide').eq(0).val();
-		var homeId = $('.ipt-hide').eq(1).val();
-		window.open('control.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+		var homeId = $('.ipt-hide.sid').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		window.open('control.jsp?province='+province+'&city='+city+'&stationId='+homeId);
 	}
 
 	// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
 	function loadToOldTime() {
-		var battgroupId = $('.ipt-hide').eq(0).val();
-		var homeId = $('.ipt-hide').eq(1).val();
-		window.open('charge-test.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+		var homeId = $('.ipt-hide.sid').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		window.open('charge-test.jsp?province='+province+'&city='+city+'&stationId='+homeId);
 	}
 	
 	//瀹氫綅鍒板憡璀﹂〉闈�

--
Gitblit v1.9.1