From a7551346a87d4bd3717529def6be1add5c2b0d16 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Wed, 25 Jul 2018 16:35:59 +0800
Subject: [PATCH] 报表显示时间

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp |  2 +-
 WebRoot/static/js/control1.js                          | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
index 379aa7e..186115f 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
@@ -116,7 +116,7 @@ li {
 	<script type="">
 		var URL = '<%=basePath%>${URL}';
 	</script>
-	<script src="../static/js/control1.js?a=1"></script>
+	<script src="../static/js/control1.js?a=2"></script>
 	<!-- 日期框 -->
 	<script>
 	//lay('#version').html('-v'+ laydate.v);
diff --git a/WebRoot/static/js/control1.js b/WebRoot/static/js/control1.js
index 5ba51ce..52a7c8a 100644
--- a/WebRoot/static/js/control1.js
+++ b/WebRoot/static/js/control1.js
@@ -29,7 +29,7 @@
 				}
 				$(".content_l ul").html(_html);
 				console.log(_index);
-				
+				window.top.loading.remove();
 			}
 			
 		});
@@ -65,9 +65,11 @@
 //			var date_arry=date_string.split(' - ');
 //			startDate=date_arry[0];
 //			endDate=date_arry[1];
+			window.top.loading.show();
 			startDate = $("#starDate").val();
 			endDate = $("#endDate").val();
 			getData(startDate,endDate);
+			
 		})
 		
 		$(".prev").click(function(){
@@ -112,7 +114,7 @@
 		if($("input[type='radio']:checked").val()==1){
 			for(var i=0;i<test_num;i++){
 			if(data.data.studentList[index].testList[i].TOTAL_SCORE>0){
-				data0[i]=data.data.studentList[index].testList[i].NAME;
+				data0[i]=data.data.studentList[index].testList[i].NAME + "\n" + data.data.studentList[index].testList[i].CREATE_DATE;
 				data1[i]=(data.data.studentList[index].testList[i].AVG_SCORE/data.data.studentList[index].testList[i].TOTAL_SCORE*100).toFixed(2);
 				data2[i]=(data.data.studentList[index].testList[i].SCORE/data.data.studentList[index].testList[i].TOTAL_SCORE*100).toFixed(2);
 				data3[i]=(data.data.studentList[index].testList[i].MAX_SCORE/data.data.studentList[index].testList[i].TOTAL_SCORE*100).toFixed(2);
@@ -154,9 +156,12 @@
 			    xAxis: {
 			        type: 'category',
 			        data: data0
+			        /*,
+			        axisLabel:{interval: 0}*/
 			    },
 			    yAxis: {
-			        type: 'value'
+			        type: 'value',
+			        splitArea: {show: true}
 			    },
 			    series: [{
 			        data: data1,
--
libgit2 0.21.4