From 8aeb6b81414905058fd11aed511bc2a0c82da3b6 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期三, 24 十月 2018 10:08:49 +0800
Subject: [PATCH] gai
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index bbde297..7a80ac5 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -78,13 +78,16 @@
</table>
<table class="condi-opt">
<tr>
- <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=""> <!-- 鎺夌珯 -->
- <input type="hidden" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value="" class="" > <!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" /> <!-- 鍋滅數 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class=""> <!-- 鎺夌珯 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" /> <!-- 鍙戠數 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" >
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 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_DAMPUP_ComError" name="" value="" class="">
<input type="hidden" id="ALM_TYPE_BTS9100S_DAMPLOW_ComError" name="" value="" class=""> <!-- 婀垮害寮傚父 -->
</tr>
</table>
@@ -230,6 +233,7 @@
record_datetime:timearr[0],
record_datetime_end:timearr[1],
station_event_type:0, //1:鍩虹珯鍋滅數 2:鍩虹珯缁埅 3:鍩虹珯鍙戠數 4:鍩虹珯寮�闂� 5:鍩虹珯鎺夌珯 6:鍩虹珯娓╁害涓婇檺 7:鍩虹珯娓╁害涓嬮檺 8:鍩虹珯婀垮害涓婇檺 9:鍩虹珯婀垮害涓嬮檺
+
page:{
pageSize:10, //姣忛〉鐨勮鏁�
pageCurr:1 //褰撳墠椤电爜鏁�
@@ -266,6 +270,7 @@
// 鏋勯�犳煡璇㈡潯浠�
function createSearchForm(){
var stationid = $('#station_name3').find("option:selected").attr('Stationid');
+ var battgroupid = batt_condition();
var temp={
StationName1:$('#station_name1').val(), // 鐪�
StationName2:$('#city').val(), // 甯�
@@ -273,12 +278,44 @@
StationId: stationid?stationid:0,
BattInUseDate:$('#startalm').val()+" 00:00:00",
BattInUseDate1:$('#endTalm').val()+" 23:59:59",
- BattGroupNum:$('#statistics').val()
+ BattGroupNum:$('#statistics').val(),
+ BattGroupId:battgroupid,
};
//console.info(temp);
return temp;
}
+ function batt_condition(){
+ var POFF_ComError = 0;
+ var XUHANG_ComError = 0;
+ var FADIAN_ComError = 0;
+ var DIAOZHAN = 0;
+ var DOOROPEN_ComError = 0;
+ var condition = 0;
+ if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
+ POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
+ condition+=parseInt(POFF_ComError);
+ }
+ if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
+ XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
+ condition+=parseInt(XUHANG_ComError);
+ }
+ if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
+ FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
+ condition+=parseInt(FADIAN_ComError);
+ }
+ if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
+ DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
+ condition+=parseInt(DIAOZHAN);
+ }
+ if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
+ DOOROPEN_ComError = $('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
+ condition+=parseInt(DOOROPEN_ComError);
+ }
+ //condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
+ //console.info(condition);
+ return condition;
+ }
//鐐瑰嚮鏌ヨ鎸夐挳
$('#paging .search').click(function(){
serachBattStatistical();
--
Gitblit v1.9.1