From ec3fd70c0d25b871f573da6df531a298831cdfeb Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Wed, 10 Apr 2019 14:14:21 +0800
Subject: [PATCH] 1、修改练习报表(5)
---
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp | 169 +++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp | 2 +-
2 files changed, 38 insertions(+), 133 deletions(-)
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index c812ddd..52b8be3 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -37,23 +37,21 @@
-
-
-
+
% |
- ${var.GET_SCORE_PERSENT } |
+ ${var.PAPER_ALL_SCORE} |
- |
@@ -158,116 +156,7 @@
-
-
@@ -365,21 +254,37 @@
return Math.round(avg / total * 100)/100 + '%' ;
}
+ function homeReport(classId){
+ var path = '<%=basePath%>homework/report.do?CLASS_ID='+classId;
+ console.log(path);
+ parent.$("#mainFrame").attr('src',path);
+ window.top.loading.show();
+ }
+
function tosearch(){
- var url = "<%=basePath%>report/report.do?classid=${info.CLASS_ID}" ;
+ console.log('${pd.CLASS_ID}');
+ var url = "<%=basePath%>homework/report.do?CLASS_ID=${pd.CLASS_ID}" ;
var startDate = $("#lastStart").val();
var endDate = $("#lastEnd").val();
- var subject_id = $("#SUBJECT_ID").val();
- url = url + "&start_date=" + startDate ;
+ //var subject_id = $("#SUBJECT_ID").val();
+ url = url + "&START_DATE=" + startDate ;
if(endDate != null){
- url = url + "&end_date=" + endDate;
- }
- if(subject_id != null){
- url = url + "&SUBJECT_ID=" + subject_id;
- }
- if(role == "admin"){
- url = url + "&ROLE=admin" ;
+ url = url + "&END_DATE=" + endDate;
}
+ console.log(url);
+ window.location.href = url;
+ window.top.loading.show();
+ /* $("#Form").sumbit(); */
+ }
+ function tosearch_week(type){
+ console.log('${pd.CLASS_ID}');
+ var url = "<%=basePath%>homework/report.do?CLASS_ID=${pd.CLASS_ID}" ;
+ //var startDate = $("#lastStart").val();
+ //var endDate = $("#lastEnd").val();
+ //var subject_id = $("#SUBJECT_ID").val();
+ url = url + "&CURRENT_WEEK=" + type ;
+
+ console.log(url);
window.location.href = url;
window.top.loading.show();
/* $("#Form").sumbit(); */
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 56c8002..241ad6d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -196,7 +196,7 @@
}
function homeReport(){
- var path = '<%=basePath%>homework/report.do';
+ var path = '<%=basePath%>homework/report.do?';
$("#mainFrame").attr('src',path);
window.top.loading.show();
--
libgit2 0.21.4