From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/voltageMbargraph.html | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/voltageMbargraph.html b/gx_tieta/WebRoot/mobil/voltageMbargraph.html
index 2dd55d7..91ec8b3 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>
@@ -93,7 +93,13 @@
</div>
</div>
</div>
-
+ <div data-role="main" class="ui-content">
+ <div class="ui-grid-c">
+ <div class="ui-block-a">鏈�澶�<span class="max"> </span></div>
+ <div class="ui-block-b">鏈�灏�<span class="min"> </span></div>
+ <div class="ui-block-c">骞冲潎<span class="avg"> </span></div>
+ <div class="ui-block-d">绱姞鍜�<span class="leijiasum"> </span></div>
+ </div>
<script type="text/javascript" src="mobilJs/echarts.js"></script>
<script type="text/javascript">
/* $('#alwaysRight').tap(function(){
@@ -129,6 +135,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