Commit 5cf105797494fc2438fe6c8aa6cdb4b8d62fb9b8

Authored by jack
1 parent 507148a9

1.报表表头增加悬停提示

2.隐藏班级编号
WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
@@ -69,13 +69,13 @@ @@ -69,13 +69,13 @@
69 <th><div style="width:80px">考试时间</div></th> 69 <th><div style="width:80px">考试时间</div></th>
70 <th><div style="width:80px">平均分</div></th> 70 <th><div style="width:80px">平均分</div></th>
71 <th><div style="width:80px">班级总人数</div></th> 71 <th><div style="width:80px">班级总人数</div></th>
72 - <th><div style="width:80px">优秀人数</div></th> 72 + <th><div style="width:80px" title="得分>=80%">优秀人数</div></th>
73 <th><div style="width:80px">优秀率</div></th> 73 <th><div style="width:80px">优秀率</div></th>
74 - <th><div style="width:80px">良好人数</div></th> 74 + <th><div style="width:80px" title="得分>=70%">良好人数</div></th>
75 <th><div style="width:80px">良好率</div></th> 75 <th><div style="width:80px">良好率</div></th>
76 - <th><div style="width:80px">及格人数</div></th> 76 + <th><div style="width:80px" title="得分>=60%">及格人数</div></th>
77 <th><div style="width:80px">及格率</div></th> 77 <th><div style="width:80px">及格率</div></th>
78 - <th><div style="width:80px">低分人数</div></th> 78 + <th><div style="width:80px" title="得分>=30%">低分人数</div></th>
79 <th><div style="width:80px">低分率</div></th> 79 <th><div style="width:80px">低分率</div></th>
80 <th><div style="width:80px">操作</div></th> 80 <th><div style="width:80px">操作</div></th>
81 </tr> 81 </tr>
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 <td > 174 <td >
175 175
176 <c:if test="${not empty var.class_id }"> 176 <c:if test="${not empty var.class_id }">
177 - <a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}">查看成绩</a> 177 + <a href="<%=basePath%>paper/paperRep2.do?CLASS_ID=${var.class_id}&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}">查看成绩</a>
178 </c:if> 178 </c:if>
179 <c:if test="${empty var.class_id }"> 179 <c:if test="${empty var.class_id }">
180 <a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a> 180 <a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a>
WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
@@ -59,6 +59,11 @@ @@ -59,6 +59,11 @@
59 <div style="padding:15px 0;background:#fff;" class="paper_title"> 59 <div style="padding:15px 0;background:#fff;" class="paper_title">
60 &nbsp; 60 &nbsp;
61 试卷名称:${myelfun:findPaperName(pd.PAPER_ID)} 61 试卷名称:${myelfun:findPaperName(pd.PAPER_ID)}
  62 +
  63 + <c:if test="${not empty pd.CLASS_ID }">
  64 + 班级名称:${myelfun:findClassName(pd.CLASS_ID)}
  65 + </c:if>
  66 +
62 </div> 67 </div>
63 68
64 <table id="simple-table" 69 <table id="simple-table"
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
@@ -71,10 +71,10 @@ @@ -71,10 +71,10 @@
71 <td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td> 71 <td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td>
72 <td><input type="text" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td> 72 <td><input type="text" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td>
73 </tr> 73 </tr>
74 - <tr> 74 + <%-- <tr>
75 <td style="width:75px;text-align: right;padding-top: 13px;">班级编码:</td> 75 <td style="width:75px;text-align: right;padding-top: 13px;">班级编码:</td>
76 <td><input type="text" name="CLASS_CODE" id="CLASS_CODE" value="${pd.CLASS_CODE}" maxlength="255" placeholder="这里输入班级编码" title="班级编码" style="width:98%;"/></td> 76 <td><input type="text" name="CLASS_CODE" id="CLASS_CODE" value="${pd.CLASS_CODE}" maxlength="255" placeholder="这里输入班级编码" title="班级编码" style="width:98%;"/></td>
77 - </tr> 77 + </tr> --%>
78 <tr> 78 <tr>
79 <td style="width:75px;text-align: right;padding-top: 13px;">班级基站:</td> 79 <td style="width:75px;text-align: right;padding-top: 13px;">班级基站:</td>
80 <td> 80 <td>
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 $("#CLASS_NAME").focus(); 161 $("#CLASS_NAME").focus();
162 return false; 162 return false;
163 } 163 }
164 - if($("#CLASS_CODE").val()==""){ 164 + /* if($("#CLASS_CODE").val()==""){
165 $("#CLASS_CODE").tips({ 165 $("#CLASS_CODE").tips({
166 side:3, 166 side:3,
167 msg:'请输入班级编码', 167 msg:'请输入班级编码',
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@
170 }); 170 });
171 $("#CLASS_CODE").focus(); 171 $("#CLASS_CODE").focus();
172 return false; 172 return false;
173 - } 173 + } */
174 if($("#BASESTATION_ID").val()==""){ 174 if($("#BASESTATION_ID").val()==""){
175 $("#BASESTATION_ID").tips({ 175 $("#BASESTATION_ID").tips({
176 side:3, 176 side:3,
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -51,14 +51,14 @@ @@ -51,14 +51,14 @@
51 <col style="width: 18%" /> 51 <col style="width: 18%" />
52 <col style="width: 18%" /> 52 <col style="width: 18%" />
53 <col style="width: 18%" /> 53 <col style="width: 18%" />
54 - <col style="width: 18%" /> 54 + <%-- <col style="width: 18%" /> --%>
55 <col style="width: 18%" /> 55 <col style="width: 18%" />
56 <thead> 56 <thead>
57 <tr> 57 <tr>
58 <th><input type="checkbox" value="0" name='ids' id="ids" />序号</th> 58 <th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
59 <th class="center">班级名称</th> 59 <th class="center">班级名称</th>
60 <th class="center">班级类型</th> 60 <th class="center">班级类型</th>
61 - <th class="center">班级编码</th> 61 + <!-- <th class="center">班级编码</th> -->
62 <th class="center">班级基站</th> 62 <th class="center">班级基站</th>
63 <th class="center">操作</th> 63 <th class="center">操作</th>
64 </tr> 64 </tr>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <col style="width: 18%" /> 76 <col style="width: 18%" />
77 <col style="width: 18%" /> 77 <col style="width: 18%" />
78 <col style="width: 18%" /> 78 <col style="width: 18%" />
79 - <col style="width: 18%" /> 79 + <%-- <col style="width: 18%" /> --%>
80 <col style="width: 18%" /> 80 <col style="width: 18%" />
81 <tbody> 81 <tbody>
82 <!-- 开始循环 --> 82 <!-- 开始循环 -->
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 value="${var.ID}" />${vs.index+1}</td> 88 value="${var.ID}" />${vs.index+1}</td>
89 <td class='center'><a href="student/listcs.do?class_id=${var.ID }">${var.CLASS_NAME}</a></td> 89 <td class='center'><a href="student/listcs.do?class_id=${var.ID }">${var.CLASS_NAME}</a></td>
90 <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td> 90 <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td>
91 - <td class='center'>${var.CLASS_CODE}</td> 91 + <%-- <td class='center'>${var.CLASS_CODE}</td> --%>
92 <td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td> 92 <td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
93 93
94 <td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td> 94 <td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>