diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index ca735f1..9991662 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -48,8 +48,8 @@

欢迎！

-

${SNAME }

-

${SNAME } 管理员

+

${SNAME }

+

${SNAME } 管理员



diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp index 53b4128..92dcf02 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp @@ -15,7 +15,6 @@ -<%@ include file="../../system/index/top.jsp"%> diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp index 28c8b76..86ade58 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp @@ -16,12 +16,10 @@ -<%@ include file="../../system/index/top.jsp"%> + - + @@ -39,14 +37,15 @@
-
+
- +
- - - - + + + + + @@ -54,6 +53,7 @@ +
序号班级类型 班级编码 班级基站操作
@@ -63,13 +63,14 @@
-
- +
+
- - - - + + + + + @@ -82,6 +83,7 @@ + @@ -102,8 +104,7 @@
- +
@@ -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){ diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp index ff15116..5fd20e9 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp @@ -15,7 +15,7 @@ -<%@ include file="../../system/index/top.jsp"%> + @@ -70,7 +70,7 @@ value="${var.ID}" />${vs.index+1} - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp index 26e4174..5e14357 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp @@ -16,7 +16,7 @@ -<%@ include file="../../system/index/top.jsp"%> + + - + @@ -57,6 +58,7 @@ +
${myelfun:findClassTypeName(var.CLASS_TYPE)} ${var.CLASS_CODE} ${myelfun:findBasestationName(var.BASESTATION_ID)}
${var.CNAME} ${var.ENAME}
序号账号 性别 教师卡编号操作
@@ -70,8 +72,9 @@ + - + @@ -86,6 +89,8 @@ ${var.ACCOUT} ${var.SEX == 1? "男":"女"} ${var.KEYPAD_ID} + + @@ -100,7 +105,7 @@
- +
@@ -112,7 +117,76 @@
- + @@ -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(); + } diff --git a/WebRoot/static/css/teach.css b/WebRoot/static/css/teach.css index d582128..c3778e0 100644 --- a/WebRoot/static/css/teach.css +++ b/WebRoot/static/css/teach.css @@ -1,4 +1,5 @@ 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="checkbox"]{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;}