通联日志国际化调整、检索条件添加及域名字典对应调整

This commit is contained in:
leijun
2019-01-07 19:40:46 +08:00
parent b85dd1a8cc
commit 4bd99aca72
4 changed files with 56 additions and 13 deletions

View File

@@ -128,8 +128,7 @@
<input id="protos" type="hidden" value="${log.protoId}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<sys:tableSort id="orderBy" name="orderBy.
" value="${page.orderBy}" callback="page();" />
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<%-- <div class="pull-left">
@@ -288,7 +287,7 @@
<label class="control-label"><spring:message code='Web'/></label>
<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<c:forEach items="${webList}" var="web" >
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
<option value="${web.id}"><spring:message code="${web.domain}"></spring:message></option>
</c:forEach>
</select>
</div>
@@ -323,6 +322,20 @@
<input name="dAsn" type="text" class="form-control" value="${log.dAsn }"/>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="s_subscribe_id"></spring:message></label>
<input name="sSubscribeId" type="text" class="form-control" value="${log.sSubscribeId }"/>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="d_subscribe_id"></spring:message></label>
<input name="dSubscribeId" type="text" class="form-control" value="${log.dSubscribeId }"/>
</div>
</div>
</div>
</div>
@@ -424,8 +437,8 @@
<td>
<c:set var="webIds">${log.webId }</c:set>
<c:forEach items="${webList}" var="dict">
<c:if test="${dict.code eq log.webId}">
<c:set var="webIds">${dict.item}</c:set>
<c:if test="${dict.id eq log.webId}">
<c:set var="webIds">${dict.domain}</c:set>
</c:if>
</c:forEach>
<spring:message code="${webIds}"/>