From e0865360fe2c4f119c52fddd424f9ebeaccfbfa1 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 11:40:50 +0800
Subject: [PATCH] 首页上地图图标面板定位到实时和历史页面时选中指定的机房功能修复

---
 gx_tieta/WebRoot/index.jsp |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 0ec2bf7..8d57304 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -2401,6 +2401,7 @@
 							'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
 							'<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+
 							'<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
+							'<input type="hidden" class="ipt-hide county" value="'+data.data.stationName5+'">'+							
 							'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
 					
 					var list = {
@@ -2542,7 +2543,10 @@
 		var home = $('.ipt-hide.home').val();
 		var province = $('.ipt-hide.province').val();
 		var city = $('.ipt-hide.city').val();
-		window.open('control.jsp?province='+province+'&city='+city+'&home='+home);
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('control.jsp',province,city,county,home);
+		window.open(url);
+		//window.open('control.jsp?province='+province+'&city='+city+'&home='+home);
 	}
 
 	// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
@@ -2550,27 +2554,49 @@
 		var home = $('.ipt-hide.home').val();
 		var province = $('.ipt-hide.province').val();
 		var city = $('.ipt-hide.city').val();
-		window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home);
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('charge-test.jsp',province,city,county,home);
+		window.open(url);
+		//window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home);
 	}
 	
 	//瀹氫綅鍒板憡璀﹂〉闈�
 	function loadToWarnPage() {
+		var home = $('.ipt-hide.home').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('elewarn.jsp',province,city,county,home);
+		window.open(url);
 		// console.info($('.ipt-hide').val());
-		var stationId = $('.ipt-hide').eq(1).val();
-		window.open('elewarn.jsp?stationId='+stationId);
+		//var stationId = $('.ipt-hide').eq(1).val();
+		//window.open('elewarn.jsp?stationId='+stationId);
 	}
 
 	// 瀹氫綅鍒拌惤鍚庡崟浣撻〉闈�
 	function loadToBehindPage() {
+		var home = $('.ipt-hide.home').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('taskplan.jsp',province,city,county,home);
+		window.open(url);
 		// console.info($('.ipt-hide').val());
-		var stationId = $('.ipt-hide').eq(1).val();
-		window.open('taskplan.jsp?stationId='+stationId);
+		//var stationId = $('.ipt-hide').eq(1).val();
+		//window.open('taskplan.jsp?stationId='+stationId);
 	}
 
 	// 瀹氫綅鍒版斁鐢靛欢鏃堕〉闈�
 	function loadToDischargeDelay() {
-		var stationId = $('.ipt-hide').eq(1).val();
-		window.open('dischargeplan.jsp?stationId='+stationId);
+		var home = $('.ipt-hide.home').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('dischargeplan.jsp',province,city,county,home);
+		window.open(url);
+	
+		//var stationId = $('.ipt-hide').eq(1).val();
+		//window.open('dischargeplan.jsp?stationId='+stationId);
 	}
 
 	// 瀹氫綅鍒版満鎴胯缁嗕俊鎭〉闈�

--
Gitblit v1.9.1