From 1d29f1c954dfea7ec03b70caf8e39e38e94c7b61 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 13 十月 2018 09:23:21 +0800
Subject: [PATCH] 添加0和1
---
gx_tieta/WebRoot/batt-state-manage.jsp | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index bf64d07..14ae71a 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,
@@ -166,7 +168,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"/>'];
@@ -392,20 +394,18 @@
var optsList = [];
//console.info(_data[0]);
for(var i=0;i<_data.length;i++){
- /* $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+_data.length+"<s:text name='Species'/>)");
- $option.attr("value","");
+ /* if(i==0){
+ $select.html("<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)");
+ $select.attr("value","");
}else{
- $option.text(_data[i-1].StationName3);
- $option.attr("value",_data[i-1].StationId);
- }
- $select.append($option);*/
+ $select.text(_data[i-1].StationName3);
+ $select.attr("value",_data[i-1].StationId);
+ }*/
var __data = _data[i];
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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -420,6 +420,7 @@
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
//alert($('#endu_type').val());
+ var stationid = $('#station_name3').find("option:selected").attr('Stationid');
var temp = {
page:{
pageSize:$('#number').val(),
@@ -427,8 +428,8 @@
},
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);
@@ -453,28 +454,43 @@
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; //鏈烘埧
- // if(data[0].station_stat_poff==1){
+ var _data = data[i];
+ arrTd[index++]=_data.stationName1; //鐪�
+ arrTd[index++]=_data.stationName2; //甯�
+ arrTd[index++]=_data.stationName3; //鏈烘埧
- // }
- arrTd[index++]=data[0].station_stat_poff; //鍋滅數
+ //arrTd[index++]=_data.station_stat_poff; //鍋滅數
+ if(_data.station_stat_poff) {
+ arrTd[index++]= create_ali_font('icon-tingdian-', 'red')+_data.station_stat_poff;
+ }else {
+ arrTd[index++]= create_ali_font('icon-tingdian-', 'green')+_data.station_stat_poff;
+ }
- 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', 'green')+_data.station_stat_fadian; //鍙戠數
+ }else {
+ arrTd[index++]= create_ali_font('icon-dynamotor', 'red')+_data.station_stat_fadian; //鍙戠數
+ }
- 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;//鎺夌珯寮�濮嬫椂闂�
+ arrTd[index++]=_data.station_stat_diaozhan;//鎺夌珯
+ arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
- arrTd[index++]=data[0].station_stat_dooropen;//寮�闂ㄥ叧闂ㄥ紓甯�
- arrTd[index++]=data[0].station_dooropen_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;
+ }else {
+ arrTd[index++] = create_ali_font('icon-quankaimen', 'green')+_data.station_stat_dooropen;
+ }
- arrTd[index++]=data[0].station_temp; //娓╁害
- arrTd[index++]=data[0].station_damp; //婀垮害
+ arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+
+ arrTd[index++]=_data.station_temp; //娓╁害
+ arrTd[index++]=_data.station_damp; //婀垮害
}
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
}
--
Gitblit v1.9.1