1.修正通联关系web查询条件与数据显示对象属性引用错误;

2.所有日志列表的查询条件,删除direction的查询条件。
This commit is contained in:
zhangwei
2019-01-08 11:00:22 +06:00
parent c564000736
commit 61cd6bb6e7
21 changed files with 46 additions and 43 deletions

View File

@@ -113,7 +113,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -123,7 +123,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/></label>

View File

@@ -241,7 +241,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -251,7 +251,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<%-- <div class="row">
<div class="col-md-2">
@@ -288,7 +288,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>
@@ -424,10 +424,13 @@
<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>
<c:if test="${webIds eq '0' }">
<c:set var="webIds">N/A</c:set>
</c:if>
<spring:message code="${webIds}"/>
</td>

View File

@@ -198,7 +198,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -208,7 +208,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -227,7 +227,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -237,7 +237,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">

View File

@@ -209,7 +209,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -219,7 +219,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">

View File

@@ -198,7 +198,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -208,7 +208,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -99,7 +99,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -109,7 +109,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/></label>

View File

@@ -160,7 +160,7 @@
<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -170,7 +170,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -160,7 +160,7 @@
<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -170,7 +170,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -111,7 +111,7 @@
</form:select>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control select2">
@@ -121,7 +121,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/></label>

View File

@@ -113,7 +113,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -123,7 +123,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/></label>

View File

@@ -197,7 +197,7 @@ $(document).ready(function(){
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -207,7 +207,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -196,7 +196,7 @@ $(document).ready(function(){
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -206,7 +206,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -169,7 +169,7 @@ $(document).ready(function(){
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -179,7 +179,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -110,7 +110,7 @@
</form:select>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control select2">
@@ -120,7 +120,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/></label>

View File

@@ -168,7 +168,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -178,7 +178,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<%-- <div class="col-md-2">

View File

@@ -113,7 +113,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -123,7 +123,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/></label>

View File

@@ -214,7 +214,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control select2">
@@ -224,7 +224,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

View File

@@ -179,7 +179,7 @@
<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/></label>
<form:select path="direction" class="selectpicker form-control">
@@ -189,7 +189,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">