From 36dcc192d70e52978e78c9b6e6cebec62a20fa51 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 10 一月 2019 15:13:55 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/hcheckAccpet-index.html | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
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);
--
Gitblit v1.9.1