From 3371dbc6506e26b995da6d7d5c0ad5994980fb06 Mon Sep 17 00:00:00 2001 From: Elvis Date: Fri, 20 Jul 2018 16:49:26 +0800 Subject: [PATCH] 0720 版本 --- WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp | 3 +++ WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp | 301 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------- WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp | 215 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp | 17 ++++++++++++++++- WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp | 4 ++++ WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp | 15 ++++++++++++--- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp | 15 +++++++++++---- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp | 15 +++++++++------ WebRoot/WEB-INF/jsp/system/index/login.jsp | 15 ++++++++++++++- WebRoot/static/css/mb_style.css | 4 +++- WebRoot/static/css/teach.css | 7 ++++--- WebRoot/static/js/control1.js | 36 ++++++++++++++++++------------------ WebRoot/static/js/loading.js | 3 +++ WebRoot/static/login/style_login.css | 6 +++--- src/com/fh/controller/api/V1.java | 35 +++++++++++++++++++++++++++++++++++ src/com/fh/controller/sunvote/student/StudentController.java | 6 +++--- 17 files changed, 404 insertions(+), 378 deletions(-) delete mode 100644 WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp index d9d1197..c48cf3b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp @@ -107,6 +107,9 @@ + - + - - + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp deleted file mode 100644 index 5beb215..0000000 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp +++ /dev/null @@ -1,215 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" - + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - - - - - - -
- - - -
-
  • -

    学生姓名:

    -
    - -
    -
    • -
  • -

    学籍号:

    -
    - -
    -
    • -
  • -

    学号:

    -
    - -
    -
    • -
  • -

    性别:

    -
    - -
    -
    • -
  • -

    组号:

    -
    - -
    -
    • -
  • -

    签到码:

    -
    - -
    -
    • -
  • -

    家长姓名:

    -
    - -
    -
    • -
  • -

    家长手机:

    -
    - -
    -
    • -
  • -

    键盘ID:

    -
    - -
    -
    • -
  • -

    备注:

    -
    - -
    -
    • - -
    - 保存 -
    -
    - -
    - - - - - <%@ include file="../../system/index/foot.jsp"%> - - - - - - - - - \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp index 7ef8c41..06f230b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp @@ -82,6 +82,9 @@
    +
    + +
    @@ -95,7 +98,9 @@ <%@ include file="../../system/index/foot2.jsp"%> \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp index 011d527..f2ba7c3 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp @@ -16,6 +16,86 @@ <%@ include file="../../system/index/top.jsp"%> + + + @@ -37,9 +117,7 @@ - 导入 - 取消 - + 导入 @@ -68,7 +146,6 @@ diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp index 2d65d54..1575a57 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp @@ -22,7 +22,10 @@ <%@ include file="../../system/index/top.jsp"%> - + @@ -61,7 +64,7 @@
    课程总分
    ${var.NAME}
    ${var.CREATE_DATE}
     + href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}" onclick="window.top.loading.show();">
    ${var.NAME}
    ${var.CREATE_DATE}
     @@ -101,7 +104,7 @@ href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME} --%> ${var.NAME} + href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}" onclick="window.top.loading.show();">${var.NAME} $(function() { - + //日期框 $('.date-picker').datepicker({ autoclose : true, @@ -215,6 +218,10 @@ window.location.href = url; /* $("#Form").sumbit(); */ } + + $(document).ready(function(){ + window.top.loading.remove(); + }); diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp index 3b9e0e4..0dca19e 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp @@ -52,12 +52,12 @@
    学号
    姓名
    得分
    -
    正确率
    +
    排名
    题目${vs.index+1}
     -
    非选择题得分
    +
    总分
    @@ -67,14 +67,14 @@ - + % - + @@ -86,12 +86,12 @@ ${var.SNO} ${var.NAME} ${var.GETSCORE} - ${var.RIGHT} + <%-- ${var.RIGHT} --%> ${vs.index + 1} ${var.detail[vs1.index].ANSWER} - ${var.OTHER_SCORE} + <%-- ${var.OTHER_SCORE} --%> ${var.GETSCORE} @@ -114,6 +114,9 @@