孙向锦 / SunvoteEducation

Commit 3b38156c1566799051d8c80b053b1ad70ce7f935

Authored by 孙向锦
2 parents 48d44272 e930e8eb

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

Inline Side-by-side
Showing 6 changed files with 125 additions and 29 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @3b38156
... ... @@ -48,8 +48,8 @@
48 48 </div>
49 49 <div class="name">
50 50 <p>欢迎！</p>
51   - <p id="school">${SNAME }</p>
52   - <p id="name">${SNAME } 管理员</p>
  51 + <p id="school" title="${SNAME }">${SNAME }</p>
  52 + <p id="name" title="${SNAME } 管理员">${SNAME } 管理员</p>
53 53 </br></br>
54 54 </div>
55 55 </div>
... ...
WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp
  View file @3b38156
... ... @@ -15,7 +15,6 @@
15 15 <!-- 下拉框 -->
16 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 17 <!-- jsp文件头和头部 -->
18   -<%@ include file="../../system/index/top.jsp"%>
19 18 <link href="../static/css/teach.css" rel="stylesheet">
20 19 <!-- 日期框 -->
21 20 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
... ...
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
  View file @3b38156
... ... @@ -16,12 +16,10 @@
16 16 <!-- 下拉框 -->
17 17 <link rel="stylesheet" href="static/ace/css/chosen.css" />
18 18 <!-- jsp文件头和头部 -->
19   -<%@ include file="../../system/index/top.jsp"%>
  19 +
20 20 <!-- 日期框 -->
21 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22   -<link
23   - href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
24   - rel="stylesheet">
  22 +<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
25 23 <link href="static/css/teach.css" rel="stylesheet">
26 24 </head>
27 25 <body class="no-skin">
... ... @@ -39,14 +37,15 @@
39 37 </div>
40 38 <div class="clearfix"></div>
41 39 </div>
42   - <div style="background:#fff;" >
  40 + <div style="background:#fff;padding:0 5%;" >
43 41  
44   - <table class="table table-striped" style="margin: 0px 5%">
  42 + <table class="table table-striped" >
45 43 <col style="width: 10%" />
46   - <col style="width: 22%" />
47   - <col style="width: 22%" />
48   - <col style="width: 23%" />
49   - <col style="width: 23%" />
  44 + <col style="width: 18%" />
  45 + <col style="width: 18%" />
  46 + <col style="width: 18%" />
  47 + <col style="width: 18%" />
  48 + <col style="width: 18%" />
50 49 <thead>
51 50 <tr>
52 51 <th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
... ... @@ -54,6 +53,7 @@
54 53 <th class="center">班级类型</th>
55 54 <th class="center">班级编码</th>
56 55 <th class="center">班级基站</th>
  56 + <th class="center">操作</th>
57 57 </tr>
58 58 </thead>
59 59 </table>
... ... @@ -63,13 +63,14 @@
63 63 <!-- 检索 -->
64 64  
65 65 </div>
66   - <div class="table_box" style="padding:0px">
67   - <table class="table table-striped" style="margin: 0px 5%">
  66 + <div class="table_box" style="padding:0px 5%">
  67 + <table class="table table-striped" >
68 68 <col style="width: 10%" />
69   - <col style="width: 22%" />
70   - <col style="width: 22%" />
71   - <col style="width: 23%" />
72   - <col style="width: 23%" />
  69 + <col style="width: 18%" />
  70 + <col style="width: 18%" />
  71 + <col style="width: 18%" />
  72 + <col style="width: 18%" />
  73 + <col style="width: 18%" />
73 74 <tbody>
74 75 <!-- 开始循环 -->
75 76 <c:choose>
... ... @@ -82,6 +83,7 @@
82 83 <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td>
83 84 <td class='center'>${var.CLASS_CODE}</td>
84 85 <td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
  86 + <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>
85 87 </tr>
86 88 </c:forEach>
87 89 </c:when>
... ... @@ -102,8 +104,7 @@
102 104 </div>
103 105  
104 106 <div class="page_box">
105   - <div class="pagination"
106   - style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
  107 + <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
107 108 </div>
108 109 </div>
109 110 </div>
... ... @@ -140,6 +141,16 @@
140 141 else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
141 142 });
142 143 });
  144 + function edit(Id){
  145 + window.top.modal.init({
  146 + 'title':'修改信息',
  147 + 'url':'<%=basePath%>sclass/goEdit2.do?ID='+Id,
  148 + func:function() {
  149 + tosearch();
  150 + }
  151 + });
  152 + window.top.modal.show();
  153 + }
143 154  
144 155 function del(Id){
145 156 window.top.remove.init({"title":"删除","func":function(success){
... ...
WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
  View file @3b38156
... ... @@ -15,7 +15,7 @@
15 15 <!-- 下拉框 -->
16 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 17 <!-- jsp文件头和头部 -->
18   -<%@ include file="../../system/index/top.jsp"%>
  18 +
19 19 <link href="../static/css/teach.css" rel="stylesheet">
20 20 <!-- 日期框 -->
21 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
... ... @@ -70,7 +70,7 @@
70 70 value="${var.ID}" />${vs.index+1}</td>
71 71 <td class='center'>${var.CNAME}</td>
72 72 <td class='center'>${var.ENAME}</td>
73   - <td class='center'></td>
  73 + <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>
74 74  
75 75 </tr>
76 76  
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
  View file @3b38156
... ... @@ -16,7 +16,7 @@
16 16 <!-- 下拉框 -->
17 17 <link rel="stylesheet" href="static/ace/css/chosen.css" />
18 18 <!-- jsp文件头和头部 -->
19   -<%@ include file="../../system/index/top.jsp"%>
  19 +
20 20 <!-- 日期框 -->
21 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 22 <link
... ... @@ -45,8 +45,9 @@
45 45 <col style="width: 10%" />
46 46 <col style="width: 15%" />
47 47 <col style="width: 15%" />
  48 + <col style="width: 7%" />
48 49 <col style="width: 15%" />
49   - <col style="width: 15%" />
  50 + <col style="width: 7%" />
50 51 <thead>
51 52 <tr>
52 53 <th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
... ... @@ -57,6 +58,7 @@
57 58 <th class="center">账号</th>
58 59 <th class="center">性别</th>
59 60 <th class="center">教师卡编号</th>
  61 + <th class="center">操作</th>
60 62 </tr>
61 63 </thead>
62 64 </table>
... ... @@ -70,8 +72,9 @@
70 72 <col style="width: 10%" />
71 73 <col style="width: 15%" />
72 74 <col style="width: 15%" />
  75 + <col style="width: 7%" />
73 76 <col style="width: 15%" />
74   - <col style="width: 15%" />
  77 + <col style="width: 7%" />
75 78 <tbody>
76 79 <!-- 开始循环 -->
77 80 <c:choose>
... ... @@ -86,6 +89,8 @@
86 89 <td class='center'>${var.ACCOUT}</td>
87 90 <td class='center'>${var.SEX == 1? "男":"女"}</td>
88 91 <td class='center'>${var.KEYPAD_ID}</td>
  92 + <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>
  93 +
89 94 </tr>
90 95  
91 96 </c:forEach>
... ... @@ -100,7 +105,7 @@
100 105 </table>
101 106 <div class="footer" style="width:auto">
102 107 <div class="creat">
103   - <input type="button" onclick="parent.$('.title_time').modal('show');" value="添加老师" />
  108 + <input type="button" onclick="$('.title_time').modal('show');" value="添加老师" />
104 109 </div>
105 110 <div class="removeAll">
106 111 <input type="button" onclick="deleteAll()" value="删除" />
... ... @@ -112,7 +117,76 @@
112 117 </div>
113 118 </form>
114 119  
115   -
  120 + <div class="modal fade title_time" tabindex="-1" role="dialog">
  121 + <div class="modal-dialog" role="document" style="z-index:1400">
  122 + <div class="modal-content">
  123 + <div class="modal-header">
  124 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  125 + <h4 class="modal-title">添加老师</h4>
  126 + </div>
  127 + <div class="modal-body">
  128 + <div class="form-group">
  129 + <label for="enter_title" class="col-sm-4 control-label">姓名</label>
  130 + <div class="col-sm-6">
  131 + <input type="text" class="form-control" id="enter_title" placeholder="输入姓名" maxlength="100" minlength="1">
  132 + </div>
  133 + <div class="clearfix"></div>
  134 + </div>
  135 +
  136 + <div class="form-group">
  137 + <label for="enter_time" class="col-sm-4 control-label">电话</label>
  138 + <div class="col-sm-6">
  139 + <input type="text" class="form-control" id="enter_time" placeholder="输入电话" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')" >
  140 + </div>
  141 + <div class="clearfix"></div>
  142 + </div>
  143 + <div class="form-group">
  144 + <label for="enter_time" class="col-sm-4 control-label">座机电话</label>
  145 + <div class="col-sm-6">
  146 + <input type="text" class="form-control" id="enter_time" placeholder="输入座机电话" maxlength="20" oninput="value=value.replace(/[^\d]/g,'')">
  147 + </div>
  148 + <div class="clearfix"></div>
  149 + </div>
  150 + <div class="form-group">
  151 + <label for="enter_time" class="col-sm-4 control-label">证件号</label>
  152 + <div class="col-sm-6">
  153 + <input type="text" class="form-control" id="enter_time" placeholder="输入证件号" />
  154 + </div>
  155 + <div class="clearfix"></div>
  156 + </div>
  157 + <div class="form-group">
  158 + <label for="enter_time" class="col-sm-4 control-label">帐号</label>
  159 + <div class="col-sm-6">
  160 + <input type="text" class="form-control" id="enter_time" placeholder="输入帐号" />
  161 + </div>
  162 + <div class="clearfix"></div>
  163 + </div>
  164 + <div class="form-group">
  165 + <label for="enter_time" class="col-sm-4 control-label">性别</label>
  166 + <div class="col-sm-6">
  167 + <select class="chosen-select form-control" name="TEMPLATE_ID" id="TEMPLATE_ID" data-placeholder="请选择您的性别">
  168 + <option value="1">男</option>
  169 + <option value="2">女</option>
  170 + </select>
  171 + </div>
  172 + <div class="clearfix"></div>
  173 + </div>
  174 + <div class="form-group">
  175 + <label for="enter_time" class="col-sm-4 control-label">教师卡编号</label>
  176 + <div class="col-sm-6">
  177 + <input type="text" class="form-control" id="enter_time" placeholder="输入教师卡编号" />
  178 + </div>
  179 + <div class="clearfix"></div>
  180 + </div>
  181 +
  182 + </div>
  183 + <div class="modal-footer">
  184 + <button type="button" class="btn btn-primary" id="time_submit">确定</button>
  185 + <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
  186 + </div>
  187 + </div><!-- /.modal-content -->
  188 + </div><!-- /.modal-dialog -->
  189 + </div><!-- /.modal -->
116 190  
117 191 <!-- basic scripts -->
118 192 <!-- 页面底部js¨ -->
... ... @@ -131,6 +205,17 @@
131 205 $(document).ready(function() {
132 206 window.top.loading.remove();
133 207 });
  208 +
  209 + function edit(Id){
  210 + window.top.modal.init({
  211 + 'title':'添加学生',
  212 + 'url':'<%=basePath%>teacher/goEdit2.do?ID='+Id,
  213 + func:function() {
  214 + tosearch();
  215 + }
  216 + });
  217 + window.top.modal.show();
  218 + }
134 219 </script>
135 220  
136 221  
... ...
WebRoot/static/css/teach.css
  View file @3b38156
1 1 html,body{width:100%;height:100%;}
  2 +table{font-size:16px;}
2 3 .clear{clear:both;}
3 4 .right{width:12px;height:12px;display:inline-block;background:url(../images/right.png) no-repeat;background-size:100%;}
4 5 .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;}
25 26 .content .content_l .info_tab{padding:10% 0;border-bottom:1px solid #80afb4;}
26 27 .content .content_l .head_pic{width:88px;height:88px;border-radius:44px;overflow:hidden;float:left;margin-left:2%;}
27 28 .content .content_l .name{margin-left:calc(88px + 10%);}
28   -.content .content_l .name p{color:#fff;}
  29 +.content .content_l .name p{width:100%;color:#fff;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;}
29 30 .content .content_l .name p:first-child{font-size:14px;}
30 31 .content .content_l .name p:nth-child(2){font-size:20px;}
31 32 .content .content_l .name p:nth-child(3){font-size:14px;}
... ...