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/mobil/conductanceMbargraph.html | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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(); //鍐呴樆
--
Gitblit v1.9.1