标准答案

孙向锦
1 parent edbb3c91
Showing 6 changed files with 129 additions and 119 deletions
WebRoot/WEB-INF/jsp/software/firmware/firmware_itemview.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
WebRoot/static/js/control-604.js
resources/mybatis1/api/V1Mapper.xml
src/com/fh/controller/software/firm/FirmController.java
src/com/fh/controller/sunvote/event/EventController.java
@@ -41,7 +41,7 @@
 					</center></div>
 					</br></br></br>
 					<center>
-					<table id="table_report" class="table table-striped table-bordered table-hover">
+					<table id="table_report"  >
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">货品编号:</td>
 								<td style="width:75px;text-align: left;padding-top: 13px;">${pd.PRODUCT_NO}</td>
@@ -56,33 +56,14 @@
 							</tr>
 					</table>
 					</center></br></br></br>
-					<table class="table table-striped table-bordered table-hover">
-							<tr>
-								<td style="text-align: right;">产品功能:</td>
-								<td>${pd.PRODUCT_FUNC}</td>
-							</tr>
-							<tr>
-								<td style="text-align: right;">产品性能:</td>
-								<td>${pd.PRODUCT_PERF}</td>
-							</tr>
-							<tr>
-								<td style="text-align: right;">适配硬件:</td>
-								<td>${pd.ADAPTABLE_HARDWARE}</td>
-							</tr>
-							<tr>
-								<td style="text-align: right;">适配软件:</td>
-								<td>${pd.ADAPTABLE_SOFTWARE}</td>
-							</tr>
-							<tr>
-								<td style="text-align: right;">产品认证:</td>
-								<td>${pd.PRODUCT_CERT}</td>
-							</tr>
-							<tr>
-								<td style="text-align: right;">注意事项:</td>
-								<td>${pd.REMARK}
-								</td>
-							</tr>
-						</table>
+					<div style="margin-left:100px;margin-right:100px;">
+						<div>产品功能:${pd.PRODUCT_FUNC}</div></br>
+						<div>产品性能:${pd.PRODUCT_PERF}</div></br>
+						<div>适配硬件:${pd.ADAPTABLE_HARDWARE}</div></br>
+						<div>适配软件:${pd.ADAPTABLE_SOFTWARE}</div></br>
+						<div>产品认证:${pd.PRODUCT_CERT}</div></br>
+						<div>注意事项:${pd.REMARK}</div></br>
+					</div>
 						</div>
 					</form>
 					</div>
@@ -28,8 +28,8 @@
 			<div class="time text-center" data-toggle="modal" data-target=".test_time"><h3>测验时长：<span class="bg-primary" id="time">45</span><span class="bg-primary">分钟</span></h3></div>
 			<div class="btn_box pull-right">
 				<input type="button" class="btn btn-success btn-lg" name="save" value="保存" id="save"/>
-				<button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".fast" id="fast">快速出题</button>
-				 <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".addQuestion" id="addQuestion">添加试题</button> 	
+				<button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".fast" id="fast">单选出题</button>
+				 <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".addQuestion" id="addQuestion">多选出题</button> 	
 				<div class="clearfix"></div>
 			</div>
 		</div>
@@ -37,32 +37,7 @@
 	</div>
 	<div class="content container">
-		<!--<div class="section section-1">
-			<div class="title">
-				<h3>一、单选</h3>
-				<input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" />
-			</div>
-			<div class="question_list">
-				 <div class="question question1">
-					<span>1、</span>
-					<ul>
-						<li class="btn btn-default on">A</li>
-						<li class="btn btn-default">B</li>
-						<li class="btn btn-default">C</li>
-						<li class="btn btn-default">D</li>
-					</ul>
-				</div>
-				<div class="question question2">
-					<span>2、</span>
-					<ul>
-						<li class="btn btn-default">A</li>
-						<li class="btn btn-default on">B</li>
-						<li class="btn btn-default">C</li>
-						<li class="btn btn-default">D</li>
-					</ul>
-				</div> 
-			</div>
-		</div>-->
+		
 	</div>
 <!-- 快速出题 -->
@@ -78,7 +53,7 @@
         <div class="form-group">
 		    <label for="inputEmail3" class="col-sm-2 control-label">试题答案</label>
 		    <div class="col-sm-10">
-		      <input type="text" class="form-control" id="answer" placeholder="输入题目答案">
+		      <input type="text" class="form-control" id="answer" placeholder="输入题目答案（例如：“ABCDA”）">
 		    </div>
 		    <div class="clearfix"></div>
 		</div>
@@ -93,6 +68,8 @@
 					<option value="6">6</option>
 					<option value="7">7</option>
 					<option value="8">8</option>
+					<option value="9">9</option>
+					<option value="10">10</option>
 				</select>
 		    </div>
 		    <div class="clearfix"></div>
@@ -122,8 +99,8 @@
         <h4 class="modal-title">添加试题</h4>
       </div>
       <div class="modal-body">
-        <div class="form-group">
-		    <label for="type" class="col-sm-2 control-label">题目名称</label>
+        <!--<div class="form-group">
+		     <label for="type" class="col-sm-2 control-label">题目名称</label>
 		    <div class="col-sm-10">
 		       <select class="form-control" id="type">
 					<option value="1" selected>单选题</option>
@@ -132,19 +109,19 @@
 					<option value="4">判断题</option>
 					<option value="5">多选题</option>
 				</select>
-		    </div>
+		    </div> 
 		    <div class="clearfix"></div>
-		</div>
+		</div>-->
 		<div class="form-group">
-		    <label for="index_s_2" class="col-sm-2 control-label">题号</label>
-		    <div class="col-sm-4">
-		      <input type="number" class="form-control" id="index_s_2" placeholder="">
+		    <label for="index_s_2" class="col-sm-2 control-label">题数</label>
+		    <div class="col-sm-10">
+		      <input type="number" class="form-control" id="index_s_2" placeholder="请输入题目数量">
 		    </div>
-		    <div class="col-sm-1"><span style="line-height:34px;">——</span></div>
+		   <!--  <div class="col-sm-1"><span style="line-height:34px;">——</span></div>
 		    <div class="col-sm-4">
 		      <input type="number" class="form-control" id="index_e_2" placeholder="">
-		    </div>
-		    <div class="clearfix"></div>
+		    </div>-->
+		    <div class="clearfix"></div> 
 		</div>
 		<div class="form-group">
 		    <label for="num_ans_2" class="col-sm-2 control-label">选项个数</label>
@@ -157,6 +134,8 @@
 					<option value="6">6</option>
 					<option value="7">7</option>
 					<option value="8">8</option>
+					<option value="9">9</option>
+					<option value="10">10</option>
 				</select>
 		    </div>
 		    <div class="clearfix"></div>
@@ -164,14 +143,14 @@
 		<div class="form-group">
 		    <label for="fraction2" class="col-sm-2 control-label">单题分数</label>
 		    <div class="col-sm-10">
-		      <input type="number" class="form-control" id="fraction2" placeholder="">
+		      <input type="number" class="form-control" id="fraction2" placeholder="请输入单题分数">
 		    </div>
 		    <div class="clearfix"></div>
 		</div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" id="addQuestion_submit">确定</button>
-        <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
+         <button type="button" class="btn btn-default" id="addQuestion_submit">确定</button>
+         <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
@@ -3,7 +3,8 @@
 	var score=0;
 	function creat(str_ans,a_num,fraction){
 		$(".section").remove();
-		$(".content").append('<div class="section section-1 single" data-fraction="'+fraction+'" data-score=""> <div class="title"> <h3><span class="que_num">一、</span><span class="que_name">单选</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>')
+		/*$(".content").append('<div class="section section-1 single" data-fraction="'+fraction+'" data-score=""> <div class="title"> <h3><span class="que_num">一、</span><span class="que_name">单选</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>')*/
+		$(".content").append('<div class="section section-1 single" data-fraction="'+fraction+'" data-score=""><div class="title"><h3><span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span></h3> </div><div class="question_list"></div></div>');
 		var str=str_ans.split('');
 		console.log(str);
 		for(i=0;i<str.length;i++){
@@ -94,7 +95,7 @@
 						}		
 				}
 			break;
-			case 5:                                             //多选题
+			/*case 5:                                             //多选题
 				$(".content").append('<div class="section section-'+answer_index_b+' check" data-fraction="'+fraction2+'" data-score=""> <div class="title"> <h3><span class="que_num">'+question_num+'、</span><span class="que_name">多选题</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
 				for(var i=index_s_2;i<=index_e_2;i++){
 						$(".section-"+answer_index_b+" .question_list").append('<div class="question question'+i+'"><span>'+i+'、</span><ul></ul></div>');
@@ -102,10 +103,21 @@
 							option=String.fromCharCode(0x41+j);
 							$(".section-"+answer_index_b+" .question"+i+' ul').append('<li class="btn btn-default">'+option+'</li>');
 						}		
+				}*/
+			case 5:                                             //多选题
+				$(".content").html("");
+				$(".content").append('<div class="section section0'+' check" data-fraction="'+fraction2+'" data-score=""> <div class="title"><h3><span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span></h3> </div> <div class="question_list"></div></div>');
+				for(var i=index_s_2;i<=index_e_2;i++){
+						$(".section0" +" .question_list").append('<div class="question question'+i+'"><span>'+i+'、</span><ul></ul></div>');
+						for(var j=0;j<a_num;j++){
+							option=String.fromCharCode(0x41+j);
+							$(".section0"+" .question"+i+' ul').append('<li class="btn btn-default">'+option+'</li>');
+						}		
 				}
 			break;
 		}
-		$(".section-"+answer_index_b).attr("data-score",$(".section-"+answer_index_b).find(".question").length*fraction2);
+//		$(".section-"+answer_index_b).attr("data-score",$(".section-"+answer_index_b).find(".question").length*fraction2);
+		$(".section0").attr("data-score",$(".section0").find(".question").length*fraction2);
 	}
 	$(document).on('click','.remove',function(){                //删除按钮
@@ -132,9 +144,9 @@
 	/*添加试题的确定按钮*/
 	$("#addQuestion_submit").click(function(){
 		$("#fast").attr("disabled","disabled");
-		var type_2=parseInt($("#type").val());
-		var index_s_2=parseInt($("#index_s_2").val());
-		var index_e_2=parseInt($("#index_e_2").val());
+		var type_2=5;//parseInt($("#type").val())
+		var index_s_2=1;//parseInt($("#index_s_2").val())
+		var index_e_2=parseInt($("#index_s_2").val());
 		//var answer_2=$("#answer_2").val();
 		var num_ans_2=$("#num_ans_2").val();
 		var fraction2=parseInt($("#fraction2").val());
@@ -142,7 +154,7 @@
 			alert("请输入题目开始序号");
 			return;
 		}else if(isNaN(index_e_2)){
-			alert("请输入题目结束序号");
+			alert("请输入题目个数");//alert("请输入题目结束序号");
 			return;
 		}else if(isNaN(fraction2)){
 			alert("请输入题目分数");
@@ -202,7 +214,7 @@
 		if($(".section").length>0){
 			var rank=0
 			for(i=0;i<$(".section").length;i++){
-				rank++;
+				/*rank++;
 				data.questions[i]={
 					chapter_id: "0",
 		            problem_type_id: "0",
@@ -220,7 +232,7 @@
 		            rank: rank,
 		            no_name: $(".section").eq(i).find(".que_num").text(),
 		            questions:[]
-					}
+					}*/
 				for(j=0;j<$(".section").eq(i).find(".question_list").children(".question").length;j++){
 					rank++;
 					var on_num=$(".section").eq(i).find(".question").eq(j).find(".on").length;
@@ -229,7 +241,7 @@
 						answer+=$(".section").eq(i).find(".question").eq(j).find(".on").eq(k).text();
 						//console.log(answer);
 					}
-					data.questions[i].questions[j]={
+					data.questions[j]={
 						chapter_id: "0",
 						problem_type_id: "0",
 						knowledge_id: "0",
@@ -244,7 +256,7 @@
 						part_score: "0",
 						remark: "",
 						rank: rank,
-						no_name: (i+1)+'.'+(j+1),
+						no_name: (j+1),
 					}
 				}
 			}
@@ -317,7 +329,8 @@ function fastSort(array,head,tail){
 if(testData.questions.length > 0){
 	fastSort(testData.questions,0,testData.questions.length-1);
 	for(var i = 0 ; i < testData.questions.length;i++){
-		if(testData.questions[0].questions.length > 1){
+		
+		if(testData.questions[0].questions && testData.questions[0].questions.length > 1){
 			fastSort(testData.questions[i].questions,0,testData.questions[i].questions.length-1);
 		}
 	}
@@ -328,40 +341,64 @@ function creatHtml(data){
 		console.log(data);
 		$(".header_box h1").html(data.title);	
 		$("#time").html(data.exam_time);
+		
+		if(data.questions.length>0){
+			$(".time").removeAttr("data-target");
+			$(".remove").remove();
+			$(".btn_box").remove();
+		}
+		
 		for(var i=0;i<data.questions.length;i++){
-			$(".content").append('<div class="section section-'+i+'" data-fraction="'+data.questions[i].score+'"> <h3><span class="que_num">'+data.questions[i].no_name+'</span>'+'<span class="que_name">'+data.questions[i].content+'</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" />  <div class="question_list"></div></div>')
-			if(data.questions.length>0){
-        $(".time").removeAttr("data-target");
-				$(".remove").remove();
-				$(".btn_box").remove();
+			if(data.questions[i].questions){
+				$(".content").append('<div class="section section-'+i+'" data-fraction="'+data.questions[i].score+'"> <h3><span class="que_num">'+data.questions[i].no_name+'</span>'+'<span class="que_name">'+data.questions[i].content+'</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" />  <div class="question_list"></div></div>');
+			}else{
+				if(i == 0){
+					$(".content").append('<div class="section section0"> <div class="question_list"></div></div>');
+				}
+				$(".section0").find(".question_list").append('<div class="question question'+(i+1)+'"><span>'+(i+1)+'、</span><ul></ul></div>');	
+				for(var k=0;k<parseInt(data.questions[i].option_num);k++){
+					str_temp=data.questions[i].answer;
+					$(".section0").find(".question"+(i+1)+' ul').append('<li class="btn btn-default">'+String.fromCharCode(0x41+k)+'</li>');
+					for(var l=0;l<str_temp.length;l++){
+						str_temp_arry=str_temp.split('');
+						code=str_temp_arry[l].charCodeAt();
+						on_index=code-65;
+						if(on_index==k){
+							$(".section0").find(".question"+(i+1)+' ul li').eq(on_index).attr("class","btn btn-default on");
+						}						
+					}
+				}
 			}
-			for(var j=0;j<data.questions[i].questions.length;j++){
-				$(".section-"+i).find(".question_list").append('<div class="question question'+(j+1)+'"><span>'+(j+1)+'、</span><ul></ul></div>');	
-				if($(".section-"+i).find(".que_name").text()=="判断题"){
-					for(var k=0;k<parseInt(data.questions[i].questions[j].option_num);k++){
-						str_temp=data.questions[i].questions[j].answer;
-						if(k%2==0){
-							$(".section-"+i).find(".question"+(j+1)+' ul').append('<li class="btn btn-default">√</li>');
-						}else if(k%2==1){
-							$(".section-"+i).find(".question"+(j+1)+' ul').append('<li class="btn btn-default">×</li>');
+			
+			if(data.questions[i].questions){
+				for(var j=0;j<data.questions[i].questions.length;j++){
+					$(".section-"+i).find(".question_list").append('<div class="question question'+(j+1)+'"><span>'+(j+1)+'、</span><ul></ul></div>');	
+					if($(".section-"+i).find(".que_name").text()=="判断题"){
+						for(var k=0;k<parseInt(data.questions[i].questions[j].option_num);k++){
+							str_temp=data.questions[i].questions[j].answer;
+							if(k%2==0){
+								$(".section-"+i).find(".question"+(j+1)+' ul').append('<li class="btn btn-default">√</li>');
+							}else if(k%2==1){
+								$(".section-"+i).find(".question"+(j+1)+' ul').append('<li class="btn btn-default">×</li>');
+							}
+							
+							if(str_temp=="√")
+								$(".section-"+i).find(".question"+(j+1)+' ul li').eq(0).attr("class","btn btn-default on");
+							else
+								$(".section-"+i).find(".question"+(j+1)+' ul li').eq(1).attr("class","btn btn-default on");
 						}
-						
-						if(str_temp=="√")
-							$(".section-"+i).find(".question"+(j+1)+' ul li').eq(0).attr("class","btn btn-default on");
-						else
-							$(".section-"+i).find(".question"+(j+1)+' ul li').eq(1).attr("class","btn btn-default on");
-					}
-				}else{			
-					for(var k=0;k<parseInt(data.questions[i].questions[j].option_num);k++){
-						str_temp=data.questions[i].questions[j].answer;
-						$(".section-"+i).find(".question"+(j+1)+' ul').append('<li class="btn btn-default">'+String.fromCharCode(0x41+k)+'</li>');
-						for(var l=0;l<str_temp.length;l++){
-							str_temp_arry=str_temp.split('');
-							code=str_temp_arry[l].charCodeAt();
-							on_index=code-65;
-							if(on_index==k){
-								$(".section-"+i).find(".question"+(j+1)+' ul li').eq(on_index).attr("class","btn btn-default on");
-							}						
+					}else{			
+						for(var k=0;k<parseInt(data.questions[i].questions[j].option_num);k++){
+							str_temp=data.questions[i].questions[j].answer;
+							$(".section-"+i).find(".question"+(j+1)+' ul').append('<li class="btn btn-default">'+String.fromCharCode(0x41+k)+'</li>');
+							for(var l=0;l<str_temp.length;l++){
+								str_temp_arry=str_temp.split('');
+								code=str_temp_arry[l].charCodeAt();
+								on_index=code-65;
+								if(on_index==k){
+									$(".section-"+i).find(".question"+(j+1)+' ul li').eq(on_index).attr("class","btn btn-default on");
+								}						
+							}
 						}
 					}
 				}
@@ -373,9 +410,20 @@ var answerLen = 0 ;
 /*快速建题中，每输入五个答案就加一个空格*/
 $("#answer").on("input propertychange",function(event){
 	if($("#answer").val().length > answerLen){
-		if(($("#answer").val().length + 1 )% 6 == 0){
-			$("#answer").val($("#answer").val()+" ");
+		var answerStr = $("#answer").val();
+		var result = "";
+		if(answerStr.length > 5){
+			answerStr = answerStr.replace(new RegExp(" ","gm"),"");
+			for(var i = 0 ; i < answerStr.length ; i++){
+				result += answerStr[i];
+				if(i % 5 == 4){
+					result += " ";
+				}
+			}
+		}else{
+			result = answerStr;
 		}
+		$("#answer").val(result);
 	}
 	answerLen = $("#answer").val().length;
 })
@@ -103,6 +103,7 @@
 			<if test="PAPER_ID != null and PAPER_ID != ''">
 				and sv_paperquestion.PAPER_ID = #{PAPER_ID}
 			</if>
+			order by LENGTH(sv_paperquestion.RANK),sv_paperquestion.RANK
 	</select>
@@ -24,7 +24,6 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 import com.fh.controller.base.BaseController;
-import com.fh.controller.sunvote.Myelfun;
 import com.fh.entity.Page;
 import com.fh.service.software.firm.FirmManager;
 import com.fh.service.software.firmware.FirmwareManager;
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,14 +18,14 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
+import com.fh.service.sunvote.event.EventManager;
 import com.fh.util.AppUtil;
+import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
-import com.fh.util.Jurisdiction;
-import com.fh.util.Tools;
-import com.fh.service.sunvote.event.EventManager;
 /** 
  * 说明：事件记录