diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp index 80e2f5e..a0b1201 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp @@ -102,7 +102,7 @@ + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp index a8f2efd..63fd62f 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp @@ -9,7 +9,7 @@ - + @@ -140,6 +140,9 @@ --> +
+

点击查看更多

+
@@ -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(''); @@ -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[i].ANSWER+'

【解析】'+data.data[i].ANALYSIS+'

'; } - $(".question_box ul").html(_html); - for(var j=0;j'+(j+1)+'、'+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(''+(j+1)+'、'+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 diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp index 5206df0..2f33d04 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp @@ -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("请先选择班级"); } diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp index f8fc699..ff9ec8c 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp @@ -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"); diff --git a/WebRoot/static/css/set_quetion.css b/WebRoot/static/css/set_quetion.css index 43ce120..9c57363 100644 --- a/WebRoot/static/css/set_quetion.css +++ b/WebRoot/static/css/set_quetion.css @@ -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;}