From b2f21d080425b0ab6e5e6170914ca2c615e5d185 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 02 一月 2019 10:22:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/conductanceM.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/conductanceM.html b/gx_tieta/WebRoot/mobil/conductanceM.html
index 735eeb4..5203883 100644
--- a/gx_tieta/WebRoot/mobil/conductanceM.html
+++ b/gx_tieta/WebRoot/mobil/conductanceM.html
@@ -65,7 +65,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>
<div class="clear" ></div>
@@ -89,9 +89,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>
@@ -145,7 +145,8 @@
function findtmp(){
var temp=getCookie("batt");
if(temp.length>0){
- var batt=eval("("+temp+")");
+ var batt=eval("("+temp+")");
+ $("#biaoti").text("鐢靛("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
$.ajax({
url : "Batt_rtdataAction_serchByCondition",
async: true,
--
Gitblit v1.9.1