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 | 170 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 128 insertions(+), 42 deletions(-) diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp index d85bcdf..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"> @@ -66,7 +68,10 @@ background-color: #2f97ff; color: #FFFFFF; } - + #eleInfor .checkCon table input { + width: auto; + height: 20px; +} </style> </head> <body> @@ -78,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> @@ -109,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> @@ -435,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(), @@ -444,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(); @@ -463,81 +513,114 @@ 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; //鏈烘埧 // 鍋滅數 if(_data.station_stat_poff) { - arrTd[index++]= create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'}); + 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', {msg: '姝e父'}); + arrTd[index++] = create_ali_font('icon-tingdian-', 'green', {msg: '姝e父'}); + arrTd[index++] = "-"; + arrTd[index++] = formartTime(0); } - - arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂� - arrTd[index++]=formartTime(_data.station_poff_tlong); //鍋滅數鏃堕暱 + // 鍙戠數 if(_data.station_stat_fadian) { - arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數 + 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', 'green', {msg: '姝e父'}); //鍙戠數 + arrTd[index++] = create_ali_font('icon-dynamotor', 'green', {msg: '姝e父'}); //鍙戠數 + arrTd[index++] = "-"; //鍙戠數寮�濮嬫椂闂� + arrTd[index++] = formartTime(0); } - - arrTd[index++]=_data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂� - arrTd[index++]=formartTime(_data.station_fadian_tlong); + // 鎺夌珯 if(_data.station_stat_diaozhan) { - arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'}); + 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: '姝e父'}); + arrTd[index++] = create_ali_font('icon-dianchi4', 'green', {msg: '姝e父'}); + 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: '姝e父'}); + arrTd[index++] = "-"; + arrTd[index++] = formartTime(0); } - arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂� - arrTd[index++]=formartTime(_data.station_diaozhan_tlong); // 寮�闂ㄥ叧闂ㄥ紓甯� if(_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', {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++]=formartTime(_data.station_dooropen_tlong); - - 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); - createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus); + }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){ - day_num = Math.floor(value/(24*60)); - value = value%(24*60); + if(value>=24*60*60){ + day_num = Math.floor(value/(24*60*60)); + value = value%(24*60*60); } - if(value>=60){ - hour_num = Math.floor(value/60); - value = value%60; + if(value>=60*60){ + hour_num = Math.floor(value/(60*60)); + value = value%(60*60); } - min_num = value; + min_num = Math.floor(value/60); return day_num+"澶�"+hour_num+"灏忔椂"+min_num+"鍒�"; } @@ -650,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