diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index a7913b70d..6287da339 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -343,6 +343,9 @@ public class BaseController { if (StringUtils.isBlank(report.getReportTime())) { report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd")); } + if (report.getReportType() == null) { + report.setReportType(1); + } } protected void initFormCondition(Model model){ List requestInfos=requestInfoService.getValidRequestInfo(); diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 5ae4ecbcb..87255c12d 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -8,9 +8,9 @@ //筛选功能初始化 filterActionInit(); //日期类型初始化 - changeReportType("${bean.reportType}", true); + changeReportType("${bean.reportType}"); $("#reportType").change(function(){ - changeReportType($("#reportType", false).val()); + changeReportType($("#reportType").val()); }); //reset $("#resetBtn").on("click",function(){ @@ -89,29 +89,25 @@ }); }); - function changeReportType(reportType, init) { + function changeReportType(reportType) { $("#intype").remove(); - var reportTime = ""; - if (init) { - reportTime = "${bean.reportTime }"; - } + var reportTime = "${bean.reportTime }"; if(reportType == 1){//需删除元素后重新添加,直接更改onclick会出现缓存问题 $("#reportTypeDiv").append(''); } else if(reportType == 2){ - $("#reportTypeDiv").append(''); + $("#reportTypeDiv").append(''); } else if(reportType == 3){ - $("#reportTypeDiv").append(''); + $("#reportTypeDiv").append(''); } } var ajaxReport=function(url,target){ - var random=new Date().getTime(); loading(''); $.ajax({ type:'post', async:false, cache:false, - url:'${ctx}'+url+"?random="+random,///report/ajaxNtcTagReport + url:'${ctx}'+url,// /report/ajaxNtcTagReport data:{ "action":$('[name="action"]').val(), "reportType":$('[name="reportType"]').val(),