From 3e819d56bbc51e64bfb7ad0dfaf98e453d773852 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Mon, 3 Sep 2018 09:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8=20=20?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=8A=A5=E3=80=81=E6=97=A5=E6=8A=A5=E3=80=81?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/list.jsp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index fe18ec221..330cb5f14 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -90,15 +90,18 @@
 		var reportTime = "${bean.reportTime}";
 		return cfgName + action + reportType + reportTime;
 	}
+
+var  reportDate=0; 
 	function changeReportType(reportType) {
 		$("#intype").remove();
 		var	reportTime = "${bean.reportTime }";
 	    var  time=getNowFormatDate();
-	     if(reportTime.length==4){
-	    	reportTime = reportTime+"-"+time.substring(5,10);
-	    }else if(reportTime.length==7){
-	    	reportTime = reportTime+"-"+time.substring(8,10);
-	    } 
+	    if(reportDate > 0){
+	    	if(reportTime.length < 10){
+	    		reportTime =time;
+	    	}
+	    }
+	    reportDate ++;
 		if(reportType == 1){//需删除元素后重新添加，直接更改onclick会出现缓存问题
 			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy-MM-dd",isShowClear:true});>');
 		} else if(reportType == 2){