From ffe4d02aeef10ec29abc88647851d6bb0e985063 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Tue, 24 Jul 2018 17:36:39 +0800
Subject: [PATCH] 修改报表时间传递

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp     |   6 +++---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp   |  32 ++++++++++++++++++++++++++------
 WebRoot/static/js/control1.js                              | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------
 src/com/fh/controller/sunvote/report/ReportController.java |   7 +++++++
 4 files changed, 115 insertions(+), 81 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
index 179ea60..379aa7e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
@@ -46,8 +46,8 @@ li {
 	<div class="header">
 		<nav class="navbar navbar-default navbar-fixed-top">
 			<div class="container">
-				<input type="text" class="date-picker" placeholder="开始日期"	name="starDate" id="starDate" data-date-format="yyyy-mm-dd"	readonly="readonly"/> 
-				<input type="text" class="date-picker" placeholder="结束日期" name="endDate" id="endDate"  data-date-format="yyyy-mm-dd"	readonly="readonly"/>
+				<input type="text" class="date-picker" placeholder="开始日期"	name="starDate" id="starDate" data-date-format="yyyy-mm-dd"	readonly="readonly" value="${start_date}"/> 
+				<input type="text" class="date-picker" placeholder="结束日期" name="endDate" id="endDate"  data-date-format="yyyy-mm-dd"	readonly="readonly" value="${end_date}"/>
 				<input type="button" value="查询" id="search" />
 			</div>
 		</nav>
@@ -116,7 +116,7 @@ li {
 	<script type="">
 		var URL = '<%=basePath%>${URL}';
 	</script>
-	<script src="../static/js/control1.js"></script>
+	<script src="../static/js/control1.js?a=1"></script>
 	<!-- 日期框 -->
 	<script>
 	//lay('#version').html('-v'+ laydate.v);
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index 1575a57..97a1809 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -39,13 +39,15 @@
 				
 					<td><div style="width:150px;text-align:center;"><span>学生人数: ${info.STUDENT_NUM}</span></div></td>
 					<td></td>
-					<td style="padding-left:2px;"><input
+					<td style="padding-left:2px;">
+					<input
 						class="span10 date-picker" name="lastStart" id="lastStart"
-						value="" type="text" data-date-format="yyyy-mm-dd"
+						value="${start_date}" type="text" data-date-format="yyyy-mm-dd"
 						readonly="readonly" style="width:88px;" placeholder="开始日期"
-						title="开始日期" /></td>
+						title="开始日期" />
+						</td>
 					<td style="padding-left:2px;"><input
-						class="span10 date-picker" name="lastEnd" id="lastEnd" value=""
+						class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
 						type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
 						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
 					<td style="vertical-align:top;padding-left:2px"><a
@@ -64,7 +66,7 @@
 						<th class="center"><div style="width:80px;">课程总分</div></th>
 						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
 							<th class="center"><a
-								href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}" onclick="window.top.loading.show();"><div style="width:180px;" class="font">${var.NAME}</br><span>${var.CREATE_DATE}</span></div></a></th>
+								 onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');"><div style="width:180px;" class="font">${var.NAME}</br><span>${var.CREATE_DATE}</span></div></a></th>
 						</c:forEach>
 					</tr>
 				</thead>
@@ -104,7 +106,7 @@
 										href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
 									</td> --%>
 									<td class="center"><a
-										href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}" onclick="window.top.loading.show();">${var.NAME}</a>
+										 onclick="student('${info.CLASS_ID}','${var.ID}')">${var.NAME}</a>
 									</td>
 									<td class="center"><fmt:formatNumber type="number"
 											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
@@ -219,6 +221,24 @@
 			/* $("#Form").sumbit(); */
 		}
 		
+		function student(classid,studentid){
+			var url = "<%=basePath%>report/student_report?studentid=" + studentid + "&class_id=" + classid ;
+			var startDate = $("#lastStart").val();
+			var endDate =  $("#lastEnd").val();
+			url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
+			window.self.location.href = url;
+			window.top.loading.show();
+		}
+		
+		function paper(class_id,testpaper_id){
+			var url = "<%=basePath%>report/test_report?TestID=" + testpaper_id + "&class_id=" + class_id;
+			var startDate = $("#lastStart").val();
+			var endDate =  $("#lastEnd").val();
+			url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
+			window.self.location.href = url;
+			window.top.loading.show();
+		}
+		
 		$(document).ready(function(){
 			window.top.loading.remove();
 		});
diff --git a/WebRoot/static/js/control1.js b/WebRoot/static/js/control1.js
index 655946d..5ba51ce 100644
--- a/WebRoot/static/js/control1.js
+++ b/WebRoot/static/js/control1.js
@@ -42,8 +42,9 @@
 		
 		studentid=getQueryString("studentid");
 		
-		getData();
-		
+		startDate = $("#starDate").val();
+		endDate = $("#endDate").val();
+		getData(startDate,endDate);
 		
 		//$('#myStathalf').circliful();
 		//$('#myStathalf1').circliful();
@@ -91,7 +92,8 @@
 	
 	
 	function data(index,data){
-	console.log(data);
+		console.log(data);
+		//data0=[];data1=[];data2=[];data3=[];
 		var GETSCORE = parseInt(data.data.studentList[index].GETSCORE);
 		var TOTALSCORE = parseInt(data.data.TOTAL_SCORE);
 		var ratio=(GETSCORE/TOTALSCORE*100).toFixed(2);
@@ -100,6 +102,12 @@
 		
 		var test_num=data.data.studentList[index].testList.length;
 		var part_num=test_num;
+		
+			data0=[];
+			data1=[];
+			data2=[];
+			data3=[];
+		
 		//console.log(data.data.studentList[index].testList[2].SCORE);
 		if($("input[type='radio']:checked").val()==1){
 			for(var i=0;i<test_num;i++){
@@ -142,76 +150,75 @@
 		$(".circle .col-md-6").eq(0).html('<div id="myStathalf" data-dimension="350" data-text="'+part_num+'/'+test_num+'" data-info="参与测试" data-width="10" data-fontsize="38" data-percent="'+partake+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
 		$('#myStathalf1').circliful();
 		$('#myStathalf').circliful();
-		 myChart.setOption(option);
+		 myChart.setOption({
+			    xAxis: {
+			        type: 'category',
+			        data: data0
+			    },
+			    yAxis: {
+			        type: 'value'
+			    },
+			    series: [{
+			        data: data1,
+			        type: 'line',
+			        symbol: 'circle',
+			        symbolSize: 5,
+			        lineStyle: {
+			            normal: {
+			                color: 'green',
+			                width: 2,
+			                type: 'dashed'
+			            }
+			        },
+			        itemStyle: {
+			            normal: {
+			                borderWidth: 2,
+			                borderColor: 'green',
+			                color: 'green'
+			            }
+			        }
+			    },{
+			        data: data3,
+			        type: 'line',
+			        symbol: 'circle',
+			        symbolSize: 5,
+			        lineStyle: {
+			            normal: {
+			                color: 'yellow',
+			                width: 2,
+			                type: 'dashed',
+			            }
+			        },
+			        itemStyle: {
+			            normal: {
+			                borderWidth: 2,
+			                borderColor: 'yellow',
+			                color: 'yellow'
+			            }
+			        }
+			    },{
+			        data: data2,
+			        type: 'line',
+			        symbol: 'circle',
+			        symbolSize: 10,
+			        lineStyle: {
+			            normal: {
+			                color: 'blue',
+			                width: 4,
+			                type: 'solid'
+			            }
+			        },
+			        itemStyle: {
+			            normal: {
+			                borderWidth: 3,
+			                borderColor: 'blue',
+			                color: 'blue',
+			                label : {show: true}
+			            }
+			        }
+			    }]
+			});
 	}
 	 
 	 
 	var myChart = echarts.init(document.getElementById('main'));
-	var option = {
-    xAxis: {
-        type: 'category',
-        data: data0
-    },
-    yAxis: {
-        type: 'value'
-    },
-    series: [{
-        data: data1,
-        type: 'line',
-        symbol: 'circle',
-        symbolSize: 5,
-        lineStyle: {
-            normal: {
-                color: 'green',
-                width: 2,
-                type: 'dashed'
-            }
-        },
-        itemStyle: {
-            normal: {
-                borderWidth: 2,
-                borderColor: 'green',
-                color: 'green'
-            }
-        }
-    },{
-        data: data3,
-        type: 'line',
-        symbol: 'circle',
-        symbolSize: 5,
-        lineStyle: {
-            normal: {
-                color: 'yellow',
-                width: 2,
-                type: 'dashed',
-            }
-        },
-        itemStyle: {
-            normal: {
-                borderWidth: 2,
-                borderColor: 'yellow',
-                color: 'yellow'
-            }
-        }
-    },{
-        data: data2,
-        type: 'line',
-        symbol: 'circle',
-        symbolSize: 10,
-        lineStyle: {
-            normal: {
-                color: 'blue',
-                width: 4,
-                type: 'solid'
-            }
-        },
-        itemStyle: {
-            normal: {
-                borderWidth: 3,
-                borderColor: 'blue',
-                color: 'blue',
-                label : {show: true}
-            }
-        }
-    }]
-};
\ No newline at end of file
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index a50c49a..1f76dd9 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -100,6 +100,8 @@ public class ReportController extends BaseController {
 		mv.addObject("studentList", studentList);
 		info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
 		mv.addObject("info", info);
+		mv.addObject("start_date", pd.get("START_DATE"));
+		mv.addObject("end_date", pd.get("END_DATE"));
 		mv.setViewName("sunvote/teacher/teacher_report_1");
 		return mv;
 	}
@@ -108,6 +110,9 @@ public class ReportController extends BaseController {
 	public ModelAndView teacher_report() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"教师报表");
 		ModelAndView mv = this.getModelAndView();
+		PageData pd = this.getPageData();
+		mv.addObject("start_date", pd.get("START_DATE"));
+		mv.addObject("end_date", pd.get("END_DATE"));
 		return mv;
 	}
 	
@@ -119,6 +124,8 @@ public class ReportController extends BaseController {
 		PageData pd = getPageData();
 		mv.addObject("URL", "report/student_report_data?class_id=" +pd.getString("CLASS_ID"));
 		mv.setViewName("sunvote/teacher/stduent_report");
+		mv.addObject("start_date", pd.get("START_DATE"));
+		mv.addObject("end_date", pd.get("END_DATE"));
 		return mv;
 	}
 	
--
libgit2 0.21.4