From b50a740dbef0ecb9d105a7f0934a66cae48115d0 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Sat, 15 Dec 2018 17:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E8=B7=83iP=E8=AF=A6=E6=83=85=E5=9B=BE?=
 =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=EF=BC=8C=E5=9B=BE=E4=B8=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=B0=8F=E6=97=B6=E5=86=85=E7=9A=84top10=E8=B6=8B?=
 =?UTF-8?q?=E5=8A=BF=EF=BC=8C=E5=88=97=E8=A1=A8=E4=B8=BA=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=86=85=E7=9A=84top10=E6=AF=8F=E6=9D=A1?=
 =?UTF-8?q?=E7=BA=BF=E6=9C=80=E5=A4=A7=E5=80=BC=E7=9A=84=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/trafficIpActiveList.jsp        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index 78f6e3e5d..34d1b8c81 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -44,11 +44,13 @@
 							<tr>
 								<th><spring:message code="ip_addr"/></th>
 								<th><spring:message code="area_id"/></th>
+								<th><spring:message code="c2s_byte_num"/></th>
+								<th><spring:message code="s2c_byte_num"/></th>
+								<th><spring:message code="bytes"/></th>
 								<th><spring:message code="link_num"/></th>
 								<th><spring:message code="c2s_pkt_num"/></th>
 								<th><spring:message code="s2c_pkt_num"/></th>
-								<th><spring:message code="c2s_byte_num"/></th>
-								<th><spring:message code="s2c_byte_num"/></th>
+								<th><spring:message code="packet"/></th>
 								<th><spring:message code="stat_time"/></th>
 							</tr>
 						</thead>
@@ -65,18 +67,20 @@
 										</c:choose>
 										</c:forEach>
 									</td>
+									<td>${entry.c2sByteLen }</td>
+									<td>${entry.s2cByteLen }</td>
+									<td>${entry.s2cByteLen+entry.c2sByteLen }</td>
 									<td>${entry.linkNum }</td>
 									<td>${entry.c2sPktNum }</td>
 									<td>${entry.s2cPktNum }</td>
-									<td>${entry.c2sByteLen }</td>
-									<td>${entry.s2cByteLen }</td>
+									<td>${entry.s2cPktNum+entry.c2sPktNum}</td>
 									<td>${entry.statTime }</td>
 <%-- 									<td><fmt:formatDate value="${entry.statTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> --%>
 								</tr>
 							</c:forEach>
 						</tbody>
 					</table>
-					<div class="page">${page}</div>
+<%-- 					<div class="page">${page}</div> --%>
 				</div>
 			</div>
 		</div>