1.修改日志字段显示2.修改国际化英文翻译3.日志界面增加查看详情4.修改查询条件与字段名相同

This commit is contained in:
zhanghongqing
2018-08-02 17:40:16 +08:00
parent 699ca9d3a2
commit e09a7d0e69
23 changed files with 243 additions and 171 deletions

View File

@@ -187,7 +187,7 @@ $(document).ready(function(){
<th><spring:message code='deviceid'/></th>
<th><spring:message code='direct'/></th>
<th><spring:message code='stream_type'/></th>
<th><spring:message code='nest_addr_list'/></th>
<%-- <th><spring:message code='nest_addr_list'/></th> --%>
<th><spring:message code='server_locate'/></th>
<th><spring:message code='client_locate'/></th>
</tr>
@@ -195,7 +195,7 @@ $(document).ready(function(){
<tbody>
<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
<tr>
<td>${log.cfgId}</td>
<td>${log.cfgId}<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -204,7 +204,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td title="${fns:escapeHtml(log.appLabel)}">
${fns:stringFormat(log.appLabel,30)}
@@ -236,9 +242,9 @@ $(document).ready(function(){
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td title="${fns:escapeHtml(log.addrList)}">
<%-- <td title="${fns:escapeHtml(log.addrList)}">
${fns:stringFormat(log.addrList,30)}
</td>
</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
</tr>