From 8b6a2a67a0bf081252648ba46fffd5591b3afc98 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 11:46:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java b/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java
index 018be90..6ddf9e1 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java
@@ -263,16 +263,19 @@
// DateAxis axis = new DateAxis("Dates");
// Axis xAxis = lineModel.getAxis(AxisType.X);
- Axis xAxis = new CategoryAxis();
- xAxis.setTickAngle(-50);
- if(chartSensorsList.size()>30 && chartSensorsList.size()<240) {
- xAxis.setTickCount(200);
- }else if(chartSensorsList.size()>=240) {
- xAxis.setTickCount(240);
- }
+ Axis xAxis = new DateAxis();
+
lineModel.getAxes().put(AxisType.X, xAxis);
lineModel.setShowDatatip(true);
-// axis.setTickFormat("%b %d, %Y");
+ if (periodType == 1) {
+ xAxis.setTickFormat("%m-%d:%H");
+ }
+ if (periodType == 2) {
+ xAxis.setTickFormat("%m-%d");
+ }
+ if (periodType == 3) {
+ xAxis.setTickFormat("%m-%d");
+ }
// axis.setMax(DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm"));
// axis.setMin(minDate);
// axis.setTickFormat("%Y-%m-%d %H:%M");
--
Gitblit v1.9.2