修改编辑试题后，添加的返回路径

孙向锦
1 parent 34279892
Showing 5 changed files with 26 additions and 3 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
WebRoot/static/js/control-604.js
src/com/fh/controller/system/login/LoginController.java
@@ -321,6 +321,11 @@
 		//		window.top.loading.show();
 			//}
 		});
+		
+		var defaultUrl = '${pd.DEFAULTURL}' ;
+		if(defaultUrl != '' && defaultUrl != ''){
+			$("#mainFrame").attr('src',defaultUrl);
+		}
 	</script>
 </body>
 </html>
 \ No newline at end of file
@@ -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=2"></script>
+<script type="text/javascript" src="../static/js/control-604.js?a=3"></script>
 </body>
@@ -229,6 +229,11 @@
 				window.top.loading.show();
 			//}
 		});
+		
+		var defaultUrl = '${pd.DEFAULTURL}' ;
+		if(defaultUrl != '' && defaultUrl != ''){
+			$("#mainFrame").attr('src',defaultUrl);
+		}
 	</script>
 </body>
 </html>
 \ No newline at end of file
@@ -424,7 +424,11 @@ $(function() {
 			contentType : "application/x-www-form-urlencoded; charset=utf-8",
 			success : function(data) {
 				$(".loading").css("display", "none");
-				window.location.href = JUMP_URL + "&src=";
+				if(testData.paper_type == '1'){
+					window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list2.do";
+				}else{
+					window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list4.do?school_id=" + testData.school_id ;
+				}
 			}
 		})
 	}
@@ -275,12 +275,15 @@ public class LoginController extends BaseController {
 					mv.setViewName("sunvote/teacher/teacher_main");
 					mv.addObject("user", user);
 					pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
+					if(pd.get("DEFAULTURL") == null){
+						pd.put("DEFAULTURL", "../paper/list2.do");
+					}
 					mv.addObject("pd", pd);
 					return mv;
 				}else if("admin".equals(changeMenu)){
 					PageData tpd = new PageData();
 					tpd.put("ID", user.getUSER_ID());
-					
+					String schoolId = "" ;
 					List<PageData> adminInfos = v1Service.getAdminInfo(tpd);
 					List<PageData> gradeInfos = new ArrayList<PageData>();
 					List<PageData> subjectInfos = new ArrayList<PageData>();
@@ -301,6 +304,7 @@ public class LoginController extends BaseController {
 						}else{
 							subjectInfos.add(tmpd);
 						}
+						schoolId = pad.getString("SCHOOL_ID");
 						mv.addObject("SNAME", pad.get("SNAME"));
 						mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID"));
 					}
@@ -312,7 +316,12 @@ public class LoginController extends BaseController {
 					mv.setViewName("sunvote/admin/admin_main");
 					mv.addObject("user", user);
 					pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
+					if(pd.get("DEFAULTURL") == null){
+						pd.put("DEFAULTURL", "../paper/list4.do?school_id=" + schoolId);
+					}
+					//
 					mv.addObject("pd", pd);
+					
 					return mv;
 				}