From b970557c78917de53ac44956577ed01ec73c16d4 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 24 Aug 2018 14:17:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=9B=BE=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AF=A6=E6=83=85=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/DashboardController.java | 25 ++- .../views/dashboard/dashBoardIndex.jsp | 205 ++++++------------ .../views/dashboard/trafficConnList.jsp | 180 +++++++++++++++ .../views/dashboard/trafficIpActiveList.jsp | 70 +++++- .../global/plugins/highcharts/css/common.css | 37 +--- .../plugins/highcharts/css/data_text.css | 113 +++++++--- .../global/plugins/highcharts/echart.js | 6 +- .../webapp/static/pages/css/dashboard.css | 5 + .../webapp/static/pages/scripts/dashboard.js | 129 +++++++++++ 9 files changed, 554 insertions(+), 216 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/dashboard/trafficConnList.jsp create mode 100644 src/main/webapp/static/pages/css/dashboard.css create mode 100644 src/main/webapp/static/pages/scripts/dashboard.js diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java index 0962220b2..2ce2d1381 100644 --- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java +++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java @@ -19,6 +19,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.Page; +import com.nis.domain.PageLog; import com.nis.util.CodeDicUtils; import com.nis.util.Constants; import com.nis.util.StringUtil; @@ -408,16 +409,19 @@ public class DashboardController extends BaseController{ @RequestMapping(value="ipActiveList") public String ipActiveList( HttpServletRequest request, HttpServletResponse response, Model model){ - Page page = new Page(request, response); - TrafficIpActiveStatistic ip = new TrafficIpActiveStatistic(); - ip.setIpAddr("1.1.1.1"); - ip.setAreaId("11"); - ip.setLinkNum(1212); + PageLog page = new PageLog(request, response); List list = new ArrayList(); - list.add(ip); + for (int i = 1; i < 10; i++) { + TrafficIpActiveStatistic ip = new TrafficIpActiveStatistic(); + ip.setId(i); + ip.setIpAddr(3+i+".1.1."+i); + ip.setAreaId("11"); + ip.setLinkNum(1212); + list.add(ip); + } page.setList(list); model.addAttribute("page", page); - return "/dashboard/trafficIpActiveList"; + return "/dashboard/trafficConnList"; } @@ -450,6 +454,7 @@ public class DashboardController extends BaseController{ return "/dashboard/trafficIpActiveChart"; } public class TrafficIpActiveStatistic{ + Integer id=1; String ipAddr="10.1.1.2"; String areaId="1045"; Integer linkNum=3121; @@ -459,6 +464,12 @@ public class DashboardController extends BaseController{ Integer s2cByteLen=23323; String statTime; + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } public String getStatTime() { return statTime; } diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index 80f5170c9..ecb78c464 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -8,6 +8,9 @@ 数据概览 + + + +
-
+
-
-
+ - -
+
-
-
-

活跃网站流量

-

15802

+ - -
+ <%--
-
-
-

热门网站流量

-

15802

-
-
-
-
-

互联网流量包数

-

15802

+
-
+
--%>
- +
@@ -175,41 +186,6 @@ Linux 0 - - 4 - DOS - 0 - - - 5 - windows - 0 - - - 6 - iOS - 0 - - - 7 - windows - 0 - - - 8 - windows - 0 - - - 9 - windows - 0 - - - 10 - windows - 0 -
@@ -254,41 +230,6 @@ Google 0 - - 4 - Yahoo - 0 - - - 5 - qq - 0 - - - 6 - Googleusercontent - 0 - - - 7 - Microsoftonline - 0 - - - 8 - Pornhub - 0 - - - 9 - Youtube - 0 - - - 10 - Facebook - 0 -
@@ -313,27 +254,15 @@ <%-- --%> - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${entry.id }${entry.ipAddr }${entry.areaId }${entry.linkNum }${entry.c2sPktNum }${entry.s2cPktNum }${entry.c2sByteLen }${entry.s2cByteLen }
+
${page}
+
+
+

+  1 + +

+ + + + + + + + + + + + +
12131
241241
31412
34655
37457
33457
38468
3367
33456
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp index 8b8f6ca33..56e46263c 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp @@ -17,6 +17,9 @@ + +
+
@@ -64,9 +67,72 @@
- - +