gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.日志检索->协议->邮箱 增加 动作 查询条件,选"动作"时传入监测和阻断对应的Service

Browse Source 
2.实时报表->流量统计和协议统计 增加 方向 查询条件,out为0 in为1

(cherry picked from commit 3612bf09d9)
This commit is contained in:
李皓宸
2019-01-21 06:54:35 +00:00
committed by 王鑫
parent 77f9d927be
commit 4ed438f8aa
4 changed files with 112 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
View File

@@ -38,15 +38,36 @@
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false)"/> </div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="direction"/></span>
</div>
<%-- <label class="control-label"><spring:message code="direction"/>：</label> --%>
<select id="searchDirection" name="searchDirection" class="selectpicker select2 input-small">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<c:choose>
<c:when test="${direction.itemCode == searchDirection}">
<option value="${direction.itemCode}" selected="true"><spring:message code="${direction.itemValue}"></spring:message></option>
</c:when>
<c:otherwise>
<option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></option>
</c:otherwise>
</c:choose>
</c:forEach>
</select>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
@@ -134,10 +155,11 @@ function searchList(){
// 根据单位切换数据
function changeBandwidth(unitType,beginDate,endDate){
var searchDirection=$("#searchDirection").val();
$.ajax({
url:"${ctx}/dashboard/traffic/bandwidthTransThree",
type:"get",
data:{"beginDate":beginDate,"endDate":endDate,"searchQuotaType":unitType},
data:{"beginDate":beginDate,"endDate":endDate,"searchQuotaType":unitType,"searchDirection":searchDirection},
dataType:"json",
async:true,
timeout:50000,

33
src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
View File

@@ -71,10 +71,32 @@
</select>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="direction"/></span>
</div>
<%-- <label class="control-label"><spring:message code="direction"/>：</label> --%>
<select id="searchDirection" name="searchDirection" class="selectpicker select2 input-small">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<c:choose>
<c:when test="${direction.itemCode == searchDirection}">
<option value="${direction.itemCode}" selected="true"><spring:message code="${direction.itemValue}"></spring:message></option>
</c:when>
<c:otherwise>
<option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></option>
</c:otherwise>
</c:choose>
</c:forEach>
</select>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
</form:form>
@@ -164,12 +186,13 @@ function searchList(){
}
function ajaxProtocolList(start,end,entranceId){
var protoType=$("#protoType").val();
var searchDirection=$("#searchDirection").val();
loading();
$.ajax({
url: '${ctx}/dashboard/traffic/protocolList',
type: 'get',
dataType: "json",
data:{"beginDate":start,"endDate":end,"protoType":protoType,"entranceId":entranceId},
data:{"beginDate":start,"endDate":end,"protoType":protoType,"entranceId":entranceId,"searchDirection":searchDirection},
async:true,
timeout:50000,
traditional:true,