From 58a598834e4b87d6d0522b2d3374e478fb8dfa03 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.11>
Date: 星期二, 16 十月 2018 14:37:06 +0800
Subject: [PATCH] 电池信息配置页面中添加基站号码的查询和修改功能
---
gx_tieta/WebRoot/control.jsp | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6d70783..62da258 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1013,29 +1013,32 @@
var unit = "";
if(lname == 'Voltage'){
unit ="V";
- max = batt.MonVolStd*1.25;
+ /* max = batt.MonVolStd*1.25;
var tempmax = Math.max.apply( Math, array);
if(tempmax > max){
max = tempmax*1.25;
- }
+ } */
+ max = Math.max.apply( Math, array)*1.1;
max = max.toFixed(3);
}else if(lname == 'Resistance'){
unit = "m惟";
- max = (batt.MonResStd*1.25);
+ /* max = (batt.MonResStd*1.25);
max = 10;
var tempmax = Math.max.apply( Math, array)*1.25;
if(tempmax<max){
max = tempmax;
- }
+ } */
+ max = Math.max.apply( Math, array)*1.1;
max = (max).toFixed(3);
}else if(lname == 'Temperature'){
unit = "鈩�";
- max = (Math.max.apply( Math, array)*1.25).toFixed(3);
+ max = (Math.max.apply( Math, array)*1.5).toFixed(3);
}else if(lname == 'Conductance'){
- max = (batt.MonSerStd*1.25).toFixed(3);
+ //max = (batt.MonSerStd*1.25).toFixed(3);
+ max = (Math.max.apply( Math, array)*1.1).toFixed(3);
}else if(lname == 'MonJHCurr') {
unit = "mA";
- max = (Math.max.apply( Math, array)*1.25).toFixed(3);
+ max = (Math.max.apply( Math, array)*1.1).toFixed(3);
}
//console.info("max:"+max+" min:"+min);
if(lname=='Resistance' || lname=='Temperature'){
@@ -1669,17 +1672,20 @@
var array = getArray(lname);
var batt = getBatt();
var min = (Math.min.apply( Math, array)*0.9).toFixed(3);
- var max = 0 ;
+ var max = (Math.max.apply( Math, array)*1.1).toFixed(3);
//console.info(batt);
if(lname == 'Voltage'){
- max = (batt.MonVolStd*1.25).toFixed(3);
+ //max = (batt.MonVolStd*1.25).toFixed(3);
+ max = (Math.max.apply( Math, array)*1.1).toFixed(3);
}else if(lname == 'Resistance'){
//max = (batt.MonResStd*1.25).toFixed(3);
- max =10;
+ //max =10;
+ max = (Math.max.apply( Math, array)*1.1).toFixed(3);
}else if(lname == 'Temperature'){
- max = (Math.max.apply( Math, array)*1.25).toFixed(3);
+ max = (Math.max.apply( Math, array)*1.5).toFixed(3);
}else if(lname == 'Conductance'){
- max = (batt.MonSerStd*1.25).toFixed(3);
+ //max = (batt.MonSerStd*1.25).toFixed(3);
+ max = (Math.max.apply( Math, array)*1.1).toFixed(3);
}
//console.info("max:"+max+" min:"+min);
if(lname=='Resistance' || lname=='Temperature'){
--
Gitblit v1.9.1