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

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

@@ -56,7 +56,15 @@
<c:forEach var="entry" items="${ipActiveList }" varStatus="status">
<tr>
<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.c2sPktNum }</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
}
}
// 当文字过长有省略时取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()];