From 96cc207910bf9581c5f975e982c1305d415401f5 Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Sun, 29 Sep 2019 15:59:42 +0800
Subject: [PATCH] 1.轻松考-增加题目根据rank字段排序功能

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp |  2 +-
 WebRoot/static/js/control-604.js                       | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index 9f76e30..b2dd878 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -211,7 +211,7 @@
 	//var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"单选","option_num":"","option_content":"","answer":"","difficulty":"","analysis":"","question_from":"","score":1,"part_score":"","remark":"","rank":"1","no_name":"一、","questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.1"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"B","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.2"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"C","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.3"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"D","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.4"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.5"}]}]};
 	//var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]};
 </script>
-<script type="text/javascript" src="../static/js/control-604.js?a=3"></script>
+<script type="text/javascript" src="../static/js/control-604.js?a=4"></script>
 
 
 </body>
diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js
index 8b54119..1a31e59 100644
--- a/WebRoot/static/js/control-604.js
+++ b/WebRoot/static/js/control-604.js
@@ -468,6 +468,18 @@ $(function() {
 		fastSort(array, nowIndex + 1, tail);
 	}
 	function creatHtml(data) {
+		data.questions.sort(function (a, b) {
+//			if (a.rank < b.rank) {
+//				return -1;
+//			} else if (a.rank == b.rank) {
+//				return 0;
+//			} else {
+//				return 1;
+//			}
+			var rankA = isNaN(parseInt(a.rank))?0:parseInt(a.rank);
+			var rankB = isNaN(parseInt(b.rank))?0:parseInt(b.rank);
+			return rankA-rankB;
+		})
 		console.log(data);
 		$(".header_box h1").html(data.title);
 		$("#time").html(data.exam_time);
@@ -483,6 +495,19 @@ $(function() {
 
 		for (var i = 0; i < data.questions.length; i++) {
 			if (data.questions[i].questions) {
+				var sortTemp = data.questions[i].questions.sort(function (a, b) {
+//					if (parseInt(a.rank) < parseInt(b.rank)) {
+//						return -1;
+//					} else if (a.rank == b.rank) {
+//						return 0;
+//					} else {
+//						return 1;
+//					}
+					var rankA = isNaN(parseInt(a.rank))?0:parseInt(a.rank);
+					var rankB = isNaN(parseInt(b.rank))?0:parseInt(b.rank);
+					return rankA-rankB;
+				})
+				console.log(sortTemp)
 				$(".content")
 						.append(
 								'<div class="section section-'
--
libgit2 0.21.4