From ff7ab13edb06dba67e0a430e8c700f4c33c9a8e3 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Wed, 29 Aug 2018 16:17:07 +0800
Subject: [PATCH] 修复一些小bug

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp      |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp     |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp |  43 +++++++++++++++++--------------------------
 WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp        |  11 +++++++----
 WebRoot/static/js/set_question.js                        |  19 +++++++++++++++----
 WebRoot/static/js/teach_paper.js                         |   3 ++-
 WebRoot/static/js/test_list.js                           | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------
 7 files changed, 156 insertions(+), 126 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
index 99d5ccd..38fdbab 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -124,5 +124,5 @@
 	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script src="../static/ace/js/bootbox.js"></script>
-	<script src="../static/js/teach_paper.js?a=1"></script>
+	<script src="../static/js/teach_paper.js?a=2"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index fe1579f..9ad831b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -101,7 +101,7 @@
 						</ul>
 					</li>
 					<li>
-						<p>云测验测验分析</p>
+						<p>即时测测验分析</p>
 						<ul class="menu_2">
 						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
 							<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index 161aab3..828c7c9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -67,7 +67,7 @@
 						<th class="center"><div style="width:80px;">课程总分</div></th>
 						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
 							<th class="center kc"><a
-								 onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');"><div style="width:180px;" class="font">${var.NAME}</br><span>${var.CREATE_DATE}</span></div></a></th>
+								 onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');"><div style="width:180px;     margin: 0 auto;" class="font">${var.NAME}</br><span>${var.CREATE_DATE}</span></div></a></th>
 						</c:forEach>
 					</tr>
 				</thead>
@@ -249,36 +249,27 @@
 		$(document).ready(function(){
 			window.top.loading.remove();
 			
+			var sour = "${testpaperList}";
 			
-			
-			//alert(window.top.document.getElmentById("mainFrame").clienHeight);
-			var _width = $('#mainFrame', parent.document).width()-40;
-			var _heigh = $('#mainFrame', parent.document).height()-100;
-			//console.log(_heigh);
-			
-			var options = {
-            width: _width,
-            height: _heigh,
-            pinnedRows: 4,
-            pinnedCols: 3,
-            container: "#scrollableTable",
-            removeOriginal: true
-        	};
-
-			var sour = ${testpaperList};
-			
-			if(sour != null && sour.length > 0){
-			$("#simple-table").tablescroller(options);
-	        var name_height = $(".kc").last().parent().height()-18.5;
-	        console.log(name_height);
-	        $(".th_name").height(name_height);
+			if(sour != null && sour.length > 3){
+				var _width = $('#mainFrame', parent.document).width()-40;
+				var _heigh = $('#mainFrame', parent.document).height()-100;
+				var options = {
+	            width: _width,
+	            height: _heigh,
+	            pinnedRows: 4,
+	            pinnedCols: 3,
+	            container: "#scrollableTable",
+	            removeOriginal: true
+	        	};
+				$("#simple-table").tablescroller(options);
+		        var name_height = $(".kc").last().parent().height()-18.5;
+		        console.log(name_height);
+		        $(".th_name").height(name_height);
 			}
 				
 		});
 		
-		
-		//console.log('${studentList}');
-		
 	</script>
 
 </body>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
index 984d511..d8931f8 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
@@ -25,7 +25,7 @@
 		<div class="box_header">
 			<div class="head_box_l">
 				<p>
-					<span class="right_b"></span>云测验测验分析
+					<span class="right_b"></span>即时测测验分析
 				</p>
 			</div>
 			<div class="head_box_r">
@@ -46,9 +46,9 @@
 				<thead>
 					<tr>
 						<th>序号</th>
-						<th>创建时间</th>
+						<th>测验名称</th>
 						<th>班级</th>
-						<th>试卷名称</th>
+						<th>创建时间</th>
 						<th>查看</th>
 					</tr>
 				</thead>
@@ -79,5 +79,8 @@
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
 	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
-	<script src="../static/js/test_list.js"></script>
+	<script type="text/javascript">
+		var user_id= "${pd.userId}";
+	</script>
+	<script src="../static/js/test_list.js?a=2"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/static/js/set_question.js b/WebRoot/static/js/set_question.js
index f239a36..f2ac07f 100644
--- a/WebRoot/static/js/set_question.js
+++ b/WebRoot/static/js/set_question.js
@@ -7,6 +7,8 @@ var url="";
 	var pageNum=1;
 	var end=0;
 	var flag=0;
+	var paper_title = "" ;
+	var paper_time = "0" ;
 	
 	
 	$(document).ready(function(){
@@ -35,6 +37,9 @@ var url="";
 				for(var i=0;i<data.data.length;i++){
 					point_html +='<li data-id="'+data.data[i].KNOWLEDGE_ID+'" data-img-click=0 data-span-click=0><img src="../static/images/add.png" class="add" /><span>'+(i+1)+data.data[i].NAME+'</span></li>';
 				}
+				if(data.data.length > 0){
+					paper_title = data.data[0].NAME;
+				}
 				$(".section").children("ul").html(point_html);
 				getQuestion($(".section li").eq(0));
 			}
@@ -269,11 +274,13 @@ var url="";
 			pageNum=1;
 			$(".question_box ul").html("");
 			var that=$(this).closest("li");
-			if($(".tab .active").attr("data-index")==1){				
+			if($(".tab .active").attr("data-index")==1){	
+					paper_title = this.textContent;
 					getQuestion(that);
 					$(".menu_active").removeClass();
 					that.addClass("menu_active");
 			}else{
+					paper_title = this.textContent;
 					getQuestion(that);
 					$(".menu_active").removeClass();
 					that.addClass("menu_active");
@@ -339,10 +346,14 @@ var url="";
 			}
 		});
 		$(".topic").click(function(){
-			if(parseInt($("#all_que_num").text())>0)
+			if(parseInt($("#all_que_num").text())>0){
+				paper_time = parseInt($("#all_que_num").text()) > 75 ? "150" : (parseInt($("#all_que_num").text()) * 2);
+				$("#title").val(paper_title);
+				$("#time").val(paper_time);
 				$('#myModal').modal('show');
-			else
+			}else{
 				alert("请先选择题目")
+			}
 		});
 		$(".view_more").click(function(){                     //加载更多
 			flag++;
@@ -376,7 +387,7 @@ var url="";
 				grade_id: "",
 				class_id: class_id,
 				user_id: user_id,
-				score: "100",
+				score: "",
 				questions: question_arry
 			};
 			sessionStorage.setItem("data",JSON.stringify(data));
diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js
index 0fd0973..2c97a1c 100644
--- a/WebRoot/static/js/teach_paper.js
+++ b/WebRoot/static/js/teach_paper.js
@@ -5,7 +5,7 @@
 			subject_id="",
 			class_id="";
 		$(document).ready(function(){
-			getList();
+			
 			timeList();
 			$.ajax({
 				url:url+"/SunvoteEducation/teacher/info",
@@ -25,6 +25,7 @@
 						$(".classList li").eq(0).addClass("active");
 						$("#dealer_id_2").html(option_html);
 					}
+					getList();
 				}
 			})
 
diff --git a/WebRoot/static/js/test_list.js b/WebRoot/static/js/test_list.js
index d875d39..6e70bd5 100644
--- a/WebRoot/static/js/test_list.js
+++ b/WebRoot/static/js/test_list.js
@@ -1,97 +1,121 @@
-var url="";
-		
-		var option_html="";
-		var user_id= "8dbef15bb6d043ec94b719ede583b033",
-			subject_id="";
-			
-		function getQueryString(name) {
-		  var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-		  var r = window.location.search.substr(1).match(reg);
-		  if (r != null) return unescape(r[2]); return null;
-		}
-		var class_id=getQueryString("classid");
-		$(document).ready(function(){
-			getList();
-			$.ajax({
-				url:url+"/SunvoteEducation/teacher/info",
-				async:false,
-				type:"post",
-				success:function(data){
-					subject_id=data.data.subjectList[0].SUBJECT_ID;
-					user_id=data.data.ID;
-					if(data.data.classInfoList.length>0){
-						for(var i=0;i<data.data.classInfoList.length;i++){
-							option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
-						}
-						$("#dealer_id_2").html(option_html);
-					}
-				}
-			})
-			//日期框
-			$('.date-picker').datepicker({
-				autoclose: true,
-				todayHighlight: true
-			});
-			window.top.loading.remove();
-		})
-		function getList(start_date,end_date,class_id){             //获取测验列表
-			var tab_html="";
-			$.ajax({
-				url:url+"/SunvoteEducation/api/v1/testpaper",
-				async:false,
-				type:"post",
-				data:{
-					paper_type:"101",
-					user_id:user_id,
-					subject_id:subject_id,
-					class_id:class_id,
-					currentpage:"1",
-					showcount:"",
-					start_date:start_date,
-					end_date:end_date
+var url = "";
+var option_html = "";
+var subject_id = "";
+
+function getQueryString(name) {
+	var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+	var r = window.location.search.substr(1).match(reg);
+	if (r != null)
+		return unescape(r[2]);
+	return null;
+}
+var class_id = getQueryString("classid");
+$(document)
+		.ready(
+				function() {
+					
+					$.ajax({
+								url : url + "/SunvoteEducation/teacher/info",
+								async : false,
+								type : "post",
+								success : function(data) {
+									subject_id = data.data.subjectList[0].SUBJECT_ID;
+									user_id = data.data.ID;
+									if (data.data.classInfoList.length > 0) {
+										for (var i = 0; i < data.data.classInfoList.length; i++) {
+											option_html += '<option value="'
+													+ data.data.classInfoList[i].CLASS_ID
+													+ '">'
+													+ data.data.classInfoList[i].CLASS_NAME
+													+ '</option>'
+										}
+										$("#dealer_id_2").html(option_html);
+									}
+									getList();
+								}
+							})
+					// 日期框
+					$('.date-picker').datepicker({
+						autoclose : true,
+						todayHighlight : true
+					});
+					window.top.loading.remove();
+				})
+function getList(start_date, end_date, class_id) { // 获取测验列表
+	var tab_html = "";
+	if(class_id == null){
+		class_id = getQueryString("classid");
+	}
+	$.ajax({
+				url : url + "/SunvoteEducation/api/v1/testpaper",
+				async : false,
+				type : "post",
+				data : {
+					test_type : "101",
+					user_id : user_id,	
+					subject_id : subject_id,
+					class_id : class_id,
+					currentpage : "1",
+					showcount : "",
+					start_date : start_date,
+					end_date : end_date
 				},
-				success:function(data){
+				success : function(data) {
 					console.log(data);
-					for(var i=0;i<data.data.length;i++){
-						tab_html += '<tr><td>'+(i+1)+'</td><td>'+data.data[i].createDate+'</td><td>'+getClassName(data.data[i].classId)+'</td><td>'+data.data[i].name+'</td><td><a onclick="window.top.loading.show();jump($(this));" data-id="'+data.data[i].testpaperId+'" >查看</a></td></tr>'
+					for (var i = 0; i < data.data.length; i++) {
+						tab_html += '<tr><td>'
+								+ (i + 1)
+								+ '</td><td>'
+								+ data.data[i].name
+								+ '</td><td>'
+								+ getClassName(data.data[i].classId)
+								+ '</td><td>'
+								+ data.data[i].createDate
+								+ '</td><td><a onclick="window.top.loading.show();jump($(this));" data-id="'
+								+ data.data[i].testpaperId
+								+ '" >查看</a></td></tr>'
 					}
 					$("#tab_body").html(tab_html);
 				}
 			});
+}
+function jump(obj) { // 预览测验详情
+	var id = obj.attr("data-id");
+	location.href = "paper_view1.do?testpaperId=" + id;
+}
+function getSubjectName(id) { // 获取科目中文名
+	var subjectName = "";
+	$.ajax({
+		url : url + "/SunvoteEducation/api/v1/subjectcname",
+		async : false,
+		type : "post",
+		data : {
+			id : id
+		},
+		success : function(data) {
+			subjectName = data.data;
 		}
-		function jump(obj){               //预览测验详情
-			var id=obj.attr("data-id");
-			location.href="paper_view1.do?testpaperId="+id;
-		}
-		function getSubjectName(id){   //获取科目中文名
-			var subjectName="";
-			$.ajax({
-				url:url+"/SunvoteEducation/api/v1/subjectcname",
-				async:false,
-				type:"post",
-				data:{id:id},
-				success:function(data){
-					subjectName=data.data;
-				}
-			})
-			return subjectName;
-		}
-		function getClassName(id){  //获取班级中文名
-			var className="";
-			$.ajax({
-				url:url+"/SunvoteEducation/api/v1/classname",
-				async:false,
-				type:"post",
-				data:{id:id},
-				success:function(data){
-					className=data.data;
-				}
-			})
-			return className;
+	})
+	return subjectName;
+}
+function getClassName(id) { // 获取班级中文名
+	var className = "";
+	$.ajax({
+		url : url + "/SunvoteEducation/api/v1/classname",
+		async : false,
+		type : "post",
+		data : {
+			id : id
+		},
+		success : function(data) {
+			className = data.data;
 		}
-		function tosearch(){           //搜索
-			var start_date=$("#lastStart").val();
-			var end_date=$("#lastEnd").val();
-			var class_id=$("#dealer_id_2").val();
-			getList(start_date,end_date,class_id);
-		}
\ No newline at end of file
+	})
+	return className;
+}
+function tosearch() { //搜索
+	var start_date = $("#lastStart").val();
+	var end_date = $("#lastEnd").val();
+	var class_id = $("#dealer_id_2").val();
+	getList(start_date, end_date, class_id);
+}
\ No newline at end of file
--
libgit2 0.21.4