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 |  203 ++++++++++++++++++++++++++------------------------
 1 files changed, 107 insertions(+), 96 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 05f3e7e..f39a91b 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -10,6 +10,7 @@
 	<link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
 	<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
 	<link rel="stylesheet" type="text/css" href="css/tbl.css">
+	<link rel="stylesheet" type="text/css" href="src/css/layui.css">
 	<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
 	<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
 	<style type="text/css">
@@ -87,11 +88,14 @@
 		    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%;
 		} 
+		.fr{
+		float:right;
+		}
 	</style>
 	<link rel="stylesheet" href="css/fgpanel.css">
 </head>
@@ -126,6 +130,9 @@
 	
     </div>    
 	</div>
+	<!-- 瀛樺偍homeinfo鐨勫�� -->
+	<div id="homeInfoIframe"></div>
+	<div id="homeInfoIframeAll"></div>
 </body>
 
 <script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
@@ -134,11 +141,11 @@
 <script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
 <script type="text/javascript" src="js/tbl.js"></script>
 <script type="text/javascript" src="mobilJs/base.js"></script>
-
+<script type="text/javascript" src="src/layui.all.js"></script>
 
  <script type="text/javascript">
           /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
-	function getButIndex(t){
+	function getButIndex(t){ //鏌ョ湅瀹炴椂鏁版嵁 
 	    var index = $(t).attr("but-index");   
 	   // index=(index/33-1);
 	   	console.info(index);
@@ -146,14 +153,52 @@
 	   	window.location.href="control.html"; 	
 	    return ;
 	}
+	
+	var iframePopup = '';		// 寮瑰嚭闈㈡澘鏍囪瘑绗�
 	function getApplyYanshouIndex(t){
 		var index = $(t).attr("but-index");
 		console.info(index);
-		setApplyYanshou(index);
+		var arr=setApplyYanshou(index);
+		console.log(arr);							//鏂规硶涓�锛�1鎸夐挳鎼炲畾鎵�鏈夈�傝鍦ㄦ瀵规帴鍔犲叆寮瑰嚭妗嗭紝涓婁紶瑙嗛缁忕含搴︾瓑
 		
-		return ;
+		if(arr.length == 0) {
+			layer.msg('鑾峰彇鏁版嵁澶辫触锛侊紒');
+			return ;
+		}
+		
+		// 瀛樺偍鎵�鏈夌殑鏁版嵁
+		$('#homeInfoIframeAll').data('allData', arr);
+		var _data = arr[0];
+		var temp = {
+			homeId: _data.binf.StationId
+			,homeName: _data.binf.StationName
+			,addr: ''
+			,lng: 0
+			,lat: 0
+		}
+		// 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
+		$('#homeInfoIframe').data('homeInfo', temp);
+		
+		iframePopup = layer.open({
+                type: 2
+                ,closeBtn: 0
+                ,title: false
+                ,area: ['100%', '100%']
+                ,full: true
+                ,anim: 4
+                ,content: 'iframe/homeinfo1.html'
+            });
+            layer.full(iframePopup);
+		
+		// applyendyanshou(arr);
+		
 	}
- 
+ 	function getApplyYanshoupicture(t){
+ 		var index = $(t).attr("but-index");
+		console.info(index);//鏂规硶2
+		var arr=setApplyYanshou(index);
+		//璇峰湪姝ゅ鎺ュ姞鍏ュ脊鍑烘
+ 	}
     var arrTd = new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
     var tblCon = $('.tbl-container');
     var Page = {
@@ -165,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');
@@ -189,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){
@@ -209,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,
@@ -223,8 +290,10 @@
 	function yanshou(check_en){
 		if(check_en==0){
 			return "鏈獙鏀�";
-		}else{
-			return "宸查獙鏀�";
+		}else if(check_en==2){
+			return "宸茬敵璇烽獙鏀�";
+		}else if(check_en==1){
+			return"宸插畬鎴愰獙鏀�";s
 		}
 	}
 	// 鏌ヨ鍐呭
@@ -247,6 +316,7 @@
  				if(data.code!=0&&data.data.length>0){
  					data=data.data
  					console.info(data);
+ 					Page.pageAll=data[data.length-1].num;
  					for(var i=0;i<data.length;i++){
  					arrdata.push(data[i]);//瀛樺偍鏁版嵁
  					arrTd[index++] = data[i].binf.StationId;
@@ -283,13 +353,19 @@
  					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>';
+ 					//鏂规硶2 2鎸夐挳瑙e紑浠ヤ笅涓�鏉℃敞閲婃寜閽�
+ 					//'<a onclick="getApplyYanshoupicture(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>'
  					}
  				}
  				console.info(arrTd);
  				console.info(arrdata);
+ 				//Page.pageCurr=Math.ceil(Page.pageAll/Page.pageSize);
+ 				//console.info(Page.pageCurr);
+ 				setPage();
  				createTbl(tblCon, arrTh, arrTd);
  				/*timeer = window.setTimeout(function() {
 							searchBattLife();
@@ -299,10 +375,10 @@
 	}
 		
 		function setApplyYanshou(index){
-			//var value = Math.floor(34*index);
 			console.info(arrdata);
-			if(arrdata.length>0){   //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
-				creatYanshouObj(arrdata,index);
+			if(arrdata.length>0){   //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁		                                      
+				var arr= creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+				return arr;
 			}else{
 				alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
 			}
@@ -310,11 +386,10 @@
 		
 		function creatYanshouObj(arrdata,index){
 			var StationId = arrdata[index].binf.StationId;
-			console.info(StationId);
+			//console.info(StationId);
 			var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
-			for(var i=0;i<arrdata.length;i++){
-				if(StationId == arrdata[i].binf.StationId){
-					
+			for(var i=0;i<arrdata.length;i++){//涓�娆¢獙鏀惰鏈烘埧涓嬬殑鎵�鏈夌數姹犵粍鏋勫缓瀵硅薄 銆�
+				if(StationId == arrdata[i].binf.StationId){		
 					var obj = {
 						binf:{
 							StationId : arrdata[i].binf.StationId,	// 鏈烘埧缂栧彿
@@ -356,12 +431,18 @@
 						}
 					}
 					arr.push(obj);
-					//console.info(obj)
 				}
 			}
-			console.info(obj);
-			var temp = JSON.stringify(arr);
-			$.ajax({
+			console.info(arr);
+			
+					
+			return arr;
+			//applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+		}
+		
+		function applyendyanshou(arr){
+		var temp = JSON.stringify(arr);
+			$.ajax({                                   //鐢宠楠屾敹
 	 			type: 'post',
 				async: true,
 				url: 'Battinf_applyAction!checkPro',
@@ -375,11 +456,12 @@
 					}
 				}
 			});
+		
 		}
  		function setcookiedit(index){
  				var arrcookie = new Array();	
-			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
-				   	var value = Math.floor(34*index);
+			   	for(var i=0;i<33;i++){//鍏盿rrTh.length椤癸紝鏈�鍚庡嚑椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
+				   	var value = Math.floor(arrTh.length*index);
 				   	value = Math.floor(value+i);
 			   		arrcookie.push(arrTd[value]);
 			   	}
@@ -429,78 +511,8 @@
 			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
  				setCookie("batt",json1);
  		}
- 		
- 		function setcookieCreat(index){
- 				var arrcookie = new Array();	
-			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
-				   	var value = Math.floor(34*index);
-				   	//console.info(value);
-				   	value = Math.floor(value+i);
-				 	if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
-				 		var groupid = Math.floor(arrTd[value]+1);
-				 		console.info(groupid);
-				 		arrcookie.push(groupid);
-				 	}else{
-				   		//console.info(value);
-			   			arrcookie.push(arrTd[value]);
-			   		}
-			   	}
-			   	arrcookie.push("new");
-			   	//console.info(arrcookie);
-			   	var json=window.JSON.stringify(arrcookie);
-			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
- 		}
 		
-	// 鏌ヨ鍐呭
-
-		function getUpdateArr(temp){
-			var arr = new Array();
-			var obj = new Object();
-			obj.StationId = temp[0];	// 鏈烘埧缂栧彿
-			obj.StationName = (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]);	// 鎷兼帴鏈烘埧鍚嶇О
-			obj.StationName1 = temp[1];		// 鐪�
-			obj.StationName2 = temp[2];		// 甯�
-			obj.StationName5 = temp[3];		// 鍖�/鍘�
-			obj.StationName3 = temp[4];		// 鏈烘埧鍚嶇О
-			obj.StationName4 = temp[5];		// 璁惧鍚嶇О
-			obj.StationIp = temp[6];				//鏈烘埧ip
-			obj.FBSDeviceId = temp[7];				//璁惧id
-			obj.FbsDeviceIp = temp[8];				//璁惧ip
-			obj.FbsDeviceIp_YM = temp[9];			// 璁惧鎺╃爜
-			obj.FbsDeviceIp_WG = temp[10];			// 缃戝叧
-			obj.FBSDeviceName = temp[11];			//璁惧鍚嶇О
-			obj.GroupIndexInFBSDevice = temp[12];	//fbs璁惧绱㈠紩
-			obj.BattGroupId = temp[13];				//鐢垫睜缁刬d
-			obj.BattGroupNum = temp[14];			//鏈烘埧鍐呯數姹犵粍缂栧彿
-			obj.BattGroupName = temp[15];			//鐢垫睜缁勫悕绉�
-			obj.FloatVolLevel = temp[16];			//娴厖鐢靛帇闃�鍊�
-			obj.OfflineVolLevel = temp[17];			//绂荤嚎鐢靛帇闃�鍊�
-			obj.BattFloatCurrent = temp[18];		//娴厖鐢垫祦闃�鍊�
-			obj.MonCount = temp[19];				//鍗曚綋鏁伴噺
-			obj.MonCapStd = temp[20];				//鏍囩О瀹归噺
-			obj.MonVolStd = temp[21];				//鏍囩О鐢靛帇
-			obj.MonResStd = temp[22];				//鏍囩О鍐呴樆
-			obj.MonSerStd = temp[23];				//鏍囩О鐢靛
-			obj.MonVolLowToAvg = temp[24];			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
-			
-			
-			obj.Load_curr = temp[25];				//璐熻浇鐢垫祦
-			obj.DisCurrMax = temp[26];				//鏈�澶ф牳瀹圭數娴�
-			obj.station_phone = temp[27];			//鍩虹珯鍙风爜
-							
-			obj.BattProducer = temp[28];			//鐢垫睜鍝佺墝
-			obj.BattModel = temp[29];				//鐢垫睜鍨嬪彿
-			obj.BattProductDate =  temp[30];		//鐢垫睜鐢熶骇鏃ユ湡
-			obj.BattInUseDate =  temp[31];			//鐢垫睜浣跨敤鏃ユ湡
-			obj.install_user = temp[32];			//瀹夎浜哄憳
-			arr.push(obj);
-			console.info(arr);
-			return arr;
-		}	
-	
-	
-			
-	function createSearchForm(){
+	function createSearchForm(){//鏌ヨ宸插鏍镐紶鍙傘��
 		var temp={
 				page:Page,
 				StationName1:$('#mainteArea').val(),
@@ -525,8 +537,7 @@
 				},
 			};
 			console.info(temp);
-			return temp;
-			
+			return temp;		
 		}	
 	
 	$(function() {

--
Gitblit v1.9.1