From 2421e7a75751f1f8e0fc58811a7abcfd8420c13d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 29 十月 2018 10:48:49 +0800
Subject: [PATCH] 修复bug
---
gx_tieta/WebRoot/batt-state-manage.jsp | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 1c4e701..7434bbe 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -10,12 +10,13 @@
<head>
<base href="<%=basePath%>">
- <title>鍩虹珯鐘舵�佺鐞�</title> <!-- 鍩虹珯鐘舵�佺鐞� -->
+ <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="css/basic.css" rel="stylesheet">
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
+ <link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
<link rel="stylesheet" href="css/nocontent.css">
<link rel="stylesheet" href="alifont/iconfont.css">
<meta http-equiv="pragma" content="no-cache">
@@ -67,7 +68,10 @@
background-color: #2f97ff;
color: #FFFFFF;
}
-
+ #eleInfor .checkCon table input {
+ width: auto;
+ height: 20px;
+}
</style>
</head>
<body>
@@ -79,8 +83,8 @@
<!-- 涓讳綋鍐呭 -->
<div id="main">
<div id="eleInfor">
- <span class="summary">鍩虹珯鐘舵�佺鐞嗘煡璇�--><s:text name="Show/hide_the_query_conditions"/></span>
- <div class="checkCon">
+ <span class="summary"><s:text name="Station_statequery"/>--><s:text name="Show/hide_the_query_conditions"/></span>
+ <div class="checkCon filter-container">
<form action="" id="search_form">
<!-- 缁存姢鍖轰俊鎭� -->
<table>
@@ -110,6 +114,16 @@
</tr>
</table>
+ <table class="condi-opt">
+ <tr>
+ <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>
</form>
</div>
</div>
@@ -436,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(),
@@ -445,11 +460,45 @@
StationName2:$('#city').val(),
StationName3:$('#station_name3').val(),
StationId: stationid?stationid:0,
-
+ BattGroupNum: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;
+ }
+ var myTimeOut;
+ //鏌ヨ鏈烘埧鐘舵��
function searchstationstate(){
var temp = createSearchParam();
arrTd = new Array();
@@ -467,7 +516,7 @@
//console.info(data.data);
var data = data.data;
//console.info(data[0].dev_id);
- for(i=0;i<data.length;i++){
+ for(var i=0;i<data.length;i++){
var _data = data[i];
arrTd[index++] = _data.stationName1; //鐪�
arrTd[index++] = _data.stationName2; //甯�
@@ -476,7 +525,7 @@
// 鍋滅數
if(_data.station_stat_poff) {
arrTd[index++] = create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
- arrTd[index++] = _data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
+ arrTd[index++] = _data.station_poff_start_time; //鍋滅數寮�濮嬫椂闂�
arrTd[index++] = StringtoData(_data.station_poff_start_time); //鍋滅數鏃堕暱
}else {
arrTd[index++] = create_ali_font('icon-tingdian-', 'green', {msg: '姝ｅ父'});
@@ -530,15 +579,24 @@
arrTd[index++] = _data.station_temp; //娓╁害
arrTd[index++] = _data.station_damp; //婀垮害
+
+ Page.pageAll = _data.page.pageAll;
}
- Page.pageAll = data.length;
+ 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);
+
+ window.clearTimeout(myTimeOut);
+ myTimeOut = window.setTimeout(searchstationstate, 8000);
}
- })
+ });
}
function StringtoData(value){
var date1= value; //寮�濮嬫椂闂�
@@ -675,9 +733,12 @@
{
var _index = (i+1)%eleTh.length;
var _icon = eleTd.eq(i).find('.icon');
+ var _fa = eleTd.eq(i).find('.fa');
if(_icon.length) {
ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";
- }else {
+ }else if(_fa.length){
+ ArrTd+=eleTd.eq(i).find('.fa').data('msg')+"&";
+ }else{
ArrTd+=eleTd.eq(i).text()+"&";
}
}
--
Gitblit v1.9.1