From 1e02a9ddf9ea00defdc4b70a0b3c833662db2a19 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.26>
Date: 星期一, 15 十月 2018 16:03:15 +0800
Subject: [PATCH] 告警时间段

---
 gx_tieta/WebRoot/batt-state-statistical.jsp |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 74cfaf4..c1df1cf 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -160,7 +160,7 @@
 		$(function () {
 			// 鍒濆鍖栭〉闈㈢殑鏁版嵁
 			//鑷畾涔夋暟缁勫彉閲忥紝鏁扮粍鐨勫�间负鐢垫睜鍛婅琛ㄦ牸鐨勮〃澶�	缂栧彿				鏈烘埧鍚嶇О							鐢垫睜缁勫悕绉�								鍛婅鍚嶇О							鍗曚綋缂栧彿								鍛婅鍊�							鍛婅绛夌骇							鍛婅纭								鍛婅纭鏃堕棿								鍛婅寮�濮嬫椂闂�							鍛婅鎴鏃堕棿
-			ArrWarnTh = ['鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
+			ArrWarnTh = ['鍛婅鏃堕棿娈�','鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
 			ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
 			
 			createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
@@ -293,24 +293,19 @@
 						console.info(currenEnddata);
 						for(i=currentStartdata;i<currenEnddata;i++){
 						console.info(data);
+							ArrWarnTb[index++]=data[i].dev_ip;        //鍛婅鏃堕棿娈�
 							ArrWarnTb[index++]=data[i].stationName;   //鏈烘埧鍚嶇О 
-							ArrWarnTb[index++]=data[i].num;        //鍋滅數
-							ArrWarnTb[index++]=data[i].record_id;//鍙戠數娆℃暟
-							ArrWarnTb[index++]=data[i].alm_type;//鎺夌珯娆℃暟
-							ArrWarnTb[index++]=data[i].alm_level;//寮�闂ㄥ紓甯�
+							ArrWarnTb[index++]=data[i].num;        		//鍋滅數
+							ArrWarnTb[index++]=data[i].record_id;		//鍙戠數娆℃暟
+							ArrWarnTb[index++]=data[i].alm_type;		//鎺夌珯娆℃暟
+							ArrWarnTb[index++]=data[i].alm_level;		//寮�闂ㄥ紓甯�
 							ArrWarnTb[index++]=data[i].alm_is_confirmed;//娓╁害涓婇檺
 							ArrWarnTb[index++]=data[i].alm_cleared_type;//娓╁害涓嬮檺
-							ArrWarnTb[index++]=data[i].usr_id;//婀垮害涓婇檺
-							ArrWarnTb[index++]=data[i].note;//婀垮害涓嬮檺
+							ArrWarnTb[index++]=data[i].usr_id;			//婀垮害涓婇檺
+							ArrWarnTb[index++]=data[i].note;			//婀垮害涓嬮檺
 						}
-							
-						//creatArrTb(ArrWarnTb);
-						//var arr = new Array();
-						//for(k=0;k<Page.pagesize;k++){
-						//	arr = 
-						//}
 						createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb); 
-     					}
+     				}
 				}
 			})
 		} 

--
Gitblit v1.9.1