1.修改app,协议,行为日志得查询条件,可检索;

2.修改通联关系日志,前台检索条件为webId,后台webId需转为domainId,数据列表展示为网站下域名信息(由于日志的域名id字段名称定义为了webId的问题,但实际数据为域名信息,需要界面前后台处理转换);
3.百分比查询增加地域条件。
This commit is contained in:
zhangwei
2019-01-08 13:59:15 +06:00
parent 94dc852118
commit 78dc94f96c
6 changed files with 76 additions and 39 deletions

View File

@@ -210,19 +210,19 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="social_app"/></label>
<form:select path="labelAppId" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${appList}" var="dict">
<form:option value="${dict.code}"><spring:message code="${dict.item}"/></form:option>
</c:forEach>
</form:select>
<form:select path="labelAppId" 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="${appList}" var="dict" >
<form:option value="${dict.code}"><spring:message code="${dict.item}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<c:if test="${log.functionId eq 63 or log.functionId eq 408}">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="basic_protocol"/></label>
<form:select path="labelProtoId" class="selectpicker select2 form-control">
<form:select path="labelProtoId" 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="${protocolList}" var="dict">
<form:option value="${dict.code}"><spring:message code="${dict.item}"/></form:option>

View File

@@ -68,7 +68,8 @@
data:{
"searchFoundStartTime":$("input[name=searchFoundStartTime]").val(),
"searchFoundEndTime":$("input[name=searchFoundEndTime]").val(),
"searchStreamDir":1
"searchStreamDir":1,
"entranceId":$("#entranceId").val()
},
async:true,
success:function(data,textStatus){//处理返回结果
@@ -288,7 +289,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.id}"><spring:message code="${web.domain}"></spring:message></option>
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
</c:forEach>
</select>
</div>
@@ -345,7 +346,7 @@
<th class="sort-column app_id" column="APP">APP</th>
<th class="sort-column proto_id" column="application_layer_protocol"><spring:message code="application_layer_protocol"/></th>
<th class="sort-column web_id" column="Web">Web</th>
<th class="sort-column web_id" column="Web"><spring:message code="domain_name"/></th>
<th class="sort-column cap_ip" column="clj_ip"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto" column="transport_layer_protocol" isVisible="false"><spring:message code="transport_layer_protocol"/></th>
@@ -423,7 +424,7 @@
<td>
<c:set var="webIds">${log.webId }</c:set>
<c:forEach items="${webList}" var="dict">
<c:forEach items="${domainList}" var="dict">
<c:if test="${dict.id eq log.webId}">
<c:set var="webIds">${dict.domain}</c:set>
</c:if>