Commit e3c5db27c6c39601f77fd9a8b3468293ff535b36

Authored by jack
1 parent bf10975d

1.放开题型选择

WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
102 <h4 class="modal-title">添加试题</h4> 102 <h4 class="modal-title">添加试题</h4>
103 </div> 103 </div>
104 <div class="modal-body"> 104 <div class="modal-body">
105 - <!--<div class="form-group"> 105 + <div class="form-group">
106 <label for="type" class="col-sm-2 control-label">题目名称</label> 106 <label for="type" class="col-sm-2 control-label">题目名称</label>
107 <div class="col-sm-10"> 107 <div class="col-sm-10">
108 <select class="form-control" id="type"> 108 <select class="form-control" id="type">
@@ -115,16 +115,16 @@ @@ -115,16 +115,16 @@
115 </select> 115 </select>
116 </div> 116 </div>
117 <div class="clearfix"></div> 117 <div class="clearfix"></div>
118 - </div>--> 118 + </div>
119 <div class="form-group"> 119 <div class="form-group">
120 <label for="index_s_2" class="col-sm-2 control-label">题数</label> 120 <label for="index_s_2" class="col-sm-2 control-label">题数</label>
121 <div class="col-sm-10"> 121 <div class="col-sm-10">
122 <input type="number" class="form-control" id="index_s_2" placeholder="请输入题目数量(1-100)" oninput="if(value.length>3) value=value.slice(0,3)"> 122 <input type="number" class="form-control" id="index_s_2" placeholder="请输入题目数量(1-100)" oninput="if(value.length>3) value=value.slice(0,3)">
123 </div> 123 </div>
124 - <!-- <div class="col-sm-1"><span style="line-height:34px;">——</span></div> 124 + <!-- <div class="col-sm-1"><span style="line-height:34px;">——</span></div>
125 <div class="col-sm-4"> 125 <div class="col-sm-4">
126 <input type="number" class="form-control" id="index_e_2" placeholder=""> 126 <input type="number" class="form-control" id="index_e_2" placeholder="">
127 - </div>--> 127 + </div> -->
128 <div class="clearfix"></div> 128 <div class="clearfix"></div>
129 </div> 129 </div>
130 <div class="form-group"> 130 <div class="form-group">
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 $("title").html(title); 202 $("title").html(title);
203 } 203 }
204 $(document).ready(function(){ 204 $(document).ready(function(){
205 - var _height = $(".page-header").height(); 205 + var _height = $(".header_box").outerHeight()+80;
206 $(".content").css("padding-top",_height); 206 $(".content").css("padding-top",_height);
207 207
208 }); 208 });
WebRoot/static/js/control-604.js
@@ -177,20 +177,16 @@ $(function() { @@ -177,20 +177,16 @@ $(function() {
177 } 177 }
178 } 178 }
179 break; 179 break;
180 - /*  
181 - * case 5: //多选题 $(".content").append('<div class="section  
182 - * section-'+answer_index_b+' check" data-fraction="'+fraction2+'"  
183 - * data-score=""> <div class="title"> <h3><span  
184 - * class="que_num">'+question_num+'、</span><span class="que_name">多选题</span></h3>  
185 - * <input type="button" class="btn btn-danger pull-right remove"  
186 - * name="remove" value="删除" /> </div> <div class="question_list"></div></div>');  
187 - * for(var i=index_s_2;i<=index_e_2;i++){  
188 - * $(".section-"+answer_index_b+" .question_list").append('<div  
189 - * class="question question'+i+'"><span>'+i+'、</span><ul></ul></div>');  
190 - * for(var j=0;j<a_num;j++){ option=String.fromCharCode(0x41+j);  
191 - * $(".section-"+answer_index_b+" .question"+i+' ul').append('<li class="btn btn-default">'+option+'</li>'); } }  
192 - */  
193 - case 5: // 多选题 180 +
  181 + case 5: //多选题
  182 + $(".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
  183 + +'、</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>');
  184 + for(var i=index_s_2;i<=index_e_2;i++){
  185 + $(".section-"+answer_index_b+" .question_list").append('<div class="question question'+i+'"><span>'+i+'、</span><ul></ul></div>');
  186 + for(var j=0;j<a_num;j++){ option=String.fromCharCode(0x41+j);
  187 + $(".section-"+answer_index_b+" .question"+i+' ul').append('<li class="btn btn-default">'+option+'</li>'); } }
  188 +
  189 + /*case 5: // 多选题
194 // $(".content").html(""); 190 // $(".content").html("");
195 $(".content") 191 $(".content")
196 .append( 192 .append(
@@ -224,7 +220,7 @@ $(function() { @@ -224,7 +220,7 @@ $(function() {
224 } 220 }
225 } 221 }
226 total_score += ((index_e_2 - index_s_2 + 1) * fraction2); 222 total_score += ((index_e_2 - index_s_2 + 1) * fraction2);
227 - $("#score_all").text(total_score); 223 + $("#score_all").text(total_score);*/
228 break; 224 break;
229 } 225 }
230 // $(".section-"+answer_index_b).attr("data-score",$(".section-"+answer_index_b).find(".question").length*fraction2); 226 // $(".section-"+answer_index_b).attr("data-score",$(".section-"+answer_index_b).find(".question").length*fraction2);
@@ -262,10 +258,15 @@ $(function() { @@ -262,10 +258,15 @@ $(function() {
262 /* 添加试题的确定按钮 */ 258 /* 添加试题的确定按钮 */
263 $("#addQuestion_submit").click(function() { 259 $("#addQuestion_submit").click(function() {
264 // $("#fast").attr("disabled","disabled"); 260 // $("#fast").attr("disabled","disabled");
265 - var type_2 = 5;// parseInt($("#type").val())  
266 - var index_s_2 = 1;// parseInt($("#index_s_2").val())  
267 - var index_e_2 = parseInt($("#index_s_2").val()); 261 + //var type_2 = 5;// parseInt($("#type").val())
  262 + //var index_s_2 = 1;// parseInt($("#index_s_2").val())
  263 + //var index_e_2 = parseInt($("#index_s_2").val());
268 // var answer_2=$("#answer_2").val(); 264 // var answer_2=$("#answer_2").val();
  265 +
  266 + $("#fast").attr("disabled","disabled");
  267 + var type_2 = parseInt($("#type").val());
  268 + var index_s_2 = 1;
  269 + var index_e_2 = parseInt($("#index_s_2").val());
269 var num_ans_2 = $("#num_ans_2").val(); 270 var num_ans_2 = $("#num_ans_2").val();
270 var fraction2 = parseFloat($("#fraction2").val()); 271 var fraction2 = parseFloat($("#fraction2").val());
271 if (isNaN(index_s_2)) { 272 if (isNaN(index_s_2)) {
@@ -407,7 +408,7 @@ $(function() { @@ -407,7 +408,7 @@ $(function() {
407 "json" : data 408 "json" : data
408 }; 409 };
409 console.log(data); 410 console.log(data);
410 - ajax_submit(url, dataJson); 411 + //ajax_submit(url, dataJson);
411 } else 412 } else
412 alert("请添加试题"); 413 alert("请添加试题");
413 }); 414 });