From bba339575f11b6922b7cadda4eca2dddaa728e08 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期四, 03 一月 2019 16:11:28 +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 | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approve-index.html b/gx_tieta/WebRoot/mobil/batt-approve-index.html
index fa21748..1c493a4 100644
--- a/gx_tieta/WebRoot/mobil/batt-approve-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-approve-index.html
@@ -125,32 +125,33 @@
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;
+ }
}
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;
--
Gitblit v1.9.1