1，完善数字题

jack
1 parent 803a7d44
Showing 2 changed files with 92 additions and 78 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
WebRoot/static/js/control-604.js
@@ -41,41 +41,7 @@
 	</div>
  
 	<div class="content container">
-		<div class="section section-1 number" data-fraction="1" 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 class="question question1">
-					<span>1、</span>
-					<ul>
-						<li class="btn btn-default on" contenteditable="true" onkeydown="$(this).text(NumberCheck($(this).text()))">请输入答案</li>
-					</ul>
-				</div>
-				<div class="question question2">
-					<span>2、</span>
-					<ul>
-						<li class="btn btn-default on" contenteditable="true">请输入答案</li>
-					</ul>
-				</div>
-				<div class="question question3">
-					<span>3、</span>
-					<ul>
-						<li class="btn btn-default on" contenteditable="true">请输入答案</li>
-					</ul>
-				</div>
-				<div class="question question4">
-					<span>4、</span>
-					<ul>
-						<li class="btn btn-default on" contenteditable="true">请输入答案</li>
-					</ul>
-				</div>
-			</div>
-		</div>
+		
 	</div>
  
 <!-- 快速出题 -->
@@ -190,43 +190,77 @@ $(function() {
 		 * for(var j=0;j<a_num;j++){ 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 section-'
-									+ answer_index_b
-									+ ' check" data-fraction="'
-									+ fraction2
-									+ '" data-score="'
-									+ ((index_e_2 - index_s_2 + 1) * fraction2)
-									+ '"> <div class="title"><h3>第'
-									+ answer_index_b
-									+ '大题(多选)总分: '
-									+ (index_e_2 - index_s_2 + 1)
-									+ ' X '
-									+ fraction2
-									+ ' = '
-									+ ((index_e_2 - index_s_2 + 1) * fraction2)
-									+ ' 分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
-			for (var i = index_s_2; i <= index_e_2; i++) {
-				questionNUm++;
-				$(".section-" + answer_index_b + " .question_list").append(
-						'<div class="question question' + questionNUm
-								+ '"><span>' + questionNUm
-								+ '、</span><ul></ul></div>');
-				for (var j = 0; j < a_num; j++) {
-					option = String.fromCharCode(0x41 + j);
-					$(
-							".section-" + answer_index_b + " .question"
-									+ questionNUm + ' ul').append(
-							'<li class="btn btn-default">' + option + '</li>');
-				}
-			}
-			total_score += ((index_e_2 - index_s_2 + 1) * fraction2);
-			$("#score_all").text(total_score);
-			break;
-			case 6: break;
+		
+			case 5: $(".content") //多选题
+			.append(
+					'<div class="section section-'
+							+ answer_index_b
+							+ ' check" data-fraction="'
+							+ fraction2
+							+ '" data-score="'
+							+ ((index_e_2 - index_s_2 + 1) * fraction2)
+							+ '"> <div class="title"><h3>第'
+							+ answer_index_b
+							+ '大题(多选)总分: '
+							+ (index_e_2 - index_s_2 + 1)
+							+ ' X '
+							+ fraction2
+							+ ' = '
+							+ ((index_e_2 - index_s_2 + 1) * fraction2)
+							+ ' 分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
+	for (var i = index_s_2; i <= index_e_2; i++) {
+		questionNUm++;
+		$(".section-" + answer_index_b + " .question_list").append(
+				'<div class="question question' + questionNUm
+						+ '"><span>' + questionNUm
+						+ '、</span><ul></ul></div>');
+		for (var j = 0; j < a_num; j++) {
+			option = String.fromCharCode(0x41 + j);
+			$(
+					".section-" + answer_index_b + " .question"
+							+ questionNUm + ' ul').append(
+					'<li class="btn btn-default">' + option + '</li>');
+		}
+	}
+	total_score += ((index_e_2 - index_s_2 + 1) * fraction2);
+	$("#score_all").text(total_score);
+	break;
+			case 6: // 数字题
+				// $(".content").html("");
+					$(".content")
+							.append(
+									'<div class="section section-'
+											+ answer_index_b
+											+ ' number" data-fraction="'
+											+ fraction2
+											+ '" data-score="'
+											+ ((index_e_2 - index_s_2 + 1) * fraction2)
+											+ '"> <div class="title"><h3>第'
+											+ answer_index_b
+											+ '大题(数字题)总分: '
+											+ (index_e_2 - index_s_2 + 1)
+											+ ' X '
+											+ fraction2
+											+ ' = '
+											+ ((index_e_2 - index_s_2 + 1) * fraction2)
+											+ ' 分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
+					for (var i = index_s_2; i <= index_e_2; i++) {
+						questionNUm++;
+						$(".section-" + answer_index_b + " .question_list").append(
+								'<div class="question question' + questionNUm
+										+ '"><span>' + questionNUm
+										+ '、</span><ul><li class="btn btn-default on" contenteditable="true" onkeyup="NumberCheck(this.innerText,this)">请输入答案</li></ul></div>');
+//						for (var j = 0; j < a_num; j++) {
+//							option = String.fromCharCode(0x41 + j);
+//							$(
+//									".section-" + answer_index_b + " .question"
+//											+ questionNUm + ' ul').append(
+//									'<li class="btn btn-default">' + option + '</li>');
+//						}
+					}
+					total_score += ((index_e_2 - index_s_2 + 1) * fraction2);
+					$("#score_all").text(total_score);
+					break;
 		}
 		// $(".section-"+answer_index_b).attr("data-score",$(".section-"+answer_index_b).find(".question").length*fraction2);
 		$(".section0").attr("data-score",
@@ -375,7 +409,7 @@ $(function() {
 												.eq(k).text();
 										// console.log(answer);
 									}
-									if (answer == '') {
+									if (answer == ''||answer.indexOf("请输入答案")>=0) {
 										alert("还有试题未编辑答案。");
 										return;
 									}
@@ -736,8 +770,10 @@ function keydown2(e){
 		}
 	}
  
-function NumberCheck(num) {
+function NumberCheck(num,obj) {
     var str = num;
+    //callback(str,obj)
+    console.log("num:"+num)
     var len1 = str.substr(0, 1);
     var len2 = str.substr(1, 1);
     //如果第一位是0，第二位不是点，就用数字把点替换掉
@@ -756,8 +792,20 @@ function NumberCheck(num) {
       }
     }
     //正则替换，保留数字和小数点
-    str = str.replace(/[^\d^\.]+/g,'')
-    //如果需要保留小数点后两位，则用下面公式
-    //str = str.replace(/\.\d\d$/,'')
-    return str;
+    str = str.replace(/[^\-?\d.]/g,'')
+    
+    obj.innerText=str
+    
+    callback(str,obj)
+}
+function callback(tp,obj) {
+	var _div = obj//document.querySelector('.number .on');
+	var range = document.createRange();
+
+	range.selectNodeContents(_div);
+	range.collapse(false);
+
+	var sel = window.getSelection();
+	sel.removeAllRanges();
+	sel.addRange(range);
 }