diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp index aa3c75a..8898123 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp @@ -57,6 +57,7 @@ + @@ -66,6 +67,7 @@ 建议考试时长 考试次数 总分 + 试卷类型 操作 @@ -81,6 +83,7 @@ + @@ -93,6 +96,7 @@ ${var.EXAM_TIME} ${var.TEST_NUM} ${var.SCORE} + ${var.PAPER_TYPE ==1?"个人卷":"年级卷"} disabled style="pointer-events:none;color:#ccc" href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩 diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 78d2ffa..f8f0079 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -285,7 +285,7 @@ //} }); - var defaultUrl = '${pd.DEFAULTURL}?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}'; + var defaultUrl = '${pd.DEFAULTURL}?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}&SUBJECT_ID=${pd.TEACHER.SUBJECT_ID}'; if (defaultUrl != '' && defaultUrl != '') { $("#mainFrame").attr('src', defaultUrl); }