Commit 0868bf55346b7602832d3e62b344b74f6488d633

Authored by 孙向锦
2 parents 80838e9c 2e6cd2f3

Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
... ... @@ -262,7 +262,7 @@
262 262 }
263 263  
264 264 function tosearch(){
265   - console.log('${pd.CLASS_ID}');
  265 +
266 266 var url = "<%=basePath%>homework/report.do?CLASS_ID=${pd.CLASS_ID}" ;
267 267 var startDate = $("#lastStart").val();
268 268 var endDate = $("#lastEnd").val();
... ... @@ -271,17 +271,14 @@
271 271 if(endDate != null){
272 272 url = url + "&END_DATE=" + endDate;
273 273 }
274   - console.log(url);
  274 +
275 275 window.location.href = url;
276 276 window.top.loading.show();
277 277 /* $("#Form").sumbit(); */
278 278 }
279   - function tosearch_week(type){
  279 + function tosearch_week(type){ //上一周 本周 下一周
280 280 console.log('${pd.CLASS_ID}');
281 281 var url = "<%=basePath%>homework/report.do?CLASS_ID=${pd.CLASS_ID}" ;
282   - //var startDate = $("#lastStart").val();
283   - //var endDate = $("#lastEnd").val();
284   - //var subject_id = $("#SUBJECT_ID").val();
285 282 url = url + "&CURRENT_WEEK=" + type ;
286 283  
287 284 console.log(url);
... ... @@ -292,7 +289,7 @@
292 289  
293 290 function student(classid,studentid){
294 291  
295   - var url = "<%=basePath%>report/student_report?studentid=" + studentid + "&class_id=" + classid ;
  292 + var url = "<%=basePath%>homework/student.do?studentid=" + studentid + "&class_id=" + classid ;
296 293 var startDate = $("#lastStart").val();
297 294 var endDate = $("#lastEnd").val();
298 295 url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
... ...