gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
zhangdongxu
2018-12-22 21:48:18 +08:00
parent 11d2f1c2e6 278ebbdeb7
commit 347ec045d3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java
View File

@@ -98,7 +98,7 @@ public class DynamicIndexController extends BaseController {
List<Map> results = new ArrayList<>(); List<Map> results = new ArrayList<>();
if (hour == null || hour <= 0) { if (hour == null || hour <= 0) {
hour = 1; hour = 2;
} }
Date now = new Date(); Date now = new Date();
@@ -175,7 +175,8 @@ public class DynamicIndexController extends BaseController {
List<Map> results = new ArrayList<>(); List<Map> results = new ArrayList<>();
if (hour == null || hour <= 0) { if (hour == null || hour <= 0) {
hour = 24; //hour = 24;
hour = 2;
} }
Date now = new Date(); Date now = new Date();
@@ -244,7 +245,7 @@ public class DynamicIndexController extends BaseController {
List results = new ArrayList<>(); List results = new ArrayList<>();
if (hour == null || hour <= 0) { if (hour == null || hour <= 0) {
hour = 24; hour = 2;
} }
Date now = new Date(); Date now = new Date();

2
src/main/webapp/WEB-INF/views/home.jsp.new
View File

@@ -28,7 +28,7 @@
sessionStorage.setItem("log_total","${log_total}"); sessionStorage.setItem("log_total","${log_total}");
sessionStorage.setItem("log_time_start","${log_time_start}"); sessionStorage.setItem("log_time_start","${log_time_start}");
sessionStorage.setItem("log_time_range","${log_time_range}"); 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"; //window.frames['mainFrame'].location="${ctx}/dashboard/logChart";
//国际化切换 //国际化切换
var lang = "${cookie.Language.value }".toLowerCase(); var lang = "${cookie.Language.value }".toLowerCase();