From acd2fbfdd949d314ba6f0b85e28b67689d0a62ef Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 11:38:30 +0800
Subject: [PATCH] 修改传感器信息的图
---
src/main/java/com/nanometer/smartlab/service/SysContainerSensorsService.java | 2 ++
src/main/webapp/container_status_mng.xhtml | 2 +-
src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java | 19 +++++++++++--------
3 files changed, 14 insertions(+), 9 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");
diff --git a/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsService.java b/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsService.java
index b174c43..2ed59fd 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsService.java
@@ -27,4 +27,6 @@
List<ContainerStatusMngDto> selectInfo(Map<String, Object> params) throws RuntimeException;
int countAll(Map<String, Object> params) throws RuntimeException;
+
+ //获得
}
diff --git a/src/main/webapp/container_status_mng.xhtml b/src/main/webapp/container_status_mng.xhtml
index e7c85ec..a8ade4e 100644
--- a/src/main/webapp/container_status_mng.xhtml
+++ b/src/main/webapp/container_status_mng.xhtml
@@ -74,7 +74,7 @@
</p:panel>
</h:form>
- <p:dialog modal="true" header="查看" dynamic="true" appendTo="@(body)" id="dialog" widgetVar="dialog" resizable="false" width="1000">
+ <p:dialog modal="true" header="查看" dynamic="true" appendTo="@(body)" id="dialog" widgetVar="dialog" resizable="false" width="1500">
<h:form id="dialogForm" styleClass="container-status-form" style="padding-bottom: 40px">
<p:panelGrid columns="2" styleClass="content2 grid-padding-bottom2">
<p:panel styleClass="center-header">
--
Gitblit v1.9.2