From 489a3f1088a53d45e862477fd7e1069a77a40693 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Wed, 11 Jul 2018 20:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/NtcDestIpReportController.java     |  2 +-
 .../report/NtcEntranceReportController.java   |  2 +-
 .../webapp/WEB-INF/views/report/attrType.jsp  | 57 +++++++++++--------
 .../webapp/WEB-INF/views/report/destIp.jsp    | 23 +++++---
 .../WEB-INF/views/report/entranceId.jsp       | 23 +++++---
 5 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
index 9474a0d6d..786e9da14 100644
--- a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
@@ -78,7 +78,7 @@ public class NtcDestIpReportController extends BaseController {
 		List<Long> _line= new ArrayList<Long>();
 		_line.add(total);
 		_line.addAll(line);
-		for (int i = 0; i < 20; i++) {
+		for (int i = 0; i < 40; i++) {
 			showData.put("巴西"+i, _line);
 		}
 		
diff --git a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
index d77f52e2b..e780ecdb0 100644
--- a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
@@ -78,7 +78,7 @@ public class NtcEntranceReportController extends BaseController {
 		List<Long> _line= new ArrayList<Long>();
 		_line.add(total);
 		_line.addAll(line);
-		for (int i = 0; i < 20; i++) {
+		for (int i = 0; i < 40; i++) {
 			showData.put(""+i, _line);
 		}
 		
diff --git a/src/main/webapp/WEB-INF/views/report/attrType.jsp b/src/main/webapp/WEB-INF/views/report/attrType.jsp
index 68caa5aaf..813ef1f68 100644
--- a/src/main/webapp/WEB-INF/views/report/attrType.jsp
+++ b/src/main/webapp/WEB-INF/views/report/attrType.jsp
@@ -4,28 +4,37 @@
 	$(function() {
 	});
 </script>
-	<table id="attrTypeTable"
-		class="table table-striped table-bordered table-condensed text-nowrap">
-		<thead>
-			<tr>
-				<th><spring:message code="attribute" /></th>
-				<th><spring:message code="log_total" /></th>
-				<c:forEach items="${titles}" var="title">
-					<th>${title}</th>
-				</c:forEach>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach items="${datas}" var="data">
-				<tr>
-					<td><c:forEach items="${xzs}" var="xz">
-							<c:if test="${xz.serviceDictId==data.key}">${xz.itemValue}</c:if>
-						</c:forEach></td>
-					<c:forEach items="${data.value}" var="cloumn" varStatus="status">
-						<td>${cloumn}</td>
-					</c:forEach>
-				</tr>
+<table id="attrTypeTable"
+	class="table table-striped table-bordered table-condensed text-nowrap">
+	<thead>
+		<tr>
+			<th><spring:message code="attribute" /></th>
+			<th><spring:message code="log_total" /></th>
+			<c:forEach items="${titles}" var="title">
+				<th>${title}</th>
 			</c:forEach>
-		</tbody>
-	</table>
-	<div class="page">${page}</div>
\ No newline at end of file
+		</tr>
+	</thead>
+	<tbody>
+		<script type="text/javascript">
+			var trContent = "";
+			<c:forEach items="${datas}" var="data">
+				trContent += "<tr>";
+				<c:forEach items="${xzs}" var="xz">
+					<c:if test="${xz.serviceDictId==data.key}">
+						trContent += "<td>${xz.itemValue}</td>";
+					</c:if>
+				</c:forEach>
+				<c:forEach items="${data.value}" var="cloumn" varStatus="status">
+					trContent += "<td>${cloumn}</td>";
+				</c:forEach>
+				trContent += "</tr>";
+			</c:forEach>
+			$('tbody').remove();
+			$('#attrTypeTable').append("<tbody></tbody>");
+			$('tbody').html(trContent);
+			pagination();
+		</script>
+	</tbody>
+</table>
+<div class="page">${page}</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/report/destIp.jsp b/src/main/webapp/WEB-INF/views/report/destIp.jsp
index a89db3906..db10d82f9 100644
--- a/src/main/webapp/WEB-INF/views/report/destIp.jsp
+++ b/src/main/webapp/WEB-INF/views/report/destIp.jsp
@@ -15,16 +15,23 @@ $(function(){
 			</tr>
 		</thead>
 		<tbody>
+			<script type="text/javascript">
+			var trContent = "";
 			<c:forEach items="${datas}" var="data">
-				<tr>
-					<c:forEach items="${data.key}" var="key" varStatus="status">
-						<td>${key}</td>
-					</c:forEach>
-					<c:forEach items="${data.value}" var="cloumn" varStatus="status">
-						<td>${cloumn}</td>
-					</c:forEach>
-				</tr>
+				trContent += "<tr>";
+				<c:forEach items="${data.key}" var="destCountry" varStatus="status">
+					trContent += "<td>${destCountry}</td>";
+				</c:forEach>
+				<c:forEach items="${data.value}" var="cloumn" varStatus="status">
+					trContent += "<td>${cloumn}</td>";
+				</c:forEach>
+				trContent += "</tr>";
 			</c:forEach>
+			$('tbody').remove();
+			$('#destIpTable').append("<tbody></tbody>");
+			$('tbody').html(trContent);
+			pagination();
+		</script>
 		</tbody>
 	</table>
 	<div class="page">${page}</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/report/entranceId.jsp b/src/main/webapp/WEB-INF/views/report/entranceId.jsp
index 970d3d807..f4298ef1c 100644
--- a/src/main/webapp/WEB-INF/views/report/entranceId.jsp
+++ b/src/main/webapp/WEB-INF/views/report/entranceId.jsp
@@ -15,16 +15,23 @@ $(function(){
 			</tr>
 		</thead>
 		<tbody>
+			<script type="text/javascript">
+			var trContent = "";
 			<c:forEach items="${datas}" var="data">
-				<tr>
-					<c:forEach items="${data.key}" var="key" varStatus="status">
-						<td>${key}</td>
-					</c:forEach>
-					<c:forEach items="${data.value}" var="cloumn" varStatus="status">
-						<td>${cloumn}</td>
-					</c:forEach>
-				</tr>
+				trContent += "<tr>";
+				<c:forEach items="${data.key}" var="entranceId" varStatus="status">
+					trContent += "<td>${entranceId}</td>";
+				</c:forEach>
+				<c:forEach items="${data.value}" var="cloumn" varStatus="status">
+					trContent += "<td>${cloumn}</td>";
+				</c:forEach>
+				trContent += "</tr>";
 			</c:forEach>
+			$('tbody').remove();
+			$('#entranceIdTable').append("<tbody></tbody>");
+			$('tbody').html(trContent);
+			pagination();
+		</script>
 		</tbody>
 	</table>
 	<div class="page">${page}</div>
\ No newline at end of file