From 6429ab881efa6bc9d3bd773680b552e87a4798a7 Mon Sep 17 00:00:00 2001 From: Elvis Date: Wed, 18 Jul 2018 19:49:41 +0800 Subject: [PATCH] remove --- WebRoot/WEB-INF/jsp/save_result2.jsp | 32 ++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------- WebRoot/WEB-INF/jsp/sunvote/student/student_edit.jsp | 4 ++-- WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp | 27 +++++++++++++-------------- WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- WebRoot/WEB-INF/jsp/sunvote/student/student_list2_bak.jsp | 337 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp | 6 +++++- WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp | 3 ++- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp | 16 +++++++++++----- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp | 23 ++++++++++------------- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1_bak.jsp | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp | 32 +++++++++++++++----------------- WebRoot/WEB-INF/jsp/system/index/foot2.jsp | 20 ++++++++++++++++++++ WebRoot/afterService/developer.html | 3763 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/static/css/mb_style.css | 14 ++++++++++++++ WebRoot/static/css/teach.css | 2 +- WebRoot/static/js/dailog.js | 33 +++++++++++++++++++++++++++++++++ WebRoot/static/js/loading.js | 31 +++++++++++++++++++++++++++++++ WebRoot/static/js/remove.js | 26 ++++++++++++++++++++++++++ src/com/fh/controller/sunvote/school/SchoolController.java | 1 - src/com/fh/controller/sunvote/student/StudentController.java | 3 +-- src/com/fh/entity/Page.java | 4 ++-- 22 files changed, 4708 insertions(+), 460 deletions(-) create mode 100644 WebRoot/WEB-INF/jsp/save_result2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/student/student_list2_bak.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1_bak.jsp create mode 100644 WebRoot/WEB-INF/jsp/system/index/foot2.jsp create mode 100644 WebRoot/afterService/developer.html create mode 100644 WebRoot/static/css/mb_style.css create mode 100644 WebRoot/static/js/dailog.js create mode 100644 WebRoot/static/js/loading.js create mode 100644 WebRoot/static/js/remove.js diff --git a/WebRoot/WEB-INF/jsp/save_result2.jsp b/WebRoot/WEB-INF/jsp/save_result2.jsp new file mode 100644 index 0000000..3f97a35 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/save_result2.jsp @@ -0,0 +1,32 @@ +<%@ 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"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + +保存结果 + + + + + + + + +
+ + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp index 08b584d..66dbc3e 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp @@ -19,6 +19,10 @@ href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> + + + + @@ -37,8 +41,9 @@

- + +
@@ -47,8 +52,7 @@ - + @@ -61,7 +65,7 @@ - + @@ -88,94 +92,66 @@
- +
- -
-<%@ include file="../../system/index/foot.jsp"%> +<%@ include file="../../system/index/foot2.jsp"%> + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit.jsp index 7f97285..ea8435d 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit.jsp @@ -47,7 +47,7 @@ --%> - @@ -79,7 +79,7 @@ diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp index ce6e499..3a2bb22 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp @@ -32,57 +32,56 @@
-
序号序号 测验标题 创建时间 建议考试时长
${vs.index+1}${vs.index+1} ${var.TITLE} ${var.CREATE_DATE} ${var.EXAM_TIME} 性别: <%--
- 保存 + 保存 取消
+
- + - + - + - + --%> - - + - + - + - + - + - +
姓名:姓名:
学籍号:学籍号:
学号:学号:
性别:性别: <%--
组号:组号:
签到码:签到码:
家长姓名:家长姓名:
家长手机号:家长手机号:
键盘ID:键盘ID:
备注:备注:
- 保存 - 取消 +
保存
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp index b7ab6d6..46eb44b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp @@ -1,337 +1,149 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ 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"%> <% String path = request.getContextPath(); String basePath = request.getScheme() + "://" - + request.getServerName() + ":" + request.getServerPort() - + path + "/"; + + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> - - + - - - - -<%@ include file="../../system/index/top.jsp"%> - - + + + +中天电子-教育管理系统 + + + + + + + + + + + - + - -
- -
-
-
-
-
- - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 序号姓名性别组号签到码键盘ID操作
- - ${vs.index+1}${var.NAME}${var.SEX == 1 ? "男":var.SEX == 0 ?"女":"未知"}${var.GROUPID}${var.SIGN_NO}${var.KEYPAD_ID} - -
您无权查看
没有相关数据
-
- + + + +
+
+

+ 学生管理 +

+
+ +
+
+
+ + + + + + + + + + + + + - - + + + + + + + + -
序号姓名学号键盘ID操作
- 新增 - 批量上传 - - - ${vs.index+1}${var.NAME}${var.SNO}${var.KEYPAD_ID}
-
-
- -
- -
- + + + + + + 没有相关数据 + + + + + + + +
+
+ +
+
+ +
+
+
-
- - - - - - - -
- + + - - - <%@ include file="../../system/index/foot.jsp"%> - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2_bak.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2_bak.jsp new file mode 100644 index 0000000..b7ab6d6 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2_bak.jsp @@ -0,0 +1,337 @@ +<%@ 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"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + + +<%@ include file="../../system/index/top.jsp"%> + + + + + + +
+ +
+
+
+
+
+ + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 序号姓名性别组号签到码键盘ID操作
+ + ${vs.index+1}${var.NAME}${var.SEX == 1 ? "男":var.SEX == 0 ?"女":"未知"}${var.GROUPID}${var.SIGN_NO}${var.KEYPAD_ID} + +
您无权查看
没有相关数据
+
+ + + + + +
+ 新增 + 批量上传 + + +
+
+
+ +
+ +
+ +
+ +
+
+ + + + + + + +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp index 76bbfc5..48c488b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp @@ -190,7 +190,11 @@ var URL = "<%=basePath%>api/v1/uploadpaper"; var JUMP_URL = "<%=basePath%>/main/teacher"; if(testData.questions.length>0){ - $("title").html("浏览试卷"); + var title = testData.title; + if(title == null || title == ''){ + title = "浏览试卷"; + } + $("title").html(title); } //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"单选","option_num":"","option_content":"","answer":"","difficulty":"","analysis":"","question_from":"","score":1,"part_score":"","remark":"","rank":"1","no_name":"一、","questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.1"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"B","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.2"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"C","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.3"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"D","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.4"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.5"}]}]}; //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]}; diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp index 8ce2598..67cf61c 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp @@ -34,7 +34,8 @@
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 0b9ea7f..21e7153 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -20,7 +20,8 @@ - + + @@ -120,14 +121,19 @@ + + + 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 aae6a94..2fedaee 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp @@ -22,22 +22,19 @@ <%@ include file="../../system/index/top.jsp"%> + -
-

+
- - - - - - - + + + + - - - + + + + href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}">
${var.NAME}${var.CREATE_DATE}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1_bak.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1_bak.jsp new file mode 100644 index 0000000..aae6a94 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1_bak.jsp @@ -0,0 +1,224 @@ +<%@ 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"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + +${info.CLASS_NAME}成绩报表 + + + + +<%@ include file="../../system/index/top.jsp"%> + + + + + +
+

+ + +
课程统计: ${info.testsize}
班级名册: ${info.CLASS_NAME}
学生人数: ${info.STUDENT_NUM}
课程统计: ${info.testsize}
班级名册: ${info.CLASS_NAME}
学生人数: ${info.STUDENT_NUM}
姓名课程平均得分率课程总分
姓名
课程平均得分率
课程总分
 ${var.NAME}(${var.CREATE_DATE})
+ + + + + + + + + + + + + +
课程统计: ${info.testsize}
班级名册: ${info.CLASS_NAME}
学生人数: ${info.STUDENT_NUM}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + +
姓名课程平均得分率课程总分${var.NAME}(${var.CREATE_DATE})
班级课程总分${var.TOTAL_SCORE}
班级课程平均分${var.AVG_SCORE}
班级课程平均得分率%
${var.NAME} + ${var.NAME} + %${var.GETSCORE } ${var[TEST_ID] }
+
+
+ + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + 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 8fdb3ae..3b9e0e4 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp @@ -25,20 +25,18 @@ -
-
-
-
+
+
- + - + - + @@ -47,20 +45,20 @@
测验名称: ${testpaperInfo.NAME}
收卷时间: ${testpaperInfo.END_DATE}
班级名册：${classInfo.CLASS_NAME}                  学生人数: ${classInfo.studentNum}
+ style="margin-top:15px;"> - - - - - - + + + + + + - + - - + + diff --git a/WebRoot/WEB-INF/jsp/system/index/foot2.jsp b/WebRoot/WEB-INF/jsp/system/index/foot2.jsp new file mode 100644 index 0000000..db1ec69 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/system/index/foot2.jsp @@ -0,0 +1,20 @@ + <% + String pathf = request.getContextPath(); + String basePathf = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + pathf + "/"; + %> + + + + + + \ No newline at end of file diff --git a/WebRoot/afterService/developer.html b/WebRoot/afterService/developer.html new file mode 100644 index 0000000..9039a3e --- /dev/null +++ b/WebRoot/afterService/developer.html @@ -0,0 +1,3763 @@ + + + + + + + + + + + + + + + +
+
+
+ +
+
+
+ +

教育-轻松考

+ +
+

获取所有年级列表

+ +

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/grade

+ + +
键盘学号姓名得分正确率排名
键盘
学号
姓名
得分
正确率
排名
 题目${vs.index+1}
题目${vs.index+1}
 非选择题得分总分
非选择题得分
总分
+ + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
school_idstring是学校ID可以不传（不传读取所有年级，传入年级则查询学校有哪些年级）
+ + + +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": [
+        {
+            "NAME": "高一",
+            "DESC": "高中一年级",
+            "ID": "13",
+            "REMARK": "高中一年级"
+        }
+    ]
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code请求返回码string
message请求返回信息string
data数据array
data.NAME年级名称string
data.DESC年级描述string
data.ID年级IDstring
data.REMARK年级补充描述string
+
+

获取所有科目列表

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/subject

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
school_idstring是学校ID可以为空（为空时，grade_id 无效） 查询学校所有科目，不传为所有科目
grade_idstring是年级ID可以为空， 查询该学校该年级所有科目，不传为该学校所有科目
+ + + +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": [
+        {
+            "CNAME": "语文",
+            "ID": "1",
+            "REMARK": "语文课",
+            "ENAME": "Chinese"
+        }
+    ]
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code请求返回代码string
message请求返回信息string
data数据array
data.CNAME科目中文名称string
data.ID科目IDstring
data.REMARK科目备注string
data.ENAME科目英文名string
+
+

获取所有题型(数据基本上不会变化)

+ +

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/questiontype

+ + + + + + + + +
+

获取所有班级类型(数据基本上不会变化)

+ +

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/classtype

+ + + + + + + + +
+

上传测验详细情况（强制更新上次已存在成绩）

+ +

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/uploadupdatetestpaper

+ + + + +
+
+ Body +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Body参数名类型必需描述示例 e.g.
namestring是测试名称
paperIdstring是试卷ID
classIdnumber是班级ID
teacherIdstring是教师ID
startDatestring是开始时间
endDatestring是结束时间
createDatestring是创建时间
totalScorenumber是试卷总分
otherScorenumber是其他分
highScorenumber是最高分
lowScorenumber是最低分
avgScorenumber是平均分
studentsarray是学生信息
students.studentIdstring是学生ID
students.scorenumber是学生得分
students.questionsarray是学生答题
students.questions.questionIdstring是题目ID
students.questions.scorenumber是题目分数
students.questions.answerTypenumber是题目类型
students.questions.answerstring是题目答案
students.questions.rightnumber是是否正确
students.questions.pressTimenumber是按键时间
students.questions.receiverDatestring是接收日期
students.questions.likesnumber是是否点赞
students.questions.ranknumber是排序
students.questions.subjectivenumber是
+ + + +
+

网络情况统计

+ +

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/network

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
seqstring是序列号76
client_idstring是客户端ID（客户端自己生成自己的ID）54646464sdfs
session_idstring是会话ID（本次会话的ID，由客户端维护，如果该值不同，为不同的会话）fsfsadfsf2545245
+ + + +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": {
+        "CLIENT_IP": "127.0.0.1",
+        "SUCCESS_COUNT": "24",
+        "FAIL_COUNT": "76"
+    }
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code状态码string
message状态信息string
data数据object
data.FAIL_COUNT失败次数string
data.SUCCESS_COUNT成功次数string
data.CLIENT_IP客户端IP地址string
+
+

登录

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/login

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
usernamestring是用户名和密码一起配对登录
passwordstring是密码和用户名一起配对登录
KEYPAD_IDstring是键盘ID使用键盘登录时，不需要用户名和密码
CLIENT_IDstring是客服端ID由客户端维护，可以为空，给统计使用
+ + + +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": {
+        "PHONE": "13973199797",
+        "KEYPAD_ID": "2355533110",
+        "classInfoList": [
+            {
+                "CLASS_CODE": "199",
+                "CLASS_NAME": "199班",
+                "CLASS_ID": "2"
+            }
+        ],
+        "NAME": "陈老师",
+        "CARD_NO": "2355533110",
+        "SEX": 1,
+        "ACCOUT": "Bob",
+        "ID": "57bb1e6f138247a0b05cc721a5da1b64",
+        "SEAT_PHONE": "809",
+        "SCHOOL_ID": "4",
+        "PASSWORD": "",
+        "subjectList": [
+            {
+                "CNAME": "英语",
+                "SUBJECT_ID": "3",
+                "ENAME": "English"
+            }
+        ]
+    }
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code请求返回代码string
message请求状态信息string
data数据object
data.PHONE电话号码string
data.KEYPAD_ID键盘IDstring
data.classInfoList班级信息array
data.classInfoList.CLASS_CODE班级代码string
data.classInfoList.CLASS_NAME班级名称string
data.classInfoList.CLASS_ID班级IDstring
data.NAME老师姓名string
data.CARD_NO身份证号string
data.SEX性别（1男2女）number
data.ACCOUT账户名string
data.ID用户IDstring
data.SEAT_PHONE座机电话string
data.SCHOOL_ID学校IDstring
data.PASSWORD密码（不回返回密码，被拦截位空）string
data.subjectList科目信息array
data.subjectList.CNAME中文科目名string
data.subjectList.SUBJECT_ID科目IDstring
data.subjectList.ENAME英语科目名string
+
+

获取班级详细情况（包含学生）

+ +

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/class

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
idstring是班级ID1
school_idstring是学校ID与ID冲突，如果存在ID，该参数无效。查询该学校的班级
grade_idstring是年级ID与ID冲突，如果存在ID，该参数无效。需要存在school_id,查询该学校年级的班级
+ + + +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": {
+        "CLASS_TYPE": "1",
+        "keyboards": [
+            {
+                "KEYBOARD_ID": "100001"
+            }
+        ],
+        "CLASS_CODE": "202",
+        "BASESTATION_ID": "1",
+        "CLASS_NAME": "202班",
+        "ID": "5",
+        "SCHOOL_ID": "16",
+        "GRADE_ID": "1",
+        "studentList": [
+            {
+                "KEYPAD_ID": "0000000001",
+                "NAME": "陆冠璇",
+                "SNO": "2511133",
+                "STUDENT_ID": "178cc86df5cd4bebb8d4392251e3e78f"
+            }
+        ]
+    }
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code请求状态代码string
message请求状态信息string
data具体数据object
data.CLASS_TYPE班级类型string
data.CLASS_CODE班级代码string
data.BASESTATION_ID基站IDstring
data.CLASS_NAME班级名称string
data.ID班级IDstring
data.SCHOOL_ID学校IDstring
data.GRADE_ID年级IDstring
data.studentList学生列表array
data.studentList.KEYPAD_ID键盘IDstring
data.studentList.NAME学生姓名string
data.studentList.STUDENT_ID学生IDstring
data.keyboards备用键盘列表array
data.keyboards.KEYBOARD_ID备用键盘IDstring
+
+

获取试卷列表

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/paper

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
paper_typestring是试卷类型1
user_idstring是用户ID2
subject_idstring是科目（参照获取所有科目列表中的ID）4
+ + +

详细说明：

+

+

+

+
+

+

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": [
+        {
+            "PAPER_TYPE": "1",
+            "SCORE": "100",
+            "PAPER_ID": "2",
+            "USER_ID": "2",
+            "SCHOOL_ID": "4",
+            "CREATE_DATE": "2018-05-29 16:10:03",
+            "MODIFY_DATE": "1",
+            "SUBJECT_ID": "5",
+            "EXAM_TIME": "20",
+            "TITLE": "地理模拟试卷二",
+            "PAPER_STATE": "1",
+            "REMARK": "1",
+            "GRADE_ID": "10"
+        }
+    ]
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code返回代码string
message详细信息string
data数据array
data.PAPER_TYPE试卷类型string
data.SCORE试卷总分string
data.PAPER_ID试卷IDstring
data.USER_ID用户IDstring
data.SCHOOL_ID学校IDstring
data.CREATE_DATE创建时间string
data.MODIFY_DATE修改时间string
data.SUBJECT_ID科目IDstring
data.EXAM_TIME考试时间（分钟）string
data.TITLE试卷标题string
data.PAPER_STATE试卷状态string
data.REMARK备注string
data.GRADE_ID年级string
+
+

获取试卷试题

+ +

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/paperinfo

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
PAPER_IDstring是试卷ID2
+ + +

详细说明：

+

+

+
<br>
+
+

+

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": {
+        "title": "英语综合测验卷1",
+        "exam_time": "120",
+        "paper_type": "1",
+        "subject_id": "3",
+        "grade_id": "13",
+        "user_id": "57bb1e6f138247a0b05cc721a5da1b64",
+        "questions": [
+            {
+                "question_id": "7642ac223a9a47d79507673abfef3de0",
+                "content": "单选",
+                "option_num": "",
+                "option_content": "",
+                "answer": "",
+                "difficulty": "",
+                "analysis": "",
+                "rank": "1",
+                "no_name": "一、",
+                "questions": [
+                    {
+                        "question_id": "2ff0a83e4ebf4802966c1ad1b9c0bf26",
+                        "content": "",
+                        "option_num": "4",
+                        "option_content": "",
+                        "answer": "C",
+                        "difficulty": "0",
+                        "analysis": "",
+                        "rank": "31",
+                        "no_name": "1.30"
+                    }
+                ]
+            }
+        ],
+        "score": "110"
+    }
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code返回代码string
message详细信息string
data数据object
data.title试卷标题string
data.exam_time试卷时间string
data.paper_type试卷类型string
data.subject_id科目IDstring
data.grade_id年级IDstring
data.questions题目列表array
data.questions.question_id题目IDstring
data.questions.content题目类容string
data.questions.option_num选项个数string
data.questions.answer标准答案string
data.questions.difficulty试题难度string
data.questions.analysis试题分析string
data.questions.rank排序string
data.questions.no_name题号string
data.score试卷总分string
+
+

上传试卷试题

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/uploadpaper

+ + + + +
+
+ Body +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Body参数名类型必需描述示例 e.g.
datastring是数据
titlestring是试卷标题
exam_timenumber是考试时间
paper_typenumber是试卷类型
subject_idnumber是科目ID
grade_idnumber是年级ID
user_idnumber是用户ID
scorenumber是总分
questionsarray是题目列表
questions.chapter_idnumber是章节
questions.problem_type_idnumber是题目类型
questions.knowledge_idnumber是知识点
questions.contentstring是问题内容
questions.option_numnumber是答案选项个数（用于选择题）
questions.option_contentstring是选项内容
questions.answerstring是题目答案
questions.difficultynumber是题目难度
questions.analysisstring是题目分析
questions.question_fromnumber是题目来源
questions.scorenumber是题目总分
questions.part_scorenumber是题目部分分
questions.remarkstring是备注
questions.ranknumber是题目排序标记（用于题目排序）
questions.no_namenumber是题目标记（用户题目前的序号）三、选择题中的三、
+ +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": "a28164f11572421d97b902376c94f9ae"
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
data数据：试卷IDstring
code返回代码string
message详细信息string
+
+

获取测验列表

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/testpaper

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Header参数名类型必需描述示例 e.g.
content-typestring是
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
paper_idstring是试卷ID可以为空
class_idstring是班级ID可以为空
user_idstring是用户ID可以为空
namestring是测样标题不建议使用（为空）
+ + + +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": [
+        {
+            "testpaperId": "74ffd81e48b94d63bf7dc7e6ecf39c1e",
+            "name": "英语综合测验卷1",
+            "paperId": "885bd114d8bc427494107e0e6a7a6891",
+            "classId": "2",
+            "teacherId": "57bb1e6f138247a0b05cc721a5da1b64",
+            "startDate": "2018-06-07 09:00:00",
+            "endDate": "2018-06-07 11:30:00",
+            "createDate": "2018-06-07 11:31:00",
+            "otherScore": "70",
+            "highScore": "100",
+            "lowScore": "40",
+            "avgScore": "78",
+            "remark": "",
+            "students": []
+        }
+    ]
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code请求返回状态码string
message请求返回信息string
data数据array
data.testpaperId测验IDstring
data.name测验标题string
data.paperId试卷IDstring
data.classId班级IDstring
data.teacherId教师IDstring
data.startDate开考时间string
data.endDate结束时间string
data.createDate创建时间string
data.otherScore主观题分数string
data.highScore最高分string
data.lowScore最低分string
data.avgScore平均分数string
data.remark备注string
+
+

获取测验详细情况

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/downloadtestpaper

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
IDstring是
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Body参数名类型必需描述示例 e.g.
IDstring是
+ + + +
+

上传测验详细情况

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/uploadtestpaper

+ + + + +
+
+ Body +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Body参数名类型必需描述示例 e.g.
namestring是测样名称（可以和试卷标题不一样）2018年1月语文轻松考第一次
paperIdstring是试卷ID
classIdstring是班级ID
teacherIdstring是考试教师ID
startDatestring是开考时间
endDatestring是停止考试时间
createDatestring是测验报表创建时间可以不传
otherScorestring是其他主观题分数可以不传
highScorestring是最高分
lowScorestring是最低分
avgScorestring是平均分
remarkstring是备注可以不传
studentsarray是学生答题情况
students.studentIdstring是学生ID
students.scorestring是学生分数可以为空
students.questionsarray是学生答题集
students.questions.questionIdstring是学生答题ID
students.questions.answerstring是学生答题答案
students.questions.rightstring是学生答题是否正确
students.questions.scorestring是学生答题得分
students.questions.likesstring是是否点赞可以不传
students.questions.answerTypestring是答题类型键盘/other
students.questions.pressTimestring是按键时间可以不传
students.questions.receiverDatestring是接收时间可以不传
students.questions.subjectivestring是是否主观题可以不传
students.questions.notestring是笔记可以不传
students.questions.markNostring是标记等级可以不传
students.questions.rankstring是排序（后面添加，为了方便报表显示时，有顺序的排序，否则需要匹配试卷才能知道试题顺序）可以不传
totalScorestring是试卷总分
+ + + +
+

键盘扫描上传

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/keypadscan

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
KEYPAD_IDstring是键盘ID
BATTERY_INFOstring是电量信息
ONLINEstring是是否在线1在线 0不在线
+ + + +

返回示例：

+
+ 
+                                {
+    "code": "0",
+    "message": "success",
+    "data": {}
+}
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
参数名描述类型
code请求返回代码string
message请求返回信息string
+

软件管理

+ +
+

获取软件的最新版本信息

+

请求方式：GET / POST

+

+ 请求地址：http://120.78.57.84:8888/SunvoteEducation/api/v1/newversion

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Query参数名类型必需描述示例 e.g.
softidstring是
+ + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 目录 +
+
+ + + \ No newline at end of file diff --git a/WebRoot/static/css/mb_style.css b/WebRoot/static/css/mb_style.css new file mode 100644 index 0000000..3661deb --- /dev/null +++ b/WebRoot/static/css/mb_style.css @@ -0,0 +1,14 @@ +.mb{width:100%;height:100%;background:rgba(0,0,0,0.5);position:fixed;top:0;} +.mb_box{background:#fff;width:500px;height:auto;max-height:500px;overflow:hidden;position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;} +.mb_head{background:#01a5a6;} +.mb_head p{margin:0;color:#fff;line-height:50px;text-align:center;font-size:20px;} +.mb_head .close{position:absolute;right:20px;top:15px;width:20px;} +.mb_head .close img{width:100%;} +.mb_content{height:calc(100% - 50px);} +.mb_content iframe{width:100%;height:100%;border:0;box-sizing:border-box;padding:12px;} + +.remove .mb_box{display:table;padding-bottom:5%;} +.mb_content .mb_content_l{width:50%;float:left;margin-top:5%;} +.mb_content .mb_content_l a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#3bc2d6;text-align:center;height:40px;line-height:40px;} +.mb_content .mb_content_r{width:50%;float:left;margin-top:5%;} +.mb_content .mb_content_r a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#3bc2d6;text-align:center;height:40px;line-height:40px;} diff --git a/WebRoot/static/css/teach.css b/WebRoot/static/css/teach.css index 0e440db..e871e47 100644 --- a/WebRoot/static/css/teach.css +++ b/WebRoot/static/css/teach.css @@ -32,7 +32,7 @@ html,body{width:100%;height:100%;} .content .content_l .tab1 p{width:100%;height:77px;line-height:77px;margin-bottom:0;font-size:24px;color:#fff;padding-left:10%;} .content .content_l .tab1 ul{margin-bottom:0;padding:12px 0;padding-left:15%;background:#0b535b;font-size:18px;line-height:64px;display:none;} .content .content_l .tab1 ul li{list-style:none;color:#fff;} -.content .content_r{margin-left:18%;height:100%;overflow-y:auto;} +.content .content_r{margin-left:18%;height:100%;overflow-y:hidden;} .head_box{width:100%;height:94px;background:#f5f5f5;padding:30px 5%;} diff --git a/WebRoot/static/js/dailog.js b/WebRoot/static/js/dailog.js new file mode 100644 index 0000000..138fe7e --- /dev/null +++ b/WebRoot/static/js/dailog.js @@ -0,0 +1,33 @@ +var modal={ + init:function(obj){ + this.init.title=obj.title; + this.init.url=obj.url; + this.init.func = obj.func; + }, + show:function(){ + if(window.top!=window.self){ + $("body",top.document).append('

'+window.top.init.title+'

'); + }else{ + if($(".loading").length==0) + { + $("body").append('

'+window.top.modal.init.title+'

'); + } + } + + }, + remove:function(){ + if(window.top!=window.self){ + $(".mb",top.document).remove(); + }else{ + if($(".mb").length>0) + $(".mb").remove(); + } + if(window.top.modal.init.func){ + window.top.modal.init.func(); + } + } +} +$(document).on("click",".close",function(){ + window.top.modal.remove(); +}) + diff --git a/WebRoot/static/js/loading.js b/WebRoot/static/js/loading.js new file mode 100644 index 0000000..5f064c5 --- /dev/null +++ b/WebRoot/static/js/loading.js @@ -0,0 +1,31 @@ +/*********************** +*名称：加载等待插件 +*日期：2018年7月17日 +*用法：此插件依托于jquery插件，所以在使用时，需要在jquery后引入，且此插件需要置入body内。 +* 展示loading为loading.show(url),url为loading.gif图片路径。移除loading为loading.remove(); +* 可放入$(document).ready()内； +***********************/ + + +var loading={ + show:function(url){ + if(window.top!=window.self){ + $("body",top.document).append('
'); + }else{ + if($(".loading").length==0) + { + //alert($("body").length); + $("body").append('
'); + } + } + }, + remove:function(){ + if(window.top!=window.self){ + $(".loading",top.document).remove(); + }else{ + if($(".loading").length>0) + $(".loading").remove(); + } + + } +} \ No newline at end of file diff --git a/WebRoot/static/js/remove.js b/WebRoot/static/js/remove.js new file mode 100644 index 0000000..c15e0dc --- /dev/null +++ b/WebRoot/static/js/remove.js @@ -0,0 +1,26 @@ + +var remove={ + init:function(obj){ + this.init.title=obj.title; + this.init.func = obj.func; + }, + show:function(){ + if(window.top!=window.self){ + $("body",top.document).append('

'+window.top.remove.init.title+'

确认
取消
'); + }else{ + if($(".loading").length==0) + { + $("body").append('

'+window.top.remove.init.title+'

确认
取消
'); + } + } + }, + remove:function(){ + if(window.top!=window.self){ + $(".remove",top.document).remove(); + }else{ + if($(".remove").length>0) + $(".remove").remove(); + } + + } +} \ No newline at end of file diff --git a/src/com/fh/controller/sunvote/school/SchoolController.java b/src/com/fh/controller/sunvote/school/SchoolController.java index f29f3e4..6cfb506 100644 --- a/src/com/fh/controller/sunvote/school/SchoolController.java +++ b/src/com/fh/controller/sunvote/school/SchoolController.java @@ -27,7 +27,6 @@ import com.fh.util.AppUtil; import com.fh.util.Jurisdiction; import com.fh.util.ObjectExcelView; import com.fh.util.PageData; -import com.google.gson.Gson; /** * 说明：学校 diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java index 43d6d1a..43be44d 100644 --- a/src/com/fh/controller/sunvote/student/StudentController.java +++ b/src/com/fh/controller/sunvote/student/StudentController.java @@ -75,7 +75,6 @@ public class StudentController extends BaseController { @RequestMapping(value="/save2") public ModelAndView save2() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"新增Student"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限 ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -94,7 +93,7 @@ public class StudentController extends BaseController { mv.addObject("msg","success"); - mv.setViewName("save_result"); + mv.setViewName("save_result2"); return mv; } diff --git a/src/com/fh/entity/Page.java b/src/com/fh/entity/Page.java index 8f8f9e1..3f306ba 100644 --- a/src/com/fh/entity/Page.java +++ b/src/com/fh/entity/Page.java @@ -64,7 +64,7 @@ public class Page { sb.append("