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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
default
2018-12-17 16:16:12 +08:00
parent c7cd72f5c3 97ec833058
commit f5f4380dcf
2 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp
View File

@@ -54,51 +54,33 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="area_type"/></span>
</div>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<form:select path="searchCountry" class="selectpicker form-control">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="area_type"/></span>
</div>
<form:select path="searchCountry" class="selectpicker form-control input-medium">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('AREA_TYPE')}" var="areaType" >
<form:option value="${areaType.itemCode}"><spring:message code="${areaType.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</form:select>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="start_ip"/></span>
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="start_ip"/></span>
</div>
<input name="searchStartIp" type="text" class="form-control input-small" maxlength="20" value="${log.searchStartIp }" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<input name="searchStartIp" type="text" class="form-control input-small" value="${log.searchStartIp }" />
</div>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_ip"/></span>
</div>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<input name="searchEndIp" type="text" class="form-control input-small" value="${log.searchEndIp }" />
</div>
<input name="searchEndIp" type="text" class="form-control input-small" maxlength="20" value="${log.searchEndIp }" />
</div>
</div>

14
src/main/webapp/WEB-INF/views/report/urlReportList.jsp
View File

@@ -28,7 +28,7 @@
console.log(title);
if(title != undefined && title != null){
if(title.length > 80){
$(this).find("td").eq(0).text(title.substring(0,80)+"...");
$(this).find("td").eq(0).text(title.substring(0,80));
}else{
$(this).find("td").eq(0).text(title);
}
@@ -69,18 +69,12 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="url"/></span>
</div>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<input name="searchUrl" type="text" class="form-control input-medium" value="${log.searchUrl }" />
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="url"/></span>
</div>
<input name="searchUrl" type="text" class="form-control input-medium" maxlength="20" value="${log.searchUrl }" />
</div>
</div>
<div class="pull-left">