From 977715c1467694dd81a4015fdaab5f0e2aec45a4 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期四, 10 一月 2019 14:36:43 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/index.html                 |   15 +++++--
 gx_tieta/WebRoot/mobil/wcheckAccept.html          |    3 +
 gx_tieta/WebRoot/mobil/wcheckAccept-index.html    |    9 ++--
 gx_tieta/WebRoot/mobil/wapprovalBatt-index.html   |    6 ++-
 gx_tieta/WebRoot/mobil/batt-approve-index.html    |    2 
 gx_tieta/WebRoot/mobil/hcheckAccpet-index.html    |   26 +++++++++----
 gx_tieta/WebRoot/mobil/batt-unapproved-index.html |    2 
 gx_tieta/WebRoot/mobil/wapprovalBatt.html         |    3 +
 8 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approve-index.html b/gx_tieta/WebRoot/mobil/batt-approve-index.html
index 7b69220..5dd2a1d 100644
--- a/gx_tieta/WebRoot/mobil/batt-approve-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-approve-index.html
@@ -102,7 +102,7 @@
 		var arrdata = new Array();
 		
 		var Page = {
-			pageSize:20, 				//姣忛〉鐨勮鏁�
+			pageSize:100, 				//姣忛〉鐨勮鏁�
 			pageCurr:1,  				//褰撳墠椤电爜鏁�
 			pageAll:0,
 		};
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
index 4e67438..74426ce 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
@@ -75,7 +75,7 @@
 		var arrdata = new Array();
 		
 		var Page = {
-			pageSize:20, 				//姣忛〉鐨勮鏁�
+			pageSize:100, 				//姣忛〉鐨勮鏁�
 			pageCurr:1,  				//褰撳墠椤电爜鏁�
 			pageAll:0,
 		};
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
index 7bffaee..aad45b6 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
@@ -64,7 +64,14 @@
 				aLi = $(this).index();
 				console.info(aLi);
 				console.info(stationlist);
-				station = getbatt(stationlist,aLi);
+				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);
 				if(arr){
@@ -75,7 +82,7 @@
 		
 		var arrTd = new Array();
 		var arrdata = new Array();
-		
+		var pageindexNum = new Array();//鐢变簬杩囨护閲嶅鏈烘埧锛屽垎椤靛け鏁堬紝瀛樺偍姣忛〉鏈烘埧涓暟銆�
 		var Page = {
 			pageSize:20, 				//姣忛〉鐨勮鏁�
 			pageCurr:1,  				//褰撳墠椤电爜鏁�
@@ -118,19 +125,21 @@
 		 					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){
 	 						loadclose();
-	 						createUl($('#battList'),model);
+	 						createUl($('#battList'),model,Page.pageCurr);
 	 					//}else{
 	 						//addteUl($('#battList'),model);
 	 					//}
@@ -219,7 +228,7 @@
 		   	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>');
 			
@@ -227,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);
@@ -238,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>');
 			
@@ -251,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);
diff --git a/gx_tieta/WebRoot/mobil/index.html b/gx_tieta/WebRoot/mobil/index.html
index 80037c4..45eea61 100644
--- a/gx_tieta/WebRoot/mobil/index.html
+++ b/gx_tieta/WebRoot/mobil/index.html
@@ -61,23 +61,30 @@
 
 	<script type="text/javascript" src="mobilJs/base.js"></script>
 	<script>
-	$(document).bind("mobileinit", function(){
-		
-	
+	$(document).bind("mobileinit", function(){	
 		// enable i18n
 		$.mobile.i18nEnabled = false;
 		//$.mobile.i18nFolder = "i18n"
 		$.mobile.ignoreContentEnabled = true;
-
 		// $(document).delegate("#btn", "vclick", function(){
 
 		// 	alert( $.trim( $("#tpl").html() ) );
 		// });
+		/*cleanCookie("wapproval");
+		cleanCookie("happroval");
+		cleanCookie("batt");
+		cleanCookie("station"); */ 
 	});
 
 	$(function(){
 		delCookie("pages");
 		delCookie("stationId");
+		delCookie("wapproval");
+		delCookie("happroval");
+		delCookie("batt");
+		delCookie("station");
+		delCookie("eleparm");
+		delCookie("eleparm1"); 
 		$(document.body).css( "visibility", "visible") ;
 	});
 	
diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
index 5a20fae..15890e7 100644
--- a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
+++ b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
@@ -74,7 +74,7 @@
 		var arrdata = new Array();
 		
 		var Page = {
-			pageSize:20, 				//姣忛〉鐨勮鏁�
+			pageSize:100, 				//姣忛〉鐨勮鏁�
 			pageCurr:1,  				//褰撳墠椤电爜鏁�
 			pageAll:0,
 		};
@@ -115,16 +115,18 @@
 			 					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=model;
 	 					createUl($('#battList'),model);
 	 				}
 	 			}
diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt.html b/gx_tieta/WebRoot/mobil/wapprovalBatt.html
index a743356..4cd59b1 100644
--- a/gx_tieta/WebRoot/mobil/wapprovalBatt.html
+++ b/gx_tieta/WebRoot/mobil/wapprovalBatt.html
@@ -248,6 +248,7 @@
 	// 閫氳繃瀹℃壒璇锋眰
 	function exBattGroupAjax(data) {
 		// 璇锋眰鍚庡彴
+		loadshow();
 		$.ajax({
 			type: 'post'
 			,async: true
@@ -258,9 +259,11 @@
 				var rs = JSON.parse(res.result);
 				// console.log(rs);
 				if(rs.code == 1) {
+					loadclose();
 					alert("纭瀹℃牳鎴愬姛");
 					window.location.href="wapprovalBatt-index.html";
 				}else {
+					loadclose();
 					alert('纭瀹℃牳澶辫触锛�');
 				}		
 			}
diff --git a/gx_tieta/WebRoot/mobil/wcheckAccept-index.html b/gx_tieta/WebRoot/mobil/wcheckAccept-index.html
index 3e77be9..1b7db4b 100644
--- a/gx_tieta/WebRoot/mobil/wcheckAccept-index.html
+++ b/gx_tieta/WebRoot/mobil/wcheckAccept-index.html
@@ -74,7 +74,7 @@
 		var arrdata = new Array();
 		
 		var Page = {
-			pageSize:20, 				//姣忛〉鐨勮鏁�
+			pageSize:100, 				//姣忛〉鐨勮鏁�
 			pageCurr:1,  				//褰撳墠椤电爜鏁�
 			pageAll:0,
 		};
@@ -115,16 +115,17 @@
 			 					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);
-		 						
+		 						console.info(model);	
 	 						}
 	 					}
-	 					stationlist=model;
+	 					//stationlist=model;
 	 					createUl($('#battList'),model);
 	 				}
 	 			}
diff --git a/gx_tieta/WebRoot/mobil/wcheckAccept.html b/gx_tieta/WebRoot/mobil/wcheckAccept.html
index 0f197aa..ae1c6fc 100644
--- a/gx_tieta/WebRoot/mobil/wcheckAccept.html
+++ b/gx_tieta/WebRoot/mobil/wcheckAccept.html
@@ -385,6 +385,7 @@
 	// 閫氳繃瀹℃壒璇锋眰
 	function exBattGroupAjax(data) {
 		// 璇锋眰鍚庡彴
+		loadshow();
 		$.ajax({
 			type: 'post'
 			,async: true
@@ -395,9 +396,11 @@
 				var rs = JSON.parse(res.result);
 				// console.log(rs);
 				if(rs.code == 1) {
+					loadclose();
 					alert("纭楠屾敹鎴愬姛");
 					window.location.href="wcheckAccept-index.html";
 				}else {
+					loadclose();
 					alert('纭楠屾敹澶辫触');
 				}		
 			}

--
Gitblit v1.9.1