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

ANS\HTTPS report界面调整提交

Browse Source
This commit is contained in:
dongxiaoyan
2018-12-18 04:19:49 +08:00
parent 45b1d4b324
commit f492ec8353
8 changed files with 191 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,13 @@
<input name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
</div>
<div class="pull-left">
<form:select path="searchAsnType" class="selectpicker select2 input-small">
<form:option value="1"><spring:message code="d_asn"/></form:option>
<form:option value="2"><spring:message code="s_asn"/></form:option>
</form:select>
</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>
@@ -103,8 +109,7 @@
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
<th class="sort-column bps" columan="bps"><spring:message code="bps"/></th>
<th class="sort-column pps" columan="pps"><spring:message code="pps"/></th>
<th class="sort-column s_asn" columan="s_asn"><spring:message code="s_asn"/></th>
<th class="sort-column d_asn" columan="d_asn"><spring:message code="d_asn"/></th>
<th class="sort-column s_asn" columan="asn"><spring:message code="asn"/></th>
</tr>
</thead>
<tbody>
@@ -113,12 +118,10 @@
<%-- <td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo" ><i class="icon-book-open"></i></a>
</td> --%>
</td> --%>
<td>${log.bps }</td>
<td>${log.pps }</td>
<td>${log.sAsn}</td>
<td>${log.dAsn}</td>
<td>${log.asn}</td>
</tr>
</c:forEach>
</tbody>

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

@@ -99,6 +99,15 @@
<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>
</div>
<div class="pull-right">
<div class="btn-group">
<sys:delRow url="${ctx}/report/httpsExport?type=excel" searchUrl="${ctx}/report/httpsUrlList" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</div>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
<i class="icon-wrench"></i>
</a>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
@@ -114,37 +123,24 @@
<%-- <th><spring:message code="log"/></th> --%>
<%-- <th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
<th class="sort-column url" columan="url" style="width: 350px;"><spring:message code="url"/></th>
<th class="sort-column ip_addr" columan="ip_addr"><spring:message code="ip_addr"/></th>
<th class="sort-column sum" columan="sum"><spring:message code="sum"/></th>
<th class="sort-column url_count" columan="url_count"><spring:message code="url_count"/></th>
<%--<th class="sort-column url" column="url" style="width: 350px;"><spring:message code="url"/></th>
<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 url" column="url" style="width: 350px;"><spring:message code="url"/></th>
<th class="sort-column ip_addr" column="ipCount"><spring:message code="ip_count"/></th>
<th class="sort-column sum" column="connCount"><spring:message code="counnection_count"/></th>
<th class="sort-column url_count" column="reportTime"><spring:message code="statistic_time"/></th>
</tr>
</thead>
<tbody>
<c:forEach var="log" items="${page.list }" varStatus="status">
<c:if test="${empty log.dataList}">
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>${log.url }</td>
<td></td>
<td></td>
<td >${log.urlCount}</td>
<td>${log.ipCount }</td>
<td>${log.connCount }</td>
<td >${log.reportTime}</td>
</tr>
</c:if>
<c:if test="${!empty log.dataList}">
<c:forEach var="ips" items="${log.dataList}" varStatus="status">
<tr>
<c:if test="${status.index==0}">
<td rowspan="${fn:length(log.dataList)}">${log.url }</td>
</c:if>
<td>${ips.ipAddr }</td>
<td >${ips.sum}</td>
<c:if test="${status.index==0}">
<td rowspan="${fn:length(log.dataList)}">${log.urlCount}</td>
</c:if>
</tr>
</c:forEach>
</c:if>
</c:forEach>
</tbody>