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/batt-approve-index.html | 119 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 40 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approve-index.html b/gx_tieta/WebRoot/mobil/batt-approve-index.html
index 90e652a..5dd2a1d 100644
--- a/gx_tieta/WebRoot/mobil/batt-approve-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-approve-index.html
@@ -45,6 +45,16 @@
</div>
</div>
</body>
+ <div data-role="main" class="ui-content">
+ <div class="tbl-container"></div>
+ </div>
+ <script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+ <script type="text/javascript" src="js/tbl.js"></script>
+ <script type="text/javascript" src="js/panel.js"></script>
+ <script type="text/javascript" src="mobilJs/base.js"></script>
<script type="text/javascript" src="js/battNav.js"></script>
<script type="text/javascript">
var stationlist = new Array();
@@ -54,7 +64,7 @@
setCookie("station",null);
setCookie("batt",null);
searchBattLife();
- getnumber();//鏌ヨ鎵�鏈夌殑閫氳鎶�鏈苟鏀惧叆缂撳瓨銆�
+
});
// 鐐瑰嚮鏈烘埧浜嬩欢
@@ -70,11 +80,29 @@
});
});
+ // 鐩戞祴椤甸潰婊氬姩鍒版枃妗ｇ殑搴曢儴
+ $(document).on('scrollstop', function() {
+ var tblCont = $('.tbl-container');
+ var loading = $('.ui-loading');
+ var scrollTop = $(this).scrollTop();
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ //console.info(pageNum);
+ if(loading.length == 0 ) {
+ var winHt = $(window).height();
+ var docHt = $(this).height();
+ var shiftHt = docHt - winHt;
+ if(shiftHt < scrollTop || shiftHt == scrollTop) {
+ Page.pageCurr++;
+ searchBattLife();
+ }
+ }
+ });
+
var arrTd = new Array();
var arrdata = new Array();
var Page = {
- pageSize:20, //姣忛〉鐨勮鏁�
+ pageSize:100, //姣忛〉鐨勮鏁�
pageCurr:1, //褰撳墠椤电爜鏁�
pageAll:0,
};
@@ -82,30 +110,14 @@
function getcreatArr(){
obj = {
apply_en : 1,
+ check_en:0,
binf : {
page:Page,
}
}
return obj;
}
- function getnumber(){ //鍚戣幏鍙栨墍鏈夐�氳璁℃暟骞跺瓨鍏ョ紦瀛�
- $.ajax({
- type: 'post',
- async: true,
- url: 'Battinf_applyAction!devCommNum',
- data: null,
- dataType: 'json',
- success:function(data) {
- data = JSON.parse(data.result);
- if(data.code==1){
- console.info(data.data);
- var json =JSON.stringify(data.data);
- setCookie("numberget",json);
- //return data.data;
- }
- }
- });
- }
+
// 鏌ヨ鍐呭
function searchBattLife(){
var temp = JSON.stringify(getcreatArr());
@@ -119,38 +131,45 @@
data: "json="+temp,
dataType: 'json',
success:function(data) {
+ console.info(data);
data = JSON.parse(data.result);
if(data.code!=0&&data.data.length>0){
data=data.data
var model = new Array();
console.info(data);
for(var i=0;i<data.length;i++){
- arrdata.push(data[i]);//瀛樺偍鏁版嵁
- if(model.length==0){
- model.push(data[i].binf.StationName);
- }else{
- if(model[model.length-1]!=data[i].binf.StationName){
- model.push(data[i].binf.StationName);
- }
- }
- console.info(model);
- stationlist=model;
+ //if(data[i].check_en!=1){
+ arrdata.push(data[i]);//瀛樺偍鏁版嵁
+ if(model.length==0){
+ model.push(data[i].binf.StationName);
+ }else{
+ if(model[model.length-1]!=data[i].binf.StationName){//鑻ヤ笉閲嶅锛屽垯PUSH杩涘幓
+ model.push(data[i].binf.StationName);
+ }
+ }
+ console.info(model);
+
+ // }
+ }
+ stationlist=model;
+ if(Page.pageCurr==1){
+ createUl($('#battList'),model);
+ }else{
+ addUl($('#battList'),model);
}
- createUl($('#battList'),model);
}
-
}
});
}
function setarrbatt(arrdata,station){
- console.info(arrdata);
- if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
- var arr= creatYanshouObj(arrdata,station);//鐢宠楠屾敹鏂规硶銆�
- return arr;
- }else{
- alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
- }
+ console.info(arrdata);
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ var arr= creatYanshouObj(arrdata,station);//鐢宠楠屾敹鏂规硶銆�
+ return arr;
+ }else{
+ alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+ }
}
function creatYanshouObj(arrdata,station){ //閫氳繃鐐瑰嚮鏈烘埧淇℃伅锛坰tationid锛夛紝鑾峰彇璇ユ満鎴跨數姹犵粍
//var StationId = arrdata[index].binf.StationId;
@@ -209,7 +228,7 @@
console.info(arr);
//applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
var json=window.JSON.stringify(arr);
- setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ setCookie("eleparm1",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
return arr;
}
@@ -236,6 +255,26 @@
ulCon.append(_ul).trigger('create');
loadclose();
}
+ function addUl(ulCon, dataList) {
+
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i]+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
//鑾峰彇褰撳墠閫変腑鐨刡att
function getbatt(arr,index){
--
Gitblit v1.9.1