吴杰0827修改

孙向锦
1 parent 0aad4b6b
Showing 6 changed files with 144 additions and 55 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
WebRoot/static/css/set_quetion.css
@@ -102,7 +102,7 @@
 	<script src="../static/js/echars.js"></script>
 	<script src="../static/js/loading.js"></script>
 	<script>
-	var url="http://127.0.0.1:8080/SunvoteEducation";
+	var url="";
 	var question_box=[];
 	function slide(obj){                      //查看解析
 		obj.closest(".star_box").siblings(".resolve").slideToggle(function(){
@@ -123,24 +123,36 @@ function getQueryString(name) {
 	var userid=getQueryString("userid");
 	var _html="";
+	var question_id_arry="";
 	$(document).ready(function(){
 		window.top.loading.remove();
+			var data=JSON.parse(sessionStorage.getItem("data")); 
+				console.log(data);
+				$("#paper_title").html(data.title);
+				$("#time").html(data.exam_time);
+				if(data.questions.length>0){
+					for(var i=0;i<data.questions.length;i++){
+						question_id_arry+=data.questions[i].question_id+',';
+					}
+					getQuestionInfo(question_id_arry);
+				}
+		
+	})
+	function getQuestionInfo(id){
 		$.ajax({
-			url:url+"/api/v1/paperinfo",
-			async:false,
+			url:url+"/SunvoteEducation/api/v1/question",
+			async:true,
 			type:"post",
-			data:{PAPER_ID:PAPER_ID},
+			data:{ID:id},
 			success:function(data){
 				console.log(data);
-				$("#paper_title").html(data.data.title);
-				$("#time").html(data.data.exam_time);
-				if(data.data.questions.length>0){				
-					for(var i=0;i<data.data.questions.length;i++){
-						_html += '<li class="question_li" data-id="'+data.data.questions[i].question_id+'"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【答案】 '+data.data.questions[i].answer+'</p><p><span>【解析】</span>'+data.data.questions[i].analysis+'</p></div><div class="clearfix"></div></div><div class="star_box"><div class="col-md-6 move"><img src="../static/images/up_ico.png" class="up"/><img src="../static/images/down_ico.png" class="down"/></div><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看解析</a></div></div><div class="clearfix"></div></div></li>';
+				if(data.data.length>0){				
+					for(var i=0;i<data.data.length;i++){
+						_html += '<li class="question_li" data-id="'+data.data[i].QUESTION_ID+'"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【答案】 '+data.data[i].ANSWER+'</p><p><span>【解析】</span>'+data.data[i].ANALYSIS+'</p></div><div class="clearfix"></div></div><div class="star_box"><div class="col-md-6 move"><img src="../static/images/up_ico.png" class="up"/><img src="../static/images/down_ico.png" class="down"/></div><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看解析</a></div></div><div class="clearfix"></div></div></li>';
 					}
 					console.log(_html);
 					$(".analysis ul").html(_html);
-					for(var j=0;j<data.data.questions.length;j++){
+					for(var j=0;j<data.data.length;j++){
 						var option_html="";
 						var sum=0;
 						var right_num=0;
@@ -148,22 +160,23 @@ function getQueryString(name) {
 						var data2=[];
 						var answer="";
 						var color=[];
-						$(".analysis li .stem").eq(j).append('<span class="li_index">'+(j+1)+'</span>、'+data.data.questions[j].content);
-						var arry_option=data.data.questions[j].option_content;
-						arry_option=arry_option.replace("[","");
-						arry_option=arry_option.replace("]","");
-						arry_option=arry_option.split(",");
+						$(".analysis li .stem").eq(j).append('<span class="li_index">'+(j+1)+'</span>、'+data.data[j].CONTENT);
+						var arry_option=data.data[j].OPTION_CONTENT;
+						//arry_option=arry_option.replace("[","");
+						//arry_option=arry_option.replace("]","");
+						//arry_option=arry_option.split(",");
 						for(var x=0;x<arry_option.length;x++){
 							option_html += '<li><span>'+String.fromCharCode(64 + parseInt(x+1))+'.</span>'+arry_option[x]+'</li>';
 						}
 						$(".option").eq(j).html(option_html);
-						star(j,parseInt(data.data.questions[j].difficulty));
+						star(j,parseInt(data.data[j].DIFFICULTY));
 					}
 				}
 			}
 		})
-	})
+		
+	}
 	function star(index,num){                //难度星级
 			$(".star").eq(index).append('<ul></ul>');
 			var li_html="";
@@ -244,7 +257,7 @@ function getQueryString(name) {
 			};
 			//console.log(data);
 			$.ajax({
-			url:url+"/api/v1/publishpaper",
+			url:url+"/SunvoteEducation/api/v1/publishpaper",
 			async:false,
 			type:"post",
 			dataType: "json",
@@ -41,7 +41,7 @@
 		<div class="col-md-12 analysis">
 			<ul>
-				<li>
+				<!--<li>
 					<div class="stem">
 						<p>1.如图，检测4个足球，其中超过标准质量的克数记为正数，不足标准质量的克数记为负数．从轻重的角度看，最接近标准的是（　　）</p>
 					</div>
@@ -106,17 +106,46 @@
 						</div>
 						<div class="clearfix"></div>
 					</div>
-				</li>
+				</li>-->
 			</ul>
 		</div>
 	</div>
-
+	<div class="modal fade" id="myModal" tabindex="-1" role="dialog">
+	  <div class="modal-dialog" role="document">
+		<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">完成选题</h4>
+		  </div>
+		  <div class="modal-body">
+			<table class="table table-bordered">
+			  <thead>
+					<tr>
+						<th>序号</th>
+						<th>学生姓名</th>
+						<th>选项</th>
+						<th>答题时间</th>
+					</tr>
+				</thead>
+				<tbody class="student_list">
+					
+				</tbody>
+			</table>
+		  </div>
+		  <div class="modal-footer">
+			<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+			<button type="button" class="btn btn-primary" id="submit">确定</button>
+		  </div>
+		</div><!-- /.modal-content -->
+	  </div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
 	</div>
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	<script src="../static/js/echars.js"></script>
 	<script src="../static/js/loading.js"></script>
 	<script>
-	var url="http://127.0.0.1:8080/SunvoteEducation";
+	var url="";
 	function slide(obj){                      //查看详情
 		obj.closest(".star_box").siblings(".resolve").slideToggle(function(){
 			if($(".resolve").css("display") == "none")
@@ -171,7 +200,7 @@
 			],
 			series : [
 				{
-					name:'直接访问',
+					name:'选项人数',
 					type:'bar',
 					barWidth: '60%',
 					data:data1,
@@ -202,7 +231,7 @@ function getQueryString(name) {
 	$(document).ready(function(){
 		window.top.loading.remove();
 		$.ajax({
-			url:url+"/api/v1/testpaperinfo",
+			url:url+"/SunvoteEducation/api/v1/testpaperinfo",
 			async:false,
 			type:"post",
 			data:{ID:testpaperId},
@@ -212,7 +241,7 @@ function getQueryString(name) {
 				$("#time").html(data.data.CREATE_DATE);
 				if(data.data.QUESTIONS.length>0){				
 					for(var i=0;i<data.data.QUESTIONS.length;i++){
-						_html += '<li class="question_li"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【答案】 '+data.data.QUESTIONS[i].ANSWER+'</p><p><span>【解析】</span>'+data.data.QUESTIONS[i].ANALYSIS+'</p></div><div class="clearfix"></div><div class="tab_report_box"><div class="col-md-3"><p>答错人数</p><div class="round_w_orange"><div class="round_n_orange"><span>0/0</span></div></div></div><div class="col-md-3"><p>错误率</p><div class="round_w_red"><div class="round_n_red"><span>100%</span></div></div></div><div class="col-md-6"><div id="main'+i+'" style="width:250px;height:140px;"></div></div><div class="clearfix"></div></div></div><div class="star_box"><div class="col-md-6">错误学生：0/0</div><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看详情</a></div></div><div class="clearfix"></div></div></li>';
+						_html += '<li class="question_li" data-id="'+data.data.QUESTIONS[i].QUESTION_ID+'"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【答案】 '+data.data.QUESTIONS[i].ANSWER+'</p><p><span>【解析】</span>'+data.data.QUESTIONS[i].ANALYSIS+'</p></div><div class="clearfix"></div><div class="tab_report_box"><div class="col-md-3"><p>答错人数</p><div class="round_w_orange"><div class="round_n_orange"><span>0/0</span></div></div></div><div class="col-md-3"><p>错误率</p><div class="round_w_red"><div class="round_n_red"><span>100%</span></div></div></div><div class="col-md-6"><div id="main'+i+'" style="width:250px;height:140px;"></div></div><div class="clearfix"></div></div></div><div class="star_box"><div class="col-md-6">错误学生：<span class="erro_num">0/0</span></div><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看详情</a></div></div><div class="clearfix"></div></div></li>';
 					}
 					console.log(_html);
 					$(".analysis ul").html(_html);
@@ -243,6 +272,7 @@ function getQueryString(name) {
 							sum += parseInt(answerinfo[k].COUNT);
 						}
 						$(".round_n_orange span").eq(j).text((sum-right_num)+"/"+sum);
+						$(".erro_num").eq(j).text((sum-right_num)+"/"+sum);
 						$(".round_n_red span").eq(j).text(((sum-right_num)/sum).toFixed(2)*100+"%");
 						$(".option").eq(j).find("ul").html(option_html);
@@ -268,9 +298,26 @@ function getQueryString(name) {
 			$(".star").eq(index).find("ul").html(li_html);
 		}
+	$(document).on("click",".round_n_orange",function(){
+		var question_id = $(this).closest("li").attr("data-id");
+		var student_html="";
+		$.ajax({
+			url:url+"/SunvoteEducation/api/v1/qstudentinfo",
+			async:false,
+			type:"post",
+			data:{question_id:question_id,test_id:testpaperId},
+			success:function(data){
+				console.log(data);
+				for(var i=0;i<data.data.length;i++){
+					student_html+='<tr><td>'+(i+1)+'</td><td>'+data.data[i].NAME+'</td><td>'+data.data[i].ANSWER+'</td><td>'+data.data[i].PRESS_TIME+'秒</td></tr>';
+				}
+				$(".student_list").html(student_html);
+			}
+		});
+		$('#myModal').modal('show');
+	})	
-		
-		console.log(${pd.A});
+
 	</script>
 </html>
@@ -9,7 +9,7 @@
     <!-- Bootstrap -->
     <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 	<link href="../static/css/teach.css" rel="stylesheet">
-	<link href="../static/css/set_quetion.css?t=11" rel="stylesheet">
+	<link href="../static/css/set_quetion.css?t=12" rel="stylesheet">
     <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
     <!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
@@ -140,6 +140,9 @@
 				</li> -->
 			</ul>
+			<div class="view_more">
+				<p>点击查看更多<span>︾</span></p>
+			</div>
 		</div>
 	</div>
 	</div>
@@ -191,6 +194,8 @@
 	var TEXTBOOK_ID="";
 	var question_box=[];
 	var question_num=0;
+	var pageNum=0;
+	var end=0;
 	$(document).ready(function(){
@@ -208,6 +213,7 @@
 	var subject_id=getQueryString("subject_id");
 	var class_id=getQueryString("class_id");
+	var user_id=getQueryString("user_id");
 	//alert(subject_id+";"+class_id);
@@ -256,7 +262,7 @@
 			url:url+"/SunvoteEducation/api/v1/point",
 			async:false,			
 			type:"post",
-			data:{depth:"",subject_id:20,p_id:id,knowledge_from:101},
+			data:{depth:"",subject_id:subject_id,p_id:id,knowledge_from:101},
 			success:function(data){
 				console.log(data);
 				obj.append('<ul></ul>');
@@ -295,19 +301,22 @@
 			url:url+"/SunvoteEducation/api/v1/questions",
 			async:true,
 			type:"post",
-			data:{chapter_id:chapter_id,teachingmaterial_id:"",knowledge_id:knowledge_id,question_from:101,user_id:"",problem_type:"",subject_id:"",count:"5"},
+			data:{chapter_id:chapter_id,teachingmaterial_id:"",knowledge_id:knowledge_id,question_from:101,user_id:"",problem_type:"",subject_id:subject_id,count:"5",pageNum:pageNum},
 			success:function(data){
 			window.top.loading.remove();
+			console.log(data);
 			if(data.data.length>0){
 				for(var i=0;i<data.data.length;i++){
 					_html += '<li data-id="'+data.data[i].QUESTION_ID+'"><div class="content"></div><div class="option"><ul></ul></div><div class="resolve"><div class="resolve_box"><p><span>【答案】</span> '+data.data[i].ANSWER+'</p><p><span>【解析】</span>'+data.data[i].ANALYSIS+'</p></div></div><div class="star_box"><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看解析</a><div class="check_box"></div></div></div><div class="clearfix"></div></div></li>';
 				}
-				$(".question_box ul").html(_html);
-				for(var j=0;j<data.data.length;j++){
+				$(".question_box").children("ul").append(_html);
+				console.log(5*pageNum);
+				for(var j=5*pageNum;j<(data.data.length+5*pageNum);j++){
 					var option_html="";
-					$(".question_box li .content").eq(j).append('<span>'+(j+1)+'、</span>'+data.data[j].CONTENT);
-					var arry_option=data.data[j].OPTION_CONTENT;
-					if(question_box.indexOf(data.data[j].QUESTION_ID)>=0){
+					//console.log(data.data[j-5*pageNum].CONTENT);
+					$(".question_box li .content").eq(j).append('<span>'+(j+1)+'、</span>'+data.data[j-5*pageNum].CONTENT);
+					var arry_option=data.data[j-5*pageNum].OPTION_CONTENT;
+					if(question_box.indexOf(data.data[j-5*pageNum].QUESTION_ID)>=0){
 						$(".check_box").eq(j).addClass("checked");
 					}
 					//arry_option=arry_option.replace("[","");
@@ -318,11 +327,13 @@
 					}
 					$(".option").eq(j).find("ul").html(option_html);
-					star(j,parseInt(data.data[j].DIFFICULTY));
+					star(j,parseInt(data.data[j-5*pageNum].DIFFICULTY));
 				}
 			}else{
-				$(".question_box ul").html("");
+				$(".question_box").children("ul").html("");
+				pageNum-=1;
+				end=1;
 			}
 			}
@@ -448,12 +459,16 @@
 		$(".section").on("click","span",function(event){       //点击菜单获取题目
 			window.top.loading.show();
 			event.stopPropagation();
-			
+			$(".question_box ul").html("");
 			var that=$(this).closest("li");
 			if($(".tab .active").attr("data-index")==1){				
 					getQuestion(that);
+					$(".menu_active").removeClass();
+					that.addClass("menu_active");
 			}else{
 					getQuestion(that);
+					$(".menu_active").removeClass();
+					that.addClass("menu_active");
 			}
 		});
@@ -524,6 +539,14 @@
 			else
 				alert("请先选择题目")
 		});
+		$(".view_more").click(function(){
+			pageNum++;
+			if(end>0){
+				$(".view_more p").html("没有更多了");
+				return;
+			}
+			getQuestion($(".menu_active"));
+		})
 		$("#submit").click(function(){
 			var question_arry=[];
 			for(var i=0;i<question_num;i++){
@@ -540,27 +563,29 @@
 				title: $("#title").val(),
 				exam_time: $("#time").val(),
 				paper_type: "101",
-				subject_id: "20",
+				subject_id: subject_id,
 				grade_id: "",
 				class_id: class_id,
-				user_id: "8dbef15bb6d043ec94b719ede583b033",
+				user_id: user_id,
 				score: "100",
 				questions: question_arry
 			};
 			//console.log(data);
-			$.ajax({
-			url:url+"/SunvoteEducation/api/v1/publishpaper",
-			async:false,
-			type:"post",
-			dataType: "json",
-			headers: {'Content-Type': 'application/json'},
-			data:JSON.stringify(data),
-			success:function(data){
-				alert("上传成功");
-				$('#myModal').modal('hide');
-				window.history.go(-1);
-			}
-		})	
+			sessionStorage.setItem("data",JSON.stringify(data));
+			location.href="paper_view.do?classID="+class_id+"&userid="+user_id;
+			/* $.ajax({
+				url:url+"/SunvoteEducation/api/v1/publishpaper",
+				async:false,
+				type:"post",
+				dataType: "json",
+				headers: {'Content-Type': 'application/json'},
+				data:JSON.stringify(data),
+				success:function(data){
+					alert("上传成功");
+					$('#myModal').modal('hide');
+					window.history.go(-1);
+				}
+			}) */	
 		})
 	</script>
@@ -217,7 +217,7 @@
 		});
 		function setQUestion(){
 			if($(".classList .active").length>0){
-				location.href="set_question.do?subject_id="+subject_id+"&class_id="+class_id;
+				location.href="set_question.do?subject_id="+subject_id+"&class_id="+class_id+"&user_id="+user_id;
 			}else{
 				alert("请先选择班级");
 			}
@@ -227,7 +227,7 @@
 		}
 		function jump(obj){
 			var id=obj.attr("data-id");
-			location.href="paper_view1.do?testpaperId="+id + "&a={a:b}";
+			location.href="paper_view1.do?testpaperId="+id;
 		}
 		$(".classList").on("click","li",function(){
 			$(this).siblings().removeClass("active");
@@ -34,6 +34,10 @@ li{list-style:none;}
 .screen{width:100%;height:150px;background:#fff;box-shadow: 0 0 10px #ccc;margin-top:10px;padding:10px;}
 .tag dt,dd{display:inline-block;}
+.right_content{box-sizing:border-box;padding-bottom:80px;}
+.view_more p{font-size: 18px;width: 100%;text-align: center;background: #ccc;color: #fff;line-height:40px;}
+.view_more p span{vertical-align:sub;margin-left:8px;}
+
 .option{padding:10px 0;}
 .option ul{padding:0;}
 .option li{width:100%;padding:10px 0;}