From 282692023273e6bf237b613ef6c39ef08ebc4c49 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.30>
Date: 星期三, 24 十月 2018 10:27:35 +0800
Subject: [PATCH] bug
---
gx_tieta/WebRoot/batt-state-manage.jsp | 50 ++++++++++++++++++++++---
gx_tieta/WebRoot/batt-state-statistical.jsp | 36 +-----------------
2 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index fb758f9..1ec4c49 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -116,10 +116,11 @@
</table>
<table class="condi-opt">
<tr>
- <td><input type="checkbox" id="" name="" value="" class="" />鍋滅數</td> <!-- 鍋滅數 -->
- <td><input type="checkbox" id="" name="" value="" class="" />鍙戠數</td> <!-- 鍙戠數 -->
- <td><input type="checkbox" id="" name="" value="" class="">鎺夌珯</td> <!-- 鎺夌珯 -->
- <td><input type="checkbox" id="" name="" value="" class="" >寮�闂ㄥ紓甯�</td><!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" />鍋滅數</td> <!-- 鍋滅數 -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class="">缁埅</td> <!-- 鎺夌珯 -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" />鍙戠數</td> <!-- 鍙戠數 -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" >寮�闂ㄥ紓甯�</td>
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 class="">鎺夌珯</td> <!-- 鎺夌珯 -->
</tr>
</table>
@@ -449,6 +450,7 @@
function createSearchParam(){
//alert($('#endu_type').val());
var stationid = $('#station_name3').find("option:selected").attr('Stationid');
+ var battgroupid = batt_condition();
var temp = {
page:{
pageSize:$('#number').val(),
@@ -458,11 +460,42 @@
StationName2:$('#city').val(),
StationName3:$('#station_name3').val(),
StationId: stationid?stationid:0,
-
+ BattGroupNum:battgroupid,
};
- //console.info(temp);
+ 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;
+ }
var myTimeOut;
//鏌ヨ鏈烘埧鐘舵��
@@ -552,6 +585,11 @@
var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
$('#total').text(Page.pageAll);
$('#current').text(Page.pageCurr+"/"+pageNum);
+ }else{
+ Page.pageAll = 0;
+ var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
+ $('#total').text(Page.pageAll);
+ $('#current').text(Page.pageCurr+"/"+pageNum);
}
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 7a80ac5..d399e94 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -270,7 +270,6 @@
// 鏋勯�犳煡璇㈡潯浠�
function createSearchForm(){
var stationid = $('#station_name3').find("option:selected").attr('Stationid');
- var battgroupid = batt_condition();
var temp={
StationName1:$('#station_name1').val(), // 鐪�
StationName2:$('#city').val(), // 甯�
@@ -278,44 +277,13 @@
StationId: stationid?stationid:0,
BattInUseDate:$('#startalm').val()+" 00:00:00",
BattInUseDate1:$('#endTalm').val()+" 23:59:59",
- BattGroupNum:$('#statistics').val(),
- BattGroupId:battgroupid,
+ BattGroupNum:$('#statistics').val(),
};
//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