From d7348237114a673d44973191d6b5080d06dc98c4 Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Thu, 27 Jun 2019 17:01:24 +0800
Subject: [PATCH] 1.修改课后练报表页面

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp         |   4 ++--
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp       | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
 src/com/fh/controller/sunvote/homework/HomeworkController.java |   8 ++++----
 3 files changed, 138 insertions(+), 24 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 82d6c72..b40d50e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -184,8 +184,8 @@
 		parent.$("#mainFrame").attr('src',path);
 		window.top.loading.show();
 	}
-	function homeReport(){
-		var path = '<%=basePath%>homework/report.do?';
+	function homeReport(homework_id){
+		var path = '<%=basePath%>homework/report2.do?HOMEWORK_ID='+homework_id;
 		parent.$("#mainFrame").attr('src',path);
 		window.top.loading.show();
 	}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index 396893d..9e31303 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -52,6 +52,7 @@
 		float:left;
 		list-style:none;
 		border:1px solid #ddd;
+		cursor: pointer;
 	}
 	.correct{
 		color:#28be56;
@@ -68,17 +69,21 @@
 	}
 	.q_charts{
 		width:100%;
-		height:200px;
+		height:240px;
+		postion:relative;
+		margin-top:20px;
+		text-align:center;
 	}
 	.rel{
-		width:20px;
+		width:40px;
 		height:100%;
+		position:relative;
 	}
 	.ans_correct{
-		background:#f00;
+		background:#28be56;
 	}
 	.ans_error{
-		background:#ff0;
+		background:#ff5353;
 	}
 	.ans_list{
 		display:inline-block;
@@ -86,13 +91,57 @@
 		margin:0 10px;
 	}
 	.ans_list p{
-		margin:0;
+		margin-bottom:0;
+		margin-top:5px;
 		line-height:20px;
+		text-align:center;
+	}
+	.ans_option{
+		cursor: pointer;
 	}
 	.p_num{
-		
+		position:absolute;
+		top:-20px;
 	}
-	
+	.ans_error_round{
+		width:20px;
+		height:20px;
+		margin:0 auto;
+		background:#ff5353;
+		color:#fff;
+		border-radius:10px;
+	}
+	.ans_correct_round{
+		width:20px;
+		height:20px;
+		margin:0 auto;
+		background:#28be56;
+		color:#fff;
+		border-radius:10px;
+	}
+	.student_list{
+		width:100%;
+		padding:10px;
+		background:#f3f3f3;
+		box-sizing:border-box;
+	}
+	.cle:after{
+		visibility:hidden; 
+		display:block; 
+		font-size:0; 
+		content:'\20'; 
+		clear:both; 
+		height:0;
+		}
+	.student_list li{
+		width:120px;
+		height:20px;
+		list-style:none;
+		text-align:center;
+		line-height:20px;
+		float:left;
+	}
+
 	</style>
 </head>
 
@@ -105,7 +154,7 @@
 	</div>						
 	<div class="clear"></div>
 </div>
-<div style="padding:0 20px;padding-top:3%;margin-top:102px;">
+<div style="padding:0 20px;padding-top:3%;padding-bottom:3%;margin-top:102px;">
 	<div class="overall">
 		<h3>作业总体情况：</h3>
 		<table class="table table-bordered ">
@@ -117,13 +166,17 @@
 			<tbody>
 				<tr>
 					<td>提交情况：25/30</td>
-					<td>题量：10</td>
-					<td>最高得分率：100%</td>
+					<td>题量：${page_data.QUESTION_COUNT}</td>
+					<td>最高得分率：${page_data.GET_MAX_SCORE*100/page_data.ALL_SCORE}%</td>
 					<td>最低得分率：10%</td>
-					<td>平均得分率：60%</td>
+					<td>平均得分率：${page_data.GET_SCORE_PERSENT}</td>
 				</tr>
 				<tr>
-					<td colspan="5">未提交人：张三、李四</td>
+					<td colspan="5">未提交人：${data[0].STUDENT_NAME }
+						<c:forEach items="${data}" begin="1" var="var" varStatus="vs">
+							、${var.STUDENT_NAME}							
+						</c:forEach>
+					</td>
 				</tr>
 			</tbody>
 		</table>
@@ -161,15 +214,40 @@
         <p>正确答案：D  得分率：84%</p>
         <div class="q_charts">
         	<div class="ans_list" style="height:50px;">
-        		<p class="p_num">8人</p>
-        		<div class="rel ans_correct"></div>
+        		
+        		<div class="rel ans_correct">
+        			<p class="p_num">8人</p>
+        		</div>
         		<p class="ans_option">A</p>
         	</div>
-        	<div class="ans_list" style="height:100px;">
-        		<p class="p_num">8人</p>
-        		<div class="rel ans_correct"></div>
-        		<p class="ans_option">A</p>
+        	<div class="ans_list" style="height:100px;">	
+        		<div class="rel ans_error">
+        			<p class="p_num">16人</p>
+        		</div>
+        		<p class="ans_option">B</p>
         	</div>
+        	<div class="ans_list" style="height:200px;">	
+        		<div class="rel ans_correct">
+        			<p class="p_num">32人</p>
+        		</div>
+        		<p class="ans_option">C</p>
+        	</div>
+        	<div class="ans_list" style="height:150px;">	
+        		<div class="rel ans_correct">
+        			<p class="p_num">24人</p>
+        		</div>
+        		<p class="ans_option ans_correct_round">D</p>
+        	</div>
+        </div>
+        <div class="student_list cle">
+        	<li>黄某某</li>
+        	<li>黄某某</li>
+        	<li>黄某某</li>
+        	<li>黄某某</li>
+        	<li>黄某某</li>
+        	<li>黄某某</li>
+        	<li>黄某某</li>
+        	<li>黄某某</li>
         </div>
       </div>
     </div>
@@ -196,6 +274,21 @@
     
 	<script type="text/javascript">
 		$(function() {
+			var ans_details = '${page_data.ANSWER_PERSENT}';
+			
+			if(ans_details != ''){
+				var _html="";
+				var ans_arry = ans_details.split(",");
+				for(i = 0;i<ans_arry.length;i++){
+					temp = parseInt(ans_arry[i].replace("%",""));
+					if(temp>=80){
+						_html+='<li class="list correct">'+i+'('+ans_arry[i]+')'+'</li>';
+					}else{
+						_html+='<li class="list erro">'+(i+1)+'('+ans_arry[i]+')'+'</li>';
+					}				
+				}
+				$(".single ul").html(_html);
+			}
 			
 			//日期框
 			$('.date-picker').datepicker({
@@ -350,6 +443,27 @@
 			 
 			 $(document).on("click",".list",function(){
 				 $('#myModal').modal('toggle')
+			 });
+			 
+			 $(document).on("click",".ans_option",function(){
+				 var className = $(this).siblings(".rel").attr("class");
+				 
+				 
+				 $(".ans_option").attr("class","ans_option");
+				 if(className.indexOf("ans_error")>0){
+					 if($(this).hasClass("ans_error_round")){
+						 return;
+					 }else{
+						 $(this).addClass("ans_error_round");
+					 }
+					 
+				 }else{
+					 if($(this).hasClass("ans_correct_round")){
+						 return;
+					 }else{
+						 $(this).addClass("ans_correct_round");
+					 }
+				 }
 			 })
 				
 		});
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 3cb7cd6..6cf07ce 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -308,14 +308,14 @@ public class HomeworkController extends BaseController {
 			pageData = homeworkService.findById(pageData);
 			List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
 			pageData.put("NO_COUNT", data.size());
-			modelAndView.addObject("pageData", pageData); // 报表统计情况
+			modelAndView.addObject("page_data", pageData); // 报表统计情况
 			modelAndView.addObject("data", data);// 未答学生列表
 			
 		}
 		if(isChineseLanguageClient()){
-			modelAndView.setViewName("sunvote/homework/??????");
+			modelAndView.setViewName("sunvote/homework/homework_report");
 		}else{
-			modelAndView.setViewName("sunvote/homework/??????");
+			modelAndView.setViewName("sunvote/homework/en_homework_report");
 		}
 		
 		return modelAndView;
@@ -428,7 +428,7 @@ public class HomeworkController extends BaseController {
 				String[] answers = answer.split(";");
 				if(answers.length >= indexint -1){
 					String ans = answers[indexint - 1];
-					String[] anss = ans.split(":");
+					String[] anss = ans.split(",");
 					if(anss != null && anss.length == 2){
 						PageData tresult = null;
 						for(PageData ptd : result){
--
libgit2 0.21.4