From 94e5b0bddf2b83e1591de425d3e30030fcbb1d23 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:50:53 +0800
Subject: [PATCH] 新建修改到APPLY

---
 gx_tieta/WebRoot/batt-life-manage.jsp |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 6a87c1a..1cd616e 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -160,7 +160,7 @@
         var tblStatus = new Array();    // 琛ㄦ牸鐘舵�佹暟缁�
         var tblOptsHd = new Array();    // 琛ㄦ牸閫夐」澶撮儴
         var tblOptsBd = new Array();  // 琛ㄦ牸閫夐」鏁扮粍
-        arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','瀹為檯鐢垫祦', '鏈�灏忓疄闄呯画鑸椂闂�(min)','骞冲潎瀹為檯缁埅鏃堕棿(min)', '鏈�澶у疄闄呯画鑸椂闂�(min)', '鐞嗚缁埅鏃堕棿(min)', '鏄惁鎺夌珯'];
+        arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','璐熻浇鐢垫祦', '鏈�灏忓疄闄呯画鑸椂闂�(min)','骞冲潎瀹為檯缁埅鏃堕棿(min)', '鏈�澶у疄闄呯画鑸椂闂�(min)', '鐞嗚缁埅鏃堕棿(min)', '鏄惁鎺夌珯'];
         //arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>',  '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];
         //tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
         tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -184,6 +184,36 @@
             var cardBd = $('#cardOption .con_table');
             createCard(cardHd, tblOptsHd, tblOptsBd);
             createCard(cardBd, tblOptsHd, tblOptsBd);
+            
+            // 璁剧疆鏄惁鎺夌珯
+			var pre_is_stand = getQueryString('is_stand');
+			if(pre_is_stand){
+				$('#is_stand').val(pre_is_stand);
+				
+				if(pre_is_stand == 0) {
+					$('#actual_timelong').val(0);
+					$('#actual_timelong').prop('disabled', true);
+				}
+			}
+			
+			// 璁剧疆缁埅鏃堕暱
+			var pre_timelong = getQueryString('timelong');
+			if(pre_timelong){
+				$('#actual_timelong').val(pre_timelong);
+			}
+			
+			// 鐐瑰嚮鏄惁鎺夌珯涓哄惁璁剧疆缁埅鏃堕暱涓嶅彲鐐�
+            $('#is_stand').change(function() {
+            	$('#actual_timelong').prop('disabled', false);
+            	console.log($(this).val())
+            	// 闈炴帀绔欒缃画鑸椂闀挎棤娉曠偣鍑�
+            	if($(this).val() == 0) {
+            		$('#actual_timelong').val(0);
+            		$('#actual_timelong').prop('disabled', true);
+            	}
+            	
+            	
+            });
         });
 
         // 鐢熸垚琛ㄦ牸
@@ -461,17 +491,14 @@
 		
 		//鏋勯�犳煡璇㈡潯浠�
 		function createSearchParam(){
-			//alert($('#endu_type').val());
-			//Page.pageCurr = $('#number').val();
-			//console.info(Page);
 			var temp = {							
 				page:Page,
 				stationName:$('#station_name').val(),					//鏈烘埧鍚�
 				stationName5:$('#county').val(),
 				stationName2:$('#city').val(),							//甯�
 				stationName1:$('#station_name1').val(),					//鐪�
-				is_out_stand:$('#is_stand').val(),									//鏄惁鎺夌珯
-				endurance_actual_timelong:$('#actual_timelong').val(),						//瀹為檯
+				is_out_stand: $('#is_stand').val(),						//鏄惁鎺夌珯
+				endurance_actual_timelong: $('#actual_timelong').val(),						//瀹為檯
 			};
 			//console.info(temp);
 			return temp;
@@ -510,6 +537,7 @@
 							arrTd[index++]=data[i].endurance_actual_timelong;
 							arrTd[index++]=data[i].endurance_actual_timelong_max;
 							arrTd[index++]=data[i].endurance_theory_timelong;
+							//console.info(data[i].deviceId+"===="+data[i].is_out_stand);
 							if(data[i].is_out_stand==0){  //鏈帀绔�(缁胯壊)
 								arrTd[index++]='<div class="status effect" ></div>';
 							}

--
Gitblit v1.9.1