From c843c7f132db61df174c59477ce32a0ca2b5d21a Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 30 三月 2022 16:59:51 +0800
Subject: [PATCH] add

---
 src/main/webapp/container_status_mng.xhtml |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/container_status_mng.xhtml b/src/main/webapp/container_status_mng.xhtml
index a8ade4e..3c224cc 100644
--- a/src/main/webapp/container_status_mng.xhtml
+++ b/src/main/webapp/container_status_mng.xhtml
@@ -76,15 +76,22 @@
 
 	<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:panelGrid columns="16" styleClass="content2 grid-padding-bottom2">
 				<p:panel styleClass="center-header">
 					<p:selectOneMenu value="#{containerStatusMngController.periodType}">
 						<p:ajax event="change" listener="#{containerStatusMngController.onSelectPeriodType}" process="@form" update="@form"/>
-						<f:selectItem itemLabel="本日" itemValue="1" />
-						<f:selectItem itemLabel="本周" itemValue="2" />
-						<f:selectItem itemLabel="本月" itemValue="3" />
+						<f:selectItems
+								value="#{containerStatusMngController.dateRangeList}"
+								var="item" itemLabel="#{item.name}" itemValue="#{item.value}"/>
 					</p:selectOneMenu>
 				</p:panel>
+				<p:outputLabel value="温度最大值:#{containerStatusMngController.temperatureMap.get('maxTemperature')}"/>
+				<p:outputLabel value="温度最小值:#{containerStatusMngController.temperatureMap.get('minTemperature')}"/>
+				<p:outputLabel value="湿度最大值:#{containerStatusMngController.humidityMap.get('maxHumidity')}"/>
+				<p:outputLabel value="湿度最小值:#{containerStatusMngController.humidityMap.get('minHumidity')}"/>
+				<p:outputLabel value="浓度最大值:#{containerStatusMngController.vocMap.get('maxVoc')}"/>
+				<p:outputLabel value="浓度最小值:#{containerStatusMngController.vocMap.get('minVoc')}"/>
+
 			</p:panelGrid>
 			<p:panel style="padding-left: 35px !important;">
 				<p:selectOneButton value="#{containerStatusMngController.lineType}">
@@ -100,4 +107,4 @@
 		</h:form>
 	</p:dialog>
 </ui:composition>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.2