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

网站详情统计-域名增加多选查询条件

Browse Source
This commit is contained in:
zhanghongqing
2018-12-21 10:59:16 +08:00
parent 61e2e5ea82
commit 06d94fc75f
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -475,7 +475,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="websiteList")
@ResponseBody
public List websiteList(Integer entranceId,Integer domain,Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
public List websiteList(Integer entranceId,Integer[] domain,Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_WEBSITELIST_NOTIME;
@@ -489,7 +489,11 @@ public class TrafficStatisticsInfoController extends BaseController {
}
url=urlAddDate(url, beginDate, endDate);
if(domain!=null){
url=url+"&domain="+domain;
for (Integer dom : domain) {
if(dom!=null){
url=url+"&domain="+dom;
}
}
}
if(entranceId!=null){
url=url+"&entranceId="+entranceId;

15
src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
View File

@@ -47,7 +47,7 @@
code="begin_date" /></span>
</div>
<input id="beginDate" name="beginDate" type="text"
readonly="readonly" class="form-control" style="width:200px"
readonly="readonly" class="form-control" style="width:166px"
value=""
onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
</div>
@@ -59,7 +59,7 @@
code="end_date" /></span>
</div>
<input id="endDate" name="endDate" type="text" readonly="readonly"
class="form-control" value="" style="width:200px"
class="form-control" value="" style="width:166px"
onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/>
</div>
</div>
@@ -69,8 +69,8 @@
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="domain_name"/></span>
</div>
<select id="domain" name="domain" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
<select id="domain" name="domain" class="selectpicker form-control" data-max-options="50" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${domainList}" var="dict" >
<option value="${dict.id}"><spring:message code="${dict.domain}"></spring:message></option>
</c:forEach>
@@ -110,12 +110,6 @@
<div class="row" >
<div id="chart" style="width:98%;height: 510px; -moz-user-select: none; position: relative;"></div>
</div>
<%-- <ul class="nav nav-tabs">
<li class="active"><a href="#">网站</a></li>
<li><a href="${ctx}/dashboard/ipActiveList">主题</a></li>
<li><a href="${ctx}/dashboard/ipActiveList">服务</a></li>
</ul> --%>
<div class="col-md-12">
<div class="portlet">
@@ -221,6 +215,7 @@
},
async : false,
timeout : 40000,
traditional:true,
success : function(data) {
if (data != null && data.length > 0
&& data[0].error != null) {