Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

孙向锦
2 parents ed6f550b d318653d
Showing 7 changed files with 26 additions and 7 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -29,6 +29,7 @@
       <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
       <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
+    
 </head>
 <body>
 	<div class="header">
@@ -166,6 +167,9 @@
 						<p>年级升级</p>
 					</li>
 					<li>
+						<p>模板设置</p>
+					</li>
+					<li>
 						<p>其他配置</p>
 					</li>
 				</ul>
@@ -16,6 +16,8 @@
 	<%@ include file="../../system/index/top.jsp"%>
 	<!-- 日期框 -->
 	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+	<!-- 编辑页样式覆盖 -->
+	<link rel="stylesheet" href="static/css/edit.css" />
 </head>
 <body class="no-skin">
 <!-- /section:basics/navbar.layout -->
@@ -30,7 +32,7 @@
 					<form action="sclass/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
 						<div id="zhongxin" style="padding-top: 13px;">
-						<table id="table_report" class="table table-striped table-bordered table-hover">
+						<table id="table_report" class="table">
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">所属学校:</td>
 								<td>
@@ -47,7 +49,7 @@
 								<td style="width:75px;text-align: right;padding-top: 13px;">所属年级:</td>
 								<td>
 								<%-- <input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td> --%>
-								<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属年级" disabled="disabled">
+								<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属年级" >
 									<c:forEach var="item" items="${grades}">
 										<option value="${item.ID}"  <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
 									</c:forEach>
@@ -87,7 +89,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>
@@ -83,6 +83,7 @@
 									<td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td>
 									<td class='center'>${var.CLASS_CODE}</td>
 									<td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
+									
 									<td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a href="#" onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
 								</tr>
 							</c:forEach>
@@ -16,6 +16,7 @@
 	<%@ include file="../../system/index/top.jsp"%>
 	<!-- 日期框 -->
 	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+	<link rel="stylesheet" href="static/css/edit.css" />
 </head>
 <body class="no-skin">
 <!-- /section:basics/navbar.layout -->
@@ -31,7 +32,7 @@
 						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
 						<input type="hidden" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}"/>
 						<div id="zhongxin" style="padding-top: 13px;">
-						<table id="table_report" class="table table-striped table-bordered table-hover">
+						<table id="table_report" class="table">
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">科目名称:</td>
 								<td>
@@ -80,6 +81,8 @@
 			$("#Form").submit();
 			$("#zhongxin").hide();
 			$("#zhongxin2").show();
+			window.top.modal.remove();
+			tosearch();
 		}
 		$(function() {
@@ -70,7 +70,7 @@
 										value="${var.ID}" />${vs.index+1}</td>
 									<td class='center'>${var.CNAME}</td>
 									<td class='center'>${var.ENAME}</td>
-									<td><a href="#" onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a href="#" onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
+									<td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
 								</tr>
@@ -89,7 +89,7 @@
 											<td class='center'>${var.ACCOUT}</td>
 											<td class='center'>${var.SEX == 1? "男":"女"}</td>
 											<td class='center'>${var.KEYPAD_ID}</td>
-											<td><a href="#" onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a href="#" onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
+											<td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
 										</tr>
@@ -208,7 +208,7 @@
 		function edit(Id){
 			window.top.modal.init({
-			'title':'添加学生',
+			'title':'修改信息',
 			'url':'<%=basePath%>teacher/goEdit2.do?ID='+Id,
 			func:function() {
 				tosearch();
@@ -78,6 +78,15 @@
    		if(window.top != window.self){
 	   		window.top.location.href = "<%=basePath%>";
    		}
+   		
+   		document.onkeydown = function (e) { // 回车提交表单
+   		// 兼容FF和IE和Opera
+   		    var theEvent = window.event || e;
+   		    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+   		    if (code == 13) {
+   		    	severCheck();
+   		    }
+   		}
    		//客户端校验
 		function check() {