From 53b98bf8455152fdc761e60be9fad116ac2b774f Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 十二月 2018 14:25:55 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/temperatureM.html | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/temperatureM.html b/gx_tieta/WebRoot/mobil/temperatureM.html
index de82ea2..902b561 100644
--- a/gx_tieta/WebRoot/mobil/temperatureM.html
+++ b/gx_tieta/WebRoot/mobil/temperatureM.html
@@ -56,7 +56,7 @@
<div data-role="page">
<div data-role="header" data-position="fixed">
<a href="control.html" class="ui-btn ui-corner-all ui-shadow ui-icon-arrow-l ui-btn-icon-left" target="_top" style="padding-bottom:0.7em; padding-top:0.7em;">杩斿洖</a>
- <h1>娓╁害</h1>
+ <h1 id="biaoti">娓╁害</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style="padding-bottom:-0.7em; padding-top:-0.7em;" >
<h1 id="alwaysRight">鏇村</h1>
<h1 class="full-width">
@@ -79,9 +79,9 @@
<div data-role="main" class="ui-content">
<div class="ui-grid-b">
- <div class="ui-block-a">MAX <span class="max"> </span></div>
- <div class="ui-block-b">MIN <span class="min"> </span></div>
- <div class="ui-block-c">AVG <span class="avg"> </span></div>
+ <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>
<table data-role="table" class="ui-responsive" data-mode="">
<thead>
@@ -171,6 +171,7 @@
if(temp.length>0){
var batt=eval("("+temp+")");
//console.info(batt);
+ $("#biaoti").text("娓╁害("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
$.ajax({
url : "Batt_rtdataAction_serchByCondition",
async: true,
--
Gitblit v1.9.1