From b66ed691935b9369cb93c5397d562128591b09d7 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期五, 11 一月 2019 19:33:33 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/wapprovalBatt-index.html | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
index 378caf9..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,15 +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);
}
}
@@ -151,6 +154,7 @@
num :arrdata[i].num,
check_en:arrdata[i].check_en,
apply_date: arrdata[i].apply_date,
+ apply_name: arrdata[i].apply_name,
binf:{
StationId : arrdata[i].binf.StationId, // 鏈烘埧缂栧彿
StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName3+"-"+arrdata[i].binf.StationName4), // 鎷兼帴鏈烘埧鍚嶇О
--
Gitblit v1.9.1