Commit 9166761015e464375c08604ee4327fc6f6a337a7

Authored by =
1 parent dafcdfc6

1.增加预览

2、增加取消交互
WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
172 <div style="text-align: center;" colspan="10"> 172 <div style="text-align: center;" colspan="10">
173 173
174 <a class="btn btn-mini btn-primary" onclick="save();">确定布置</a> 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> 175 + <a class="btn btn-mini btn-danger" onclick="back()">取消</a>
176 </div> 176 </div>
177 </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> 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>
@@ -237,7 +237,11 @@ @@ -237,7 +237,11 @@
237 237
238 238
239 }); 239 });
240 - 240 + function back(){
  241 + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
  242 + parent.$("#mainFrame").attr('src',path);
  243 + window.top.loading.show();
  244 + }
241 function save_data(data){ 245 function save_data(data){
242 $.ajax({ //获取该名教师下的班级信息 246 $.ajax({ //获取该名教师下的班级信息
243 url:'<%=basePath%>homework/uploadHomework', 247 url:'<%=basePath%>homework/uploadHomework',
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
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/goView.do?homework_id=${var.HOMEWORK_ID}">${var.NAME}</a></td> 89 + <td ><a onclick="view('<%=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>
@@ -167,6 +167,11 @@ @@ -167,6 +167,11 @@
167 parent.$("#mainFrame").attr('src',path); 167 parent.$("#mainFrame").attr('src',path);
168 window.top.loading.show(); 168 window.top.loading.show();
169 } 169 }
  170 + function view(url){
  171 + var path = url
  172 + parent.$("#mainFrame").attr('src',path);
  173 + window.top.loading.show();
  174 + }
170 function edit(Id){ 175 function edit(Id){
171 var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id; 176 var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id;
172 parent.$("#mainFrame").attr('src',path); 177 parent.$("#mainFrame").attr('src',path);
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
@@ -62,46 +62,7 @@ @@ -62,46 +62,7 @@
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}"/> 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> 63 </li>
64 </c:if> 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> --> 65 +
105 </ul> 66 </ul>
106 </div> 67 </div>
107 68
@@ -119,9 +80,9 @@ @@ -119,9 +80,9 @@
119 <col width="10%"/> 80 <col width="10%"/>
120 <thead> 81 <thead>
121 <tr> 82 <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> 83 + <th style="text-align:left;"><span>题目数量</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/></th>
  84 + <th><span>选项个数</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/></th>
  85 + <th><span>分值</span><input type="number" class="w_100 score" id="score" value="1"/></th>
125 <th></th> 86 <th></th>
126 </tr> 87 </tr>
127 </thead> 88 </thead>
@@ -151,9 +112,9 @@ @@ -151,9 +112,9 @@
151 </div> 112 </div>
152 113
153 </td> 114 </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> 115 + <td class="middle"><span>选项个数</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/></td>
  116 + <td class="middle"><span>分值</span><input type="number" class="w_100 score" value="${var.SCORE}"/></td>
  117 + <td class="last"></td>
157 </tr> 118 </tr>
158 </c:forEach> 119 </c:forEach>
159 </c:when> 120 </c:when>
@@ -171,8 +132,8 @@ @@ -171,8 +132,8 @@
171 <div> 132 <div>
172 <div style="text-align: center;" colspan="10"> 133 <div style="text-align: center;" colspan="10">
173 134
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> 135 +
  136 + <a class="btn btn-mini btn-danger" onclick="back();">退出</a>
176 </div> 137 </div>
177 </div> 138 </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> 139 <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>
@@ -202,83 +163,20 @@ @@ -202,83 +163,20 @@
202 <!--提示框--> 163 <!--提示框-->
203 <script type="text/javascript" src="static/js/jquery.tips.js"></script> 164 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
204 <!--页面交互--> 165 <!--页面交互-->
205 - <script src="static/js/control_homework.js?t=1"></script> 166 +
206 <script> 167 <script>
207 - var homework_id="${pd.HOMEWORK_ID}";  
208 168
209 $(function() { 169 $(function() {
210 window.top.loading.remove(); 170 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 }); 171 });
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 - }); 172 + function back(){
  173 + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
  174 + parent.$("#mainFrame").attr('src',path);
  175 + window.top.loading.show();
280 } 176 }
281 177
  178 +
  179 +
282 </script> 180 </script>
283 </body> 181 </body>
284 </html> 182 </html>
285 \ No newline at end of file 183 \ No newline at end of file