From eec8a33340e2f3ae8bc09362e3912c88a8d59b27 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 10:59:18 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-manage.jsp | 213 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 173 insertions(+), 40 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 14ae71a..7434bbe 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -1,4 +1,5 @@
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+
<%
String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
@@ -9,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">
@@ -24,7 +26,7 @@
<meta http-equiv="description" content="This is my page">
<style type="text/css">
- body {
+ body {
overflow-x: hidden !important;
}
#tbHead table{
@@ -65,7 +67,11 @@
.filter a:hover {
background-color: #2f97ff;
color: #FFFFFF;
- }
+ }
+ #eleInfor .checkCon table input {
+ width: auto;
+ height: 20px;
+}
</style>
</head>
<body>
@@ -77,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>
@@ -108,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>
@@ -168,7 +184,7 @@
var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['鐪�','甯�', '鏈烘埧鍚嶇О','鍋滅數','鍋滅數寮�濮嬫椂闂�', '鍙戠數','鍙戠數寮�濮嬫椂闂�','鎺夌珯','鎺夌珯寮�濮嬫椂闂�', '寮�闂�/寮�鍏崇數婧愬紓甯�','寮�闂�/寮�鍏崇數婧愬紓甯稿紑濮嬫椂闂�', '娓╁害寮傚父','婀垮害寮傚父'];
+ arrTh = ['鐪�','甯�', '鏈烘埧鍚嶇О','鍋滅數','鍋滅數寮�濮嬫椂闂�','鍋滅數鏃堕暱','鍙戠數','鍙戠數寮�濮嬫椂闂�','鍙戠數鏃堕暱','鎺夌珯','鎺夌珯寮�濮嬫椂闂�', '鎺夌珯鏃堕暱','缁埅','缁埅寮�濮嬫椂闂�','缁埅鏃堕暱','寮�闂�/鍏抽棬寮傚父','寮�闂�/鍏抽棬寮傚父寮�濮嬫椂闂�','寮�闂�/鍏抽棬寮傚父鏃堕暱', '娓╁害寮傚父','婀垮害寮傚父'];
//tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -193,6 +209,17 @@
createCard(cardHd, tblOptsHd, tblOptsBd);
createCard(cardBd, tblOptsHd, tblOptsBd);
});
+
+
+ $(document).ready(function(){
+ $('#tbBrdw').scroll(function(){
+ var scrollX=$(this).scrollLeft();
+ $('#tbHead table').css('left',-scrollX+'px');
+ });
+
+ });
+
+
// 鐐瑰嚮鏉′欢绛涢�夋洿鏀硅〃鏍肩殑楂樺害
$(function() {
@@ -219,7 +246,7 @@
$('#paging .search').click(function() {
- searchstationstate();
+ searchstationstate();
//noContent.showNoContent(); //鏄剧ず鏌ヨ澶辫触妗�
});
@@ -414,6 +441,8 @@
$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+
+ searchstationstate();
});
}
@@ -421,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(),
@@ -430,15 +460,48 @@
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;
+ //鏌ヨ鏈烘埧鐘舵��
function searchstationstate(){
var temp = createSearchParam();
- var arrTd = new Array();
+ arrTd = new Array();
$.ajax({
type: "post",
url: "Bts_station_stateAction_action_serchByCondition",
@@ -450,55 +513,116 @@
var index = 0;
var data = JSON.parse(data.result);
if(data.code==1&&data.data!=null){
- console.info(data.data);
+ //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; //甯�
- arrTd[index++]=_data.stationName3; //鏈烘埧
+ arrTd[index++] = _data.stationName1; //鐪�
+ arrTd[index++] = _data.stationName2; //甯�
+ arrTd[index++] = _data.stationName3; //鏈烘埧
- //arrTd[index++]=_data.station_stat_poff; //鍋滅數
+ // 鍋滅數
if(_data.station_stat_poff) {
- arrTd[index++]= create_ali_font('icon-tingdian-', 'red')+_data.station_stat_poff;
+ arrTd[index++] = create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
+ arrTd[index++] = _data.station_poff_start_time; //鍋滅數寮�濮嬫椂闂�
+ arrTd[index++] = StringtoData(_data.station_poff_start_time); //鍋滅數鏃堕暱
}else {
- arrTd[index++]= create_ali_font('icon-tingdian-', 'green')+_data.station_stat_poff;
+ arrTd[index++] = create_ali_font('icon-tingdian-', 'green', {msg: '姝ｅ父'});
+ arrTd[index++] = "-";
+ arrTd[index++] = formartTime(0);
}
-
- arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
-
+
// 鍙戠數
if(_data.station_stat_fadian) {
- arrTd[index++]= create_ali_font('icon-dynamotor', 'green')+_data.station_stat_fadian; //鍙戠數
+ arrTd[index++] = create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
+ arrTd[index++] = _data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++] = StringtoData(_data.station_fadian_start_time);
}else {
- arrTd[index++]= create_ali_font('icon-dynamotor', 'red')+_data.station_stat_fadian; //鍙戠數
+ arrTd[index++] = create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
+ arrTd[index++] = "-"; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++] = formartTime(0);
+ }
+
+ // 鎺夌珯
+ if(_data.station_stat_diaozhan) {
+ arrTd[index++] = create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
+ arrTd[index++] = _data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
+ arrTd[index++] = StringtoData(_data.station_diaozhan_start_time);
+ }else {
+ arrTd[index++] = create_ali_font('icon-dianchi4', 'green', {msg: '姝ｅ父'});
+ arrTd[index++] = "-";//鎺夌珯寮�濮嬫椂闂�
+ arrTd[index++] = formartTime(0);
+ }
+
+ //缁埅
+ if(_data.station_stat_xuhang){
+ arrTd[index++] = create_fa_font('fa-television','red',{msg: '缁埅寮傚父'});
+ arrTd[index++] = _data.station_xuhang_start_time;
+ arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
+ }else{
+ arrTd[index++] = create_fa_font('fa-television','green',{msg: '姝ｅ父'});
+ arrTd[index++] = "-";
+ arrTd[index++] = formartTime(0);
}
- arrTd[index++]=_data.station_fadian_start_time;//鍙戠數寮�濮嬫椂闂�
-
- arrTd[index++]=_data.station_stat_diaozhan;//鎺夌珯
- arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
-
- // arrTd[index++]=_data.station_stat_dooropen;//寮�闂ㄥ叧闂ㄥ紓甯�
+ // 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
- arrTd[index++] = create_ali_font('icon-quankaimen', 'red')+_data.station_stat_dooropen;
+ arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
+ arrTd[index++] = _data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++] = StringtoData(_data.station_dooropen_start_time);
}else {
- arrTd[index++] = create_ali_font('icon-quankaimen', 'green')+_data.station_stat_dooropen;
+ arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '鍏抽棬'});
+ arrTd[index++] = "-";//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++] = formartTime(0);
}
+
+ arrTd[index++] = _data.station_temp; //娓╁害
+ arrTd[index++] = _data.station_damp; //婀垮害
- arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
-
- arrTd[index++]=_data.station_temp; //娓╁害
- arrTd[index++]=_data.station_damp; //婀垮害
+ Page.pageAll = _data.page.pageAll;
}
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ 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; //寮�濮嬫椂闂�
+ var date2 = new Date(); //缁撴潫鏃堕棿
+ var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
+ var date4 = Math.floor(date3/(1000));
+ return formartTime(date4);
+ }
+ //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
+ function formartTime(value){
+ value = Math.abs(parseInt(value));
+ //console.info(value);
+ var day_num = 0;
+ var hour_num = 0;
+ var min_num = 0;
+ if(value>=24*60*60){
+ day_num = Math.floor(value/(24*60*60));
+ value = value%(24*60*60);
+ }
+ if(value>=60*60){
+ hour_num = Math.floor(value/(60*60));
+ value = value%(60*60);
+ }
+ min_num = Math.floor(value/60);
+ return day_num+"澶�"+hour_num+"灏忔椂"+min_num+"鍒�";
+ }
//棣栭〉
$('#home').click(function(){
@@ -607,7 +731,16 @@
var ArrTd="";
for(var i=0;i<eleTd.length;i++)
{
- ArrTd+=eleTd.eq(i).text()+"&";
+ 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 if(_fa.length){
+ ArrTd+=eleTd.eq(i).find('.fa').data('msg')+"&";
+ }else{
+ ArrTd+=eleTd.eq(i).text()+"&";
+ }
}
eleTh_Text.attr('value',ArrTh);
eleTd_Text.attr('value',ArrTd);
--
Gitblit v1.9.1