From 5e2e996c69015b8e53d0fcf6008bec2cca2764e3 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.12>
Date: 星期五, 09 十一月 2018 13:20:06 +0800
Subject: [PATCH] 关sql

---
 gx_tieta/WebRoot/Top.jsp |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index f130bd6..7511362 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -557,7 +557,7 @@
 	
 	//鏌ヨ鐢垫睜鍛婅淇℃伅
 	function searchBattAlarm(data){
-		//console.info(data);
+		console.info(data);
 		$.ajax({ 	
 	        type:"post", 				
 	        url: "Battalarm_dataAction!serchBatt_alarm",				
@@ -574,16 +574,17 @@
 				var model = eval('('+data.result+')');
 				if(model.code == 1){
 					var obj = model.data[0];
-					//console.info(obj);
+					console.info(obj);
 					if(obj.alm_cleared_type == 0){
 						//瀹炴椂鍛婅
-						window.open("elewarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);
+						window.open("elewarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
 					}else{
 						//鍘嗗彶鍛婅
-						window.open("eleHistoryWarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);
+						window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
 					}
 				}else{
-					alert("璇ュ憡璀﹀凡缁忚鍒犻櫎");
+					alert("璇ュ憡璀﹀凡缁忔仮澶�");
+					//window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
 				}				
 	    	} 				
 		});
@@ -609,12 +610,12 @@
 					var obj = model.data[0];
 					console.info(obj);
 					if(obj.alm_cleared_type == 0){
-						window.open("equipWarn1.jsp");
+						window.open("equipWarn1.jsp?home="+obj.stationName);
 					}else{
-						window.open("equipHistWarn1.jsp?stationId="+obj.stationId);
+						window.open("equipHistWarn1.jsp?home="+obj.stationName);
 					}
 				}else{
-					alert("璇ュ憡璀﹀凡缁忚鍒犻櫎");
+					alert("璇ュ憡璀﹀凡缁忔仮澶�");
 				}		
 	    	} 				
 		});

--
Gitblit v1.9.1