From a01811e5bbdf9c1705f0819621d4238f16332ff4 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 3 Dec 2018 12:52:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=96=87?= =?UTF-8?q?=E5=AD=97=E7=9C=81=E7=95=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B4=BB?= =?UTF-8?q?=E8=B7=83ip=E5=9C=B0=E5=9F=9F=E6=98=A0=E5=B0=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9F=9F=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/TrafficStatisticsInfoController.java | 4 ++-- .../resources/sql/20181130/update_code_app_dic.sql | 2 +- .../WEB-INF/views/dashboard/trafficIpActiveList.jsp | 10 +++++++++- .../global/plugins/tableExport-3.3.13/tableexport.js | 10 ++++++++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index d8608d950..c821303ef 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -73,8 +73,8 @@ public class TrafficStatisticsInfoController extends BaseController { inoctetsNum = (Double) map.get("inoctets"); outoctetsNum = (Double) map.get("outoctets"); //单位换算 byte->bit/s - inoctetsNum=(inoctetsNum*8)/(5*60*60); - outoctetsNum=(outoctetsNum*8)/(5*60*60); + inoctetsNum=(inoctetsNum*8)/(5*60); + outoctetsNum=(outoctetsNum*8)/(5*60); } bandwidth=inoctetsNum+outoctetsNum; diff --git a/src/main/resources/sql/20181130/update_code_app_dic.sql b/src/main/resources/sql/20181130/update_code_app_dic.sql index f6c4589c8..7ae13c98b 100644 --- a/src/main/resources/sql/20181130/update_code_app_dic.sql +++ b/src/main/resources/sql/20181130/update_code_app_dic.sql @@ -515,7 +515,7 @@ INSERT INTO `code_app_dic` VALUES ('476', 'orbit', 'orbit', '200440', '', '', '0 INSERT INTO `code_app_dic` VALUES ('477', 'ourworld', 'ourworld', '200441', '', '', '0', '0000000009', '', 'GAMING'); INSERT INTO `code_app_dic` VALUES ('478', 'overwatch', 'overwatch', '200442', '', '', '0', '0000000009', '', 'GAMING'); INSERT INTO `code_app_dic` VALUES ('479', 'diablo3', 'diablo3', '200443', '', '', '0', '0000000009', '', 'GAMING'); -INSERT INTO `code_app_dic` VALUES ('480', 'dianping', 'dianping', 'Dueling', '', '', '0', '0000000027', '', 'MOBILE_APP'); +INSERT INTO `code_app_dic` VALUES ('480', 'dianping', 'dianping', '200444', '', '', '0', '0000000027', '', 'MOBILE_APP'); INSERT INTO `code_app_dic` VALUES ('481', 'dianshijia', 'dianshijia', '200445', '', '', '0', '0000000010', '', 'P2PTV'); INSERT INTO `code_app_dic` VALUES ('482', 'discord', 'discord', '200446', '', '', '0', '0000000021', '', 'VOIP'); INSERT INTO `code_app_dic` VALUES ('483', 'dogecoin', 'dogecoin', '200447', '', '', '0', '0000000001', '', 'ECOMMERCE'); diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp index 74a0bb534..ab0a4715c 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp @@ -56,7 +56,15 @@ ${entry.ipAddr } - ${entry.areaId } + + + + + + + + + ${entry.linkNum } ${entry.c2sPktNum } ${entry.s2cPktNum } diff --git a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js index 7f3f65a82..50b3984eb 100644 --- a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js +++ b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js @@ -101,6 +101,11 @@ rcMap[ir + i][ic] = 1 } } + // 当文字过长有省略时取title导出 + var titleText=$(val).text(); + if($(val).attr("title")!=null&&$(val).attr("title")!=""){ + titleText=$(val).attr("title"); + } if (rcMap[ir]) { var threshold = ic + 1, total = 0, @@ -112,13 +117,14 @@ break; } } + return new Array(total).concat({ - v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()), + v: TableExport.prototype.formatValue(isTrimWhitespace, titleText), t: TableExport.prototype.getType($(val).attr('class')) }); } return { - v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()), + v: TableExport.prototype.formatValue(isTrimWhitespace, titleText), t: TableExport.prototype.getType($(val).attr('class')) }; }).get()];