From 4b347a15901e589291e38fc061c9b64295c202f7 Mon Sep 17 00:00:00 2001 From: Elvis Date: Mon, 19 Nov 2018 14:53:59 +0800 Subject: [PATCH] 修改编辑试题后，添加的返回路径 --- WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp | 5 +++++ WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp | 5 +++++ WebRoot/static/js/control-604.js | 6 +++++- src/com/fh/controller/system/login/LoginController.java | 11 ++++++++++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index b56d79f..c9032d8 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -321,6 +321,11 @@ // window.top.loading.show(); //} }); + + var defaultUrl = '${pd.DEFAULTURL}' ; + if(defaultUrl != '' && defaultUrl != ''){ + $("#mainFrame").attr('src',defaultUrl); + } \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp index 7851e46..42d0b21 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":[]}; - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 78ede8d..4546623 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -229,6 +229,11 @@ window.top.loading.show(); //} }); + + var defaultUrl = '${pd.DEFAULTURL}' ; + if(defaultUrl != '' && defaultUrl != ''){ + $("#mainFrame").attr('src',defaultUrl); + } \ No newline at end of file diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js index 20b11dc..8b54119 100644 --- a/WebRoot/static/js/control-604.js +++ b/WebRoot/static/js/control-604.js @@ -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 ; + } } }) } diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java index 04cd1a2..ef52d4c 100644 --- a/src/com/fh/controller/system/login/LoginController.java +++ b/src/com/fh/controller/system/login/LoginController.java @@ -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 adminInfos = v1Service.getAdminInfo(tpd); List gradeInfos = new ArrayList(); List subjectInfos = new ArrayList(); @@ -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; } -- libgit2 0.21.4