diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 56e7bb5df..0423c13ce 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -337,6 +337,9 @@ public class BaseController { protected void initReportCondition(Model model,SearchReport report){ List serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId()); model.addAttribute("serviceList", serviceList); + if (StringUtils.isBlank(report.getReportTime())) { + report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd")); + } } protected void initFormCondition(Model model){ List requestInfos=requestInfoService.getValidRequestInfo(); diff --git a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java index 7ed1ceebb..1c8e725bb 100644 --- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java @@ -133,6 +133,7 @@ public class NtcSrcipDomesticReportController extends BaseController { } model.addAttribute("splitor", Constants.REPORT_TRIM_CONNECTOR); model.addAttribute("datas", showData); + model.addAttribute("dataLength", showData.size()); return "/report/srcIp"; } } diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java index d31d973c2..f897c4792 100644 --- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java @@ -125,6 +125,7 @@ public class NtcTagReportController extends BaseController { showData.put(label.getServiceDictId().toString(), _line); } model.addAttribute("datas", showData); + model.addAttribute("dataLength", showData.size()); return "/report/label"; } } diff --git a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp new file mode 100644 index 000000000..173bd4a46 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp @@ -0,0 +1,146 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/label.jsp b/src/main/webapp/WEB-INF/views/report/label.jsp index 46a92074c..d50ee4e82 100644 --- a/src/main/webapp/WEB-INF/views/report/label.jsp +++ b/src/main/webapp/WEB-INF/views/report/label.jsp @@ -1,9 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> - +<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> +<%-- --%> @@ -29,4 +27,4 @@ $(function(){
-
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 51c2d88c1..e37a6a9bb 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -109,7 +109,8 @@ var ajaxReport=function(url,target){ $.ajax({ type:'post', async:false, - url:'${ctx}'+url,///report/ajaxNtcTagReport + cache:false, + url:'${ctx}'+url+"?random="+Math.random,///report/ajaxNtcTagReport data:{ "action":$('[name="action"]').val(), "reportType":$('[name="reportType"]').val(), @@ -118,10 +119,11 @@ var ajaxReport=function(url,target){ dataType:"html", success:function(data){ $(target).html(data);//#label + pagination(); closeTip(); } - }); -} + }); +}; diff --git a/src/main/webapp/WEB-INF/views/report/srcIp.jsp b/src/main/webapp/WEB-INF/views/report/srcIp.jsp index be44c3c08..c5eda3462 100644 --- a/src/main/webapp/WEB-INF/views/report/srcIp.jsp +++ b/src/main/webapp/WEB-INF/views/report/srcIp.jsp @@ -1,9 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> - +<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> +<%-- --%> @@ -25,7 +23,7 @@ $(function(){ - +
${cloumn}
-
${page}
+