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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
request 和配置状态统计增加编译id
xml增加compileId去重
首页增加统计时间展示
This commit is contained in:
duandongmei
2018-09-19 10:20:48 +08:00
parent 348f822a02 c60e42d2ba
commit 7daf953fe3
9 changed files with 319 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/webapp/WEB-INF/views/index.jsp
View File

@@ -83,7 +83,15 @@
<form id="searchForm" action="${ctx}/configure/statistics/configureStateStatistics" >
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<font size="4"><i class="fa fa-cogs"> <spring:message code="letter_statistics_info"/></i></font> <a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh pull-right"> </a>
<font size="4"><i class="fa fa-cogs"> <spring:message code="letter_statistics_info"/>
[<spring:message code="statistic_time"/>：<c:forEach items="${requestStatisticTime }" var="requestStatisticTime" varStatus="status">
<c:if test="${status.index eq 0 }">
${requestStatisticTime.statistic_time }
</c:if>
</c:forEach>]
</i>
</font>
<a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh pull-right"> </a>
<h5 class="page-header"></h5>
<div class="tableDiv">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
@@ -111,7 +119,13 @@
<div class="page">${page}</div>
</div>
<div class="statisticsStatus">
<font size="4"><i class="fa fa-cogs"> <spring:message code="configure_statistics_info"/></i></font> <a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh pull-right"> </a>
<font size="4"><i class="fa fa-cogs"> <spring:message code="configure_statistics_info"/>
[<spring:message code="statistic_time"/>：<c:forEach items="${configStatisticTime }" var="configStatisticTime" varStatus="status">
<c:if test="${status.index eq 0 }">
${configStatisticTime.statistic_time }
</c:if>
</c:forEach>]
</i></font> <a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh pull-right"> </a>
<h5 class="page-header"></h5>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>