From 4faf63560bd4ab8a3bf075fee6e55e63e92ac960 Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Fri, 12 Apr 2019 11:49:41 +0800
Subject: [PATCH] 1.修改练习报表

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index f61c4c6..fe40871 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -50,7 +50,7 @@
 	<div class="clear"></div>
 </div>
 <div style="padding-top:3%;margin-top:102px;">
-${pd }
+
   <!-- Nav tabs -->
   <ul class="nav nav-tabs" role="tablist" style="padding-bottom:3%">
     
@@ -102,6 +102,7 @@ ${pd }
 						<th class="center th_name"><div style="width:150px;">姓名</div></th>
 						<th class="center "><div style="width:150px;">课程平均得分率</div></th>
 						<th class="center"><div style="width:80px;">课程总分</div></th>
+						<th class="center"><div style="width:150px;">个人完成情况</div></th>
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<th class="center kc"><a
 								 onclick="paper('${pd.CLASS_ID}','${var_h.HOMEWORK_ID}');"><div style="width:180px;     margin: 0 auto;cursor:hand" class="font">${var_h.NAME}</br><span>${var_h.COMPLETE_DATE}</span></div></a></th>
@@ -113,6 +114,7 @@ ${pd }
 						<td class="center"><div style="width:150px;">班级课程总分</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
+						<td class="center"><div style="width:80px;"></div></td>
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td>
 						</c:forEach>
@@ -121,24 +123,27 @@ ${pd }
 						<td class="center"><div style="width:150px;">班级课程平均分</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
+						<td class="center"><div style="width:80px;"></div></td>
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE}</div></td>
 						</c:forEach>
 					</tr>
 					<tr>
-						<td class="center"><div style="width:150px;">完成情况</div></td>
+						<td class="center"><div style="width:150px;">班级课程平均得分率</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
+						<td class="center"><div style="width:80px;"></div></td>
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td>
 						</c:forEach>
 					</tr>
 					<tr>
-						<td class="center"><div style="width:150px;">班级课程平均得分率</div></td>
+						<td class="center"><div style="width:150px;">练习完成情况</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
+						<td class="center"><div style="width:80px;"></div></td>
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
-							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td>
+							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.COMPLETE_DESC }</div></td>
 						</c:forEach>
 					</tr>
 
@@ -156,6 +161,9 @@ ${pd }
 											value="${var.PAPER_ALL_SCORE == 0 ? 0: (var.STUDENT_ALL_SCORE / var.PAPER_ALL_SCORE * 100)}"
 											maxFractionDigits="2" />%</div></td>
 									<td class="center"><div style="width:80px;margin:0 auto;">${var.PAPER_ALL_SCORE}</div></td>
+									<td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
+											value="${var.ALL_COUNT == 0 ? 0: (var.COMPLETE_COUNT / var.ALL_COUNT * 100)}"
+											maxFractionDigits="2" />%</div></td>
 									<c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1">
 										<td class="center"><div style="width:80px;margin:0 auto;"><c:set var="TEST_ID"
 												value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td>
@@ -338,8 +346,8 @@ ${pd }
 				var options = {
 	            width: _width,
 	            height: _heigh,
-	            pinnedRows: 4,
-	            pinnedCols: 3,
+	            pinnedRows: 5,
+	            pinnedCols: 4,
 	            container: "#scrollableTable",
 	            removeOriginal: true
 	        	};
--
libgit2 0.21.4