From 9887c97863d53f48bb39f73c366e86d5fcd0476e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 04 一月 2019 17:17:17 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 9 +++++----
gx_tieta/WebRoot/mobil/voltageMbargraph.html | 3 ++-
gx_tieta/WebRoot/mobil/temperatureMbargraph.html | 5 +++--
gx_tieta/WebRoot/mobil/internalresistanceMbargraph.html | 5 +++--
gx_tieta/WebRoot/mobil/conductanceMbargraph.html | 5 +++--
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index efa9644..3c203fa 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -582,15 +582,15 @@
var rs = JSON.parse(res.result);
var resData = [];
var isUpdateTbl = false;
+ //console.log(Page.all);
if(rs.code == 1) {
var data = rs.data;
- // console.log(data);
+ //console.log(data);
// 閬嶅巻鏁版嵁鐨勫��
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = formaterResData(_data);
-
- if(_data.apply_note != Page.all) {
+ if(_data.apply_note &&_data.apply_note != Page.all) {
resData.push(_tmp);
Page.setAll(_data.apply_note);
isUpdateTbl = true;
@@ -598,8 +598,9 @@
}
}else {
Page.setAll(0);
+ isUpdateTbl = true;
}
- // console.log(isUpdateTbl);
+ //console.log(isUpdateTbl);
if(isUpdateTbl) {
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
diff --git a/gx_tieta/WebRoot/mobil/conductanceMbargraph.html b/gx_tieta/WebRoot/mobil/conductanceMbargraph.html
index 13773d2..4749bb2 100644
--- a/gx_tieta/WebRoot/mobil/conductanceMbargraph.html
+++ b/gx_tieta/WebRoot/mobil/conductanceMbargraph.html
@@ -82,7 +82,7 @@
background-image: linear-gradient(#ffefaa,#ffe155);
font-weight: bold; color: #333333; text-decoration: none;">杩斿洖</a>
- <h1>鐢靛</h1>
+ <h1 id="biaoti">鐢靛</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style=" background-color: none; color: #333333; text-decoration: none;" >
<h1 id="alwaysRight">鍏朵粬</h1>
@@ -159,7 +159,8 @@
var model = eval("("+data.result+")");
//model = eval("("+model.result+")");
datas = model.data;
-
+ $("#biaoti").text("鐢靛("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
+
mon_vol = new Array(); //鐢靛帇
mon_tmp = new Array(); //娓╁害
mon_res = new Array(); //鍐呴樆
diff --git a/gx_tieta/WebRoot/mobil/internalresistanceMbargraph.html b/gx_tieta/WebRoot/mobil/internalresistanceMbargraph.html
index c5943b8..a90ee79 100644
--- a/gx_tieta/WebRoot/mobil/internalresistanceMbargraph.html
+++ b/gx_tieta/WebRoot/mobil/internalresistanceMbargraph.html
@@ -75,7 +75,7 @@
<a href="control.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left" target="_top" style="padding:0.5em 0.5em; /*background-color: #e9e9e9; color: #333333;*/color:#fff;border:1px solid #3a755a;; text-decoration: none;">杩斿洖</a>
- <h1>鍐呴樆</h1>
+ <h1 id="biaoti">鍐呴樆</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style=" background-color: none; color: #ffffff; text-decoration: none;" >
<h1 id="alwaysRight">鍏朵粬</h1>
@@ -147,7 +147,8 @@
var model = eval("("+data.result+")");
//model = eval("("+model.result+")");
datas = model.data;
-
+ $("#biaoti").text("鍐呴樆("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
+
mon_vol = new Array(); //鐢靛帇
mon_tmp = new Array(); //娓╁害
mon_res = new Array(); //鍐呴樆
diff --git a/gx_tieta/WebRoot/mobil/temperatureMbargraph.html b/gx_tieta/WebRoot/mobil/temperatureMbargraph.html
index be80e08..fa1772c 100644
--- a/gx_tieta/WebRoot/mobil/temperatureMbargraph.html
+++ b/gx_tieta/WebRoot/mobil/temperatureMbargraph.html
@@ -59,7 +59,7 @@
background-image: -o-linear-gradient(#5f9cc5,#396b9e);
background-image: linear-gradient(#5f9cc5,#396b9e); border: 1px solid #044062; color: #fff; text-decoration: none;">杩斿洖</a>
- <h1>娓╁害</h1>
+ <h1 id="biaoti">娓╁害</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style=" background-color: none; color: #333333; text-decoration: none;" >
<h1 id="alwaysRight">鍏朵粬</h1>
@@ -133,7 +133,8 @@
var model = eval("("+data.result+")");
//model = eval("("+model.result+")");
datas = model.data;
-
+ $("#biaoti").text("娓╁害("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
+
mon_vol = new Array(); //鐢靛帇
mon_tmp = new Array(); //娓╁害
mon_res = new Array(); //鍐呴樆
diff --git a/gx_tieta/WebRoot/mobil/voltageMbargraph.html b/gx_tieta/WebRoot/mobil/voltageMbargraph.html
index 2dd55d7..469aa14 100644
--- a/gx_tieta/WebRoot/mobil/voltageMbargraph.html
+++ b/gx_tieta/WebRoot/mobil/voltageMbargraph.html
@@ -59,7 +59,7 @@
background-image: -o-linear-gradient(#444,#2d2d2d);
background-image: linear-gradient(#444,#2d2d2d); border:1px solid #111; color: #fff; text-decoration: none;">杩斿洖</a>
- <h1>鍗曚綋鐢靛帇</h1>
+ <h1 id="biaoti">鍗曚綋鐢靛帇</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style=" background-color: none; color: #333333; text-decoration: none;" >
<h1 id="alwaysRight">鍏朵粬</h1>
<div class="clear"></div>
@@ -129,6 +129,7 @@
var model = eval("("+data.result+")");
//model = eval("("+model.result+")");
datas = model.data;
+ $("#biaoti").text("鐢靛帇("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
mon_vol = new Array(); //鐢靛帇
mon_tmp = new Array(); //娓╁害
--
Gitblit v1.9.1