From 28147eccbd73ac66bf03ae3940a38ceef407ab7f Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Fri, 1 Jun 2018 11:21:19 +0800
Subject: [PATCH] 修改加载控制条

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp | 12 +++++++++---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp   |  2 +-
 WebRoot/static/js/control.js                           | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index 720f54a..05b9676 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -107,7 +107,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" id="fast_submit">确定</button>
-        <button type="button" class="btn btn-primary" data-dismiss="fast">取消</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
@@ -178,7 +178,7 @@
       </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="addQuestion">取消</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
@@ -205,14 +205,20 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" id="time_submit">确定</button>
-        <button type="button" class="btn btn-primary" data-dismiss="test_time">取消</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
+<div class="loading" style="background:rgba(0,0,0,0.5);width:100%;height:100%;position:absolute;top:0;display:none;">
+	<img src="../static/images/loading.gif" width="200px" style="position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;"/>
+</div>
 <script>
 	var testData = ${pd.JSON};
 	var URL = "<%=basePath%>api/v1/uploadpaper";
+	if(testData.questions.length>0){
+		$("title").html("浏览试卷");
+	}
 	//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>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 41884ab..b01712e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -199,7 +199,7 @@
 			var name = $("#enter_title").val();
 			var time = $("#enter_time").val();
 			window.open("<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time);
-			$(".title_time").hide();
+			$(".title_time").modal("hide");
 		});
 	</script>
 	
diff --git a/WebRoot/static/js/control.js b/WebRoot/static/js/control.js
index e8b626b..48955fd 100644
--- a/WebRoot/static/js/control.js
+++ b/WebRoot/static/js/control.js
@@ -210,7 +210,7 @@
 	$("#save").click(function(){
 		var url= URL;
 		var data={
-			title: $(".text-center").text(),
+			title: $(".text-center").html(),
 		    exam_time: parseInt($("#time").text()),
 		    paper_type: "1",
 		    subject_id: "1",
@@ -268,9 +268,8 @@
 			data=JSON.stringify(data);
 			dataJson={"json":data};
 			console.log(data);
-			ajax_submit(url,dataJson);
+//			ajax_submit(url,dataJson);
 			var suc=ajax_submit(url,dataJson);
-//			alert(suc);
 			if(suc==1){
 				
 			}			
@@ -282,23 +281,61 @@
 
 /*ajax封装函数*/
 function ajax_submit(url,data){
+	$(".loading").css("display","block");
 	var flag=0;
 	$.ajax({
 		url:url,
 		type:"POST",
-		async:false, 
+		//async:false, 
 		data:data,
 		dataType:"json",
 		success:function(data){
 			flag=1;
+			$(".loading").css("display","none");
 			alert("保存成功");
 			window.close();
 		}
 	})
 	return flag;
 }
+function fastSort(array,head,tail){
+    //考虑到给每个分区操作的时候都是在原有的数组中进行操作的，所以这里head,tail来确定分片的位置
+    /*生成随机项*/
+    var randomnum = parseInt((head + tail) / 2 );
+    var random = array[randomnum];
+    /*将小于random的项放置在其左边  策略就是通过一个临时的数组来储存分好区的结果，再到原数组中替换*/
+    var arrayTemp = [];
+    var unshiftHead = 0;
+    for(var i = head;i <= tail;i++){
+      if(parseInt(array[i].rank)<parseInt(random.rank)){
+        arrayTemp.unshift(array[i]);
+        unshiftHead++;
+      }else if(parseInt(array[i].rank)>parseInt(random.rank)){
+        arrayTemp.push(array[i]);
+      }
+      /*当它等于的时候放哪，这里我想选择放到队列的前面，也就是从unshift后的第一个位置放置*/
+      if(parseInt(array[i].rank)===parseInt(random.rank)){
+        arrayTemp.splice(unshiftHead,0,array[i]);
+      }
+    }
+    /*将对应项覆盖原来的记录*/
+    for(var j = head , u=0;j <= tail;j++,u++){
+      array.splice(j,1,arrayTemp[u]);
+    }
+    /*寻找中间项所在的index*/
+    var nowIndex = array.indexOf(random);
 
-
+    /*设置出口，当要放进去的片段只有2项的时候就可以收工了*/
+    if(arrayTemp.length <= 2){
+      return;
+    }
+    /*递归，同时应用其左右两个区域*/
+    fastSort(array,head,nowIndex);
+    fastSort(array,nowIndex+1,tail);
+  }
+	if(testData.questions.length > 0 && testData.questions[0].questions.length > 1){
+		fastSort(testData.questions[0].questions,0,testData.questions[0].questions.length-1);
+	}
 	creatHtml(testData);
 function creatHtml(data){	
 		console.log(data);
--
libgit2 0.21.4