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

1、修改用户统计界面，2.修改流量统计加载问题，3、配置异常增加error提示

Browse Source
This commit is contained in:
zhanghongqing
2018-11-08 14:52:58 +08:00
parent b7fc16e681
commit 22d1228097
19 changed files with 172 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,10 +127,10 @@
</head>
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<%-- <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/traffic/userBehavior'"><spring:message code="refresh"/></button>
<button type="button" class="btn btn-default" onClick="javascript:window.history.go(-1)"><spring:message code="back"/></button>
</div>
</div> --%>
<h3 class="page-title">
<spring:message code="traffic_user_behavior"></spring:message>
</h3>
@@ -249,11 +249,10 @@
<div class="httpReqCfg">
<div class="row">
<div class="col-md-4" style="padding-right: 1px;">
<div class="panel panel-default" style="height: 500px;">
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
<h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5>
<div id="deviceRank" class="drank hm-scroll">
<%-- <h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5> --%>
<!-- <div class="table-responsive"> -->
<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
@@ -280,14 +279,12 @@
<thead>
<tr>
<th><spring:message code="account"/></th>
<th><spring:message code="link_num"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${accountList}" var="data">
<tr>
<td>${data.account}</td>
<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
<td title="${data.account}">${data.account}</td>
</tr>
</c:forEach>
@@ -297,13 +294,12 @@
<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
</c:if>
<!-- </div> -->
</div>
</div>
</div>
</div>
<div class="col-md-8" style="padding-left: 8px;">
<div class="panel panel-default">
<div class="col-md-11" >
<div class=" ">
<div class="panel-body" style="height:500px">
<h5 class="ng-binding"><spring:message code="account"/> : ${searchAccount}</h5>
<div id="trend" style="height: 400px; position: relative;" >
@@ -329,7 +325,7 @@
<span class="year" title="<spring:message code="link_num"/>: <fmt:formatNumber type='number' value='${us.num}' minFractionDigits='0'/>">${us.reportTime}</span>
</div>
</div>
<div class="process-noyear">
<div class="process-noyear" title="${us.nasIp}">
${us.nasIp}
</div>
</div>
@@ -354,10 +350,10 @@
<!-- IP -->
<div class="httpResCfg">
<div class="row">
<div class="col-md-4" style="padding-right: 1px; ">
<div class="panel panel-default" style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
<h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5>
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:auto;">
<%-- <h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5> --%>
<div id="deviceRank" class="drank hm-scroll">
<!-- <div class="table-responsive"> -->
@@ -385,15 +381,13 @@
<thead>
<tr>
<th><spring:message code="ip"/></th>
<th><spring:message code="link_num"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${nasIpList}" var="data">
<tr>
<td>${data.nasIp}</td>
<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
<td title="${data.nasIp}">${data.nasIp}</td>
</tr>
</c:forEach>
@@ -408,8 +402,8 @@
</div>
</div>
<div class="col-md-8" style="padding-left: 8px;">
<div class="panel panel-default">
<div class="col-md-11" >
<div class=" ">
<div class="panel-body" style="height: 500px">
<h5 class="ng-binding"><spring:message code="ip"/> : ${searchNasIp}</h5>
<div id="trend" style="height: 400px; position: relative;" >
@@ -437,7 +431,7 @@
</div>
</div>
<div class="process-noyear">
<div class="process-noyear" title="${it.account}">
${it.account}
</div>
</div>