From 8bdfc7d14aa75c3d0c49f7abdb7ad5042b766f1e Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 27 Jun 2019 15:17:36 +0800
Subject: [PATCH] 修改即时测链接都无效

---
 WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp       | 6 ++++--
 WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp    | 6 ++++--
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp | 6 +++++-
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp   | 3 +++
 WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp    | 3 +++
 WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp      | 3 +++
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index 8c12a56..5aab2f9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -398,6 +398,8 @@
 			//	$("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
 			//	window.top.loading.show();
 			//}
+			$("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
+			window.top.loading.show();
 		}
 		
 		$("#time_submit").click(function(){
@@ -451,8 +453,8 @@
 			$("#jishice_paper").click(function() {
 				var path = "../teacher/teach_paper.do?school_id=" + schoolId;
 				//if($("#mainFrame").attr('src') != (path)){
-				//		$("#mainFrame").attr('src',path);
-				//		window.top.loading.show();
+						$("#mainFrame").attr('src',path);
+						window.top.loading.show();
 				//}
 			});
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
index 2046ef3..571ef48 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
@@ -398,6 +398,8 @@
 			//	$("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
 			//	window.top.loading.show();
 			//}
+			$("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
+			window.top.loading.show();
 		}
 		
 		$("#time_submit").click(function(){
@@ -451,8 +453,8 @@
 			$("#jishice_paper").click(function() {
 				var path = "../teacher/teach_paper.do?school_id=" + schoolId;
 				//if($("#mainFrame").attr('src') != (path)){
-				//		$("#mainFrame").attr('src',path);
-				//		window.top.loading.show();
+						$("#mainFrame").attr('src',path);
+						window.top.loading.show();
 				//}
 			});
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
index 1c31869..a7bc969 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
@@ -129,7 +129,11 @@
 	<script src="../static/ace/js/bootbox.js"></script>
 	<script type="text/javascript">
   		var url = "<%=basePath%>";
-	  		$.fn.datepicker.dates['en'] = {
+
+		$(document).ready(function(){
+			window.top.loading.remove();
+		});
+	  	$.fn.datepicker.dates['en'] = {
 						    days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
 						    daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
 						    daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
index 199b0fb..e640add 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
@@ -85,6 +85,9 @@
 	<script type="text/javascript">
 		var user_id= "${pd.userId}";
 		var url = "<%=basePath%>";
+		$(document).ready(function(){
+			window.top.loading.remove();
+		});
 	</script>
 	<script src="../static/js/en_test_list.js?a=0"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
index f53273d..0ed4507 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -123,6 +123,9 @@
 		</div><!-- /.modal -->
   	<script type="text/javascript">
   		var url = "<%=basePath%>" ;
+  		$(document).ready(function(){
+			window.top.loading.remove();
+		});
   		$('.date-picker').datepicker({
 				autoclose: true,
 				todayHighlight: true,
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
index e057d76..d050aa0 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
@@ -85,6 +85,9 @@
 	<script type="text/javascript">
 		var user_id= "${pd.userId}";
 		var url = "<%=basePath%>";
+		$(document).ready(function(){
+			window.top.loading.remove();
+		});
 	</script>
 	<script src="../static/js/test_list.js?a=1"></script>
 </html>
\ No newline at end of file
--
libgit2 0.21.4