From 278ebbdeb7f9635bffa2fdd7fc983bb4cd5c82bf Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Sat, 22 Dec 2018 21:46:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BD=BF=E8=BD=AE=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=95=8C=E9=9D=A2=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=98=AF=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/dynamicpage/DynamicIndexController.java | 7 ++++--- src/main/webapp/WEB-INF/views/home.jsp.new | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java index 6c39d5fa0..afcda50a7 100644 --- a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java +++ b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java @@ -98,7 +98,7 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 1; + hour = 2; } Date now = new Date(); @@ -175,7 +175,8 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 24; + //hour = 24; + hour = 2; } Date now = new Date(); @@ -244,7 +245,7 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 24; + hour = 2; } Date now = new Date(); diff --git a/src/main/webapp/WEB-INF/views/home.jsp.new b/src/main/webapp/WEB-INF/views/home.jsp.new index 77f5ec52f..274323d77 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp.new +++ b/src/main/webapp/WEB-INF/views/home.jsp.new @@ -28,7 +28,7 @@ sessionStorage.setItem("log_total","${log_total}"); sessionStorage.setItem("log_time_start","${log_time_start}"); sessionStorage.setItem("log_time_range","${log_time_range}"); - window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&baseNum=" + baseNum; + window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&hour=2&baseNum=" + baseNum; //window.frames['mainFrame'].location="${ctx}/dashboard/logChart"; //国际化切换 var lang = "${cookie.Language.value }".toLowerCase();