From 6e68fc715eeb60c8cc7f969dd4c0afec1e7beddc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期三, 17 十月 2018 10:18:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 74cfaf4..36c3558 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -81,21 +81,19 @@
<table class="condi-opt">
<tr>
- <td>
- <input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" checked="checked" value="" class="" />鍋滅數 <!-- 鍋滅數 -->
- </td>
- <td>
- <input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" checked="checked" value="" class="" />鍙戠數 <!-- 鍙戠數 -->
- </td>
- <td>
- <input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" checked="checked" value="" class="">鎺夌珯 <!-- 鎺夌珯 -->
- </td>
+
+ <input type="hidden" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value="" class="" /> <!-- 鍋滅數 -->
+
+ <input type="hidden" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value="" class="" /> <!-- 鍙戠數 -->
+
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value="" class=""> <!-- 鎺夌珯 -->
+
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value="" class="" checked="checked">寮�闂ㄥ紓甯�</td> <!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_TEMPUP_ComError" name="" checked="checked" value="" class="">娓╁害涓婇檺鍛婅</td>
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_TEMPLOW_ComError" name="" checked="checked" value="" class="">娓╁害涓嬮檺鍛婅</td> <!-- 娓╁害寮傚父 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DAMPUP_ComError" name="" checked="checked" value="" class="">婀垮害涓婇檺鍛婅</td>
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DAMPLOW_ComError" name="" checked="checked" value="" class="">婀垮害涓嬮檺鍛婅</td> <!-- 婀垮害寮傚父 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value="" class="" > <!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_TEMPUP_ComError" name="" value="" class="">
+ <input type="hidden" id="ALM_TYPE_BTS9100S_TEMPLOW_ComError" name="" value="" class=""> <!-- 娓╁害寮傚父 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DAMPUP_ComError" name="" value="" class="">
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DAMPLOW_ComError" name="" value="" class=""> <!-- 婀垮害寮傚父 -->
</tr>
</table>
</div>
@@ -160,7 +158,7 @@
$(function () {
// 鍒濆鍖栭〉闈㈢殑鏁版嵁
//鑷畾涔夋暟缁勫彉閲忥紝鏁扮粍鐨勫�间负鐢垫睜鍛婅琛ㄦ牸鐨勮〃澶� 缂栧彿 鏈烘埧鍚嶇О 鐢垫睜缁勫悕绉� 鍛婅鍚嶇О 鍗曚綋缂栧彿 鍛婅鍊� 鍛婅绛夌骇 鍛婅纭 鍛婅纭鏃堕棿 鍛婅寮�濮嬫椂闂� 鍛婅鎴鏃堕棿
- ArrWarnTh = ['鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
+ ArrWarnTh = ['鍛婅鏃堕棿娈�','鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
@@ -285,32 +283,27 @@
$('#current').text(Page.pageCurr+"/"+pageNum);
var currentStartdata=Math.ceil((Page.pageCurr-1)*Page.pageSize);
var currenEnddata = 0;
- if(Math.ceil(Page.pageAll-(Page.pageCurr-1)*Page.pageSize)<Page.pageSize){
- currenEnddata = Math.ceil((Page.pageAll-(Page.pageCurr-1)*Page.pageSize)+(Page.pageCurr-1)*Page.pageSize);
+ if(Page.pageAll-(Page.pageCurr-1)*Page.pageSize<Page.pageSize){
+ currenEnddata =(Page.pageAll-(Page.pageCurr-1)*Page.pageSize)+(Page.pageCurr-1)*Page.pageSize;
}else{
- currenEnddata = Math.ceil((Page.pageCurr)*Page.pageSize);
+ currenEnddata = (Page.pageCurr)*Page.pageSize;
}
- console.info(currenEnddata);
+ //console.info(currenEnddata);
for(i=currentStartdata;i<currenEnddata;i++){
- console.info(data);
+ //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