Commit 6808857368c4945f498f9559648147343fa0e9f9
1 parent
85ea5817
1.布置练习数据渲染(数字转字母待解决)
Showing
3 changed files
with
49 additions
and
40 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -2,6 +2,8 @@ | @@ -2,6 +2,8 @@ | ||
2 | <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | 2 | <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> |
3 | <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> | 3 | <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> |
4 | <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> | 4 | <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> |
5 | +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> | ||
6 | + | ||
5 | <% | 7 | <% |
6 | String path = request.getContextPath(); | 8 | String path = request.getContextPath(); |
7 | String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; | 9 | String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; |
@@ -52,6 +54,14 @@ | @@ -52,6 +54,14 @@ | ||
52 | <td> | 54 | <td> |
53 | <div class="classBox"> | 55 | <div class="classBox"> |
54 | <ul> | 56 | <ul> |
57 | + <c:if test="${pd.CLASS_ID != ''}"> | ||
58 | + <li class="checked"> | ||
59 | + <input type="checkbox" checked="true" id="class0" name="className" value="${pd.CLASS_ID}" /> | ||
60 | + <label for="class0"></label> | ||
61 | + <span>${myelfun:findClassName(pd.CLASS_ID)}</span> | ||
62 | + <input class="date-picker" type="text" class="form-control" style="width:150px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.COMPLETE_DATE}"/> | ||
63 | + </li> | ||
64 | + </c:if> | ||
55 | <!-- <li> | 65 | <!-- <li> |
56 | 66 | ||
57 | <input type="checkbox" id="class1" name="className" value="1" /> | 67 | <input type="checkbox" id="class1" name="className" value="1" /> |
@@ -122,42 +132,38 @@ | @@ -122,42 +132,38 @@ | ||
122 | <col width="20%"/> | 132 | <col width="20%"/> |
123 | <col width="20%"/> | 133 | <col width="20%"/> |
124 | <col width="10%"/> | 134 | <col width="10%"/> |
125 | - <tbody class="subject_body_tbody"> | ||
126 | - <!-- <tr> | ||
127 | - <td class="first">1</td> | ||
128 | - <td class="middle"> | ||
129 | - | ||
130 | - <div class="question question1"> | ||
131 | - | ||
132 | - <ul> | ||
133 | - <li class="btn btn-default on">A</li> | ||
134 | - <li class="btn btn-default">B</li> | ||
135 | - <li class="btn btn-default">C</li> | ||
136 | - <li class="btn btn-default">D</li> | ||
137 | - </ul> | ||
138 | - </div> | ||
139 | - | ||
140 | - </td> | ||
141 | - <td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="4"/><span class="redu">-</span></td> | ||
142 | - <td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="1"/><span class="redu">-</span></td> | ||
143 | - <td class="last"><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td> | ||
144 | - </tr> | ||
145 | - <tr> | ||
146 | - <td class="first">1</td> | ||
147 | - <td class="middle"> | ||
148 | - <div class="question question1"> | ||
149 | - <ul> | ||
150 | - <li class="btn btn-default on">A</li> | ||
151 | - <li class="btn btn-default">B</li> | ||
152 | - <li class="btn btn-default">C</li> | ||
153 | - <li class="btn btn-default">D</li> | ||
154 | - </ul> | ||
155 | - </div> | ||
156 | - </td> | ||
157 | - <td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="4"/><span class="redu">-</span></td> | ||
158 | - <td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="1"/><span class="redu">-</span></td> | ||
159 | - <td class="last"><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td> | ||
160 | - </tr>--> | 135 | + <tbody class="subject_body_tbody"> |
136 | + <c:choose> | ||
137 | + <c:when test="${not empty pd.PROBLEMS}"> | ||
138 | + <c:forEach items="${pd.PROBLEMS}" var="var" varStatus="vs"> | ||
139 | + <tr> | ||
140 | + <td class="first">${var.RANK}</td> | ||
141 | + <td class="middle"> | ||
142 | + <div class="question question${var.RANK}"> | ||
143 | + <ul> | ||
144 | + <c:forEach var="i" begin="1" end="${var.OPTION_NUM}"> | ||
145 | + <c:set var="a" value="fn:substring('ABCDEFGHI',i-1,i)"/> | ||
146 | + | ||
147 | + <li class="btn btn-default <c:if test="${fn:contains(var.RIGHT_ANSWER, a)}"> on </c:if>">${a}</li> | ||
148 | + </c:forEach> | ||
149 | + | ||
150 | + </ul> | ||
151 | + </div> | ||
152 | + | ||
153 | + </td> | ||
154 | + <td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="redu">-</span></td> | ||
155 | + <td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="${var.SCORE}"/><span class="redu">-</span></td> | ||
156 | + <td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td> | ||
157 | + </tr> | ||
158 | + </c:forEach> | ||
159 | + </c:when> | ||
160 | + <c:otherwise> | ||
161 | + <tr class="main_info"> | ||
162 | + <td colspan="100" class="center">没有相关数据</td> | ||
163 | + </tr> | ||
164 | + </c:otherwise> | ||
165 | + </c:choose> | ||
166 | + | ||
161 | </tbody> | 167 | </tbody> |
162 | </table> | 168 | </table> |
163 | </div> | 169 | </div> |
@@ -196,7 +202,7 @@ | @@ -196,7 +202,7 @@ | ||
196 | <!--提示框--> | 202 | <!--提示框--> |
197 | <script type="text/javascript" src="static/js/jquery.tips.js"></script> | 203 | <script type="text/javascript" src="static/js/jquery.tips.js"></script> |
198 | <!--页面交互--> | 204 | <!--页面交互--> |
199 | - <script src="static/js/control_homework.js?t=12"></script> | 205 | + <script src="static/js/control_homework.js?t=1"></script> |
200 | <script> | 206 | <script> |
201 | $(function() { | 207 | $(function() { |
202 | window.top.loading.remove(); | 208 | window.top.loading.remove(); |
@@ -207,11 +213,11 @@ | @@ -207,11 +213,11 @@ | ||
207 | todayHighlight: true | 213 | todayHighlight: true |
208 | }); | 214 | }); |
209 | }); | 215 | }); |
210 | - | 216 | + if('${pd.CLASS_ID}'==''){ |
211 | $.ajax({ //获取该名教师下的班级信息 | 217 | $.ajax({ //获取该名教师下的班级信息 |
212 | url:'<%=basePath%>coursemanagement/teacherClass', | 218 | url:'<%=basePath%>coursemanagement/teacherClass', |
213 | type:"get", | 219 | type:"get", |
214 | - data:{teacher_id:"08b418184e5044c7b419caa830b834a7"}, | 220 | + data:{teacher_id:'${pd.TEACHER_ID}'}, |
215 | success:function(res){ | 221 | success:function(res){ |
216 | console.log(res); | 222 | console.log(res); |
217 | if(res.data.length>0){ | 223 | if(res.data.length>0){ |
@@ -224,6 +230,8 @@ | @@ -224,6 +230,8 @@ | ||
224 | } | 230 | } |
225 | } | 231 | } |
226 | }); | 232 | }); |
233 | + } | ||
234 | + | ||
227 | 235 | ||
228 | }); | 236 | }); |
229 | 237 |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -151,7 +151,7 @@ | @@ -151,7 +151,7 @@ | ||
151 | $("#Form").submit(); | 151 | $("#Form").submit(); |
152 | } | 152 | } |
153 | function add(Id){ | 153 | function add(Id){ |
154 | - var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id; | 154 | + var path = '<%=basePath%>homework/goAdd2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id; |
155 | parent.$("#mainFrame").attr('src',path); | 155 | parent.$("#mainFrame").attr('src',path); |
156 | window.top.loading.show(); | 156 | window.top.loading.show(); |
157 | } | 157 | } |
WebRoot/static/js/control_homework.js
@@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
26 | } | 26 | } |
27 | } | 27 | } |
28 | else if(_id=="ans_num"){//新增选项 | 28 | else if(_id=="ans_num"){//新增选项 |
29 | + alert(work.que_num); | ||
29 | for(j=1;j<=work.que_num;j++){ //轮询每道题目 | 30 | for(j=1;j<=work.que_num;j++){ //轮询每道题目 |
30 | var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数 | 31 | var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数 |
31 | if(now_length<work.ans_num){ //当前题目选项个数小于数字框中个数,则把选项个数增加到数字框中的个数 | 32 | if(now_length<work.ans_num){ //当前题目选项个数小于数字框中个数,则把选项个数增加到数字框中的个数 |