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 |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 14ae71a..4bf6a3d 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -414,6 +414,8 @@
 					$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 					
 				}
+				
+				searchstationstate();
 			});
 		}
 		
@@ -432,7 +434,6 @@
 				StationId: stationid?stationid:0,
 				
 			};
-			console.info(temp);
 			return temp;
 		}
 
@@ -459,32 +460,38 @@
 							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:'鍋滅數寮傚父'});
 							}else {
-								arrTd[index++]= create_ali_font('icon-tingdian-', 'green')+_data.station_stat_poff;
+								arrTd[index++]= create_ali_font('icon-tingdian-', 'green', {msg: '姝e父'});
 							}
 							
 							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: '鍙戠數寮傚父'}); //鍙戠數
 							}else {
-								arrTd[index++]= create_ali_font('icon-dynamotor', 'red')+_data.station_stat_fadian; //鍙戠數
+								arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '姝e父'}); //鍙戠數
 							}
 							
 							arrTd[index++]=_data.station_fadian_start_time;//鍙戠數寮�濮嬫椂闂�
 							
-							arrTd[index++]=_data.station_stat_diaozhan;//鎺夌珯
+							// 鎺夌珯
+							if(_data.station_stat_diaozhan) {
+								arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
+							}else {
+								arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '姝e父'});
+							}
+							
 							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: '寮�闂�'});
 							}else {
-								arrTd[index++] = create_ali_font('icon-quankaimen', 'green')+_data.station_stat_dooropen;
+								arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '鍏抽棬'});
 							}
 							
 							arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
@@ -492,6 +499,10 @@
 							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);
 					}
 				}
@@ -607,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