From f0bb5c3c5b95ec825e4e444b7688c595d5ebebc7 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期六, 29 十二月 2018 14:24:54 +0800
Subject: [PATCH] 修改。

---
 gx_tieta/WebRoot/mobil/voltageM.html |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/voltageM.html b/gx_tieta/WebRoot/mobil/voltageM.html
index d2cb3e5..72c6133 100644
--- a/gx_tieta/WebRoot/mobil/voltageM.html
+++ b/gx_tieta/WebRoot/mobil/voltageM.html
@@ -49,6 +49,13 @@
 		height:1px;
 		clear:both;
 	}
+	.ui-grid-c>.ui-block-a, .ui-grid-c>.ui-block-b, .ui-grid-c>.ui-block-c, .ui-grid-c>.ui-block-d {
+    width: 20%;
+    font-size: 0.9em;
+    }
+    .ui-grid-c>.ui-block-c, .ui-grid-c>.ui-block-d {
+    width:30%;
+    }
 </style>
 
 
@@ -57,7 +64,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>
@@ -80,10 +87,11 @@
 		</div>
 			     	  
 		<div data-role="main" class="ui-content">
-		     <div class="ui-grid-b">
-		         <div class="ui-block-a">MAX&nbsp;<span class="max">&nbsp;</span></div>
-		         <div class="ui-block-b">MIN&nbsp;<span class="min">&nbsp;</span></div>
-		         <div class="ui-block-c">AVG&nbsp;<span class="avg">&nbsp;</span></div>
+		     <div class="ui-grid-c">
+		         <div class="ui-block-a">鏈�澶у��<span class="max">&nbsp;</span></div>
+		         <div class="ui-block-b">鏈�灏忓��<span class="min">&nbsp;</span></div>
+		         <div class="ui-block-c">骞冲潎鍊�<span class="avg">&nbsp;</span></div>
+		         <div class="ui-block-d">绱姞鍜�<span class="leijiasum">&nbsp;</span></div>
 		     </div>
 		      <table data-role="table" data-mode="" class="ui-responsive"  id="myTable">
 		            <thead>
@@ -135,8 +143,10 @@
 	 
 	 function findtmp(){
 	 	var temp=getCookie("batt");
+	 	console.info(temp);
 	 	if(temp.length>0){
 	 		var batt=eval("("+temp+")");
+	 		$("#biaoti").text("鐢靛帇("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
 	 		//console.info(batt);
 	 		$.ajax({
 				url : "Batt_rtdataAction_serchByCondition",
@@ -215,6 +225,7 @@
 	function createCount(datas){
 		var temp=new Array();
 		var sum=0;
+		console.info(datas);
 		for(var i=0;i<datas.length;i++){
 			temp.push((datas[i].mon_vol).toFixed(3));
 			sum+=parseFloat(temp[i]);
@@ -222,11 +233,11 @@
 		var max=Math.max.apply(null, temp);
 		var min=Math.min.apply(null, temp);
 		var avg=(sum/temp.length).toFixed(3);
-	 
-	      
+	    sum=(sum).toFixed(2); 
         $(".max").text(max+'V');
         $(".min").text(min+'V');
-        $(".avg").text(avg+'V');     
+        $(".avg").text(avg+'V'); 
+        $(".leijiasum").text(sum+'V');    
 	} 
 	
 	function isMax(datas,flag){

--
Gitblit v1.9.1