diff --git a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java index c88f3f0c4..c1e9fcf8b 100644 --- a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java +++ b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java @@ -368,12 +368,13 @@ public class ConfigStatisticsController extends BaseController { } } @RequestMapping("configTrans") - public String configTrans(Model model,Integer cfgId,String beginDate,String endDate,String timeSize,String chartType,String cfgDesc){ + public String configTrans(Model model,Integer cfgId,String beginDate,String endDate,String timeSize,String chartType,String cfgDesc,String serviceId){ model.addAttribute("timeSize", timeSize); model.addAttribute("cfgId", cfgId); model.addAttribute("beginDate", beginDate); model.addAttribute("endDate", endDate); model.addAttribute("chartType_1", chartType); + model.addAttribute("serviceId", serviceId); if(!cfgDesc.equals("undefined") && !cfgDesc.equals("") && cfgDesc !=null){ model.addAttribute("cfgDesc", cfgDesc); }else{ @@ -387,11 +388,14 @@ public class ConfigStatisticsController extends BaseController { @RequestMapping("ajaxConfigStatistic") @ResponseBody public List ajaxConfigStatistic(String cfgId,String timeSize,String cfgDesc,@RequestParam(required=false)String beginDate, - @RequestParam(required=false)String endDate,Model model,HttpServletRequest request){ + @RequestParam(required=false)String endDate,String serviceId,Model model,HttpServletRequest request){ Map fromJsonList = new HashMap(); List resultList = new ArrayList(); String url = Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT; url=url+"?pageSize=-1&searchCfgId="+cfgId; + if(!StringUtil.isEmpty(serviceId)) { + url=url+"&searchService="+serviceId; + } if(!StringUtil.isEmpty(timeSize)) { if(timeSize.equals("1")){ url=url+"&searchBusinessType=2"; diff --git a/src/main/webapp/WEB-INF/views/dashboard/configStatisticTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/configStatisticTrans.jsp index bd6d5b686..60ae764bc 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/configStatisticTrans.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/configStatisticTrans.jsp @@ -20,6 +20,7 @@ <%-- --%> +
@@ -65,11 +66,12 @@ $(document).ready(function(){ var cfgId=$("#cfgId").val(); var timeSize=$("#timeSize").val(); var chartType = $("#chartType").val(); + var serviceId = $("#serviceId").val(); $.ajax({ url: '${ctx}/dashboard/traffic/ajaxConfigStatistic', type : "get" , dataType:"json", - data:{"beginDate":beginDate,"endDate":endDate,"timeSize":timeSize,"cfgId":cfgId}, + data:{"beginDate":beginDate,"endDate":endDate,"timeSize":timeSize,"cfgId":cfgId,"serviceId":serviceId}, async:true, timeout:50000, success:function (rs) { diff --git a/src/main/webapp/WEB-INF/views/dashboard/newConfigStatistic.jsp b/src/main/webapp/WEB-INF/views/dashboard/newConfigStatistic.jsp index 68f82f907..acc7c1ab2 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newConfigStatistic.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newConfigStatistic.jsp @@ -17,7 +17,7 @@ - + ${log.cfgId} ${log.cfgDesc } ${log.sum } @@ -36,12 +36,12 @@ //配置统计页面 配置ID点击事件 - function searchByConfig(cfgId,cfgDesc){ + function searchByConfig(cfgId,cfgDesc,serviceId){ var beginDate = $("#beginDate").val(); var endDate = $("#endDate").val(); var timeSize = $(".timeSize:checked").val(); var chartType = $("#chartType").val(); - var url= "${ctx}/dashboard/traffic/configTrans?beginDate="+beginDate+"&endDate="+endDate+"&timeSize="+timeSize+"&cfgId="+cfgId+"&chartType="+chartType+"&cfgDesc="+cfgDesc; + var url= "${ctx}/dashboard/traffic/configTrans?beginDate="+beginDate+"&endDate="+endDate+"&timeSize="+timeSize+"&cfgId="+cfgId+"&chartType="+chartType+"&cfgDesc="+cfgDesc+"&serviceId="+serviceId; openPicWindow(url); } //点击 配置Id的弹窗方法