From 0184fec5b0fd9a7007ef6f1ac61f8d4af8b4fe74 Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Tue, 20 Aug 2019 15:43:43 +0800
Subject: [PATCH] 1.修改bug

---
 WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp      | 4 ++--
 WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp | 2 +-
 WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index b90255a..4fb5e2b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -233,7 +233,7 @@
 							<label for="enter_time" class="col-sm-4 control-label">测验时长（分钟）</label>
 							<div class="col-sm-6">
 								<input type="number" class="form-control" id="enter_time"
-									placeholder="输入测验时长（单位：分钟）" maxlength="3"
+									placeholder="输入测验时长（单位：分钟）" min="0" maxlength="3"
 									oninput="if(value.length>3) value=value.slice(0,3)">
 							</div>
 							<div class="clearfix"></div>
@@ -246,7 +246,7 @@
 									data-placeholder="这里输入所属学校">
 									<option value="-1">--请选择--</option>
 									<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-										<option value="${var.GRADE_ID}">${var.GNAME}</option>
+										<option value="${var.GRADE_ID}">${var.NAME}</option>
 									</c:forEach>
 								</select>
 							</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
index 68ee1c8..2f990c1 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
@@ -46,7 +46,7 @@
 							<tr>
 								<td style="text-align: center;" colspan="10">
 									<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
-									<a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
+									<a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
 								</td>
 							</tr>
 						</table>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
index 334907b..10a4855 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
@@ -172,6 +172,7 @@
 			window.top.modal.init({
 			'title':'添加科目',
 			'url':'<%=basePath%>subject/goAdd2.do?school_id=${pd.SCHOOL_ID}&grade_id=${pd.GRADE_ID}',
+			'height':220,
 			func:function() {
 				tosearch();
 			}
--
libgit2 0.21.4