From 560b3556bf3410080e9ffbcc35733c3310aeb958 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.29>
Date: 星期五, 12 十月 2018 17:40:09 +0800
Subject: [PATCH] 111

---
 gx_tieta/WebRoot/image/dot/red.gif     |    0 
 gx_tieta/WebRoot/image/dot/green.gif   |    0 
 gx_tieta/WebRoot/batt-state-manage.jsp |   18 +++++++++++-------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index d7aa1b2..bf64d07 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -166,7 +166,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,13 +392,15 @@
 					var optsList = [];
 					//console.info(_data[0]);
 					for(var i=0;i<_data.length;i++){
-					/*	if(i==0){
-							$select.html("<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)");	
-							$select.attr("value","");
+					/*	$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","");
 						}else{
-							$select.text(_data[i-1].StationName3);
-							$select.attr("value",_data[i-1].StationId);	
-						}*/
+							$option.text(_data[i-1].StationName3);
+							$option.attr("value",_data[i-1].StationId);	
+						}
+						$select.append($option);*/
 						var __data = _data[i];
 						var _attr = {
 							StationId: __data.StationId
@@ -454,7 +456,9 @@
 							arrTd[index++]=data[0].stationName1;  //鐪�
 							arrTd[index++]=data[0].stationName2;	//甯�
 							arrTd[index++]=data[0].stationName3;	//鏈烘埧
+						//	if(data[0].station_stat_poff==1){
 							
+						//	}
 							arrTd[index++]=data[0].station_stat_poff; //鍋滅數
 							
 							arrTd[index++]=data[0].station_poff_start_time //鍋滅數寮�濮嬫椂闂�
diff --git a/gx_tieta/WebRoot/image/dot/green.gif b/gx_tieta/WebRoot/image/dot/green.gif
new file mode 100644
index 0000000..1fd7a57
--- /dev/null
+++ b/gx_tieta/WebRoot/image/dot/green.gif
Binary files differ
diff --git a/gx_tieta/WebRoot/image/dot/red.gif b/gx_tieta/WebRoot/image/dot/red.gif
new file mode 100644
index 0000000..3ba6606
--- /dev/null
+++ b/gx_tieta/WebRoot/image/dot/red.gif
Binary files differ

--
Gitblit v1.9.1