From 1d2b1e62c4290d8731faa3e3475896a2d26cad18 Mon Sep 17 00:00:00 2001 From: flower Date: Thu, 10 Jan 2019 23:16:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=A2=9E=E5=8A=A0=E8=80=83?= =?UTF-8?q?=E8=AF=95=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/exam/domain/ExamExamination.java | 8 +- .../templates/exam/examExamination/add.html | 10 + .../templates/exam/examExamination/edit.html | 385 ++++++++++-------- 3 files changed, 218 insertions(+), 185 deletions(-) diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExamination.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExamination.java index 091717fe1..e3e928651 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExamination.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExamination.java @@ -25,10 +25,10 @@ private static final long serialVersionUID = 1L; private Integer examPaperId; /** 试卷名称 */ private String name; - /** - * 考试类型(1-模拟考试；2-正式考试) - */ - private String type; + /** + * 考试类型(1-模拟考试；2-正式考试) + */ + private String type; /** 是否控制开始结束时间（0-不控制,1-控制） */ private String enableControlTime; /** 开始时间 */ diff --git a/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html b/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html index c2e5805f0..c09bf912a 100644 --- a/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html +++ b/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html @@ -31,6 +31,16 @@ +
+ + +
+ +
+
+
diff --git a/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html b/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html index c9d9f1f96..02830bc24 100644 --- a/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html +++ b/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html @@ -1,200 +1,223 @@ - + -
-
- - -
+
+ + + +
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
- -
-
-
- +
+ +
+ +
+
+ +
+
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
-
- + } + }; + $.ajax(config) + } +