From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control_battparm.html | 67 ++++++++-------------------------
1 files changed, 16 insertions(+), 51 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control_battparm.html b/gx_tieta/WebRoot/mobil/control_battparm.html
index d900fb4..577ce25 100644
--- a/gx_tieta/WebRoot/mobil/control_battparm.html
+++ b/gx_tieta/WebRoot/mobil/control_battparm.html
@@ -143,13 +143,10 @@
pageAll:0,
};
- var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿',
- '鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','缁忓害','缁村害','鍦板潃','鐢宠鏃堕棿','鐢宠鐘舵��','鐢宠浜�','瀹℃牳浜�'];
+ var arrTh = [ '璁惧ID', '鏈烘埧鍚嶇О', '鐢垫睜鏍囩О瀹归噺','鐢垫睜鏍囩О鍐呴樆','鐢垫睜缁勬暟','姣忕粍鐢垫睜鍗曚綋鏁伴噺','鍗曚綋鏍囩О鐢靛帇','鐢垫睜缁勭鏍囩О鐢靛帇','鐢垫睜鏍囩О娓╁害','鐢垫睜娴厖鐢靛帇闃堝��','鐢垫睜娴厖鐢垫祦闃堝��','鍦ㄧ嚎鐢靛帇浣庨槇鍊�','鐢垫睜缁勮繛鎺ョ被鍨�'];
dataArr = [];
- var startTime = "1980-01-01";
- var endTime = new Date().format('yyyy-MM-dd');
var tbl = $('.tbl-container');
- var temp = getCookie("wapproval");
+ var temp = getCookie("control_battparm");
temp = JSON.parse(temp);
console.info(temp);
createTbl(tbl, arrTh, dataArr);
@@ -157,58 +154,26 @@
Page.pageCurr=1;
console.info(temp);
setBattLife();
- battnumber();
//searchBattLife();
//console.info($("#getnumber").val());
});
function setBattLife(){
data = temp;
- var index = 0;
- for(var i=0;i<data.length;i++){
- arrTd[index++] = data[i].binf.StationId;
- arrTd[index++] = data[i].binf.StationName1;
- arrTd[index++] = data[i].binf.StationName2;
- arrTd[index++] = data[i].binf.StationName5;
- arrTd[index++] = data[i].binf.StationName3;
- arrTd[index++] = data[i].binf.StationName4;
- arrTd[index++] = data[i].binf.StationIp;
- arrTd[index++] = data[i].binf.FBSDeviceId;
- arrTd[index++] = data[i].binf.FbsDeviceIp;
- arrTd[index++] = data[i].binf.FbsDeviceIp_YM;
- arrTd[index++] = data[i].binf.FbsDeviceIp_WG;
- arrTd[index++] = data[i].binf.FBSDeviceName;
- arrTd[index++] = data[i].binf.GroupIndexInFBSDevice;
- arrTd[index++] = data[i].binf.BattGroupId;
- arrTd[index++] = data[i].binf.BattGroupNum;
- arrTd[index++] = data[i].binf.BattGroupName;
- arrTd[index++] = data[i].binf.FloatVolLevel;
- arrTd[index++] = data[i].binf.OfflineVolLevel;
- arrTd[index++] = data[i].binf.BattFloatCurrent;
- arrTd[index++] = data[i].binf.MonCount;
- arrTd[index++] = data[i].binf.MonCapStd;
- arrTd[index++] = data[i].binf.MonVolStd;
- arrTd[index++] = data[i].binf.MonResStd;
- arrTd[index++] = data[i].binf.MonSerStd;
- arrTd[index++] = data[i].binf.MonVolLowToAvg;
- arrTd[index++] = data[i].binf.Load_curr;
- arrTd[index++] = data[i].binf.DisCurrMax;
- arrTd[index++] = data[i].binf.station_phone;
- arrTd[index++] = data[i].binf.BattProducer;
- arrTd[index++] = data[i].binf.BattModel;
- arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);
- arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
- arrTd[index++] = data[i].binf.install_user;
- arrTd[index++] = data[i].longitude;//缁忓害
- arrTd[index++] = data[i].latitude;//绾害
- arrTd[index++] = data[i].address;//鍦板潃
- arrTd[index++] = data[i].apply_date;
- arrTd[index++] = check(data[i].check_en);
- arrTd[index++] = data[i].apply_name;
- arrTd[index++] = data[i].confirm_name;
- //arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>瀹℃牳</a>';
- }
-
+ var index=0;
+ arrTd[index++] = data.dev_id;
+ arrTd[index++] = data.StationName;
+ arrTd[index++] = data.STD_CAP;
+ arrTd[index++] = data.STD_RES;
+ arrTd[index++] = data.BattGroupCount;
+ arrTd[index++] = data.EachGroupBattCount;
+ arrTd[index++] = data.MonomerVol;
+ arrTd[index++] = data.GroupVol;
+ arrTd[index++] = data.BattTemp;
+ arrTd[index++] = data.FloatChargeVol;
+ arrTd[index++] = data.FloatChargeCurr;
+ arrTd[index++] = data.OnlineVolLow;
+ arrTd[index++] = data.GroupConnType;
createTbl(tblCon, arrTh, arrTd);
}
--
Gitblit v1.9.1