Commit 4b347a15901e589291e38fc061c9b64295c202f7
1 parent
34279892
修改编辑试题后，添加的返回路径
Showing
5 changed files
with
26 additions
and
3 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
| ... | ... | @@ -321,6 +321,11 @@ |
| 321 | 321 | // window.top.loading.show(); |
| 322 | 322 | //} |
| 323 | 323 | }); |
| 324 | + | |
| 325 | + var defaultUrl = '${pd.DEFAULTURL}' ; | |
| 326 | + if(defaultUrl != '' && defaultUrl != ''){ | |
| 327 | + $("#mainFrame").attr('src',defaultUrl); | |
| 328 | + } | |
| 324 | 329 | </script> |
| 325 | 330 | </body> |
| 326 | 331 | </html> |
| 327 | 332 | \ No newline at end of file | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
| ... | ... | @@ -211,7 +211,7 @@ |
| 211 | 211 | //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"}]}]}; |
| 212 | 212 | //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]}; |
| 213 | 213 | </script> |
| 214 | -<script type="text/javascript" src="../static/js/control-604.js?a=2"></script> | |
| 214 | +<script type="text/javascript" src="../static/js/control-604.js?a=3"></script> | |
| 215 | 215 | |
| 216 | 216 | |
| 217 | 217 | </body> | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
| ... | ... | @@ -229,6 +229,11 @@ |
| 229 | 229 | window.top.loading.show(); |
| 230 | 230 | //} |
| 231 | 231 | }); |
| 232 | + | |
| 233 | + var defaultUrl = '${pd.DEFAULTURL}' ; | |
| 234 | + if(defaultUrl != '' && defaultUrl != ''){ | |
| 235 | + $("#mainFrame").attr('src',defaultUrl); | |
| 236 | + } | |
| 232 | 237 | </script> |
| 233 | 238 | </body> |
| 234 | 239 | </html> |
| 235 | 240 | \ No newline at end of file | ... | ... |
WebRoot/static/js/control-604.js
| ... | ... | @@ -424,7 +424,11 @@ $(function() { |
| 424 | 424 | contentType : "application/x-www-form-urlencoded; charset=utf-8", |
| 425 | 425 | success : function(data) { |
| 426 | 426 | $(".loading").css("display", "none"); |
| 427 | - window.location.href = JUMP_URL + "&src="; | |
| 427 | + if(testData.paper_type == '1'){ | |
| 428 | + window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list2.do"; | |
| 429 | + }else{ | |
| 430 | + window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list4.do?school_id=" + testData.school_id ; | |
| 431 | + } | |
| 428 | 432 | } |
| 429 | 433 | }) |
| 430 | 434 | } | ... | ... |
src/com/fh/controller/system/login/LoginController.java
| ... | ... | @@ -275,12 +275,15 @@ public class LoginController extends BaseController { |
| 275 | 275 | mv.setViewName("sunvote/teacher/teacher_main"); |
| 276 | 276 | mv.addObject("user", user); |
| 277 | 277 | pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称 |
| 278 | + if(pd.get("DEFAULTURL") == null){ | |
| 279 | + pd.put("DEFAULTURL", "../paper/list2.do"); | |
| 280 | + } | |
| 278 | 281 | mv.addObject("pd", pd); |
| 279 | 282 | return mv; |
| 280 | 283 | }else if("admin".equals(changeMenu)){ |
| 281 | 284 | PageData tpd = new PageData(); |
| 282 | 285 | tpd.put("ID", user.getUSER_ID()); |
| 283 | - | |
| 286 | + String schoolId = "" ; | |
| 284 | 287 | List<PageData> adminInfos = v1Service.getAdminInfo(tpd); |
| 285 | 288 | List<PageData> gradeInfos = new ArrayList<PageData>(); |
| 286 | 289 | List<PageData> subjectInfos = new ArrayList<PageData>(); |
| ... | ... | @@ -301,6 +304,7 @@ public class LoginController extends BaseController { |
| 301 | 304 | }else{ |
| 302 | 305 | subjectInfos.add(tmpd); |
| 303 | 306 | } |
| 307 | + schoolId = pad.getString("SCHOOL_ID"); | |
| 304 | 308 | mv.addObject("SNAME", pad.get("SNAME")); |
| 305 | 309 | mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID")); |
| 306 | 310 | } |
| ... | ... | @@ -312,7 +316,12 @@ public class LoginController extends BaseController { |
| 312 | 316 | mv.setViewName("sunvote/admin/admin_main"); |
| 313 | 317 | mv.addObject("user", user); |
| 314 | 318 | pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称 |
| 319 | + if(pd.get("DEFAULTURL") == null){ | |
| 320 | + pd.put("DEFAULTURL", "../paper/list4.do?school_id=" + schoolId); | |
| 321 | + } | |
| 322 | + // | |
| 315 | 323 | mv.addObject("pd", pd); |
| 324 | + | |
| 316 | 325 | return mv; |
| 317 | 326 | } |
| 318 | 327 | ... | ... |