From 6f027ced715654072cb57d4c40daafaf8da7b1ce Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 13 十月 2018 14:26:54 +0800
Subject: [PATCH] 提交内容
---
gx_tieta/WebRoot/batt-state-manage.jsp | 71 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index d7aa1b2..4bf6a3d 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -16,6 +16,7 @@
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
<link rel="stylesheet" href="css/nocontent.css">
+ <link rel="stylesheet" href="alifont/iconfont.css">
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="expires" content="0">
@@ -154,6 +155,7 @@
<script type="text/javascript" src="js/loading.js"></script>
<script type="text/javascript" src="js/nocontent.js"></script>
<script type="text/javascript" src="js/createTab.js"></script>
+ <script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript">
var Page={
pageCurr:1,
@@ -403,7 +405,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -412,12 +414,15 @@
$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+
+ searchstationstate();
});
}
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
//alert($('#endu_type').val());
+ var stationid = $('#station_name3').find("option:selected").attr('Stationid');
var temp = {
page:{
pageSize:$('#number').val(),
@@ -425,11 +430,10 @@
},
StationName1:$('#station_name1').val(), //甯�
StationName2:$('#city').val(),
- StationName3:$('#station_name3').find("option:selected").text(),
- StationId:$('#station_name3').find("option:selected").attr('Stationid'),
+ StationName3:$('#station_name3').val(),
+ StationId: stationid?stationid:0,
};
- console.info(temp);
return temp;
}
@@ -451,27 +455,54 @@
var data = data.data;
//console.info(data[0].dev_id);
for(i=0;i<data.length;i++){
- arrTd[index++]=data[0].stationName1; //鐪�
- arrTd[index++]=data[0].stationName2; //甯�
- arrTd[index++]=data[0].stationName3; //鏈烘埧
+ var _data = data[i];
+ arrTd[index++]=_data.stationName1; //鐪�
+ arrTd[index++]=_data.stationName2; //甯�
+ arrTd[index++]=_data.stationName3; //鏈烘埧
- arrTd[index++]=data[0].station_stat_poff; //鍋滅數
+ // 鍋滅數
+ if(_data.station_stat_poff) {
+ arrTd[index++]= create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
+ }else {
+ arrTd[index++]= create_ali_font('icon-tingdian-', 'green', {msg: '姝ｅ父'});
+ }
- arrTd[index++]=data[0].station_poff_start_time //鍋滅數寮�濮嬫椂闂�
+ arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
- arrTd[index++]=data[0].station_stat_fadian;//鍙戠數
+ // 鍙戠數
+ if(_data.station_stat_fadian) {
+ arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
+ }else {
+ arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
+ }
- arrTd[index++]=data[0].station_fadian_start_time;//鍙戠數寮�濮嬫椂闂�
+ arrTd[index++]=_data.station_fadian_start_time;//鍙戠數寮�濮嬫椂闂�
- arrTd[index++]=data[0].station_stat_diaozhan;//鎺夌珯
- arrTd[index++]=data[0].station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
+ // 鎺夌珯
+ if(_data.station_stat_diaozhan) {
+ arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
+ }else {
+ arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '姝ｅ父'});
+ }
- arrTd[index++]=data[0].station_stat_dooropen;//寮�闂ㄥ叧闂ㄥ紓甯�
- arrTd[index++]=data[0].station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
- arrTd[index++]=data[0].station_temp; //娓╁害
- arrTd[index++]=data[0].station_damp; //婀垮害
+ // 寮�闂ㄥ叧闂ㄥ紓甯�
+ if(_data.station_stat_dooropen) {
+ arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
+ }else {
+ arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '鍏抽棬'});
+ }
+
+ arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+
+ arrTd[index++]=_data.station_temp; //娓╁害
+ arrTd[index++]=_data.station_damp; //婀垮害
}
+ 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);
}
}
@@ -587,7 +618,13 @@
var ArrTd="";
for(var i=0;i<eleTd.length;i++)
{
+ var _index = (i+1)%eleTh.length;
+ // 4--鍋滅數 6-
+ if(_index==4 || _index==6 || _index==8 || _index==10){ //鍋滅數
+ ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";
+ }else{
ArrTd+=eleTd.eq(i).text()+"&";
+ }
}
eleTh_Text.attr('value',ArrTh);
eleTd_Text.attr('value',ArrTd);
--
Gitblit v1.9.1