From f917bbb9a164a69f2824519f31c0d60308a4eaeb Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Fri, 28 Jun 2019 14:39:26 +0800
Subject: [PATCH] 1.完成单题详情

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp | 234 ++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 1 file changed, 36 insertions(+), 198 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index ed4dde4..6737808 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -143,7 +143,9 @@
 		line-height:20px;
 		float:left;
 	}
-
+	#right_ans{
+		margin-right:30px;
+	}
 	</style>
 </head>
 
@@ -190,18 +192,9 @@
 	<div class="single">
 		<h3>单题正确率详情：</h3>
 		<ul>
+		<!-- 
 			<li class="list correct">1(60%)</li>
-			<li class="list erro">2(60%)</li>
-			<li class="list correct">3(60%)</li>
-			<li class="list correct">4(60%)</li>
-			<li class="list correct">5(60%)</li>
-			<li class="list correct">6(60%)</li>
-			<li class="list correct">7(60%)</li>
-			<li class="list correct">8(60%)</li>
-			<li class="list correct">9(60%)</li>
-			<li class="list correct">10(60%)</li>
-			<li class="list correct">11(60%)</li>
-			<li class="list correct">12(60%)</li>
+ 		-->
 		</ul>
 		<div class="clear"></div>
 	</div>
@@ -214,46 +207,24 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">第一题【3分】</h4>
+        <h4 class="modal-title" id="myModalLabel">第<span id="index">1</span>题【<span id="score">0</span>分】</h4>
       </div>
       <div class="modal-body">
-        <p>正确答案：D  得分率：84%</p>
+        <p>正确答案：<span id="right_ans">D</span>  得分率：<span id="dfl">84%</span></p>
         <div class="q_charts">
+        <!-- 
         	<div class="ans_list" style="height:50px;">
-        		
         		<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;">	
-        		<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>
+        
+        	<!-- <li>黄某某</li> -->
+        	
         </div>
       </div>
     </div>
@@ -278,8 +249,12 @@
     
   
     
-	<script type="text/javascript">
-		$(function() {
+	<script type="text/javascript">			
+
+		$(document).ready(function(){
+			window.top.loading.remove();
+			
+			
 			var ans_details = '${page_data.ANSWER_PERSENT}';
 			
 			if(ans_details != ''){
@@ -288,167 +263,20 @@
 				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>';
+						_html+='<li class="list correct" data-dfl="'+ans_arry[i]+'">'+i+'('+ans_arry[i]+')'+'</li>';
 					}else{
-						_html+='<li class="list erro">'+(i+1)+'('+ans_arry[i]+')'+'</li>';
+						_html+='<li class="list erro" data-dfl="'+ans_arry[i]+'">'+(i+1)+'('+ans_arry[i]+')'+'</li>';
 					}				
 				}
 				$(".single ul").html(_html);
 			}
-			
-			//日期框
-			$('.date-picker').datepicker({
-				autoclose : true,
-				todayHighlight : true
-			});
-
-			//下拉框
-			if (!ace.vars['touch']) {
-				$('.chosen-select').chosen({
-					allow_single_deselect : true
-				});
-				$(window).off('resize.chosen').on('resize.chosen', function() {
-					$('.chosen-select').each(function() {
-						var $this = $(this);
-						$this.next().css({
-							'width' : $this.parent().width()
-						});
-					});
-				}).trigger('resize.chosen');
-				$(document).on('settings.ace.chosen',
-						function(e, event_name, event_val) {
-							if (event_name != 'sidebar_collapsed')
-								return;
-							$('.chosen-select').each(function() {
-								var $this = $(this);
-								$this.next().css({
-									'width' : $this.parent().width()
-								});
-							});
-						});
-				$('#chosen-multiple-style .btn').on(
-						'click',
-						function(e) {
-							var target = $(this).find('input[type=radio]');
-							var which = parseInt(target.val());
-							if (which == 2)
-								$('#form-field-select-4').addClass(
-										'tag-input-style');
-							else
-								$('#form-field-select-4').removeClass(
-										'tag-input-style');
-						});
-			}
-
-			//复选框全选控制
-			var active_class = 'active';
-			$('#simple-table > thead > tr > th input[type=checkbox]').eq(0).on(
-					'click',
-					function() {
-						var th_checked = this.checked;//checkbox inside "TH" table header
-						$(this).closest('table').find('tbody > tr').each(
-								function() {
-									var row = this;
-									if (th_checked)
-										$(row).addClass(active_class).find(
-												'input[type=checkbox]').eq(0)
-												.prop('checked', true);
-									else
-										$(row).removeClass(active_class).find(
-												'input[type=checkbox]').eq(0)
-												.prop('checked', false);
-								});
-					});
-		});
-		
-		var role = '${pd.ROLE}';
-		
-		function precent(avg,total){
-			if(total == 0){
-				return "0%"
-			}
-			return Math.round(avg / total * 100)/100 + '%' ;
-		}
-		
-		function homeReport(classId){
-			var path = '<%=basePath%>homework/report.do?School_id=${pd.SCHOOL_ID}&CLASS_ID='+classId;
-			console.log(path);
-			parent.$("#mainFrame").attr('src',path);
-			window.top.loading.show();
-		}
-		
-		function tosearch(){
-			
-			var url = "<%=basePath%>homework/report.do?CLASS_ID=${pd.CLASS_ID}" ;
-			var startDate = $("#lastStart").val();
-			var endDate =  $("#lastEnd").val();
-			//var subject_id =  $("#SUBJECT_ID").val();
-			url = url + "&START_DATE=" + startDate ;
-			if(endDate != null){
-				url = url + "&END_DATE=" + endDate;
-			}
-
-			window.location.href = url;
-			window.top.loading.show();
-			/* $("#Form").sumbit(); */
-		}
-		function tosearch_week(type){   //上一周 本周 下一周
-			console.log('${pd.CLASS_ID}');
-			var url = "<%=basePath%>homework/report.do?CLASS_ID=${pd.CLASS_ID}" ;
-			url = url + "&CURRENT_WEEK=" + type ;
-			
-			console.log(url);
-			window.location.href = url;
-			window.top.loading.show();
-			/* $("#Form").sumbit(); */
-		}
-		
-		function student(classid,studentid){
-		
-			var url = "<%=basePath%>homework/student.do?STUDENT_ID=" + studentid + "&CLASS_ID=" + classid ;
-			var startDate = $("#lastStart").val();
-			var endDate =  $("#lastEnd").val();
-			url = url + "&START_DATE=" + startDate + "&END_DATE=" + endDate ;
-			
-			window.location.href = url;
-			window.top.loading.show();
-		}
-		
-		function paper(class_id,testpaper_id){
-			var url = "<%=basePath%>homework/homework_report?HOMEWORK_ID=" + 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();
-			
-			 var sour = "${pd.DATA.HOMEWORKS}";
-			
-			
-			 if(sour != null && sour.length > 3){
-				var _width = $('#mainFrame', parent.document).width()-40;
-				var _heigh = $('#mainFrame', parent.document).height()-350;
-				var options = {
-	            width: _width,
-	            height: _heigh,
-	            pinnedRows: 5,
-	            pinnedCols: 4,
-	            container: "#scrollableTable",
-	            removeOriginal: true
-	        	};
-				$("#simple-table").tablescroller(options);
-		        var name_height = $(".kc").last().parent().height()-18.5;
-		        console.log(name_height);
-		        $(".th_name").height(name_height);
-			} 
-			 
 			 
 			 var data ={};
 			 $(document).on("click",".list",function(){
+				 
+				 $("#index").text($(this).index()+1);
+				 $("#dfl").text($(this).attr("data-dfl"));
+				 
 				 $.ajax({
 					 url:"<%=basePath%>homework/homeworkindex",
 					 type:"post",
@@ -456,7 +284,10 @@
 					 success:function(res){
 						 res = JSON.parse(res);
 						 data=res.DATA;
-						 console.log(res.ANSWER);
+						 console.log(res);
+						 
+						 $("#right_ans").text(res.ANSWER);
+						 $("#score").text(res.SCORE);
 						 
 						 var stundent_num=[];
 						 var _html='';
@@ -465,7 +296,7 @@
 						 }
 						 max_num=Math.max.apply(null,stundent_num);
 						 for(i=0;i<res.DATA.length;i++){
-							 if(String.fromCharCode(65+i)==res.ANSWER){
+							 if(res.ANSWER.indexOf(String.fromCharCode(65+i))>-1){
 								 _html += '<div class="ans_list" style="height:'+(stundent_num[i]*200/max_num).toFixed(2)+'px;"><div class="rel ans_correct"><p class="p_num">'+res.DATA[i].length+'人</p></div><p class="ans_option">'+String.fromCharCode(65+i)+'</p></div>'
 							 }else{
 								 _html += '<div class="ans_list" style="height:'+(stundent_num[i]*200/max_num).toFixed(2)+'px;"><div class="rel ans_error"><p class="p_num">'+res.DATA[i].length+'人</p></div><p class="ans_option">'+String.fromCharCode(65+i)+'</p></div>';
@@ -478,6 +309,13 @@
 						 $(".student_list").html(student_option_list);
 						 
 						 $(".q_charts").html(_html);
+						 
+						 var className=$(".ans_option").eq(0).siblings(".rel").attr("class");
+						 if(className.indexOf("ans_error")>0){
+							 $(".ans_option").eq(0).addClass("ans_error_round");
+						 }else{
+							 $(".ans_option").eq(0).addClass("ans_correct_round");
+						 }
 						 //console.log(max_num);
 						 $('#myModal').modal('toggle')
 					 }
--
libgit2 0.21.4