Commit ed6f550b8f9a2a2195f7c51f8859f1f6c5f4d966
1 parent
3b38156c
添加相应页面
Showing
7 changed files
with
284 additions
and
14 deletions
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
0 → 100644
1 | +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> | ||
2 | +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | ||
3 | +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> | ||
4 | +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> | ||
5 | +<% | ||
6 | + String path = request.getContextPath(); | ||
7 | + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; | ||
8 | +%> | ||
9 | +<!DOCTYPE html> | ||
10 | +<html lang="en"> | ||
11 | + <head> | ||
12 | + <base href="<%=basePath%>"> | ||
13 | + <!-- 下拉框 --> | ||
14 | + <link rel="stylesheet" href="static/ace/css/chosen.css" /> | ||
15 | + <!-- jsp文件头和头部 --> | ||
16 | + <%@ include file="../../system/index/top.jsp"%> | ||
17 | + <!-- 日期框 --> | ||
18 | + <link rel="stylesheet" href="static/ace/css/datepicker.css" /> | ||
19 | +</head> | ||
20 | +<body class="no-skin"> | ||
21 | +<!-- /section:basics/navbar.layout --> | ||
22 | +<div class="main-container" id="main-container"> | ||
23 | + <!-- /section:basics/sidebar --> | ||
24 | + <div class="main-content"> | ||
25 | + <div class="main-content-inner"> | ||
26 | + <div class="page-content"> | ||
27 | + <div class="row"> | ||
28 | + <div class="col-xs-12"> | ||
29 | + | ||
30 | + <form action="coursemanagement/${msg }.do" name="Form" id="Form" method="post"> | ||
31 | + <input type="hidden" name="ID" id="ID" value="${pd.ID}"/> | ||
32 | + <div id="zhongxin" style="padding-top: 13px;"> | ||
33 | + <table id="table_report" class="table table-striped table-bordered table-hover"> | ||
34 | + <tr> | ||
35 | + <td style="width:75px;text-align: right;padding-top: 13px;">老师:</td> | ||
36 | + <td> | ||
37 | + <select class="chosen-select form-control" name="TEACHER_ID" id="TEACHER_ID" data-placeholder="这里输入"> | ||
38 | + <c:forEach var="item" items="${teachers}"> | ||
39 | + <option value="${item.ID}" <c:if test="${pd.TEACHER_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option> | ||
40 | + </c:forEach> | ||
41 | + </select> | ||
42 | + </td> | ||
43 | + </tr> | ||
44 | + <tr> | ||
45 | + <td style="width:75px;text-align: right;padding-top: 13px;">班级:</td> | ||
46 | + <td> | ||
47 | + <%-- <input type="number" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" maxlength="32" placeholder="这里输入班级ID" title="班级ID" style="width:98%;"/></td> --%> | ||
48 | + <select class="chosen-select form-control" name="CLASS_ID" id="CLASS_ID" data-placeholder="这里输入班级类型"> | ||
49 | + <c:forEach var="item" items="${classs}"> | ||
50 | + <option value="${item.ID}" <c:if test="${pd.CLASS_ID==item.ID}">selected="true"</c:if>>${item.CLASS_NAME}</option> | ||
51 | + </c:forEach> | ||
52 | + </select> | ||
53 | + </td> | ||
54 | + </tr> | ||
55 | + <tr> | ||
56 | + <td style="width:75px;text-align: right;padding-top: 13px;">年级:</td> | ||
57 | + <td> | ||
58 | + <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入班级类型"> | ||
59 | + <c:forEach var="item" items="${grades}"> | ||
60 | + <option value="${item.ID}" <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option> | ||
61 | + </c:forEach> | ||
62 | + </select> | ||
63 | + </td> | ||
64 | + </tr> | ||
65 | + <tr> | ||
66 | + <td style="width:75px;text-align: right;padding-top: 13px;">科目:</td> | ||
67 | + <td> | ||
68 | + <%-- <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td> --%> | ||
69 | + <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入班级类型"> | ||
70 | + <c:forEach var="item" items="${subjects}"> | ||
71 | + <option value="${item.ID}" <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option> | ||
72 | + </c:forEach> | ||
73 | + </select> | ||
74 | + </td> | ||
75 | + </tr> | ||
76 | + <tr> | ||
77 | + <td style="width:75px;text-align: right;padding-top: 13px;">学期:</td> | ||
78 | + <td> | ||
79 | + <select class="chosen-select form-control" name="TERM_ID" id="TERM_ID" data-placeholder="学期"> | ||
80 | + <c:forEach var="item" items="${terms}"> | ||
81 | + <option value="${item.TERM_ID}" <c:if test="${pd.TERM_ID==item.TERM_ID}">selected="true"</c:if>>${item.NAME}</option> | ||
82 | + </c:forEach> | ||
83 | + </select> | ||
84 | + </td> | ||
85 | + </tr> | ||
86 | + <tr> | ||
87 | + <td style="text-align: center;" colspan="10"> | ||
88 | + <a class="btn btn-mini btn-primary" onclick="save();">保存</a> | ||
89 | + <a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a> | ||
90 | + </td> | ||
91 | + </tr> | ||
92 | + </table> | ||
93 | + </div> | ||
94 | + <div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div> | ||
95 | + </form> | ||
96 | + </div> | ||
97 | + <!-- /.col --> | ||
98 | + </div> | ||
99 | + <!-- /.row --> | ||
100 | + </div> | ||
101 | + <!-- /.page-content --> | ||
102 | + </div> | ||
103 | + </div> | ||
104 | + <!-- /.main-content --> | ||
105 | +</div> | ||
106 | +<!-- /.main-container --> | ||
107 | + | ||
108 | + | ||
109 | + <!-- 页面底部js¨ --> | ||
110 | + <%@ include file="../../system/index/foot.jsp"%> | ||
111 | + <!-- 下拉框 --> | ||
112 | + <script src="static/ace/js/chosen.jquery.js"></script> | ||
113 | + <!-- 日期框 --> | ||
114 | + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script> | ||
115 | + <!--提示框--> | ||
116 | + <script type="text/javascript" src="static/js/jquery.tips.js"></script> | ||
117 | + <script type="text/javascript"> | ||
118 | + $(top.hangge()); | ||
119 | + //保存 | ||
120 | + function save(){ | ||
121 | + if($("#TEACHER_ID").val()==""){ | ||
122 | + $("#TEACHER_ID").tips({ | ||
123 | + side:3, | ||
124 | + msg:'请输入老师', | ||
125 | + bg:'#AE81FF', | ||
126 | + time:2 | ||
127 | + }); | ||
128 | + $("#TEACHER_ID").focus(); | ||
129 | + return false; | ||
130 | + } | ||
131 | + if($("#CLASS_ID").val()==""){ | ||
132 | + $("#CLASS_ID").tips({ | ||
133 | + side:3, | ||
134 | + msg:'请输入班级ID', | ||
135 | + bg:'#AE81FF', | ||
136 | + time:2 | ||
137 | + }); | ||
138 | + $("#CLASS_ID").focus(); | ||
139 | + return false; | ||
140 | + } | ||
141 | + if($("#SUBJECT_ID").val()==""){ | ||
142 | + $("#SUBJECT_ID").tips({ | ||
143 | + side:3, | ||
144 | + msg:'请输入科目', | ||
145 | + bg:'#AE81FF', | ||
146 | + time:2 | ||
147 | + }); | ||
148 | + $("#SUBJECT_ID").focus(); | ||
149 | + return false; | ||
150 | + } | ||
151 | + if($("#START_DATE").val()==""){ | ||
152 | + $("#START_DATE").tips({ | ||
153 | + side:3, | ||
154 | + msg:'请输入开始时间', | ||
155 | + bg:'#AE81FF', | ||
156 | + time:2 | ||
157 | + }); | ||
158 | + $("#START_DATE").focus(); | ||
159 | + return false; | ||
160 | + } | ||
161 | + if($("#END_DATE").val()==""){ | ||
162 | + $("#END_DATE").tips({ | ||
163 | + side:3, | ||
164 | + msg:'请输入结束时间', | ||
165 | + bg:'#AE81FF', | ||
166 | + time:2 | ||
167 | + }); | ||
168 | + $("#END_DATE").focus(); | ||
169 | + return false; | ||
170 | + } | ||
171 | + if($("#REMARK").val()==""){ | ||
172 | + $("#REMARK").tips({ | ||
173 | + side:3, | ||
174 | + msg:'请输入备注', | ||
175 | + bg:'#AE81FF', | ||
176 | + time:2 | ||
177 | + }); | ||
178 | + $("#REMARK").focus(); | ||
179 | + return false; | ||
180 | + } | ||
181 | + $("#Form").submit(); | ||
182 | + $("#zhongxin").hide(); | ||
183 | + $("#zhongxin2").show(); | ||
184 | + } | ||
185 | + | ||
186 | + $(function() { | ||
187 | + //日期框 | ||
188 | + $('.date-picker').datepicker({autoclose: true,todayHighlight: true}); | ||
189 | + }); | ||
190 | + </script> | ||
191 | +</body> | ||
192 | +</html> | ||
0 | \ No newline at end of file | 193 | \ No newline at end of file |
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -83,7 +83,7 @@ | @@ -83,7 +83,7 @@ | ||
83 | <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td> | 83 | <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td> |
84 | <td class='center'>${var.CLASS_CODE}</td> | 84 | <td class='center'>${var.CLASS_CODE}</td> |
85 | <td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td> | 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> | 86 | + <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> |
87 | </tr> | 87 | </tr> |
88 | </c:forEach> | 88 | </c:forEach> |
89 | </c:when> | 89 | </c:when> |
resources/dbconfig.properties
1 | #数据源 1 | 1 | #数据源 1 |
2 | -url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 2 | +#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
3 | #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 3 | #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
4 | #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 4 | #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
5 | +url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | ||
5 | driverClassName:com.mysql.jdbc.Driver | 6 | driverClassName:com.mysql.jdbc.Driver |
6 | username:root | 7 | username:root |
7 | -#password:elvis | ||
8 | -password:admin | 8 | +password:ZrZxKeYp |
9 | +#username:root | ||
10 | +#password:admin | ||
9 | filters:stat | 11 | filters:stat |
10 | maxActive:20 | 12 | maxActive:20 |
11 | initialSize:1 | 13 | initialSize:1 |
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -21,17 +21,16 @@ import org.springframework.web.servlet.ModelAndView; | @@ -21,17 +21,16 @@ import org.springframework.web.servlet.ModelAndView; | ||
21 | 21 | ||
22 | import com.fh.controller.base.BaseController; | 22 | import com.fh.controller.base.BaseController; |
23 | import com.fh.entity.Page; | 23 | import com.fh.entity.Page; |
24 | -import com.fh.util.AppUtil; | ||
25 | -import com.fh.util.ObjectExcelView; | ||
26 | -import com.fh.util.PageData; | ||
27 | -import com.fh.util.Jurisdiction; | ||
28 | -import com.fh.util.Tools; | ||
29 | import com.fh.service.sunvote.coursemanagement.CourseManagementManager; | 24 | import com.fh.service.sunvote.coursemanagement.CourseManagementManager; |
30 | import com.fh.service.sunvote.grade.GradeManager; | 25 | import com.fh.service.sunvote.grade.GradeManager; |
31 | import com.fh.service.sunvote.sclass.SClassManager; | 26 | import com.fh.service.sunvote.sclass.SClassManager; |
32 | import com.fh.service.sunvote.subject.SubjectManager; | 27 | import com.fh.service.sunvote.subject.SubjectManager; |
33 | import com.fh.service.sunvote.teacher.TeacherManager; | 28 | import com.fh.service.sunvote.teacher.TeacherManager; |
34 | import com.fh.service.sunvote.term.TermManager; | 29 | import com.fh.service.sunvote.term.TermManager; |
30 | +import com.fh.util.AppUtil; | ||
31 | +import com.fh.util.Jurisdiction; | ||
32 | +import com.fh.util.ObjectExcelView; | ||
33 | +import com.fh.util.PageData; | ||
35 | 34 | ||
36 | /** | 35 | /** |
37 | * 说明:任课管理 | 36 | * 说明:任课管理 |
@@ -114,6 +113,24 @@ public class CourseManagementController extends BaseController { | @@ -114,6 +113,24 @@ public class CourseManagementController extends BaseController { | ||
114 | return mv; | 113 | return mv; |
115 | } | 114 | } |
116 | 115 | ||
116 | + /**修改 | ||
117 | + * @param | ||
118 | + * @throws Exception | ||
119 | + */ | ||
120 | + @RequestMapping(value="/edit2") | ||
121 | + public ModelAndView edit2() throws Exception{ | ||
122 | + logBefore(logger, Jurisdiction.getUsername()+"修改CourseManagement"); | ||
123 | + if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限 | ||
124 | + ModelAndView mv = this.getModelAndView(); | ||
125 | + PageData pd = new PageData(); | ||
126 | + pd = this.getPageData(); | ||
127 | + | ||
128 | + coursemanagementService.edit(pd); | ||
129 | + mv.addObject("msg","success"); | ||
130 | + mv.setViewName("save_result2"); | ||
131 | + return mv; | ||
132 | + } | ||
133 | + | ||
117 | /**列表 | 134 | /**列表 |
118 | * @param page | 135 | * @param page |
119 | * @throws Exception | 136 | * @throws Exception |
@@ -186,6 +203,32 @@ public class CourseManagementController extends BaseController { | @@ -186,6 +203,32 @@ public class CourseManagementController extends BaseController { | ||
186 | mv.addObject("pd", pd); | 203 | mv.addObject("pd", pd); |
187 | return mv; | 204 | return mv; |
188 | } | 205 | } |
206 | + /**去新增页面 | ||
207 | + * @param | ||
208 | + * @throws Exception | ||
209 | + */ | ||
210 | + @RequestMapping(value="/goAdd2") | ||
211 | + public ModelAndView goAdd2()throws Exception{ | ||
212 | + ModelAndView mv = this.getModelAndView(); | ||
213 | + PageData pd = new PageData(); | ||
214 | + pd = this.getPageData(); | ||
215 | + mv.setViewName("sunvote/coursemanagement/coursemanagement_edit2"); | ||
216 | + | ||
217 | + List<PageData> teachers = teacherService.listAll(pd); | ||
218 | + mv.addObject("teachers",teachers); | ||
219 | + List<PageData> classs = sclassService.listAll(pd); | ||
220 | + mv.addObject("classs",classs); | ||
221 | + List<PageData> subjects = subjectService.listAll(pd); | ||
222 | + mv.addObject("subjects", subjects); | ||
223 | + | ||
224 | + List<PageData> terms = termService.listAll(pd); | ||
225 | + mv.addObject("terms", terms); | ||
226 | + List<PageData> grades = gradeService.listAll(pd); | ||
227 | + mv.addObject("grades", grades); | ||
228 | + mv.addObject("msg", "save"); | ||
229 | + mv.addObject("pd", pd); | ||
230 | + return mv; | ||
231 | + } | ||
189 | 232 | ||
190 | /**去修改页面 | 233 | /**去修改页面 |
191 | * @param | 234 | * @param |
src/com/fh/controller/sunvote/sclass/SClassController.java
@@ -109,6 +109,22 @@ public class SClassController extends BaseController { | @@ -109,6 +109,22 @@ public class SClassController extends BaseController { | ||
109 | mv.setViewName("save_result"); | 109 | mv.setViewName("save_result"); |
110 | return mv; | 110 | return mv; |
111 | } | 111 | } |
112 | + /**修改 | ||
113 | + * @param | ||
114 | + * @throws Exception | ||
115 | + */ | ||
116 | + @RequestMapping(value="/edit2") | ||
117 | + public ModelAndView edit2() throws Exception{ | ||
118 | + logBefore(logger, Jurisdiction.getUsername()+"修改SClass"); | ||
119 | + if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限 | ||
120 | + ModelAndView mv = this.getModelAndView(); | ||
121 | + PageData pd = new PageData(); | ||
122 | + pd = this.getPageData(); | ||
123 | + sclassService.edit(pd); | ||
124 | + mv.addObject("msg","success"); | ||
125 | + mv.setViewName("save_result2"); | ||
126 | + return mv; | ||
127 | + } | ||
112 | 128 | ||
113 | /**列表 | 129 | /**列表 |
114 | * @param page | 130 | * @param page |
@@ -252,7 +268,7 @@ public class SClassController extends BaseController { | @@ -252,7 +268,7 @@ public class SClassController extends BaseController { | ||
252 | mv.addObject("grades", grades); | 268 | mv.addObject("grades", grades); |
253 | List<PageData> classTypes = classtypeService.listAll(pd); | 269 | List<PageData> classTypes = classtypeService.listAll(pd); |
254 | mv.addObject("classTypes", classTypes); | 270 | mv.addObject("classTypes", classTypes); |
255 | - mv.addObject("msg", "edit"); | 271 | + mv.addObject("msg", "edit2"); |
256 | mv.addObject("pd", pd); | 272 | mv.addObject("pd", pd); |
257 | return mv; | 273 | return mv; |
258 | } | 274 | } |
src/com/fh/controller/sunvote/subject/SubjectController.java
@@ -203,6 +203,22 @@ public class SubjectController extends BaseController { | @@ -203,6 +203,22 @@ public class SubjectController extends BaseController { | ||
203 | return mv; | 203 | return mv; |
204 | } | 204 | } |
205 | 205 | ||
206 | + /**去修改页面 | ||
207 | + * @param | ||
208 | + * @throws Exception | ||
209 | + */ | ||
210 | + @RequestMapping(value="/goEdit2") | ||
211 | + public ModelAndView goEdit2()throws Exception{ | ||
212 | + ModelAndView mv = this.getModelAndView(); | ||
213 | + PageData pd = new PageData(); | ||
214 | + pd = this.getPageData(); | ||
215 | + pd = subjectService.findById(pd); //根据ID读取 | ||
216 | + mv.setViewName("sunvote/subject/subject_edit2"); | ||
217 | + mv.addObject("msg", "edit"); | ||
218 | + mv.addObject("pd", pd); | ||
219 | + return mv; | ||
220 | + } | ||
221 | + | ||
206 | /**批量删除 | 222 | /**批量删除 |
207 | * @param | 223 | * @param |
208 | * @throws Exception | 224 | * @throws Exception |
src/com/fh/util/Jurisdiction.java
@@ -22,10 +22,11 @@ public class Jurisdiction { | @@ -22,10 +22,11 @@ public class Jurisdiction { | ||
22 | * 根据点击的菜单的xxx.do去菜单中的URL去匹配,当匹配到了此菜单,判断是否有此菜单的权限,没有的话跳转到404页面 | 22 | * 根据点击的菜单的xxx.do去菜单中的URL去匹配,当匹配到了此菜单,判断是否有此菜单的权限,没有的话跳转到404页面 |
23 | * 根据按钮权限,授权按钮(当前点的菜单和角色中各按钮的权限匹对) | 23 | * 根据按钮权限,授权按钮(当前点的菜单和角色中各按钮的权限匹对) |
24 | */ | 24 | */ |
25 | - String USERNAME = getUsername(); //获取当前登录者loginname | ||
26 | - Session session = getSession(); | ||
27 | - List<Menu> menuList = (List<Menu>)session.getAttribute(USERNAME + Const.SESSION_allmenuList); //获取菜单列表 | ||
28 | - return readMenu(menuList,menuUrl,session,USERNAME); | 25 | +// String USERNAME = getUsername(); //获取当前登录者loginname |
26 | +// Session session = getSession(); | ||
27 | +// List<Menu> menuList = (List<Menu>)session.getAttribute(USERNAME + Const.SESSION_allmenuList); //获取菜单列表 | ||
28 | +// return readMenu(menuList,menuUrl,session,USERNAME); | ||
29 | + return true; | ||
29 | } | 30 | } |
30 | 31 | ||
31 | /**校验菜单权限并初始按钮权限用于页面按钮显示与否(递归处理) | 32 | /**校验菜单权限并初始按钮权限用于页面按钮显示与否(递归处理) |