Commit c09086d0c2840e05b1333e14a4f14cb20611c716
Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop
Showing
2 changed files
with
288 additions
and
2 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
| @@ -86,14 +86,16 @@ | @@ -86,14 +86,16 @@ | ||
| 86 | <c:forEach items="${varList}" var="var" varStatus="vs"> | 86 | <c:forEach items="${varList}" var="var" varStatus="vs"> |
| 87 | <tr> | 87 | <tr> |
| 88 | <td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td> | 88 | <td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td> |
| 89 | - <td ><a target="_blank" href="<%=basePath%>homework/iteminfo.do?homework_id=${var.HOMEWORK_ID}">${var.NAME}</a></td> | 89 | + <td ><a target="_blank" href="<%=basePath%>homework/goView.do?homework_id=${var.HOMEWORK_ID}">${var.NAME}</a></td> |
| 90 | <td >${var.CREATE_DATE}</td> | 90 | <td >${var.CREATE_DATE}</td> |
| 91 | <td >${var.COMPLETE_DATE}</td> | 91 | <td >${var.COMPLETE_DATE}</td> |
| 92 | <td >${var.QUESTION_COUNT}</td> | 92 | <td >${var.QUESTION_COUNT}</td> |
| 93 | <td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td> | 93 | <td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td> |
| 94 | <td >${var.ALL_SCORE}</td> | 94 | <td >${var.ALL_SCORE}</td> |
| 95 | <td> | 95 | <td> |
| 96 | - <a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a> | 96 | + <c:if test="${var.COMPLETE_COUNT == '0'}"> |
| 97 | + <a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a> | ||
| 98 | + </c:if> | ||
| 97 | <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a> | 99 | <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a> |
| 98 | </td> | 100 | </td> |
| 99 | </tr> | 101 | </tr> |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
0 → 100644
| 1 | +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> | ||
| 2 | +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | ||
| 3 | +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> | ||
| 4 | +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> | ||
| 5 | +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> | ||
| 6 | + | ||
| 7 | +<% | ||
| 8 | + String path = request.getContextPath(); | ||
| 9 | + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; | ||
| 10 | +%> | ||
| 11 | +<!DOCTYPE html> | ||
| 12 | +<html lang="en" style="overflow-x:hidden;"> | ||
| 13 | + <head> | ||
| 14 | + <base href="<%=basePath%>"> | ||
| 15 | + <!-- 下拉框 --> | ||
| 16 | + <link rel="stylesheet" href="static/ace/css/chosen.css" /> | ||
| 17 | + <!-- jsp文件头和头部 --> | ||
| 18 | + | ||
| 19 | + <link rel="stylesheet" href="static/css/bootstrap.min.css"> | ||
| 20 | + <!-- 日期框 --> | ||
| 21 | + <link rel="stylesheet" href="static/ace/css/datepicker.css" /> | ||
| 22 | + | ||
| 23 | + | ||
| 24 | + <link rel="stylesheet" href="static/css/edit.css" /> | ||
| 25 | + <style> | ||
| 26 | + | ||
| 27 | + | ||
| 28 | + </style> | ||
| 29 | +</head> | ||
| 30 | +<body class="no-skin homework_edit"> | ||
| 31 | +<!-- /section:basics/navbar.layout --> | ||
| 32 | +<div class="main-container" id="main-container"> | ||
| 33 | + <!-- /section:basics/sidebar --> | ||
| 34 | + <div class="main-content"> | ||
| 35 | + <div class="main-content-inner"> | ||
| 36 | + <div class="page-content"> | ||
| 37 | + <div class="row"> | ||
| 38 | + <div class="col-xs-12"> | ||
| 39 | + | ||
| 40 | + <form action="homework/${msg }.do" name="Form" id="Form" method="post"> | ||
| 41 | + <input type="hidden" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}"/> | ||
| 42 | + <div id="zhongxin" style="padding-top: 13px;width:80%;margin:0 auto;"> | ||
| 43 | + <table id="table_report" class="table"> | ||
| 44 | + <tr> | ||
| 45 | + <td style="width:95px;text-align: right;padding-top: 13px;">练习标题</td> | ||
| 46 | + <td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="输入练习标题,不超过20个汉字" title="作业代码" /></td> | ||
| 47 | + </tr> | ||
| 48 | + <tr> | ||
| 49 | + <td style="width:95px;text-align: right;padding-top: 13px;">练习说明</td> | ||
| 50 | + <td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.HOMEWORK_DESC}" maxlength="255" placeholder="输入题目说明,如教材第12页1-5题,教辅第5页1-3题,尽量精简,不超过100个汉字" title="作业名称" /></td> | ||
| 51 | + </tr> | ||
| 52 | + <tr> | ||
| 53 | + <td style="width:95px;text-align: right;padding-top: 13px;">指定班级完成时间</td> | ||
| 54 | + <td> | ||
| 55 | + <div class="classBox"> | ||
| 56 | + <ul> | ||
| 57 | + <c:if test="${pd.CLASS_ID != null}"> | ||
| 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> | ||
| 65 | + <!-- <li> | ||
| 66 | + | ||
| 67 | + <input type="checkbox" id="class1" name="className" value="1" /> | ||
| 68 | + <label for="class1"></label> | ||
| 69 | + <span>1班</span> | ||
| 70 | + <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/> | ||
| 71 | + </li> | ||
| 72 | + <li> | ||
| 73 | + | ||
| 74 | + <input type="checkbox" id="class2" name="className" value="1" /> | ||
| 75 | + <label for="class2"></label> | ||
| 76 | + <span>2班</span> | ||
| 77 | + <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/> | ||
| 78 | + </li> | ||
| 79 | + <li> | ||
| 80 | + | ||
| 81 | + <input type="checkbox" id="class3" name="className" value="1" /> | ||
| 82 | + <label for="class3"></label> | ||
| 83 | + <span>3班</span> | ||
| 84 | + <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/> | ||
| 85 | + </li> | ||
| 86 | + <li> | ||
| 87 | + | ||
| 88 | + <input type="checkbox" id="class4" name="className" value="1" /> | ||
| 89 | + <label for="class4"></label> | ||
| 90 | + <span>4班</span> | ||
| 91 | + <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/> | ||
| 92 | + </li> | ||
| 93 | + <li> | ||
| 94 | + <input type="checkbox" id="class5" name="className" value="1" /> | ||
| 95 | + <label for="class5"></label> | ||
| 96 | + <span>5班</span> | ||
| 97 | + <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/> | ||
| 98 | + </li> | ||
| 99 | + <li> | ||
| 100 | + <input type="checkbox" id="class6" name="className" value="1" /> | ||
| 101 | + <label for="class6"></label> | ||
| 102 | + <span>6班</span> | ||
| 103 | + <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/> | ||
| 104 | + </li> --> | ||
| 105 | + </ul> | ||
| 106 | + </div> | ||
| 107 | + | ||
| 108 | + </td> | ||
| 109 | + </tr> | ||
| 110 | + | ||
| 111 | + </table> | ||
| 112 | + </div> | ||
| 113 | + <hr /> | ||
| 114 | + <div class="subject" style="width:80%;margin:0 auto;"> | ||
| 115 | + <table width="100%"> | ||
| 116 | + <col width="50%"/> | ||
| 117 | + <col width="20%"/> | ||
| 118 | + <col width="20%"/> | ||
| 119 | + <col width="10%"/> | ||
| 120 | + <thead> | ||
| 121 | + <tr> | ||
| 122 | + <th style="text-align:left;"><span>题目数量</span><span class="add">+</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="redu">-</span></th> | ||
| 123 | + <th><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="redu">-</span></th> | ||
| 124 | + <th><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" id="score" value="1"/><span class="redu">-</span></th> | ||
| 125 | + <th></th> | ||
| 126 | + </tr> | ||
| 127 | + </thead> | ||
| 128 | + </table> | ||
| 129 | + <table width="100%" border="0" class="subject_body_tabel"> | ||
| 130 | + <col width="10%"/> | ||
| 131 | + <col width="40%"/> | ||
| 132 | + <col width="20%"/> | ||
| 133 | + <col width="20%"/> | ||
| 134 | + <col width="10%"/> | ||
| 135 | + <tbody class="subject_body_tbody"> | ||
| 136 | + <c:choose> | ||
| 137 | + <c:when test="${not empty pd.QUESTIONS}"> | ||
| 138 | + <c:forEach items="${pd.QUESTIONS}" 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 | + | ||
| 167 | + </tbody> | ||
| 168 | + </table> | ||
| 169 | + </div> | ||
| 170 | + <hr /> | ||
| 171 | + <div> | ||
| 172 | + <div style="text-align: center;" colspan="10"> | ||
| 173 | + | ||
| 174 | + <a class="btn btn-mini btn-primary" onclick="save();">确定布置</a> | ||
| 175 | + <a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a> | ||
| 176 | + </div> | ||
| 177 | + </div> | ||
| 178 | + <div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div> | ||
| 179 | + </form> | ||
| 180 | + | ||
| 181 | + | ||
| 182 | + | ||
| 183 | + | ||
| 184 | + </div> | ||
| 185 | + <!-- /.col --> | ||
| 186 | + </div> | ||
| 187 | + <!-- /.row --> | ||
| 188 | + </div> | ||
| 189 | + <!-- /.page-content --> | ||
| 190 | + </div> | ||
| 191 | + </div> | ||
| 192 | + <!-- /.main-content --> | ||
| 193 | +</div> | ||
| 194 | +<!-- /.main-container --> | ||
| 195 | + | ||
| 196 | + <!-- 页面底部js¨ --> | ||
| 197 | + <%@ include file="../../system/index/foot.jsp"%> | ||
| 198 | + <!-- 下拉框 --> | ||
| 199 | + <script src="static/ace/js/chosen.jquery.js"></script> | ||
| 200 | + <!-- 日期框 --> | ||
| 201 | + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script> | ||
| 202 | + <!--提示框--> | ||
| 203 | + <script type="text/javascript" src="static/js/jquery.tips.js"></script> | ||
| 204 | + <!--页面交互--> | ||
| 205 | + <script src="static/js/control_homework.js?t=1"></script> | ||
| 206 | + <script> | ||
| 207 | + var homework_id="${pd.HOMEWORK_ID}"; | ||
| 208 | + | ||
| 209 | + $(function() { | ||
| 210 | + window.top.loading.remove(); | ||
| 211 | + work.que_num=parseInt($("#que_num").val()); | ||
| 212 | + //日期框 | ||
| 213 | + $(document).on("focus",".date-picker",function(){ | ||
| 214 | + $(this).datepicker({ | ||
| 215 | + autoclose: true, | ||
| 216 | + todayHighlight: true | ||
| 217 | + }); | ||
| 218 | + }); | ||
| 219 | + if(${pd.CLASS_ID==null}==true){ | ||
| 220 | + $.ajax({ //获取该名教师下的班级信息 | ||
| 221 | + url:'<%=basePath%>coursemanagement/teacherClass', | ||
| 222 | + type:"get", | ||
| 223 | + data:{teacher_id:"${pd.TEACHER_ID}"}, | ||
| 224 | + success:function(res){ | ||
| 225 | + console.log(res); | ||
| 226 | + if(res.data.length>0){ | ||
| 227 | + var _html=""; | ||
| 228 | + $.each(res.data,function(k,v){ | ||
| 229 | + _html+='<li><input type="checkbox" id="class'+k+'" name="className" value="'+v.ID+'"><label for="class'+k+'"></label><span>'+v.CLASS_NAME+'</span><input class="date-picker" type="text" style="width:150px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""></li>'; | ||
| 230 | + | ||
| 231 | + }); | ||
| 232 | + $(".classBox ul").html(_html); | ||
| 233 | + } | ||
| 234 | + } | ||
| 235 | + }); | ||
| 236 | + } | ||
| 237 | + | ||
| 238 | + | ||
| 239 | + }); | ||
| 240 | + | ||
| 241 | + function save_data(data){ | ||
| 242 | + $.ajax({ //获取该名教师下的班级信息 | ||
| 243 | + url:'<%=basePath%>homework/uploadHomework', | ||
| 244 | + type:"post", | ||
| 245 | + dataType:"text", | ||
| 246 | + data:{"JSON":data}, | ||
| 247 | + success:function(res){ | ||
| 248 | + var res=JSON.parse(res); | ||
| 249 | + if(res.message=="success"){ | ||
| 250 | + alert(res.message); | ||
| 251 | + console.log(res); | ||
| 252 | + | ||
| 253 | + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}'; | ||
| 254 | + parent.$("#mainFrame").attr('src',path); | ||
| 255 | + window.top.loading.show(); | ||
| 256 | + } | ||
| 257 | + | ||
| 258 | + } | ||
| 259 | + }); | ||
| 260 | + } | ||
| 261 | + function up_data(data){ | ||
| 262 | + $.ajax({ //获取该名教师下的班级信息 | ||
| 263 | + url:'<%=basePath%>homework/updateHomework', | ||
| 264 | + type:"post", | ||
| 265 | + dataType:"text", | ||
| 266 | + data:{"JSON":data}, | ||
| 267 | + success:function(res){ | ||
| 268 | + var res=JSON.parse(res); | ||
| 269 | + if(res.message=="success"){ | ||
| 270 | + alert(res.message); | ||
| 271 | + console.log(res); | ||
| 272 | + | ||
| 273 | + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}'; | ||
| 274 | + parent.$("#mainFrame").attr('src',path); | ||
| 275 | + window.top.loading.show(); | ||
| 276 | + | ||
| 277 | + } | ||
| 278 | + } | ||
| 279 | + }); | ||
| 280 | + } | ||
| 281 | + | ||
| 282 | + </script> | ||
| 283 | +</body> | ||
| 284 | +</html> | ||
| 0 | \ No newline at end of file | 285 | \ No newline at end of file |