Merge branch '中天电子开发' of http://120.78.57.84/Elvis/SunvoteEducation into 中天电子开发

孙向锦
2 parents 48d44272 e930e8eb
Showing 6 changed files with 125 additions and 29 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
WebRoot/static/css/teach.css
@@ -48,8 +48,8 @@
 				</div>
 				<div class="name">
 					<p>欢迎！</p>
-					<p id="school">${SNAME }</p>
-					<p id="name">${SNAME } 管理员</p>
+					<p id="school" title="${SNAME }">${SNAME }</p>
+					<p id="name" title="${SNAME } 管理员">${SNAME } 管理员</p>
 					</br></br>
 				</div>
 			</div>
@@ -15,7 +15,6 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
-<%@ include file="../../system/index/top.jsp"%>
 <link href="../static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -16,12 +16,10 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
-<%@ include file="../../system/index/top.jsp"%>
+
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link
-	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
@@ -39,14 +37,15 @@
 				</div>
 				<div class="clearfix"></div>
 			</div>
-			<div style="background:#fff;" >
+			<div style="background:#fff;padding:0 5%;" >
-				<table class="table table-striped" style="margin: 0px 5%">
+				<table class="table table-striped" >
 					<col style="width: 10%" />
-					<col style="width: 22%" />
-					<col style="width: 22%" />
-					<col style="width: 23%" />
-					<col style="width: 23%" />
+					<col style="width: 18%" />
+					<col style="width: 18%" />
+					<col style="width: 18%" />
+					<col style="width: 18%" />
+					<col style="width: 18%" />
 					<thead>
 						<tr>
 							<th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
@@ -54,6 +53,7 @@
 							<th class="center">班级类型</th>
 							<th class="center">班级编码</th>
 							<th class="center">班级基站</th>
+							<th class="center">操作</th>
 						</tr>
 					</thead>
 				</table>
@@ -63,13 +63,14 @@
 			<!-- 检索  -->
 		</div>
-		<div class="table_box" style="padding:0px">
-			<table class="table table-striped" style="margin: 0px 5%">
+		<div class="table_box" style="padding:0px 5%">
+			<table class="table table-striped" >
 				<col style="width: 10%" />
-				<col style="width: 22%" />
-				<col style="width: 22%" />
-				<col style="width: 23%" />
-				<col style="width: 23%" />
+				<col style="width: 18%" />
+				<col style="width: 18%" />
+				<col style="width: 18%" />
+				<col style="width: 18%" />
+				<col style="width: 18%" />
 				<tbody>
 					<!-- 开始循环 -->
 					<c:choose>
@@ -82,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 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>
 								</tr>
 							</c:forEach>
 						</c:when>
@@ -102,8 +104,7 @@
 				</div> 
 				<div class="page_box">
-					<div class="pagination"
-						style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
+					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
 				</div>
 			</div> 
 		</div>
@@ -140,6 +141,16 @@
 					else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
 				});
 		});
+		function edit(Id){
+			window.top.modal.init({
+			'title':'修改信息',
+			'url':'<%=basePath%>sclass/goEdit2.do?ID='+Id,
+			func:function() {
+				tosearch();
+			}
+			});
+			window.top.modal.show();
+		}
 		function del(Id){
 			window.top.remove.init({"title":"删除","func":function(success){
@@ -15,7 +15,7 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
-<%@ include file="../../system/index/top.jsp"%>
+
 <link href="../static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -70,7 +70,7 @@
 										value="${var.ID}" />${vs.index+1}</td>
 									<td class='center'>${var.CNAME}</td>
 									<td class='center'>${var.ENAME}</td>
-									<td class='center'></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>
 								</tr>
@@ -16,7 +16,7 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
-<%@ include file="../../system/index/top.jsp"%>
+
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
 <link
@@ -45,8 +45,9 @@
 					<col style="width: 10%" />
 					<col style="width: 15%" />
 					<col style="width: 15%" />
+					<col style="width: 7%" />
 					<col style="width: 15%" />
-					<col style="width: 15%" />
+					<col style="width: 7%" />
 					<thead>
 						<tr>
 							<th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
@@ -57,6 +58,7 @@
 							<th class="center">账号</th>
 							<th class="center">性别</th>
 							<th class="center">教师卡编号</th>
+							<th class="center">操作</th>
 						</tr>
 					</thead>
 				</table>
@@ -70,8 +72,9 @@
 						<col style="width: 10%" />
 						<col style="width: 15%" />
 						<col style="width: 15%" />
+						<col style="width: 7%" />
 						<col style="width: 15%" />
-						<col style="width: 15%" />
+						<col style="width: 7%" />
 						<tbody>
 							<!-- 开始循环 -->
 							<c:choose>
@@ -86,6 +89,8 @@
 											<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>
+								
 										</tr>
 									</c:forEach>
@@ -100,7 +105,7 @@
 					</table>
 					<div class="footer" style="width:auto">
 				<div class="creat">
-					<input type="button"  onclick="parent.$('.title_time').modal('show');" value="添加老师" />
+					<input type="button"  onclick="$('.title_time').modal('show');" value="添加老师" />
 				</div>
 				<div class="removeAll">
 					<input type="button" onclick="deleteAll()" value="删除" />
@@ -112,7 +117,76 @@
 		</div>
 	</form>
-
+	<div class="modal fade title_time" tabindex="-1" role="dialog">
+	  <div class="modal-dialog" role="document" style="z-index:1400">
+	    <div class="modal-content">
+	      <div class="modal-header">
+	        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+	        <h4 class="modal-title">添加老师</h4>
+	      </div>
+	      <div class="modal-body">
+	        <div class="form-group">
+			    <label for="enter_title" class="col-sm-4 control-label">姓名</label>
+			    <div class="col-sm-6">
+			      <input type="text" class="form-control" id="enter_title" placeholder="输入姓名"  maxlength="100" minlength="1">
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+	       
+	        <div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">电话</label>
+			    <div class="col-sm-6">
+			      <input type="text" class="form-control" id="enter_time" placeholder="输入电话" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')" >
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+			<div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">座机电话</label>
+			    <div class="col-sm-6">
+			      <input type="text" class="form-control" id="enter_time" placeholder="输入座机电话" maxlength="20" oninput="value=value.replace(/[^\d]/g,'')">
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+			<div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">证件号</label>
+			    <div class="col-sm-6">
+			      <input type="text" class="form-control" id="enter_time" placeholder="输入证件号" />
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+			<div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">帐号</label>
+			    <div class="col-sm-6">
+			      <input type="text" class="form-control" id="enter_time" placeholder="输入帐号" />
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+			<div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">性别</label>
+			    <div class="col-sm-6">
+			      <select class="chosen-select form-control" name="TEMPLATE_ID" id="TEMPLATE_ID" data-placeholder="请选择您的性别">
+			      		<option value="1">男</option>
+						<option value="2">女</option>
+				  </select>
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+			<div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">教师卡编号</label>
+			    <div class="col-sm-6">
+			      <input type="text" class="form-control" id="enter_time" placeholder="输入教师卡编号" />
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+			
+	      </div>
+	      <div class="modal-footer">
+	        <button type="button" class="btn btn-primary" id="time_submit">确定</button>
+	        <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
+	      </div>
+	    </div><!-- /.modal-content -->
+	  </div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
 	<!-- basic scripts -->
 	<!-- 页面底部js¨ -->
@@ -131,6 +205,17 @@
 		$(document).ready(function() {
 			window.top.loading.remove();
 		});
+		
+		function edit(Id){
+			window.top.modal.init({
+			'title':'添加学生',
+			'url':'<%=basePath%>teacher/goEdit2.do?ID='+Id,
+			func:function() {
+				tosearch();
+			}
+			});
+			window.top.modal.show();
+		}
 	</script>
 html,body{width:100%;height:100%;}
+table{font-size:16px;}
 .clear{clear:both;}
 .right{width:12px;height:12px;display:inline-block;background:url(../images/right.png) no-repeat;background-size:100%;}
 .right_b{width:20px;height:20px;margin-right:20px;display:inline-block;background:url(../images/right_b.png) no-repeat;background-size:100%;}
@@ -25,7 +26,7 @@ input[type=&quot;checkbox&quot;]{margin-right:10px;}
 .content .content_l .info_tab{padding:10% 0;border-bottom:1px solid #80afb4;}
 .content .content_l .head_pic{width:88px;height:88px;border-radius:44px;overflow:hidden;float:left;margin-left:2%;}
 .content .content_l .name{margin-left:calc(88px + 10%);}
-.content .content_l .name p{color:#fff;}
+.content .content_l .name p{width:100%;color:#fff;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;}
 .content .content_l .name p:first-child{font-size:14px;}
 .content .content_l .name p:nth-child(2){font-size:20px;}
 .content .content_l .name p:nth-child(3){font-size:14px;}