事件报表 1.筛选条件增加时间范围的限制和专项的下拉列表选择2.增加默认的查询时间范围

监测封堵(七天),重点保障(30天)用来查询和导出3.增加了国际化文件
This commit is contained in:
lihaochen
2018-12-26 19:34:10 +08:00
parent 200de1eb04
commit e999a45554
11 changed files with 3295 additions and 2847 deletions

View File

@@ -36,17 +36,17 @@
}
});
//筛选功能
// filterActionInit();
filterActionInit();
// $("span[id^=close]").on("click",function(){
// var closeId=$(this).attr("id");
// var openId=$(this).attr("id").replace("close","open");
// $("#"+closeId).hide();
// $("#"+openId).show();
// $("#"+closeId).parent().parent().next("tr").hide();
// });
// ajaxConnPercent();
$("span[id^=close]").on("click",function(){
var closeId=$(this).attr("id");
var openId=$(this).attr("id").replace("close","open");
$("#"+closeId).hide();
$("#"+openId).show();
$("#"+closeId).parent().parent().next("tr").hide();
});
ajaxConnPercent();
});
</script>
@@ -67,45 +67,55 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<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="taskId" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskId}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<!-- <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="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 Wdate input-medium" 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>
<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">
<c:forEach items="${taskList}" var="taskInfo" >
<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
</c:forEach>
</select>
</div>
</div>
<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 btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<div class="btn-group">
@@ -124,29 +134,60 @@
</a>
</div>
</div>
<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_begin_time"/></span>
</div>
<input name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchTaskStartTime}" 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="task_end_time"/></span>
</div>
<input name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
<!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" >
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label><spring:message code="task_time"/></label>
<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\')}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label>&nbsp;</label>
<input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:7})}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label><spring:message code="stat_time"/></label>
<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\')}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label>&nbsp;</label>
<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:7})}'});"/>
</div>
</div>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
@@ -162,7 +203,7 @@
<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
<th class="sort-column task_id" column="taskId"><spring:message code="task_id"/></th>
<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
<th class="sort-column ip_count" column="ipNum"><spring:message code="ip_count"/></th>
<th class="sort-column http_num" column="httpNum"><spring:message code="http_num"/></th>
@@ -177,7 +218,7 @@
<tbody>
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>${log.taskId }</td>
<td>${log.taskIds }</td>
<td>${log.taskName }</td>
<td>${log.ipNum }</td>
<td>${log.httpNum }</td>

View File

@@ -36,18 +36,18 @@
}
});
// //筛选功能
// filterActionInit();
filterActionInit();
// $("span[id^=close]").on("click",function(){
// var closeId=$(this).attr("id");
// var openId=$(this).attr("id").replace("close","open");
// $("#"+closeId).hide();
// $("#"+openId).show();
// $("#"+closeId).parent().parent().next("tr").hide();
// });
// ajaxConnPercent();
// });
$("span[id^=close]").on("click",function(){
var closeId=$(this).attr("id");
var openId=$(this).attr("id").replace("close","open");
$("#"+closeId).hide();
$("#"+openId).show();
$("#"+closeId).parent().parent().next("tr").hide();
});
ajaxConnPercent();
});
</script>
</head>
@@ -67,46 +67,56 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<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="taskId" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskId}" />
</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 Wdate input-medium" 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="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="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="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="task_name"/></span>
</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">
<c:forEach items="${taskList}" var="taskInfo" >
<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
</c:forEach>
</select>
</div>
</div>
<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 btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<div class="btn-group">
@@ -125,28 +135,59 @@
</a>
</div>
</div>
<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_begin_time"/></span>
</div>
<input name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchTaskStartTime}" 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="task_end_time"/></span>
</div>
<input name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
<!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" >
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label><spring:message code="task_time"/></label>
<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\')}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label>&nbsp;</label>
<input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:30})}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label><spring:message code="stat_time"/></label>
<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\')}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label>&nbsp;</label>
<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:30})}'});"/>
</div>
</div>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
@@ -162,7 +203,7 @@
<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
<th class="sort-column task_id" column="taskId"><spring:message code="task_id"/></th>
<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
<th class="sort-column letter_num" column="letterNum"><spring:message code="letter_num"/></th>
<th class="sort-column config_num" column="configNum"><spring:message code="config_num"/></th>
@@ -176,7 +217,7 @@
<tbody>
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>${log.taskId }</td>
<td>${log.taskIds }</td>
<td>${log.taskName }</td>
<td>${log.letterNum }</td>
<td>${log.configNum }</td>

View File

@@ -36,17 +36,17 @@
}
});
//筛选功能
// filterActionInit();
filterActionInit();
// $("span[id^=close]").on("click",function(){
// var closeId=$(this).attr("id");
// var openId=$(this).attr("id").replace("close","open");
// $("#"+closeId).hide();
// $("#"+openId).show();
// $("#"+closeId).parent().parent().next("tr").hide();
// });
// ajaxConnPercent();
$("span[id^=close]").on("click",function(){
var closeId=$(this).attr("id");
var openId=$(this).attr("id").replace("close","open");
$("#"+closeId).hide();
$("#"+openId).show();
$("#"+closeId).parent().parent().next("tr").hide();
});
ajaxConnPercent();
});
</script>
@@ -67,45 +67,64 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
<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="taskId" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskId}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<!-- <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="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 Wdate input-medium" 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>
<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">
<c:forEach items="${taskList}" var="taskInfo" >
<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
</c:forEach>
</select>
</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">
<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="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<div class="btn-group">
@@ -124,29 +143,60 @@
</a>
</div>
</div>
<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_begin_time"/></span>
</div>
<input name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchTaskStartTime}" 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="task_end_time"/></span>
</div>
<input name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
<!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" >
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label><spring:message code="task_time"/></label>
<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\')}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label>&nbsp;</label>
<input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:7})}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label><spring:message code="stat_time"/></label>
<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\')}'});"/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label>&nbsp;</label>
<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:7})}'});"/>
</div>
</div>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
@@ -162,7 +212,7 @@
<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
<th class="sort-column task_id" column="taskId"><spring:message code="task_id"/></th>
<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
<th class="sort-column ip_count" column="ipNum"><spring:message code="ip_count"/></th>
<th class="sort-column http_num" column="httpNum"><spring:message code="http_num"/></th>
@@ -177,7 +227,7 @@
<tbody>
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>${log.taskId }</td>
<td>${log.taskIds }</td>
<td>${log.taskName }</td>
<td>${log.ipNum }</td>
<td>${log.httpNum }</td>