From 6fe64d178a8d4977aa59da4384c5eceb8f0113c2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 16:43:41 +0800
Subject: [PATCH] 功能待开发

---
 gx_tieta/WebRoot/Top.jsp |  112 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index b733db6..f130bd6 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,7 +64,7 @@
 			<div class="batt-state">
 			
 				<div class="list">
-					<div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp" class="badge default" id="poweroff_num">0</a></div>		<!-- 鏈烘埧鍋滅數鏁� -->
+					<div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div>		<!-- 鏈烘埧鍋滅數鏁� -->
 				</div>
 				<div class="list">
 					<div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num">0</a></div>								<!-- 鐢垫睜鍛婅鏁� -->
@@ -175,7 +175,7 @@
 				<div class="navNuclearTest-header clearfix">
 					<span class="navNuclearTest-title"><i class="fa fa-navicon mr5"></i>鏍稿娴嬭瘯</span>
 					<div class="navNuclearTest-close fr mr10">
-						<i class="fa fa-file-text-o mr10" title="鏇村璇︽儏"></i>
+						<!-- <i class="fa fa-file-text-o mr10" title="鏇村璇︽儏"></i> -->
 						<i class="fa fa-close"  title="鍏抽棴"></i>
 					</div>
 				</div>
@@ -620,6 +620,35 @@
 		});
 	}
 	
+	//鏌ヨ鏈�杩�30鍐呯殑璁惧鍜岀數姹犲憡璀﹀苟鎾姤璇煶
+	function searchRecentlyAlarm(){
+		$.ajax({ 	
+       		type: "post", 				
+	        url: "Battalarm_dataAction!serchIn30",				
+	        async:true,				
+	        dataType:'json',
+	        data:null,		
+	        success: function(data){ 
+	        	//console.info(data);
+	        	var model = eval("("+data.result+")");
+	        	//console.info(model);
+	        	if(model.code == 1){
+	        		var alarm_str = "";
+	        		for(var i=0;i<model.data.length;i++){
+	        			var obj = model.data[i];
+	        			alarm_str += obj.note+";";
+	        		}
+	        		voice.play(alarm_str,searchRecentlyAlarm);
+	        	}else{	        	
+		        	setTimeout(searchRecentlyAlarm, 5000);
+	        	}
+        	},
+        	error:function() {
+        		setTimeout(searchRecentlyAlarm, 5000);
+        	}	
+		});
+	}
+	
 	// 鏍稿娴嬭瘯妯″潡
 	$(function() {
 		var arrTh = ['鏈烘埧鍚嶇О', '璁惧ID', '璁惧鍚嶇О','璁惧鐘舵��', '鍦ㄧ嚎鐢靛帇锛圴锛�', '缁勭鐢靛帇锛圴锛�', '缁勭鐢垫祦锛坢A锛�','璁惧娓╁害锛堚剝锛�', '宸叉祴瀹归噺锛圓H锛�', '璁惧鍛婅', '宸叉祴鏃堕棿'];
@@ -627,12 +656,15 @@
 		var eleTh = $('#navNuclearTest-data .nuclearTest-tbl-header');
 		var eleTd = $('#navNuclearTest-data .nuclearTest-tbl-body');
 		var timer = new GLOBAL.Timer.timer({
-			fun:search61850Nuclear_cap,
+			fun:searchNuclear_cap,
 			times: 4000
 		});
 		var isNew = true;
 		var dev61850Alarms = GLOBAL.DEV61850.alarmstates;
 		var dev61850Work = GLOBAL.DEV61850.workstates;
+		var BTS_workstates = GLOBAL.BTS9100.workstates;
+		var BTS_alarmstates = GLOBAL.BTS9100.alarmstates
+		 
 		
 		timer.start();
 		// 鐐瑰嚮鏍稿娴嬭瘯鏉℃暟
@@ -658,16 +690,17 @@
 				alert('褰撳墠涓鸿鎯呴〉锛屼笉鐢ㄨ烦杞紒');
 			}
 		});
-		//鏌ヨ褰撳墠鐢ㄦ埛绠$悊鐨�61850姝e湪澶勪簬鏍稿娴嬭瘯鐨勮澶囪褰�
-	    function search61850Nuclear_cap(){
+		//鏌ヨ褰撳墠鐢ㄦ埛绠$悊鐨凚TS姝e湪澶勪簬鏍稿娴嬭瘯鐨勮澶囪褰�
+	    function searchNuclear_cap(){
 		    $.ajax({ 	
 		        type:"post", 		
-		        url: "Fbs9100_stateAction_action_seach6185Nuclear_cap",				
+		        url: "Fbs9100_stateAction_action_seachNuclear_cap",				
 		        async:true,				
 		        dataType:'json',
 		        data:null,		
 		        success: function(data){ 
 					var model = eval('('+data.result+')');
+					//console.info(model);
 					if(model.code == 1){
 						$('#nuclear_test').text(model.data.length);
 						if(model.data.length != 0) {
@@ -686,37 +719,7 @@
 		       	} 				
 			});
 	    }
-	    
-	    
-	    
-		//鏌ヨ鏈�杩�30鍐呯殑璁惧鍜岀數姹犲憡璀﹀苟鎾姤璇煶
-		function searchRecentlyAlarm(){
-			$.ajax({ 	
-	       		type: "post", 				
-		        url: "Battalarm_dataAction!serchIn30",				
-		        async:true,				
-		        dataType:'json',
-		        data:null,		
-		        success: function(data){ 
-		        	console.info(data);
-		        	var model = eval("("+data.result+")");
-		        	console.info(model);
-		        	if(model.code == 1){
-		        		var alarm_str = "";
-		        		for(var i=0;i<model.data.length;i++){
-		        			var obj = model.data[i];
-		        			alarm_str += obj.note+";";
-		        		}
-		        		voice.play(alarm_str,searchRecentlyAlarm);
-		        	}else{	        	
-			        	setTimeout(searchRecentlyAlarm, 5000);
-		        	}
-	        	},
-	        	error:function() {
-	        		setTimeout(searchRecentlyAlarm, 5000);
-	        	}	
-			});
-		}
+	    	
 	    
 	    // 鏍规嵁鏁版嵁鐢熸垚琛ㄦ牸
 	    function createTblByModel(model) {
@@ -724,22 +727,22 @@
 	    	arrTd = [];
 			for(var i=0; i<model.data.length; i++) {
 				var data = model.data[i];
-				arrTd.push(data.stationName);				// 鏈烘埧鍚嶇О
-				arrTd.push(data.dev_id);					// 璁惧ID
-				arrTd.push(data.deviceName);				// 璁惧鍚嶇О
-				arrTd.push(dev61850Work[data.dev_workstate]);				// 璁惧鍚嶇О
-				arrTd.push(data.dev_captest_onlinevol);				// 鍦ㄧ嚎鐢靛帇
-				arrTd.push(data.dev_captest_groupvol);				// 缁勭鐢靛帇
-				arrTd.push(data.dev_captest_curr);				// 缁勭鐢垫祦
-				arrTd.push(data.dev_temp);					// 璁惧娓╁害
-				arrTd.push(data.dev_captest_cap);	// 宸叉祴瀹归噺
-				arrTd.push(getAlarmsText(data.dev_61850alarms));	// 璁惧鍛婅
-				arrTd.push(formatSeconds(data.num));		// 宸叉祴鏃堕棿
+				arrTd.push(data.stationName);										// 鏈烘埧鍚嶇О
+				arrTd.push(data.dev_id);											// 璁惧ID
+				arrTd.push(data.deviceName);										// 璁惧鍚嶇О
+				arrTd.push(getStateByArray(data.dev_workstate,BTS_workstates));		// 璁惧鍚嶇О
+				arrTd.push(data.dev_captest_onlinevol);								// 鍦ㄧ嚎鐢靛帇
+				arrTd.push(data.dev_captest_groupvol);								// 缁勭鐢靛帇
+				arrTd.push(data.dev_captest_curr);									// 缁勭鐢垫祦
+				arrTd.push(data.dev_temp);											// 璁惧娓╁害
+				arrTd.push(data.dev_captest_cap);									// 宸叉祴瀹归噺
+				arrTd.push(getStateByArray(data.dev_alarmstate,BTS_alarmstates));	// 璁惧鍛婅
+				arrTd.push(formatSeconds(data.num));								// 宸叉祴鏃堕棿
 			}
 			createFullTbl(eleTh, eleTd, arrTh, arrTd);
 			
 			// 鏍规嵁鍛婅鍊艰缃俯搴︼紝k1鐢甸樆锛屽閫氬帇闄嶇殑瀛椾綋棰滆壊
-			var trList = eleTd.find('tbody tr');
+			/* var trList = eleTd.find('tbody tr');
 			for(var i=0; i<model.data.length; i++) {
 				var alarms = model.data[i].dev_61850alarms.split(',');	// ['k1鐢甸樆', '閫氳', '娓╁害', '瀵奸�氬帇闄�']
 				
@@ -747,7 +750,16 @@
 				if(alarms[2] == 'true') {
 					trList.eq(i).find('td').eq(7).addClass('red');
 				}
-			} 
+			} */ 
+	    }
+	    
+	    //鏍规嵁鐘舵�佽幏鍙栬澶囩殑鐘舵��
+	    function getStateByArray(state,statearr){
+	    	var str = "鏈煡";
+	    	if(statearr && state < statearr.length){
+	    		str = statearr[state];
+	    	}
+	    	return str;
 	    }
 	    
 	    // 鑾峰彇鍛婅鍙傛暟

--
Gitblit v1.9.1