From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/control.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/js/control.js b/gx_tieta/WebRoot/js/control.js
index 8947cdd..76997e6 100644
--- a/gx_tieta/WebRoot/js/control.js
+++ b/gx_tieta/WebRoot/js/control.js
@@ -496,8 +496,8 @@
}
}
}
- var tempmax = (Math.max.apply(null,ydata)*1.25).toFixed(3);
- if(tempmax < max){
+ var tempmax = (Math.max.apply(null,ydata)*1.1).toFixed(3);
+ if(tempmax > max){
max = tempmax;
//max = (tempmax*1.25).toFixed(1);
}
--
Gitblit v1.9.1