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

实时报表：

Browse Source 
1.ASN、HttpsUrl、用户行为统计报表界面,时间范围筛选条件进行了修改范围策略
2.事件报表,增加了专项名称列表的回显,时间范围筛选条件进行了范围策略修改
3.解决了事件监测页面导出完成后再搜索报错的问题
This commit is contained in:
lihaochen
2018-12-27 18:06:07 +08:00
parent 09705aca19
commit f4acc8f063
9 changed files with 138 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/report/NtcEventBlockController.java
View File

@@ -136,6 +136,8 @@ public class NtcEventBlockController extends BaseController {
Map<String, String> noExportMap = new HashMap<String, String>(); Map<String, String> noExportMap = new HashMap<String, String>();
// --------------------------- // ---------------------------
PageLog<NtcEventMonitorOrBlockReport> page = new PageLog<NtcEventMonitorOrBlockReport>(request, response); PageLog<NtcEventMonitorOrBlockReport> page = new PageLog<NtcEventMonitorOrBlockReport>(request, response);
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize()); params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo()); params.put("pageNo", page.getPageNo());

6
src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java
View File

@@ -94,7 +94,7 @@ public class NtcEventKeyProtectionController extends BaseController {
params.put("taskIds", log.getTaskIds()); params.put("taskIds", log.getTaskIds());
} }
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_KEYPROTECTION_Report;
// String url = // String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection"; // "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection";
String recv = HttpClientUtil.getMsg(url, params, request); String recv = HttpClientUtil.getMsg(url, params, request);
@@ -135,6 +135,8 @@ public class NtcEventKeyProtectionController extends BaseController {
Map<String, String> noExportMap = new HashMap<String, String>(); Map<String, String> noExportMap = new HashMap<String, String>();
// --------------------------- // ---------------------------
PageLog<NtcEventKeyProtectionReport> page = new PageLog<NtcEventKeyProtectionReport>(request, response); PageLog<NtcEventKeyProtectionReport> page = new PageLog<NtcEventKeyProtectionReport>(request, response);
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize()); params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo()); params.put("pageNo", page.getPageNo());
@@ -173,7 +175,7 @@ public class NtcEventKeyProtectionController extends BaseController {
log.setSearchTaskStartTime(searchTaskStartTime); log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime); log.setSearchTaskEndTime(searchTaskEndTime);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_KEYPROTECTION_Report;
// String url = // String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection"; // "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection";
String recv = HttpClientUtil.getMsg(url, params, request); String recv = HttpClientUtil.getMsg(url, params, request);

2
src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java
View File

@@ -141,6 +141,8 @@ public class NtcEventMonitorController extends BaseController {
Map<String, String> noExportMap = new HashMap<String, String>(); Map<String, String> noExportMap = new HashMap<String, String>();
// --------------------------- // ---------------------------
PageLog<NtcEventMonitorOrBlockReport> page = new PageLog<NtcEventMonitorOrBlockReport>(request, response); PageLog<NtcEventMonitorOrBlockReport> page = new PageLog<NtcEventMonitorOrBlockReport>(request, response);
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize()); params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo()); params.put("pageNo", page.getPageNo());

9
src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
View File

@@ -158,6 +158,13 @@
return false; return false;
} }
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
</script> </script>
</head> </head>
<body> <body>
@@ -200,7 +207,7 @@
<%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${nowTime}'});"/> --%> <%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${nowTime}'});"/> --%>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/> value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/>
</div> </div>
</div> </div>
<div class="pull-left"> <div class="pull-left">

10
src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
View File

@@ -44,6 +44,14 @@
}; };
$("div#"+content+"").printArea(options); $("div#"+content+"").printArea(options);
} }
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
</script> </script>
</head> </head>
<body> <body>
@@ -86,7 +94,7 @@
<%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> <%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" <input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/> value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/>
</div> </div>
</div> </div>
<div class="pull-left"> <div class="pull-left">

64
src/main/webapp/WEB-INF/views/report/eventBlockList.jsp
View File

@@ -3,11 +3,12 @@
<html> <html>
<head> <head>
<title> <title>
<spring:message code="https_url_report"/> <spring:message code="ntc_event_block_report"/>
</title> </title>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
returnBack();
//reset //reset
//reset //reset
$("#resetBtn").on("click",function(){ $("#resetBtn").on("click",function(){
@@ -24,7 +25,7 @@
// $(this).find("th").eq(0).width=300; // $(this).find("th").eq(0).width=300;
if(index > 0 ){ if(index > 0 ){
var title=$(this).find("td").eq(0).attr("title"); var title=$(this).find("td").eq(0).attr("title");
console.log(title); // console.log(title);
if(title != undefined && title != null){ if(title != undefined && title != null){
if(title.length > 80){ if(title.length > 80){
$(this).find("td").eq(0).text(title.substring(0,80)); $(this).find("td").eq(0).text(title.substring(0,80));
@@ -46,9 +47,32 @@
$("#"+openId).show(); $("#"+openId).show();
$("#"+closeId).parent().parent().next("tr").hide(); $("#"+closeId).parent().parent().next("tr").hide();
}); });
ajaxConnPercent(); // ajaxConnPercent();
}); });
function setTaskTime(){
var chooseDate=new Date($('#searchTaskStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchTaskEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
function setReportTime(){
var chooseDate=new Date($('#searchReportStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchReportEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
function returnBack(){
$('.selectpicker').selectpicker();
var season = $("#taskIdArray").val(); //回选的数据
if (season !=null && season !='') {
var seasonlist = season.split(",");
$('.selectpicker').selectpicker('val',seasonlist);
$('.selectpicker').selectpicker('render');
}
};
</script> </script>
</head> </head>
<body> <body>
@@ -67,44 +91,18 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="taskIdArray" type="hidden" value="${log.taskIds}"/>
<!-- 筛选按钮展开状态--> <!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/> <input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<div class="col-md-12"> <div class="col-md-12">
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="task_name"/></span> --%>
<!-- </div> -->
<%-- <input name="taskName" type="text" class="form-control input-small" maxlength="20" value="${log.taskName }" /> --%>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="begin_date"/></span> --%>
<!-- </div> -->
<!-- <input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
<%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="end_date"/></span> --%>
<!-- </div> -->
<!-- <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
<%-- value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<!-- </div> -->
<!-- </div> -->
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="task_name"/></span> <span class="selectpicker form-control" ><spring:message code="task_name"/></span>
</div> </div>
<select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>" data-actions-box="true"> <select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<c:forEach items="${taskList}" var="taskInfo" > <c:forEach items="${taskList}" var="taskInfo" >
<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option> <option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
</c:forEach> </c:forEach>
@@ -146,7 +144,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="task_time"/>：</label> <label><spring:message code="task_time"/>：</label>
<input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/> value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
</div> </div>
</div> </div>
@@ -167,7 +165,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="stat_time"/>：</label> <label><spring:message code="stat_time"/>：</label>
<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/> value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
</div> </div>
</div> </div>

66
src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp
View File

@@ -3,11 +3,12 @@
<html> <html>
<head> <head>
<title> <title>
<spring:message code="https_url_report"/> <spring:message code="ntc_event_key_protection_report"/>
</title> </title>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
returnBack();
//reset //reset
//reset //reset
$("#resetBtn").on("click",function(){ $("#resetBtn").on("click",function(){
@@ -24,7 +25,7 @@
// $(this).find("th").eq(0).width=300; // $(this).find("th").eq(0).width=300;
if(index > 0 ){ if(index > 0 ){
var title=$(this).find("td").eq(0).attr("title"); var title=$(this).find("td").eq(0).attr("title");
console.log(title); // console.log(title);
if(title != undefined && title != null){ if(title != undefined && title != null){
if(title.length > 80){ if(title.length > 80){
$(this).find("td").eq(0).text(title.substring(0,80)); $(this).find("td").eq(0).text(title.substring(0,80));
@@ -46,9 +47,33 @@
$("#"+openId).show(); $("#"+openId).show();
$("#"+closeId).parent().parent().next("tr").hide(); $("#"+closeId).parent().parent().next("tr").hide();
}); });
ajaxConnPercent(); // ajaxConnPercent();
}); });
function setTaskTime(){
var chooseDate=new Date($('#searchTaskStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchTaskEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
function setReportTime(){
var chooseDate=new Date($('#searchReportStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchReportEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
function returnBack(){
$('.selectpicker').selectpicker();
var season = $("#taskIdArray").val(); //回选的数据
if (season !=null && season !='') {
var seasonlist = season.split(",");
$('.selectpicker').selectpicker('val',seasonlist);
$('.selectpicker').selectpicker('render');
}
};
</script> </script>
</head> </head>
<body> <body>
@@ -67,45 +92,18 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="taskIdArray" type="hidden" value="${log.taskIds}"/>
<!-- 筛选按钮展开状态--> <!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/> <input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<div class="col-md-12"> <div class="col-md-12">
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="task_name"/></span> --%>
<!-- </div> -->
<%-- <input name="taskName" type="text" class="form-control input-small" maxlength="20" value="${log.taskName }" /> --%>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="begin_date"/></span> --%>
<!-- </div> -->
<!-- <input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
<%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="end_date"/></span> --%>
<!-- </div> -->
<!-- <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
<%-- value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<!-- </div> -->
<!-- </div> -->
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="task_name"/></span> <span class="selectpicker form-control" ><spring:message code="task_name"/></span>
</div> </div>
<select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>" data-actions-box="true"> <select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<c:forEach items="${taskList}" var="taskInfo" > <c:forEach items="${taskList}" var="taskInfo" >
<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option> <option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
</c:forEach> </c:forEach>
@@ -147,7 +145,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="task_time"/>：</label> <label><spring:message code="task_time"/>：</label>
<input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/> value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
</div> </div>
</div> </div>
@@ -168,7 +166,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="stat_time"/>：</label> <label><spring:message code="stat_time"/>：</label>
<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/> value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
</div> </div>
</div> </div>

87
src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp
View File

@@ -3,11 +3,13 @@
<html> <html>
<head> <head>
<title> <title>
<spring:message code="https_url_report"/> <spring:message code="ntc_event_monitor_report"/>
</title> </title>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
returnBack();
//reset //reset
//reset //reset
$("#resetBtn").on("click",function(){ $("#resetBtn").on("click",function(){
@@ -19,12 +21,12 @@
$(".Wdate").attr("value",''); $(".Wdate").attr("value",'');
// $("#searchForm")[0].clear(); // $("#searchForm")[0].clear();
$("#searchForm")[0].reset(); $("#searchForm")[0].reset();
// $("#taskIds").val('');
}); });
$("#contentTable").find("tr").each(function(index){ $("#contentTable").find("tr").each(function(index){
// $(this).find("th").eq(0).width=300; // $(this).find("th").eq(0).width=300;
if(index > 0 ){ if(index > 0 ){
var title=$(this).find("td").eq(0).attr("title"); var title=$(this).find("td").eq(0).attr("title");
console.log(title);
if(title != undefined && title != null){ if(title != undefined && title != null){
if(title.length > 80){ if(title.length > 80){
$(this).find("td").eq(0).text(title.substring(0,80)); $(this).find("td").eq(0).text(title.substring(0,80));
@@ -46,9 +48,41 @@
$("#"+openId).show(); $("#"+openId).show();
$("#"+closeId).parent().parent().next("tr").hide(); $("#"+closeId).parent().parent().next("tr").hide();
}); });
ajaxConnPercent(); // ajaxConnPercent();
// $("#taskIds").change(function(){
// var len=$('.selectpicker option:selected').length;
// var max=$(this).attr("data-max-options");
// if (len>max) {
// $(this).attr("data-max-options")
// }
// });
}); });
function setTaskTime(){
var chooseDate=new Date($('#searchTaskStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchTaskEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
function setReportTime(){
var chooseDate=new Date($('#searchReportStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchReportEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
function returnBack(){
$('.selectpicker').selectpicker();
var season = $("#taskIdArray").val(); //回选的数据
if (season !=null && season !='') {
var seasonlist = season.split(",");
$('.selectpicker').selectpicker('val',seasonlist);
$('.selectpicker').selectpicker('render');
}
};
</script> </script>
</head> </head>
<body> <body>
@@ -67,60 +101,25 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="taskIdArray" type="hidden" value="${log.taskIds}"/>
<!-- 筛选按钮展开状态--> <!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/> <input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="task_id"/></span> --%>
<!-- </div> -->
<%-- <input name="taskIds" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskIds}" /> --%>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="task_name"/></span> --%>
<!-- </div> -->
<%-- <input name="taskName" type="text" class="form-control input-small" maxlength="30" value="${log.taskName }" /> --%>
<!-- </div> -->
<!-- </div> -->
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="task_name"/></span> <span class="selectpicker form-control" ><spring:message code="task_name"/></span>
</div> </div>
<select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>" data-actions-box="true"> <select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<c:forEach items="${taskList}" var="taskInfo" > <c:forEach items="${taskList}" var="taskInfo" >
<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option> <option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
</div> </div>
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="begin_date"/></span> --%>
<!-- </div> -->
<!-- <input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
<%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="pull-left"> -->
<!-- <div class="input-group"> -->
<!-- <div class="input-group-btn"> -->
<%-- <span class="selectpicker form-control" ><spring:message code="end_date"/></span> --%>
<!-- </div> -->
<!-- <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
<%-- value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<!-- </div> -->
<!-- </div> -->
<div class="pull-left"> <div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button> <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button> <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
@@ -133,8 +132,8 @@
<i class="fa fa-angle-down"></i> <i class="fa fa-angle-down"></i>
</button> </button>
<ul class="dropdown-menu pull-right" style="min-width: 110px;" > <ul class="dropdown-menu pull-right" style="min-width: 110px;" >
<li><sys:delRow url="${ctx}/eventMonitor/eventMonitorExport?type=excel" searchUrl="${ctx}/event/eventMonitorList" id="contentTable" maxRow="10000" label="excel"></sys:delRow></li> <li><sys:delRow url="${ctx}/eventMonitor/eventMonitorExport?type=excel" searchUrl="${ctx}/eventMonitor/eventMonitorList" id="contentTable" maxRow="10000" label="excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/eventMonitor/eventMonitorExport?type=csv" searchUrl="${ctx}/event/eventMonitorList" id="contentTable" maxRow="10000" label="csv"></sys:delRow></li> <li><sys:delRow url="${ctx}/eventMonitor/eventMonitorExport?type=csv" searchUrl="${ctx}/eventMonitor/eventMonitorList" id="contentTable" maxRow="10000" label="csv"></sys:delRow></li>
</ul> </ul>
</div> </div>
<a class="btn btn-icon-only btn-default setfields tooltips" <a class="btn btn-icon-only btn-default setfields tooltips"
@@ -155,7 +154,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="task_time"/>：</label> <label><spring:message code="task_time"/>：</label>
<input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/> value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
</div> </div>
</div> </div>
@@ -176,7 +175,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="stat_time"/>：</label> <label><spring:message code="stat_time"/>：</label>
<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/> value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
</div> </div>
</div> </div>

8
src/main/webapp/WEB-INF/views/report/urlReportList.jsp
View File

@@ -50,6 +50,12 @@
// ajaxConnPercent(); // ajaxConnPercent();
}); });
function setReportTime(){
var chooseDate=new Date($('#searchReportStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchReportEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
</script> </script>
</head> </head>
<body> <body>
@@ -86,7 +92,7 @@
<%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%> <%-- value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" <input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/> value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
</div> </div>
</div> </div>
<div class="pull-left"> <div class="pull-left">