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/hcheckAccpet-index.html |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
index fe47948..aad45b6 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
@@ -63,16 +63,26 @@
 			$('#battList').on('click', 'ul li', function () {
 				aLi = $(this).index();
 				console.info(aLi);
-				station = getbatt(stationlist,aLi);
+				console.info(stationlist);
+				var pagecurr = $(this).find('a').attr('value');
+				var index = 0;
+				for(var i=0;i<(pagecurr-1);i++){
+					index +=pageindexNum[i]; 
+				}
+				index += aLi;
+				//console.info(index);
+				station = getbatt(stationlist,index);
 				var arr=setarrbatt(arrdata,station);
 				console.info(arr);
-				window.location.href="hcheckAccpet.html";
+				if(arr){
+					window.location.href="hcheckAccpet.html";
+				}
 			});		
 		});
 		
 		var arrTd = new Array();
 		var arrdata = new Array();
-		
+		var pageindexNum = new Array();//鐢变簬杩囨护閲嶅鏈烘埧锛屽垎椤靛け鏁堬紝瀛樺偍姣忛〉鏈烘埧涓暟銆�
 		var Page = {
 			pageSize:20, 				//姣忛〉鐨勮鏁�
 			pageCurr:1,  				//褰撳墠椤电爜鏁�
@@ -92,6 +102,7 @@
 		
 		// 鏌ヨ鍐呭
 		function searchBattLife(){
+			loadshow();
 			var temp = JSON.stringify(getcreatArr());
 			console.info(temp);
 			arrTd = new Array();
@@ -114,23 +125,29 @@
 		 					arrdata.push(data[i]);//瀛樺偍鏁版嵁
 		 					if(model.length==0){
 		 						model.push(data[i].binf.StationName);
+		 						stationlist.push(data[i].binf.StationName);
 		 					}else{
 		 						if(model[model.length-1]!=data[i].binf.StationName){//鑻ヤ笉閲嶅锛屽垯PUSH杩涘幓
 		 							model.push(data[i].binf.StationName);
+		 							stationlist.push(data[i].binf.StationName);
 		 						}
 		 					}
 	 						//console.info(model);
-	 						stationlist=model;		
+	 								
 	 					}
+	 					//stationlist.push(model);
 	 					//console.info(model);
 	 					//if(Page.pageCurr==1){
-	 						createUl($('#battList'),model);
+	 						loadclose();
+	 						createUl($('#battList'),model,Page.pageCurr);
 	 					//}else{
 	 						//addteUl($('#battList'),model);
 	 					//}
 	 				}
 	 			}
-	 		});			 
+	 			
+	 		});	
+	 		loadclose();		 
 	 	}	
 	 	
 	 	function setarrbatt(arrdata,station){
@@ -162,7 +179,7 @@
 						address:arrdata[i].address,//鍦板潃
 						binf:{
 							StationId : arrdata[i].binf.StationId,	// 鏈烘埧缂栧彿
-							StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3),	// 鎷兼帴鏈烘埧鍚嶇О
+							StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName3+"-"+arrdata[i].binf.StationName4),	// 鎷兼帴鏈烘埧鍚嶇О
 							StationName1 :arrdata[i].binf.StationName1,		// 鐪�
 							StationName2 : arrdata[i].binf.StationName2,		// 甯�
 							StationName5 :  arrdata[i].binf.StationName5,		// 鍖�/鍘�
@@ -208,10 +225,10 @@
 			console.info(arr);	
 			//applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
 			var json=window.JSON.stringify(arr);
-		   	setCookie("wapproval",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+		   	setCookie("happroval",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
 			return arr;
 		}
-		function addteUl(ulCon,dataList){
+		function addteUl(ulCon,dataList,value){
 			// 鍒涘缓ul
 			var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
 			
@@ -219,7 +236,7 @@
 			for (var i = 0; i < dataList.length; i++){
 				var _li = $('<li></li');
 				
-				var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i]+'</a>');
+				var _a = $('<a href="#page1" value='+value+'  data-transition="slide">'+dataList[i]+'</a>');
 								
 				// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
 				_li.append(_a);
@@ -230,12 +247,13 @@
 			ulCon.append(_ul).trigger('create');			
 			loadclose();
 		}
- 		function createUl(ulCon, dataList) {
+ 		function createUl(ulCon, dataList,value) {
 			//console.info(index);
 			// 娓呯悊瀹瑰櫒涓嬬殑ul
 			if(Page.pageCurr==1){
 				ulCon.find('ul').remove();
 			}
+			pageindexNum[value-1]=dataList.length;
 			// 鍒涘缓ul
 			var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
 			
@@ -243,7 +261,7 @@
 			for (var i = 0; i < dataList.length; i++){
 				var _li = $('<li></li');
 				
-				var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i]+'</a>');
+				var _a = $('<a href="#page1" value='+value+'  data-transition="slide">'+dataList[i]+'</a>');
 								
 				// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
 				_li.append(_a);

--
Gitblit v1.9.1