Commit 4adcdb806558d7aeb762b8dd0e18e3309bb922b7
1 parent
40af1dd5
1.优化部分交互
Showing
5 changed files
with
91 additions
and
303 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
| @@ -2,8 +2,6 @@ | @@ -2,8 +2,6 @@ | ||
| 2 | pageEncoding="UTF-8"%> | 2 | pageEncoding="UTF-8"%> |
| 3 | <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | 3 | <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> |
| 4 | <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> | 4 | <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> |
| 5 | -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> | ||
| 6 | -<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> | ||
| 7 | <% | 5 | <% |
| 8 | String path = request.getContextPath(); | 6 | String path = request.getContextPath(); |
| 9 | String basePath = request.getScheme() + "://" | 7 | String basePath = request.getScheme() + "://" |
| @@ -16,258 +14,101 @@ | @@ -16,258 +14,101 @@ | ||
| 16 | <head> | 14 | <head> |
| 17 | <base href="<%=basePath%>"> | 15 | <base href="<%=basePath%>"> |
| 18 | 16 | ||
| 19 | -<title>${info.CLASS_NAME}成绩报表</title> | 17 | +<title>试卷成绩报表</title> |
| 20 | <base href="<%=basePath%>"> | 18 | <base href="<%=basePath%>"> |
| 21 | <!-- 下拉框 --> | 19 | <!-- 下拉框 --> |
| 22 | <link rel="stylesheet" href="static/ace/css/chosen.css" /> | 20 | <link rel="stylesheet" href="static/ace/css/chosen.css" /> |
| 23 | <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" /> | 21 | <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" /> |
| 24 | - | ||
| 25 | -<link | ||
| 26 | - href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" | ||
| 27 | - rel="stylesheet"> | 22 | +<!-- jsp文件头和头部 --> |
| 23 | +<%@ include file="../../system/index/top.jsp"%> | ||
| 28 | <!-- 日期框 --> | 24 | <!-- 日期框 --> |
| 29 | <link rel="stylesheet" href="static/ace/css/datepicker.css" /> | 25 | <link rel="stylesheet" href="static/ace/css/datepicker.css" /> |
| 30 | <style> | 26 | <style> |
| 31 | - .font span{ font-size: 12px; | ||
| 32 | - font-weight: initial;color:#000;} | ||
| 33 | - .search_btn{width:30px;} | ||
| 34 | - .btn{margin:0 5px;} | ||
| 35 | - </style> | 27 | +.table{padding-bottom:0 !important;} |
| 28 | +</style> | ||
| 36 | </head> | 29 | </head> |
| 37 | 30 | ||
| 38 | -<body style="background:#fff;"> | ||
| 39 | - | ||
| 40 | - | ||
| 41 | -<div style="padding-top:3%;"> | ||
| 42 | - | ||
| 43 | - <!-- Nav tabs --> | ||
| 44 | - <ul class="nav nav-tabs" role="tablist"> | ||
| 45 | - | ||
| 46 | - | ||
| 47 | - <c:forEach items="${pd.CLASSES}" var="var" varStatus="vs"> | ||
| 48 | - <li role="presentation" class="${vs.index==0?'active':''}"><a href="#${var.CLASS_ID}" aria-controls="${var.CLASS_ID}" role="tab" data-toggle="tab">${var.CLASS_NAME}</a></li> | ||
| 49 | - </c:forEach> | ||
| 50 | - | ||
| 51 | - </ul> | ||
| 52 | - | ||
| 53 | - | ||
| 54 | - <div style="padding:20px 20px;"> | ||
| 55 | - <form action="report/report.do" method="post" name="Form" id="Form" style="margin-bottom:0;"> | ||
| 56 | - <input type="hidden" name="CLASSID" id="CLASSID" value="${var.ID}" /> | ||
| 57 | - <input type="hidden" name="ROLE" id="ROLE" value="${pd.ROLE}" /> | ||
| 58 | - <table style="margin-top:5px;margin-bottom:20px;"> | ||
| 59 | - <tr> | ||
| 60 | - <td><div style="width:150px;text-align:center;">课程统计: ${fn:length(pd.DATA.HOMEWORKS)}</div></td> | ||
| 61 | - <td><div style="width:150px;text-align:center;">班级名册: ${myelfun:findClassName(pd.CLASS_ID)}</div></td> | ||
| 62 | - | ||
| 63 | - <td><div style="width:150px;text-align:center;"><span>学生人数: ${fn:length(pd.DATA.STUDENTS)}</span></div></td> | ||
| 64 | - <td></td> | ||
| 65 | - | ||
| 66 | - | ||
| 67 | - | ||
| 68 | - <td style="padding-left:2px;"> | ||
| 69 | - <input | ||
| 70 | - class="span10 date-picker" name="lastStart" id="lastStart" | ||
| 71 | - value="${pd.START_DATE}" type="text" data-date-format="yyyy-mm-dd" | ||
| 72 | - readonly="readonly" style="width:88px;" placeholder="开始日期" | ||
| 73 | - title="开始日期" /> | ||
| 74 | - </td> | ||
| 75 | - <td style="padding-left:2px;"><input | ||
| 76 | - class="span10 date-picker" name="lastEnd" id="lastEnd" value="${pd.END_DATE}" | ||
| 77 | - type="text" data-date-format="yyyy-mm-dd" readonly="readonly" | ||
| 78 | - style="width:88px;" placeholder="结束日期" title="结束日期" /></td> | ||
| 79 | - <td style="vertical-align:top;padding-left:2px"><a | ||
| 80 | - class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><img src="static/images/search.png" alt="" class="search_btn" /></a></td> | ||
| 81 | - <td><li class="btn btn-default btn-sm">上一周</li></td> | ||
| 82 | - <td><li class="btn btn-primary btn-sm">本周</li></td> | ||
| 83 | - <td><li class="btn btn-default btn-sm">下一周</li></td> | ||
| 84 | - </tr> | ||
| 85 | - </table> | ||
| 86 | - <hr /> | ||
| 87 | - <table id="simple-table" | ||
| 88 | - class="table table-bordered table-hover" | ||
| 89 | - style="margin-top:0px;margin-bottom:0px;"> | ||
| 90 | - <thead> | ||
| 91 | - <tr> | ||
| 92 | - <th class="center th_name"><div style="width:150px;">姓名</div></th> | ||
| 93 | - <th class="center "><div style="width:150px;">课程平均得分率</div></th> | ||
| 94 | - <th class="center"><div style="width:80px;">课程总分</div></th> | ||
| 95 | - <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> | ||
| 96 | - <th class="center kc"><a | ||
| 97 | - onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_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> | ||
| 98 | - </c:forEach> | ||
| 99 | - </tr> | ||
| 100 | - </thead> | ||
| 101 | - <tbody> | ||
| 102 | - <tr> | ||
| 103 | - <td class="center"><div style="width:150px;">班级课程总分</div></td> | ||
| 104 | - <td class="center"><div style="width:150px;"></div></td> | ||
| 105 | - <td class="center"><div style="width:80px;"></div></td> | ||
| 106 | - <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> | ||
| 107 | - <td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td> | ||
| 108 | - </c:forEach> | ||
| 109 | - </tr> | ||
| 110 | - <tr> | ||
| 111 | - <td class="center"><div style="width:150px;">班级课程平均分</div></td> | ||
| 112 | - <td class="center"><div style="width:150px;"></div></td> | ||
| 113 | - <td class="center"><div style="width:80px;"></div></td> | ||
| 114 | - <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> | ||
| 115 | - <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE}</div></td> | ||
| 116 | - </c:forEach> | ||
| 117 | - </tr> | ||
| 118 | - <tr> | ||
| 119 | - <td class="center"><div style="width:150px;">班级课程平均得分率</div></td> | ||
| 120 | - <td class="center"><div style="width:150px;"></div></td> | ||
| 121 | - <td class="center"><div style="width:80px;"></div></td> | ||
| 122 | - <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> | ||
| 123 | - <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td> | ||
| 124 | - </c:forEach> | ||
| 125 | - </tr> | ||
| 126 | - | ||
| 127 | - <c:choose> | ||
| 128 | - <c:when test="${not empty pd.DATA.STUDENTS}"> | ||
| 129 | - <c:forEach items="${pd.DATA.STUDENTS}" var="var" varStatus="vs"> | ||
| 130 | - <tr> | ||
| 131 | - <%-- <td class="center"><a | ||
| 132 | - href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a> | ||
| 133 | - </td> --%> | ||
| 134 | - <td class="center"><div style="width:150px;cursor:hand"><a | ||
| 135 | - onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a></div> | ||
| 136 | - </td> | ||
| 137 | - <td class="center"><div style="width:150px;"><fmt:formatNumber type="number" | ||
| 138 | - value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}" | ||
| 139 | - maxFractionDigits="2" />%</div></td> | ||
| 140 | - <td class="center"><div style="width:80px;margin:0 auto;">${var.GET_SCORE_PERSENT }</div></td> | ||
| 141 | - <c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1"> | ||
| 142 | - <td class="center"><div style="width:180px;margin:0 auto;"><c:set var="TEST_ID" | ||
| 143 | - value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td> | ||
| 144 | - </c:forEach> | ||
| 145 | - </tr> | ||
| 146 | - </c:forEach> | ||
| 147 | - </c:when> | ||
| 148 | - </c:choose> | ||
| 149 | - </tbody> | ||
| 150 | - </table> | ||
| 151 | - | ||
| 152 | - <div id="scrollableTable"></div> | ||
| 153 | - </form> | ||
| 154 | - </div> | ||
| 155 | - | ||
| 156 | - | ||
| 157 | - | ||
| 158 | - | ||
| 159 | -</div> | ||
| 160 | - | ||
| 161 | - <hr /> | 31 | +<body style="background:#fff;/* overflow-y:hidden; */">${pd } |
| 162 | <div style="padding:20px 20px;"> | 32 | <div style="padding:20px 20px;"> |
| 163 | - <form action="report/report.do" method="post" name="Form" id="Form" style="margin-bottom:0;"> | 33 | + |
| 34 | + <form action="report/report_test.do" method="post" name="Form" id="Form"> | ||
| 164 | <input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" /> | 35 | <input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" /> |
| 165 | - <input type="hidden" name="ROLE" id="ROLE" value="${pd.ROLE}" /> | ||
| 166 | - <table style="margin-top:5px;margin-bottom:20px;"> | ||
| 167 | - <tr> | ||
| 168 | - <td><div style="width:150px;text-align:center;">课程统计: ${info.testsize}</div></td> | ||
| 169 | - <td><div style="width:150px;text-align:center;">班级名册: ${info.CLASS_NAME}</div></td> | ||
| 170 | - | ||
| 171 | - <td><div style="width:150px;text-align:center;"><span>学生人数: ${info.STUDENT_NUM}</span></div></td> | ||
| 172 | - <td></td> | ||
| 173 | - | ||
| 174 | - | ||
| 175 | - <c:if test="${not empty subjectInfos}"> | ||
| 176 | - <td> | ||
| 177 | - <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属学校"> | ||
| 178 | - <option value="">全部</option> | ||
| 179 | - <c:forEach var="item" items="${subjectInfos}"> | ||
| 180 | - <option value="${item.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID == item.SUBJECT_ID }">selected = ture</c:if>>${item.SCNAME}</option> | ||
| 181 | - </c:forEach> | ||
| 182 | - </select> | ||
| 183 | - </td> | 36 | + <table style="margin-top:5px;"> |
| 37 | + <tr style="height: 30px"> | ||
| 38 | + <td>测验名称: ${testpaperInfo.NAME}</td> | ||
| 39 | + <c:if test="${display}"> | ||
| 40 | + <td> </td> | ||
| 41 | + <td>教师: ${teacherPd.NAME}</td> | ||
| 42 | + <td> </td> | ||
| 43 | + <td>科目名称: ${subjectPd.CNAME}</td> | ||
| 184 | </c:if> | 44 | </c:if> |
| 185 | - <td style="padding-left:2px;"> | ||
| 186 | - <input | ||
| 187 | - class="span10 date-picker" name="lastStart" id="lastStart" | ||
| 188 | - value="${start_date}" type="text" data-date-format="yyyy-mm-dd" | ||
| 189 | - readonly="readonly" style="width:88px;" placeholder="开始日期" | ||
| 190 | - title="开始日期" /> | ||
| 191 | - </td> | ||
| 192 | - <td style="padding-left:2px;"><input | ||
| 193 | - class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}" | ||
| 194 | - type="text" data-date-format="yyyy-mm-dd" readonly="readonly" | ||
| 195 | - style="width:88px;" placeholder="结束日期" title="结束日期" /></td> | ||
| 196 | - <td style="vertical-align:top;padding-left:2px"><a | ||
| 197 | - class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><img src="static/images/search.png" alt="" class="search_btn" /></a></td> | ||
| 198 | - <td><li class="btn btn-default btn-sm">上一周</li></td> | ||
| 199 | - <td><li class="btn btn-primary btn-sm">本周</li></td> | ||
| 200 | - <td><li class="btn btn-default btn-sm">下一周</li></td> | 45 | + </tr> |
| 46 | + <tr style="height: 30px"> | ||
| 47 | + <td>收卷时间: ${testpaperInfo.END_DATE}</td> | ||
| 48 | + </tr> | ||
| 49 | + <tr style="height: 30px"> | ||
| 50 | + <td>班级名册：${classInfo.CLASS_NAME}</td> | ||
| 51 | + <td> </td> | ||
| 52 | + <td><span>学生人数: ${classInfo.studentNum}</span></td> | ||
| 53 | + | ||
| 201 | </tr> | 54 | </tr> |
| 202 | </table> | 55 | </table> |
| 203 | - <hr /> | ||
| 204 | <table id="simple-table" | 56 | <table id="simple-table" |
| 205 | - class="table table-bordered table-hover" | ||
| 206 | - style="margin-top:0px;margin-bottom:0px;"> | 57 | + class="table table-striped table-bordered table-hover" |
| 58 | + style="margin-top:0px;margin-bottom:0;"> | ||
| 207 | <thead> | 59 | <thead> |
| 208 | <tr> | 60 | <tr> |
| 209 | - <th class="center th_name"><div style="width:150px;">姓名</div></th> | ||
| 210 | - <th class="center "><div style="width:150px;">课程平均得分率</div></th> | ||
| 211 | - <th class="center"><div style="width:80px;">课程总分</div></th> | ||
| 212 | - <c:forEach items="${testpaperList}" var="var" varStatus="vs"> | ||
| 213 | - <th class="center kc"><a | ||
| 214 | - onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');"><div style="width:180px; margin: 0 auto;cursor:hand" class="font">${var.NAME}</br><span>${var.CREATE_DATE}</span></div></a></th> | 61 | + <th class="center"><div style="width:80px;">姓名</div></th> |
| 62 | + <th class="center"><div style="width:80px;">排名</div></th> | ||
| 63 | + <th class="center"><div style="width:80px;">得分</div></th> | ||
| 64 | + <th class="center"><div style="width:80px;">学号</div></th> | ||
| 65 | + <th class="center"><div style="width:109px;">键盘</div></th> | ||
| 66 | + <!-- <th class="center"><div style="width:80px;">正确率</div></th> --> | ||
| 67 | + <c:forEach items="${questionInfo}" var="var" varStatus="vs"> | ||
| 68 | + <th class="center"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th> | ||
| 215 | </c:forEach> | 69 | </c:forEach> |
| 70 | + <!-- <th class="center"><div style="width:150px;">非选择题得分</div></th> --> | ||
| 71 | + <th class="center"><div style="width:80px;margin:0 auto;">总分</div></th> | ||
| 216 | </tr> | 72 | </tr> |
| 217 | </thead> | 73 | </thead> |
| 218 | <tbody> | 74 | <tbody> |
| 219 | <tr> | 75 | <tr> |
| 220 | - <td class="center"><div style="width:150px;">班级课程总分</div></td> | ||
| 221 | - <td class="center"><div style="width:150px;"></div></td> | ||
| 222 | - <td class="center"><div style="width:80px;"></div></td> | ||
| 223 | - <c:forEach items="${testpaperList}" var="var" varStatus="vs"> | ||
| 224 | - <td class="center"><div style="width:80px;margin:0 auto;">${var.TOTAL_SCORE}</div></td> | ||
| 225 | - </c:forEach> | ||
| 226 | - </tr> | ||
| 227 | - <tr> | ||
| 228 | - <td class="center"><div style="width:150px;">班级课程平均分</div></td> | ||
| 229 | - <td class="center"><div style="width:150px;"></div></td> | ||
| 230 | - <td class="center"><div style="width:80px;"></div></td> | ||
| 231 | - <c:forEach items="${testpaperList}" var="var" varStatus="vs"> | ||
| 232 | - <td class="center"><div style="width:80px;margin:0 auto;">${var.AVG_SCORE}</div></td> | ||
| 233 | - </c:forEach> | ||
| 234 | - </tr> | ||
| 235 | - <tr> | ||
| 236 | - <td class="center"><div style="width:150px;">班级课程平均得分率</div></td> | ||
| 237 | - <td class="center"><div style="width:150px;"></div></td> | ||
| 238 | - <td class="center"><div style="width:80px;"></div></td> | ||
| 239 | - <c:forEach items="${testpaperList}" var="var" varStatus="vs"> | ||
| 240 | - <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number" | ||
| 241 | - value="${var.TOTAL_SCORE == 0 ? 0: (var.AVG_SCORE / var.TOTAL_SCORE * 100)}" | ||
| 242 | - maxFractionDigits="2" />%</div></td> | 76 | + <td class="center"><div style="width:109px;">--</div></td> |
| 77 | + <td class="center"><div style="width:80px;">--</div></td> | ||
| 78 | + <td class="center"><div style="width:80px;">--</div></td> | ||
| 79 | + <td class="center"><div style="width:80px;">--</div></td> | ||
| 80 | + <!-- <td class="center"></td> --> | ||
| 81 | + <td class="center"><div style="width:80px;">--</div></td> | ||
| 82 | + <c:forEach items="${questionInfo}" var="var" varStatus="vs"> | ||
| 83 | + <td class="center"><div style="width:80px;margin:0 auto;"><c:set var="key"><c:out value="${vs.index+1}" /></c:set><fmt:formatNumber type="number" | ||
| 84 | + value="${(questionInfo[key] / classInfo.studentNum * 100)}" | ||
| 85 | + maxFractionDigits="1" />%</div></td> | ||
| 243 | </c:forEach> | 86 | </c:forEach> |
| 87 | + <!-- <td class="center"></td> --> | ||
| 88 | + <td class="center"><div style="width:80px;margin:0 auto;"></div></td> | ||
| 244 | </tr> | 89 | </tr> |
| 245 | 90 | ||
| 246 | <c:choose> | 91 | <c:choose> |
| 247 | - <c:when test="${not empty studentList}"> | ||
| 248 | - <c:forEach items="${studentList}" var="var" varStatus="vs"> | 92 | + <c:when test="${not empty studentInfo}"> |
| 93 | + <c:forEach items="${studentInfo}" var="var" varStatus="vs"> | ||
| 249 | <tr> | 94 | <tr> |
| 250 | - <%-- <td class="center"><a | ||
| 251 | - href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a> | ||
| 252 | - </td> --%> | ||
| 253 | - <td class="center"><div style="width:150px;cursor:hand"><a | ||
| 254 | - onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a></div> | ||
| 255 | - </td> | ||
| 256 | - <td class="center"><div style="width:150px;"><fmt:formatNumber type="number" | ||
| 257 | - value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}" | ||
| 258 | - maxFractionDigits="2" />%</div></td> | ||
| 259 | - <td class="center"><div style="width:80px;margin:0 auto;">${var.GETSCORE }</div></td> | ||
| 260 | - <c:forEach items="${testpaperList}" var="var1" varStatus="vs1"> | ||
| 261 | - <td class="center"><div style="width:180px;margin:0 auto;"><c:set var="TEST_ID" | ||
| 262 | - value="${var1.TESTPAPER_ID}" /> ${var[TEST_ID] }</div></td> | 95 | + <td class="center"><div style="width:80px;">${var.NAME}</div></td> |
| 96 | + <td class="center"><div style="width:80px;">${var.RANK_NUM}</div></td> | ||
| 97 | + <td class="center"><div style="width:80px;">${var.GETSCORE}</div></td> | ||
| 98 | + <td class="center"><div style="width:80px;">${var.NUMBER}</div></td> | ||
| 99 | + <td class="center"><div style="width:109px;">${var.KEYPAD_ID}</div></td> | ||
| 100 | + <%-- <td class="center">${var.RIGHT}</td> --%> | ||
| 101 | + <c:forEach items="${questionInfo}" var="var1" varStatus="vs1"> | ||
| 102 | + <td class="center" <c:if test="${var.detail[vs1.index].RIGHT== '1'}">style="background:#0bb8b9"</c:if>div style="width:80px;margin:0 auto;">${var.detail[vs1.index].ANSWER}</div></td> | ||
| 263 | </c:forEach> | 103 | </c:forEach> |
| 104 | + <%-- <td class="center">${var.OTHER_SCORE}</td> --%> | ||
| 105 | + <td class="center"><div style="width:80px;margin:0 auto;">${var.GETSCORE}</div></td> | ||
| 264 | </tr> | 106 | </tr> |
| 265 | </c:forEach> | 107 | </c:forEach> |
| 266 | </c:when> | 108 | </c:when> |
| 267 | </c:choose> | 109 | </c:choose> |
| 268 | </tbody> | 110 | </tbody> |
| 269 | </table> | 111 | </table> |
| 270 | - ${pd } | ||
| 271 | <div id="scrollableTable"></div> | 112 | <div id="scrollableTable"></div> |
| 272 | </form> | 113 | </form> |
| 273 | </div> | 114 | </div> |
| @@ -282,15 +123,31 @@ | @@ -282,15 +123,31 @@ | ||
| 282 | <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script> | 123 | <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script> |
| 283 | <!--提示框--> | 124 | <!--提示框--> |
| 284 | <script type="text/javascript" src="static/js/jquery.tips.js"></script> | 125 | <script type="text/javascript" src="static/js/jquery.tips.js"></script> |
| 285 | - | ||
| 286 | - <script language="javascript" src="static/js/tablescroller.js"></script> | 126 | + |
| 127 | + <script language="javascript" src="static/js/tablescroller.js"></script> | ||
| 287 | <script language="javascript" src="static/js/tablescroller.jquery.js"></script> | 128 | <script language="javascript" src="static/js/tablescroller.jquery.js"></script> |
| 288 | 129 | ||
| 289 | - | ||
| 290 | - | 130 | + |
| 291 | <script type="text/javascript"> | 131 | <script type="text/javascript"> |
| 292 | - $(function() { | 132 | + $(document).ready(function(){ |
| 133 | + window.top.loading.remove(); | ||
| 293 | 134 | ||
| 135 | + var _heigh = $('#mainFrame', parent.document).height()-120; | ||
| 136 | + //console.log(_heigh); | ||
| 137 | + | ||
| 138 | + var options = { | ||
| 139 | + width: '100%', | ||
| 140 | + height: _heigh, | ||
| 141 | + pinnedRows: 2, | ||
| 142 | + pinnedCols: 5, | ||
| 143 | + container: "#scrollableTable", | ||
| 144 | + removeOriginal: true | ||
| 145 | + }; | ||
| 146 | + | ||
| 147 | +// $("#simple-table").tablescroller(options); | ||
| 148 | + }); | ||
| 149 | + $(function() { | ||
| 150 | + | ||
| 294 | //日期框 | 151 | //日期框 |
| 295 | $('.date-picker').datepicker({ | 152 | $('.date-picker').datepicker({ |
| 296 | autoclose : true, | 153 | autoclose : true, |
| @@ -356,7 +213,6 @@ | @@ -356,7 +213,6 @@ | ||
| 356 | }); | 213 | }); |
| 357 | }); | 214 | }); |
| 358 | 215 | ||
| 359 | - var role = '${pd.ROLE}'; | ||
| 360 | 216 | ||
| 361 | function precent(avg,total){ | 217 | function precent(avg,total){ |
| 362 | if(total == 0){ | 218 | if(total == 0){ |
| @@ -364,74 +220,6 @@ | @@ -364,74 +220,6 @@ | ||
| 364 | } | 220 | } |
| 365 | return Math.round(avg / total * 100)/100 + '%' ; | 221 | return Math.round(avg / total * 100)/100 + '%' ; |
| 366 | } | 222 | } |
| 367 | - | ||
| 368 | - function tosearch(){ | ||
| 369 | - var url = "<%=basePath%>report/report.do?classid=${info.CLASS_ID}" ; | ||
| 370 | - var startDate = $("#lastStart").val(); | ||
| 371 | - var endDate = $("#lastEnd").val(); | ||
| 372 | - var subject_id = $("#SUBJECT_ID").val(); | ||
| 373 | - url = url + "&start_date=" + startDate ; | ||
| 374 | - if(endDate != null){ | ||
| 375 | - url = url + "&end_date=" + endDate; | ||
| 376 | - } | ||
| 377 | - if(subject_id != null){ | ||
| 378 | - url = url + "&SUBJECT_ID=" + subject_id; | ||
| 379 | - } | ||
| 380 | - if(role == "admin"){ | ||
| 381 | - url = url + "&ROLE=admin" ; | ||
| 382 | - } | ||
| 383 | - window.location.href = url; | ||
| 384 | - window.top.loading.show(); | ||
| 385 | - /* $("#Form").sumbit(); */ | ||
| 386 | - } | ||
| 387 | - | ||
| 388 | - function student(classid,studentid){ | ||
| 389 | - | ||
| 390 | - var url = "<%=basePath%>report/student_report?studentid=" + studentid + "&class_id=" + classid ; | ||
| 391 | - var startDate = $("#lastStart").val(); | ||
| 392 | - var endDate = $("#lastEnd").val(); | ||
| 393 | - url = url + "&start_date=" + startDate + "&end_date=" + endDate ; | ||
| 394 | - var SUBJECT_ID = $("#SUBJECT_ID").val(); | ||
| 395 | - if(SUBJECT_ID != null && SUBJECT_ID != ''){ | ||
| 396 | - url = url + "&SUBJECT_ID="+ SUBJECT_ID ; | ||
| 397 | - } | ||
| 398 | - window.self.location.href = url; | ||
| 399 | - window.top.loading.show(); | ||
| 400 | - } | ||
| 401 | - | ||
| 402 | - function paper(class_id,testpaper_id){ | ||
| 403 | - var url = "<%=basePath%>report/test_report?TestID=" + testpaper_id + "&class_id=" + class_id; | ||
| 404 | - var startDate = $("#lastStart").val(); | ||
| 405 | - var endDate = $("#lastEnd").val(); | ||
| 406 | - url = url + "&start_date=" + startDate + "&end_date=" + endDate ; | ||
| 407 | - window.self.location.href = url; | ||
| 408 | - window.top.loading.show(); | ||
| 409 | - } | ||
| 410 | - | ||
| 411 | - $(document).ready(function(){ | ||
| 412 | - window.top.loading.remove(); | ||
| 413 | - | ||
| 414 | - var sour = "${testpaperList}"; | ||
| 415 | - | ||
| 416 | - if(sour != null && sour.length > 3){ | ||
| 417 | - var _width = $('#mainFrame', parent.document).width()-40; | ||
| 418 | - var _heigh = $('#mainFrame', parent.document).height()-100; | ||
| 419 | - var options = { | ||
| 420 | - width: _width, | ||
| 421 | - height: _heigh, | ||
| 422 | - pinnedRows: 4, | ||
| 423 | - pinnedCols: 3, | ||
| 424 | - container: "#scrollableTable", | ||
| 425 | - removeOriginal: true | ||
| 426 | - }; | ||
| 427 | - $("#simple-table").tablescroller(options); | ||
| 428 | - var name_height = $(".kc").last().parent().height()-18.5; | ||
| 429 | - console.log(name_height); | ||
| 430 | - $(".th_name").height(name_height); | ||
| 431 | - } | ||
| 432 | - | ||
| 433 | - }); | ||
| 434 | - | ||
| 435 | </script> | 223 | </script> |
| 436 | 224 | ||
| 437 | </body> | 225 | </body> |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
| @@ -77,9 +77,9 @@ | @@ -77,9 +77,9 @@ | ||
| 77 | style="width:88px;" placeholder="结束日期" title="结束日期" /></td> | 77 | style="width:88px;" placeholder="结束日期" title="结束日期" /></td> |
| 78 | <td style="vertical-align:top;padding-left:2px"><a | 78 | <td style="vertical-align:top;padding-left:2px"><a |
| 79 | class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><img src="static/images/search.png" alt="" class="search_btn" /></a></td> | 79 | class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><img src="static/images/search.png" alt="" class="search_btn" /></a></td> |
| 80 | - <td><li class="btn ${pd.CURRENT_WEEK==-1?'btn-primary':'btn-default' } btn-default btn-sm" onclick="tosearch_week(-1)">上一周</li></td> | ||
| 81 | - <td><li class="btn btn-primary btn-sm" onclick="tosearch_week(0)">本周</li></td> | ||
| 82 | - <td><li class="btn btn-default btn-sm" onclick="tosearch_week(1)">下一周</li></td> | 80 | + <td><li class="btn ${pd.CURRENT_WEEK==-1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(-1)">上一周</li></td> |
| 81 | + <td><li class="btn ${pd.CURRENT_WEEK==0?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(0)">本周</li></td> | ||
| 82 | + <td><li class="btn ${pd.CURRENT_WEEK==1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(1)">下一周</li></td> | ||
| 83 | </tr> | 83 | </tr> |
| 84 | </table> | 84 | </table> |
| 85 | <hr /> | 85 | <hr /> |
| @@ -93,7 +93,7 @@ | @@ -93,7 +93,7 @@ | ||
| 93 | <th class="center"><div style="width:80px;">课程总分</div></th> | 93 | <th class="center"><div style="width:80px;">课程总分</div></th> |
| 94 | <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> | 94 | <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> |
| 95 | <th class="center kc"><a | 95 | <th class="center kc"><a |
| 96 | - onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_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> | 96 | + 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> |
| 97 | </c:forEach> | 97 | </c:forEach> |
| 98 | </tr> | 98 | </tr> |
| 99 | </thead> | 99 | </thead> |
| @@ -299,7 +299,7 @@ | @@ -299,7 +299,7 @@ | ||
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | function paper(class_id,testpaper_id){ | 301 | function paper(class_id,testpaper_id){ |
| 302 | - var url = "<%=basePath%>homework/homework_report?TestID=" + testpaper_id + "&class_id=" + class_id; | 302 | + var url = "<%=basePath%>homework/homework_report?HOMEWORK_ID=" + testpaper_id + "&CLASS_ID=" + class_id; |
| 303 | var startDate = $("#lastStart").val(); | 303 | var startDate = $("#lastStart").val(); |
| 304 | var endDate = $("#lastEnd").val(); | 304 | var endDate = $("#lastEnd").val(); |
| 305 | url = url + "&start_date=" + startDate + "&end_date=" + endDate ; | 305 | url = url + "&start_date=" + startDate + "&end_date=" + endDate ; |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
| @@ -118,7 +118,7 @@ li { | @@ -118,7 +118,7 @@ li { | ||
| 118 | var URL = '<%=basePath%>${URL}'; | 118 | var URL = '<%=basePath%>${URL}'; |
| 119 | var data = ${data}; | 119 | var data = ${data}; |
| 120 | </script> | 120 | </script> |
| 121 | - <script src="../static/js/home_control1.js?a=1"></script> | 121 | + <script src="../static/js/home_control1.js?a=2"></script> |
| 122 | <!-- 日期框 --> | 122 | <!-- 日期框 --> |
| 123 | <script> | 123 | <script> |
| 124 | //lay('#version').html('-v'+ laydate.v); | 124 | //lay('#version').html('-v'+ laydate.v); |
WebRoot/static/css/style1.css
| @@ -27,5 +27,5 @@ ul{padding:0;} | @@ -27,5 +27,5 @@ ul{padding:0;} | ||
| 27 | .tabel_b .tab_top .col-md-9 .color li{float:left;} | 27 | .tabel_b .tab_top .col-md-9 .color li{float:left;} |
| 28 | .tabel_b .tab_top .col-md-9 .color li span{display:inline-block;width:15px;height:6px;vertical-align: middle;margin-left:5px;margin-right:5px;} | 28 | .tabel_b .tab_top .col-md-9 .color li span{display:inline-block;width:15px;height:6px;vertical-align: middle;margin-left:5px;margin-right:5px;} |
| 29 | 29 | ||
| 30 | -.prev{width:50px;height:50px;background:url(../images/prev.png) no-repeat;background-size:100%;position:absolute;top:40%;left:3%;} | ||
| 31 | -.next{width:50px;height:50px;background:url(../images/next.png) no-repeat;background-size:100%;position:absolute;top:40%;right:3%;} | ||
| 32 | \ No newline at end of file | 30 | \ No newline at end of file |
| 31 | +.tabel_t .prev{width:50px;height:50px;background:url(../images/prev.png) no-repeat;background-size:100%;position:absolute;top:40%;left:3%;} | ||
| 32 | +.tabel_t .next{width:50px;height:50px;background:url(../images/next.png) no-repeat;background-size:100%;position:absolute;top:40%;right:3%;} | ||
| 33 | \ No newline at end of file | 33 | \ No newline at end of file |
WebRoot/static/js/home_control1.js
| @@ -69,7 +69,7 @@ | @@ -69,7 +69,7 @@ | ||
| 69 | $(".prev").click(function(){ | 69 | $(".prev").click(function(){ |
| 70 | _index-=1; | 70 | _index-=1; |
| 71 | if(_index<0){ | 71 | if(_index<0){ |
| 72 | - _index=data_temp.data.studentList.length-1; | 72 | + _index=data_temp.STUDENTS.length-1; |
| 73 | } | 73 | } |
| 74 | student(data.STUDENTS[_index].CLASS_ID,data.STUDENTS[_index].ID); | 74 | student(data.STUDENTS[_index].CLASS_ID,data.STUDENTS[_index].ID); |
| 75 | }) | 75 | }) |