From 5cf105797494fc2438fe6c8aa6cdb4b8d62fb9b8 Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Wed, 11 Dec 2019 12:04:20 +0800
Subject: [PATCH] 1.报表表头增加悬停提示 2.隐藏班级编号

---
 WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp    | 10 +++++-----
 WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp    |  5 +++++
 WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp |  8 ++++----
 WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp |  8 ++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
index 33f022b..64f1b68 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
@@ -69,13 +69,13 @@
 						<th><div style="width:80px">考试时间</div></th>
 						<th><div style="width:80px">平均分</div></th>
 						<th><div style="width:80px">班级总人数</div></th>
-						<th><div style="width:80px">优秀人数</div></th>
+						<th><div style="width:80px" title="得分>=80%">优秀人数</div></th>
 						<th><div style="width:80px">优秀率</div></th>
-						<th><div style="width:80px">良好人数</div></th>
+						<th><div style="width:80px" title="得分>=70%">良好人数</div></th>
 						<th><div style="width:80px">良好率</div></th>
-						<th><div style="width:80px">及格人数</div></th>
+						<th><div style="width:80px" title="得分>=60%">及格人数</div></th>
 						<th><div style="width:80px">及格率</div></th>
-						<th><div style="width:80px">低分人数</div></th>
+						<th><div style="width:80px" title="得分>=30%">低分人数</div></th>
 						<th><div style="width:80px">低分率</div></th>
 						<th><div style="width:80px">操作</div></th>
 					</tr>
@@ -174,7 +174,7 @@
 								<td >
 								
 								<c:if test="${not empty var.class_id }">
-								<a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}">查看成绩</a>
+								<a href="<%=basePath%>paper/paperRep2.do?CLASS_ID=${var.class_id}&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}">查看成绩</a>
 								</c:if>
 								  <c:if test="${empty var.class_id }">
 								<a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
index c637cb4..f7b22ba 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
@@ -59,6 +59,11 @@
 			<div style="padding:15px 0;background:#fff;" class="paper_title">
 				&nbsp;
 				试卷名称：${myelfun:findPaperName(pd.PAPER_ID)}
+				
+				<c:if test="${not empty pd.CLASS_ID }">
+					班级名称：${myelfun:findClassName(pd.CLASS_ID)}
+				</c:if>
+				
 			</div>
 			
 			<table id="simple-table"
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
index 444e198..64b1c56 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
@@ -71,10 +71,10 @@
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td>
 								<td><input type="text" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td>
 							</tr>
-							<tr>
+							<%-- <tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级编码:</td>
 								<td><input type="text" name="CLASS_CODE" id="CLASS_CODE" value="${pd.CLASS_CODE}" maxlength="255" placeholder="这里输入班级编码" title="班级编码" style="width:98%;"/></td>
-							</tr>
+							</tr> --%>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级基站:</td>
 								<td>
@@ -161,7 +161,7 @@
 				$("#CLASS_NAME").focus();
 			return false;
 			}
-			if($("#CLASS_CODE").val()==""){
+			/* if($("#CLASS_CODE").val()==""){
 				$("#CLASS_CODE").tips({
 					side:3,
 		            msg:'请输入班级编码',
@@ -170,7 +170,7 @@
 		        });
 				$("#CLASS_CODE").focus();
 			return false;
-			}
+			} */
 			if($("#BASESTATION_ID").val()==""){
 				$("#BASESTATION_ID").tips({
 					side:3,
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
index 97b70f4..e1cf121 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -51,14 +51,14 @@
 					<col style="width: 18%" />
 					<col style="width: 18%" />
 					<col style="width: 18%" />
-					<col style="width: 18%" />
+					<%-- <col style="width: 18%" /> --%>
 					<col style="width: 18%" />
 					<thead>
 						<tr>
 							<th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
 							<th class="center">班级名称</th>
 							<th class="center">班级类型</th>
-							<th class="center">班级编码</th>
+							<!-- <th class="center">班级编码</th> -->
 							<th class="center">班级基站</th>
 							<th class="center">操作</th>
 						</tr>
@@ -76,7 +76,7 @@
 				<col style="width: 18%" />
 				<col style="width: 18%" />
 				<col style="width: 18%" />
-				<col style="width: 18%" />
+				<%-- <col style="width: 18%" /> --%>
 				<col style="width: 18%" />
 				<tbody>
 					<!-- 开始循环 -->
@@ -88,7 +88,7 @@
 										value="${var.ID}" />${vs.index+1}</td>
 									<td class='center'><a href="student/listcs.do?class_id=${var.ID }">${var.CLASS_NAME}</a></td>
 									<td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td>
-									<td class='center'>${var.CLASS_CODE}</td>
+									<%-- <td class='center'>${var.CLASS_CODE}</td> --%>
 									<td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
 									
 									<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>
--
libgit2 0.21.4