From c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 10 一月 2019 09:09:15 +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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
index d5db535..5a20fae 100644
--- a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
+++ b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
@@ -121,9 +121,10 @@
}
}
console.info(model);
- stationlist=model;
+
}
}
+ stationlist=model;
createUl($('#battList'),model);
}
}
@@ -151,9 +152,10 @@
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.StationName5+"-"+arrdata[i].binf.StationName3), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName3+"-"+arrdata[i].binf.StationName4), // 鎷兼帴鏈烘埧鍚嶇О
StationName1 :arrdata[i].binf.StationName1, // 鐪�
StationName2 : arrdata[i].binf.StationName2, // 甯�
StationName5 : arrdata[i].binf.StationName5, // 鍖�/鍘�
@@ -204,8 +206,9 @@
function createUl(ulCon, dataList) {
//console.info(index);
// 娓呯悊瀹瑰櫒涓嬬殑ul
- ulCon.find('ul').remove();
-
+ if(Page.pageCurr==1){
+ ulCon.find('ul').remove();
+ }
// 鍒涘缓ul
var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
--
Gitblit v1.9.1