From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/WebRoot/mobil/batt-approved.html |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 3572a83..f39a91b 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -188,6 +188,7 @@
                 ,anim: 4
                 ,content: 'iframe/homeinfo1.html'
             });
+            layer.full(iframePopup);
 		
 		// applyendyanshou(arr);
 		
@@ -209,7 +210,7 @@
        
     
    	var arrdata = new Array();  
-    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');
@@ -233,16 +234,21 @@
 			success:function(data) {
 				data = JSON.parse(data.result);
 				if(data.code==1){
+					console.info(data.data);
 					var json =JSON.stringify(data.data);
 					setCookie("numberget",json);
+					//return data.data;	
 				}
 			}
 		});
 	 }
 	 function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
+	 	//var a = getnumber();
+	 	//console.info(a);
 	 	if(getCookie("numberget")){
 		 	var number = getCookie("numberget");
 		 	number = JSON.parse(number);
+		 	console.info(number);
 		 	if(number[0]){
 		 		for(var i =0; i<number.length;i++){
 		 			if(id == number[i].dev_id){
@@ -253,7 +259,24 @@
 	 	}
 	 	return 0;
 	 }
-	 
+	 function getCookiediubao(id){
+	 	if(getCookie("numberget")){
+		 	var number = getCookie("numberget");
+		 	number = JSON.parse(number);
+		 	console.info(number);
+		 	if(number[0]){
+		 		for(var i =0; i<number.length;i++){
+		 			if(id == number[i].dev_id){
+		 				var errorCount = number[i].dev_errcommcount;
+		 				var allCount = number[i].dev_commcount+errorCount;
+		 				//var parcent = (allCount==0?0:errCount/allCount*100)
+		 				//return parcent;
+		 			}
+		 		}	
+		 	}
+	 	}
+	 	return 0;
+	 }
 	 function getcreatArr(){
 		obj = {
 			apply_en : 1,
@@ -269,7 +292,7 @@
 			return "鏈獙鏀�";
 		}else if(check_en==2){
 			return "宸茬敵璇烽獙鏀�";
-		}else if(check==1){
+		}else if(check_en==1){
 			return"宸插畬鎴愰獙鏀�";s
 		}
 	}
@@ -330,6 +353,7 @@
  					arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
  					arrTd[index++] = data[i].binf.install_user;
  					arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
+ 					arrTd[index++] = getCookiediubao(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>'+
  					'<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>鐢宠楠屾敹</a>';

--
Gitblit v1.9.1