日志出入口编号改为字典中获取,去掉重复条件换为处理机IP
This commit is contained in:
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -142,6 +136,12 @@ $(document).ready(function(){
|
|||||||
</c:forEach>
|
</c:forEach>
|
||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input id=capIp name="capIp" class="form-control" type="text" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -122,16 +122,21 @@
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="entrance"/>:</label>
|
||||||
|
<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
|
||||||
|
<form:option value=""><spring:message code="select"/></form:option>
|
||||||
|
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
|
||||||
|
<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
|
||||||
|
</c:forEach>
|
||||||
|
</form:select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clj_ip"/>:</label>
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input name="entranceId" type="text" class="form-control" value="${log.entranceId}"/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -126,12 +126,6 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="entrance"/>:</label>
|
<label><spring:message code="entrance"/>:</label>
|
||||||
@@ -143,6 +137,12 @@ $(document).ready(function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clientip"/>:</label>
|
<label><spring:message code="clientip"/>:</label>
|
||||||
|
|||||||
@@ -122,16 +122,21 @@
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="entrance"/>:</label>
|
||||||
|
<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
|
||||||
|
<form:option value=""><spring:message code="select"/></form:option>
|
||||||
|
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
|
||||||
|
<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
|
||||||
|
</c:forEach>
|
||||||
|
</form:select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clj_ip"/>:</label>
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input name="entranceId" type="text" class="form-control" value="${log.entranceId}"/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
|
|||||||
@@ -131,16 +131,21 @@
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label><spring:message code="entrance"/>:</label>
|
||||||
|
<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
|
||||||
|
<form:option value=""><spring:message code="select"/></form:option>
|
||||||
|
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
|
||||||
|
<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
|
||||||
|
</c:forEach>
|
||||||
|
</form:select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><spring:message code="clj_ip"/>:</label>
|
<label><spring:message code="clj_ip"/>:</label>
|
||||||
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="form-group">
|
|
||||||
<label><spring:message code="entrance_id"/>:</label>
|
|
||||||
<input name="entranceId" type="text" class="form-control" value="${log.entranceId}"/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
|
|||||||
Reference in New Issue
Block a user