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

报表导出文字省略问题，活跃ip地域映射名称，增加地域字典

Browse Source
This commit is contained in:
zhanghongqing
2018-12-03 12:52:20 +08:00
parent 90a64dfbb2
commit a01811e5bb
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -73,8 +73,8 @@ public class TrafficStatisticsInfoController extends BaseController {
inoctetsNum = (Double) map.get("inoctets"); inoctetsNum = (Double) map.get("inoctets");
outoctetsNum = (Double) map.get("outoctets"); outoctetsNum = (Double) map.get("outoctets");
//单位换算 byte->bit/s //单位换算 byte->bit/s
inoctetsNum=(inoctetsNum*8)/(5*60*60); inoctetsNum=(inoctetsNum*8)/(5*60);
outoctetsNum=(outoctetsNum*8)/(5*60*60); outoctetsNum=(outoctetsNum*8)/(5*60);
} }
bandwidth=inoctetsNum+outoctetsNum; bandwidth=inoctetsNum+outoctetsNum;

2
src/main/resources/sql/20181130/update_code_app_dic.sql
View File

@@ -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 ('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 ('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 ('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 ('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 ('482', 'discord', 'discord', '200446', '', '', '0', '0000000021', '', 'VOIP');
INSERT INTO `code_app_dic` VALUES ('483', 'dogecoin', 'dogecoin', '200447', '', '', '0', '0000000001', '', 'ECOMMERCE'); INSERT INTO `code_app_dic` VALUES ('483', 'dogecoin', 'dogecoin', '200447', '', '', '0', '0000000001', '', 'ECOMMERCE');

10
src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
View File

@@ -56,7 +56,15 @@
<c:forEach var="entry" items="${ipActiveList }" varStatus="status"> <c:forEach var="entry" items="${ipActiveList }" varStatus="status">
<tr> <tr>
<td>${entry.ipAddr }</td> <td>${entry.ipAddr }</td>
<td>${entry.areaId }</td> <td>
<c:forEach items="${fns:getDictList('AREA_NAME')}" var="dic">
<c:choose>
<c:when test="${dic.itemCode eq entry.areaId}">
<spring:message code="${dic.itemValue}"/>
</c:when>
</c:choose>
</c:forEach>
</td>
<td>${entry.linkNum }</td> <td>${entry.linkNum }</td>
<td>${entry.c2sPktNum }</td> <td>${entry.c2sPktNum }</td>
<td>${entry.s2cPktNum }</td> <td>${entry.s2cPktNum }</td>

10
src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js
View File

@@ -101,6 +101,11 @@
rcMap[ir + i][ic] = 1 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]) { if (rcMap[ir]) {
var threshold = ic + 1, var threshold = ic + 1,
total = 0, total = 0,
@@ -112,13 +117,14 @@
break; break;
} }
} }
return new Array(total).concat({ 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')) t: TableExport.prototype.getType($(val).attr('class'))
}); });
} }
return { return {
v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()), v: TableExport.prototype.formatValue(isTrimWhitespace, titleText),
t: TableExport.prototype.getType($(val).attr('class')) t: TableExport.prototype.getType($(val).attr('class'))
}; };
}).get()]; }).get()];