孙向锦 / SunvoteEducation

Commit f4c217b4b175b9210125ff8d61fc3be8cc9613cb

Authored by jack
1 parent 8ebabb04

1.修改教师端默认链接 

2.教师端试卷管理增加试卷类型
Inline Side-by-side
Showing 2 changed files with 5 additions and 1 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
  View file @f4c217b
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
57 <col style="width: 10%" /> 57 <col style="width: 10%" />
58 <col style="width: 10%" /> 58 <col style="width: 10%" />
59 <col style="width: 10%" /> 59 <col style="width: 10%" />
  60 + <col style="width: 10%" />
60 <col style="width: 17%" /> 61 <col style="width: 17%" />
61 <thead> 62 <thead>
62 <tr> 63 <tr>
@@ -66,6 +67,7 @@ @@ -66,6 +67,7 @@
66 <th>建议考试时长</th> 67 <th>建议考试时长</th>
67 <th>考试次数</th> 68 <th>考试次数</th>
68 <th>总分</th> 69 <th>总分</th>
  70 + <th>试卷类型</th>
69 <th>操作</th> 71 <th>操作</th>
70 </tr> 72 </tr>
71 </thead> 73 </thead>
@@ -81,6 +83,7 @@ @@ -81,6 +83,7 @@
81 <col style="width: 10%" /> 83 <col style="width: 10%" />
82 <col style="width: 10%" /> 84 <col style="width: 10%" />
83 <col style="width: 10%" /> 85 <col style="width: 10%" />
  86 + <col style="width: 10%" />
84 <col style="width: 17%" /> 87 <col style="width: 17%" />
85 <tbody> 88 <tbody>
86 <c:choose> 89 <c:choose>
@@ -93,6 +96,7 @@ @@ -93,6 +96,7 @@
93 <td >${var.EXAM_TIME}</td> 96 <td >${var.EXAM_TIME}</td>
94 <td >${var.TEST_NUM}</td> 97 <td >${var.TEST_NUM}</td>
95 <td >${var.SCORE}</td> 98 <td >${var.SCORE}</td>
  99 + <td >${var.PAPER_TYPE ==1?"个人卷":"年级卷"}</td>
96 <td> 100 <td>
97 <c:if test="${var.PAPER_TYPE ==1 }"> 101 <c:if test="${var.PAPER_TYPE ==1 }">
98 <a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a> 102 <a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @f4c217b
@@ -285,7 +285,7 @@ @@ -285,7 +285,7 @@
285 //} 285 //}
286 }); 286 });
287 287
288 - var defaultUrl = '${pd.DEFAULTURL}?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}'; 288 + var defaultUrl = '${pd.DEFAULTURL}?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}&SUBJECT_ID=${pd.TEACHER.SUBJECT_ID}';
289 if (defaultUrl != '' && defaultUrl != '') { 289 if (defaultUrl != '' && defaultUrl != '') {
290 $("#mainFrame").attr('src', defaultUrl); 290 $("#mainFrame").attr('src', defaultUrl);
291 } 291 }