From c5f2e87c4d0fc18129cc05b866e647f681c8472f Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期四, 20 十二月 2018 15:22:07 +0800
Subject: [PATCH] 修改

---
 gx_tieta/WebRoot/mobil/batt-approved.html |  154 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 120 insertions(+), 34 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 9389868..a588c78 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -87,6 +87,7 @@
 		    margin: 0;
             padding-top: 0.1em;
             padding-bottom: 0.1em;
+            margin-left:7em;
 		}
 		.ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
 		    width:35%;
@@ -122,7 +123,7 @@
 			</div>		
 		</div>   
 		
-		
+	
     </div>    
 	</div>
 </body>
@@ -138,9 +139,11 @@
  <script type="text/javascript">
           /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
           function getButIndex(t){
-			    //console.warn($(t).attr("but-index"));
 			    var index = $(t).attr("but-index");   
+			   // index=(index/33-1);
+			   	console.info(index);
 			   	setcookiedit(index);
+			   	window.location.href="control.html"; 	
 			    return ;
 			}
     
@@ -154,19 +157,9 @@
 	};
 
        
-    $("#edit").click(function(){
-        window.location.href="batt-infor-conf-temp.html";   
-    });
-    $("#delete").click(function(){  //鍒犻櫎鐢垫睜缁�
-    	var temp = getCookie("eleparm");
-    	temp = JSON.parse(temp);
-    	console.info(temp);
-        var parm = getUpdateArr(temp);
-        delBatt(parm);
-       // window.location.href="batt-infor-conf-delete.html";   
-    });
+    
      
-    var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鏌ョ湅鐢垫睜缁勫疄鏃舵暟鎹�'];
+    var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','閫氳璁℃暟','鏄惁楠屾敹',''];
 	dataArr = [];
     var startTime = "1980-01-01";
     var endTime = new Date().format('yyyy-MM-dd');
@@ -174,11 +167,43 @@
     createTbl(tbl, arrTh, dataArr);
 	$(document).ready(function(){
 		setPage();
-		
-			Page.pageCurr=1;
-			searchBattLife();
+		getnumber();
+		Page.pageCurr=1;
+		searchBattLife();
+		//console.info($("#getnumber").val());
 		
 	 });
+	 function getnumber(){ 	//鍚戣幏鍙栨墍鏈夐�氳璁℃暟骞跺瓨鍏ョ紦瀛�
+		$.ajax({
+ 			type: 'post',
+			async: true,
+			url: 'Battinf_applyAction!devCommNum',
+			data: null,
+			dataType: 'json',
+			success:function(data) {
+				data = JSON.parse(data.result);
+				if(data.code==1){
+					var json =JSON.stringify(data.data);
+					setCookie("numberget",json);
+				}
+			}
+		});
+	 }
+	 function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
+	 	//id = 0;
+	 	var number = getCookie("numberget");
+	 	number = JSON.parse(number);
+	 	//console.info(number);
+	 	if(number[0].dev_id){
+	 	//console.info(number);
+	 		for(var i =0; i<number.length;i++){
+	 			if(id == number[i].dev_id){
+	 				return number[i].dev_commcount;
+	 			}
+	 		}	
+	 	}
+	 	return 0;
+	 }
 	 
 	 function getcreatArr(){
 		obj = {
@@ -189,12 +214,22 @@
 		}
 		return obj;
 	}
+	
+	function yanshou(check_en){
+		if(check_en==0){
+			return "鏈獙鏀�";
+		}else{
+			return "宸查獙鏀�";
+		}
+	}
 	// 鏌ヨ鍐呭
 	function searchBattLife(){
 		var temp = JSON.stringify(getcreatArr());
-		console.info(temp);
+		//console.info(temp);
 		arrTd = new Array();
+		getnumber();
  		var index = 0;
+ 		getCookienumber();
  		$.ajax({
  			type: 'post',
 			async: true,
@@ -240,11 +275,16 @@
  					arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);
  					arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
  					arrTd[index++] = data[i].binf.install_user;
- 					arrTd[index++] = "";
- 					arrTd[index++] = arrTd[i]='<a href=""  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+ 					arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
+ 					arrTd[index++] = yanshou(data[i].check_en);
+ 					arrTd[index++]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
  					}
  				}
- 			createTbl(tblCon, arrTh, arrTd);
+ 				console.info(arrTd);
+ 				createTbl(tblCon, arrTh, arrTd);
+ 				timeer = window.setTimeout(function() {
+							searchBattLife();
+						}, 5000);	
  			}
  		});			
 	}
@@ -258,8 +298,51 @@
 				   	//console.info(value);
 			   		arrcookie.push(arrTd[value]);
 			   	}
+			   	console.info(arrcookie);
+			   	var temp = arrcookie;
+			   		var battarr = {
+			   		StationId : temp[0],	// 鏈烘埧缂栧彿
+					StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]),	// 鎷兼帴鏈烘埧鍚嶇О
+					StationName1 :temp[1],		// 鐪�
+					StationName2 : temp[2],		// 甯�
+					StationName5 : temp[3],		// 鍖�/鍘�
+					StationName3 : temp[4],		// 鏈烘埧鍚嶇О
+					StationName4 :temp[5],		// 璁惧鍚嶇О
+					StationIp : temp[6],				//鏈烘埧ip
+					FBSDeviceId : temp[7],				//璁惧id
+					FbsDeviceIp : temp[8],				//璁惧ip
+					FbsDeviceIp_YM : temp[9],			// 璁惧鎺╃爜
+					FbsDeviceIp_WG : temp[10],			// 缃戝叧
+					FBSDeviceName : temp[11],			//璁惧鍚嶇О
+					GroupIndexInFBSDevice : temp[12],	//fbs璁惧绱㈠紩
+					BattGroupId : temp[13],				//鐢垫睜缁刬d
+					BattGroupNum : temp[14],			//鏈烘埧鍐呯數姹犵粍缂栧彿
+					BattGroupName : temp[15],        //鐢垫睜缁勭储寮�
+					FloatVolLevel : temp[16],			//娴厖鐢靛帇闃�鍊�
+					OfflineVolLevel : temp[17],			//绂荤嚎鐢靛帇闃�鍊�
+					BattFloatCurrent : temp[18],		//娴厖鐢垫祦闃�鍊�
+					MonCount : temp[19],				//鍗曚綋鏁伴噺
+					MonCapStd : temp[20],				//鏍囩О瀹归噺
+					MonVolStd : temp[21],				//鏍囩О鐢靛帇
+					MonResStd : temp[22],				//鏍囩О鍐呴樆
+					MonSerStd : temp[23],				//鏍囩О鐢靛
+					MonVolLowToAvg : temp[24],			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+			
+					Load_curr : temp[25],				//璐熻浇鐢垫祦
+					DisCurrMax : temp[26],				//鏈�澶ф牳瀹圭數娴�
+					station_phone : temp[27],			//鍩虹珯鍙风爜
+									
+					BattProducer : temp[28],			//鐢垫睜鍝佺墝
+					BattModel : temp[29],				//鐢垫睜鍨嬪彿
+					BattProductDate :  temp[30]+" 00:00:00",		//鐢垫睜鐢熶骇鏃ユ湡
+					BattInUseDate :  temp[31]+" 00:00:00",			//鐢垫睜浣跨敤鏃ユ湡
+					install_user : temp[32],			//瀹夎浜哄憳
+			   	}
+			   	var json1 = window.JSON.stringify(battarr);
+			   	console.info(battarr);
 			   	var json=window.JSON.stringify(arrcookie);
 			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ 				setCookie("batt",json1);
  		}
  		
  		function setcookieCreat(index){
@@ -283,25 +366,28 @@
 			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
  		}
 		
-/*	// 鏌ヨ鍐呭
-		function searchBattLife(){
+	// 鏌ヨ鍐呭
+	/*	function searchBattLife(){
 			
 		
 			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
 			
-		/*	for(i=0;i<340;i++){
-			 if(i%34==33){
-			 //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
-			arrTd[i]='<a href=""  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
-			console.warn(i);
-			continue;
+		/*	for(var i=0;i<340;i++){
+				if(i%34==33){
+				//<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+				console.info(i);
+				arrTd[i]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+				
+				continue;
 			
-			} 
-			       
-					 arrTd[i]=i*10;
-					}
+			}   if(i==13){
+					arrTd[i]=1002102;
+				}else{
+					arrTd[i]=i*10;
+				}
+			}
 						
-					createTbl(tblCon, arrTh, arrTd);
+			createTbl(tblCon, arrTh, arrTd);
 					
 			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */				
 		//}

--
Gitblit v1.9.1