From 7f4cff9a2ec4cb56b1628c09568a18fb78d71cbf Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 17:34:51 +0800
Subject: [PATCH] 修改

---
 gx_tieta/WebRoot/mobil/hcheckAccpet-index.html |   16 ++++++++++++----
 gx_tieta/WebRoot/mobil/hcheckAccpet.html       |    8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
index 091179c..377b812 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
@@ -63,10 +63,13 @@
 			$('#battList').on('click', 'ul li', function () {
 				aLi = $(this).index();
 				console.info(aLi);
+				console.info(stationlist);
 				station = getbatt(stationlist,aLi);
 				var arr=setarrbatt(arrdata,station);
 				console.info(arr);
-				window.location.href="hcheckAccpet.html";
+				if(arr){
+					//window.location.href="hcheckAccpet.html";
+				}
 			});		
 		});
 		
@@ -92,6 +95,7 @@
 		
 		// 鏌ヨ鍐呭
 		function searchBattLife(){
+			loadshow();
 			var temp = JSON.stringify(getcreatArr());
 			console.info(temp);
 			arrTd = new Array();
@@ -120,17 +124,21 @@
 		 						}
 		 					}
 	 						//console.info(model);
-	 						stationlist=model;		
+	 								
 	 					}
+	 					stationlist=model;
 	 					//console.info(model);
 	 					//if(Page.pageCurr==1){
+	 						loadclose();
 	 						createUl($('#battList'),model);
 	 					//}else{
 	 						//addteUl($('#battList'),model);
 	 					//}
 	 				}
 	 			}
-	 		});			 
+	 			
+	 		});	
+	 		loadclose();		 
 	 	}	
 	 	
 	 	function setarrbatt(arrdata,station){
@@ -208,7 +216,7 @@
 			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){
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet.html b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
index 40fdd03..75b3131 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
@@ -220,9 +220,9 @@
     var startTime = "1980-01-01";
     var endTime = new Date().format('yyyy-MM-dd');
     var tbl = $('.tbl-container');
-    var temp = getCookie("wapproval");
+    var temp = getCookie("happroval");
 	temp = JSON.parse(temp);
-	//console.info(temp);
+	console.info(temp);
     createTbl(tbl, arrTh, dataArr);
 	$(document).ready(function(){
 		Page.pageCurr=1;		
@@ -241,7 +241,7 @@
 	
 	$("#jizhandata").click(function(){
 			// 鏌ョ湅鏈烘埧淇℃伅
-			var temp = getCookie("wapproval");
+			var temp = getCookie("happroval");
 			data = JSON.parse(temp);
 			var lng = data[0].longitude;							// 鑾峰彇缁忓害
 			var lat = data[0].latitude;							// 鑾峰彇绾害
@@ -290,7 +290,7 @@
 	
 	function battnumber(){
        var selected=''
-      // console.info(temp);
+       console.info(temp);
        if(temp.length>0){
 	       for(var i=0;i<temp.length;i++){
 	       		selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';	

--
Gitblit v1.9.1