diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index fd7f31cde..e7f03a08b 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -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 fromJsonList = new HashMap(); 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; diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp index 943beb86a..ba5521dd4 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp @@ -47,7 +47,7 @@ code="begin_date" /> @@ -59,7 +59,7 @@ code="end_date" /> @@ -69,8 +69,8 @@
- + @@ -110,12 +110,6 @@
- <%-- --%> -
@@ -221,6 +215,7 @@ }, async : false, timeout : 40000, + traditional:true, success : function(data) { if (data != null && data.length > 0 && data[0].error != null) {