Commit 1c3b4f8d888338123e35a4a764ba2274679c1929
1 parent
9b7b8b9b
1.完善交互
Showing
5 changed files
with
49 additions
and
41 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
| ... | ... | @@ -25,42 +25,34 @@ |
| 25 | 25 | <%@ include file="../../system/index/top.jsp"%> |
| 26 | 26 | <!-- 日期框 --> |
| 27 | 27 | <link rel="stylesheet" href="static/ace/css/datepicker.css" /> |
| 28 | +<link rel="stylesheet" href="static/css/teach.css" /> | |
| 28 | 29 | <style> |
| 29 | 30 | .table{padding-bottom:0 !important;} |
| 31 | +.dec{font-size:14px;} | |
| 30 | 32 | </style> |
| 31 | 33 | </head> |
| 32 | 34 | |
| 33 | 35 | <body style="background:#fff;/* overflow-y:hidden; */"> |
| 36 | + <div class="box_header"> | |
| 37 | + <div class="head_box_l"> | |
| 38 | + <p> | |
| 39 | + <span class="right_b"></span>${pd.HOMEWORKINFO.NAME} | |
| 40 | + </p> | |
| 41 | + <p class="dec">练习说明: ${pd.HOMEWORKINFO.HOMEWORK_DESC}</p> | |
| 42 | + <p class="dec">收卷时间: ${pd.HOMEWORKINFO.COMPLETE_DATE}</p> | |
| 43 | + | |
| 44 | + </div> | |
| 45 | + <div class="head_box_r"> | |
| 46 | + <p class="dec">班级完成情况: ${pd.HOMEWORKINFO.COMPLETE_DESC}</p> | |
| 47 | + <p class="dec">班级名册：${myelfun:findClassName(pd.CLASS_ID)}</p> | |
| 48 | + <p class="dec">学生人数: ${fn:length(pd.STUDENTS)}</p> | |
| 49 | + </div> | |
| 50 | + <div class="clear"></div> | |
| 51 | + </div> | |
| 34 | 52 | <div style="padding:20px 20px;"> |
| 35 | - | |
| 36 | 53 | <form action="report/report_test.do" method="post" name="Form" id="Form"> |
| 37 | 54 | <input type="hidden" name="CLASSID" id="CLASSID" value="${pd.CLASS_ID}" /> |
| 38 | - <table style="margin-top:5px;"> | |
| 39 | - <tr style="height: 30px"> | |
| 40 | - <td>测验名称: ${pd.DATA[0].NAME}</td> | |
| 41 | - <c:if test="${display}"> | |
| 42 | - <td> </td> | |
| 43 | - <td>教师: ${teacherPd.NAME}</td> | |
| 44 | - <td> </td> | |
| 45 | - <td>科目名称: ${subjectPd.CNAME}</td> | |
| 46 | - </c:if> | |
| 47 | - </tr> | |
| 48 | - <tr style="height: 30px"> | |
| 49 | - <td>练习说明: ${pd.HOMEWORKINFO.HOMEWORK_DESC}</td> | |
| 50 | - </tr> | |
| 51 | - <tr style="height: 30px"> | |
| 52 | - <td>班级完成情况: ${pd.HOMEWORKINFO.COMPLETE_DESC}</td> | |
| 53 | - </tr> | |
| 54 | - <tr style="height: 30px"> | |
| 55 | - <td>收卷时间: ${pd.HOMEWORKINFO.COMPLETE_DATE}</td> | |
| 56 | - </tr> | |
| 57 | - <tr style="height: 30px"> | |
| 58 | - <td>班级名册：${myelfun:findClassName(pd.CLASS_ID)}</td> | |
| 59 | - <td> </td> | |
| 60 | - <td><span>学生人数: ${fn:length(pd.STUDENTS)}</span></td> | |
| 61 | - | |
| 62 | - </tr> | |
| 63 | - </table> | |
| 55 | + | |
| 64 | 56 | <table id="simple-table" |
| 65 | 57 | class="table table-bordered table-hover" |
| 66 | 58 | style="margin-top:0px;margin-bottom:0;"> |
| ... | ... | @@ -74,7 +66,7 @@ |
| 74 | 66 | <th class="center"><div style="width:80px;">得分</div></th> |
| 75 | 67 | <c:set value="${ fn:split(pd.DATA[0].ANSWER, ';') }" var="ANSWER" /> |
| 76 | 68 | <c:forEach items="${ANSWER}" var="var" varStatus="vs"> |
| 77 | - <th class="center"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th> | |
| 69 | + <th class="center th_w"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th> | |
| 78 | 70 | </c:forEach> |
| 79 | 71 | |
| 80 | 72 | </tr> |
| ... | ... | @@ -86,16 +78,16 @@ |
| 86 | 78 | <c:when test="${not empty pd.STUDENTS}"> |
| 87 | 79 | <c:forEach items="${pd.STUDENTS}" var="var" varStatus="vs"> |
| 88 | 80 | <tr> |
| 89 | - <td class="center"><div style="width:80px;">${var.RANK_NUM}</div></td> | |
| 81 | + <td class="center"><div style="width:80px;">${pd.DATA[vs.index].RANK}</div></td> | |
| 90 | 82 | <td class="center"><div style="width:80px;">${var.NAME}</div></td> |
| 91 | 83 | <td class="center"><div style="width:80px;">${var.SNO}</div></td> |
| 92 | 84 | <td class="center"><div style="width:80px;">${var.KEYPAD_ID}</div></td> |
| 93 | - <td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="#.00"/>%</div></td> | |
| 85 | + <td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="0.00"/>%</div></td> | |
| 94 | 86 | <td class="center"><div style="width:80px;">${pd.DATA[vs.index].STUDENT_SCORE}</div></td> |
| 95 | 87 | |
| 96 | 88 | <c:forEach items="${ANSWER}" var="var1" varStatus="vs1"> |
| 97 | 89 | <c:set value="${ fn:split(ANSWER[vs1.index], ',') }" var="ANSWER1" /> |
| 98 | - <td class="center" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>><div style="width:80px;margin:0 auto;">${ANSWER1[0]==""?"--":ANSWER1[0]}</div></td> | |
| 90 | + <td class="center td_w" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>><div style="width:80px;margin:0 auto;">${ANSWER1[0]==""?"--":ANSWER1[0]}</div></td> | |
| 99 | 91 | </c:forEach> |
| 100 | 92 | |
| 101 | 93 | |
| ... | ... | @@ -141,6 +133,9 @@ |
| 141 | 133 | }; |
| 142 | 134 | |
| 143 | 135 | $("#simple-table").tablescroller(options); |
| 136 | + | |
| 137 | + $(".scrollable-columns-table").css("width","100%"); | |
| 138 | + | |
| 144 | 139 | }); |
| 145 | 140 | $(function() { |
| 146 | 141 | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
| ... | ... | @@ -100,9 +100,12 @@ |
| 100 | 100 | <td> |
| 101 | 101 | <c:if test="${var.COMPLETE_COUNT == '0'}"> |
| 102 | 102 | <a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a> |
| 103 | + <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a> | |
| 103 | 104 | </c:if> |
| 104 | - <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a> | |
| 105 | - </td> | |
| 105 | + <c:if test="${var.COMPLETE_COUNT == '1'}"> | |
| 106 | + <a onclick="del('${var.HOMEWORK_ID}');" style="margin-left: 28px"><img src="static/images/remove.png" /></a> | |
| 107 | + </c:if> | |
| 108 | + | |
| 106 | 109 | </tr> |
| 107 | 110 | |
| 108 | 111 | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
| ... | ... | @@ -118,7 +118,7 @@ li { |
| 118 | 118 | var URL = '<%=basePath%>${URL}'; |
| 119 | 119 | var data = ${data}; |
| 120 | 120 | </script> |
| 121 | - <script src="../static/js/home_control1.js?a=2"></script> | |
| 121 | + <script src="../static/js/home_control1.js?a=3"></script> | |
| 122 | 122 | <!-- 日期框 --> |
| 123 | 123 | <script> |
| 124 | 124 | //lay('#version').html('-v'+ laydate.v); |
| ... | ... | @@ -137,7 +137,7 @@ li { |
| 137 | 137 | autoclose : true, |
| 138 | 138 | todayHighlight : true |
| 139 | 139 | }); |
| 140 | -function student(classid,studentid){ | |
| 140 | + function student(classid,studentid){ | |
| 141 | 141 | |
| 142 | 142 | var url = "<%=basePath%>homework/student.do?STUDENT_ID=" + studentid + "&CLASS_ID=" + classid ; |
| 143 | 143 | var startDate = $("#starDate").val(); | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
| ... | ... | @@ -20,10 +20,11 @@ |
| 20 | 20 | <!-- 日期框 --> |
| 21 | 21 | <link rel="stylesheet" href="static/ace/css/datepicker.css" /> |
| 22 | 22 | |
| 23 | - | |
| 23 | + <link rel="stylesheet" href="static/css/teach.css" /> | |
| 24 | 24 | <link rel="stylesheet" href="static/css/edit.css" /> |
| 25 | 25 | <style> |
| 26 | - | |
| 26 | + .box_header{position:fixed;top:0;left:0;width:100%;} | |
| 27 | + #Form{margin-top:102px;} | |
| 27 | 28 | |
| 28 | 29 | </style> |
| 29 | 30 | </head> |
| ... | ... | @@ -36,7 +37,14 @@ |
| 36 | 37 | <div class="page-content"> |
| 37 | 38 | <div class="row"> |
| 38 | 39 | <div class="col-xs-12"> |
| 39 | - | |
| 40 | + <div class="box_header"> | |
| 41 | + <div class="head_box_l"> | |
| 42 | + <p> | |
| 43 | + <span class="right_b"></span>练习预览 | |
| 44 | + </p> | |
| 45 | + </div> | |
| 46 | + <div class="clear"></div> | |
| 47 | + </div> | |
| 40 | 48 | <form action="homework/${msg }.do" name="Form" id="Form" method="post"> |
| 41 | 49 | <input type="hidden" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}"/> |
| 42 | 50 | <div id="zhongxin" style="padding-top: 13px;width:80%;margin:0 auto;"> | ... | ... |
WebRoot/static/js/home_control1.js
| ... | ... | @@ -60,9 +60,11 @@ |
| 60 | 60 | $("#search").click(function(){ |
| 61 | 61 | |
| 62 | 62 | window.top.loading.show(); |
| 63 | - startDate = $("#starDate").val(); | |
| 64 | - endDate = $("#endDate").val(); | |
| 65 | - getData(startDate,endDate); | |
| 63 | + //startDate = $("#starDate").val(); | |
| 64 | + //endDate = $("#endDate").val(); | |
| 65 | + //getData(startDate,endDate); | |
| 66 | + | |
| 67 | + student(data.STUDENTS[_index].CLASS_ID,data.STUDENTS[_index].ID); | |
| 66 | 68 | |
| 67 | 69 | }) |
| 68 | 70 | ... | ... |