From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control_sysparm.html | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control_sysparm.html b/gx_tieta/WebRoot/mobil/control_sysparm.html
index b463100..47c929e 100644
--- a/gx_tieta/WebRoot/mobil/control_sysparm.html
+++ b/gx_tieta/WebRoot/mobil/control_sysparm.html
@@ -143,7 +143,7 @@
pageAll:0,
};
- var arrTh = [ '璁惧ID', '璁惧鍚嶇О', '鎬荤画鑸椂闂�','淇濅竴娆′笅鐢电画鑸椂闂�','鐢垫祦閽抽噺绋�','涓�娆′笅鐢电數鍘�','浜屾涓嬬數鐢靛帇','DCDC妯″潡鏁伴噺','鍗曚綋鏁版嵁鏉ユ簮绫诲瀷','鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺','鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�','鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�','鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�','鑳屽厜鏃堕暱','鍋滅數鍏呯數鐢垫祦'];
+ var arrTh = [ '璁惧ID', '璁惧鍚嶇О', '鎬荤画鑸椂闂�','淇濅竴娆′笅鐢电画鑸椂闂�','鐢垫祦閽抽噺绋�','涓�娆′笅鐢电數鍘�','浜屾涓嬬數鐢靛帇','DCDC妯″潡鏁伴噺','鍗曚綋鏁版嵁鏉ユ簮绫诲瀷','缁埅缁勬暟','缁埅涓嬮檺','缁埅鍚姩涓嬮檺','鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�','鑳屽厜鏃堕暱','鍋滅數鍏呯數鐢垫祦'];
dataArr = [];
var tbl = $('.tbl-container');
var temp = getCookie("control_parm");
@@ -163,19 +163,19 @@
var index=0;
arrTd[index++] = data.dev_id;
arrTd[index++] = data.stationName;
- arrTd[index++] = data.GroupVolRange;
- arrTd[index++] = data.GroupVolSorce;
- arrTd[index++] = data.CurrentRange;
- arrTd[index++] = Math.ceil(data.CurrentTyte/10);
- arrTd[index++] = Math.ceil(data.MonomerOrder/10);
+ arrTd[index++] = data.GroupVolRange+"鍒嗛挓";
+ arrTd[index++] = data.GroupVolSorce+"鍒嗛挓";
+ arrTd[index++] = data.CurrentRange+"A";
+ arrTd[index++] = Math.ceil(data.CurrentTyte/10)+"V";
+ arrTd[index++] = Math.ceil(data.MonomerOrder/10)+"V";
arrTd[index++] = data.LoaderCount;//DC鏁伴噺
arrTd[index++] = data.DtCardCount;
arrTd[index++] = data.POF_BG_Boost_Cnt;
- arrTd[index++] = data.POF_BG_Boost_VolStop;
- arrTd[index++] = data.POF_BG_Boost_VolStart;
+ arrTd[index++] = data.POF_BG_Boost_VolStop+"V";
+ arrTd[index++] = data.POF_BG_Boost_VolStart+"V";
arrTd[index++] = data.MajorBattGroupNum;
- arrTd[index++] = data.BackLightTime;
- arrTd[index++] = data.PowerBreakChargeCurr;
+ arrTd[index++] = data.BackLightTime+"鍒嗛挓";
+ arrTd[index++] = data.PowerBreakChargeCurr+"A";
createTbl(tblCon, arrTh, arrTd);
}
--
Gitblit v1.9.1