Commit 91de7adcb426d1786b6c88a2147020b89a985343

Authored by 孙向锦
1 parent e2307de8

添加管理员页面

WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
... ... @@ -160,19 +160,10 @@
160 160 <p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">班长管理</p>
161 161 </li>
162 162 <li>
163   - <p id="jishice_paper">作业管理</p>
  163 + <p id="homework_paper">作业管理</p>
164 164 </li>
165 165 <li>
166   - <p>作业分析</p>
167   - <ul class="menu_2">
168   - <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
169   - <c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
170   - <li onclick="event.stopPropagation();report2('${var1.ID}')">
171   - <p>${ var1.CLASS_NAME }</p>
172   - </li>
173   - </c:forEach>
174   - </c:forEach>
175   - </ul>
  166 + <p id="homework_analysis">作业分析</p>
176 167 </li>
177 168 </ul>
178 169 </div>
... ... @@ -410,6 +401,19 @@
410 401 window.top.loading.show();
411 402 });
412 403  
  404 + $("#homework_paper").click(function (){
  405 + var path = "../homework/list.do?school_id=" + schoolId ;
  406 + //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
  407 + $("#mainFrame").attr('src',path);
  408 + window.top.loading.show();
  409 + });
  410 + $("#homework_analysis").click(function (){
  411 + var path = "../homework/report.do?school_id=" + schoolId ;
  412 + //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
  413 + $("#mainFrame").attr('src',path);
  414 + window.top.loading.show();
  415 + });
  416 +
413 417 $("#new_paper").click(function (){
414 418 var path = "../paper/list5.do?school_id=" + schoolId ;
415 419 //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
... ...
src/com/fh/controller/sunvote/homework/HomeworkController.java
... ... @@ -125,6 +125,9 @@ public class HomeworkController extends BaseController {
125 125 logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
126 126 ModelAndView mv = this.getModelAndView();
127 127 PageData pd = new PageData();
  128 + if(pd.get("TEACHER_ID") == null){
  129 + pd.put("TEACHER_ID", getTeacherID());
  130 + }
128 131 pd = this.getPageData();
129 132 String keywords = pd.getString("keywords"); // 关键词检索条件
130 133 if (null != keywords && !"".equals(keywords)) {
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
... ... @@ -186,9 +186,6 @@ public class TeacherController extends BaseController {
186 186 @RequestMapping(value = "/edit2")
187 187 public ModelAndView edit2() throws Exception {
188 188 logBefore(logger, Jurisdiction.getUsername() + "修改Teacher");
189   - if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) {
190   - return null;
191   - } // 校验权限
192 189 ModelAndView mv = this.getModelAndView();
193 190 PageData pd = new PageData();
194 191 pd = this.getPageData();
... ... @@ -599,6 +596,7 @@ public class TeacherController extends BaseController {
599 596 ModelAndView mv = this.getModelAndView();
600 597 PageData pd = new PageData();
601 598 pd = this.getPageData();
  599 + pd.put("ID", pd.get("TEACHER_ID"));
602 600 pd = teacherService.findById(pd); // 根据ID读取
603 601 mv.setViewName("sunvote/teacher/teacher_edit3");
604 602 List<PageData> schools = schoolService.listAll(pd);
... ...
src/com/fh/controller/system/login/LoginController.java
... ... @@ -265,7 +265,7 @@ public class LoginController extends BaseController {
265 265 mv.addObject("user", user);
266 266 pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
267 267 if(pd.get("DEFAULTURL") == null){
268   - pd.put("DEFAULTURL", "../paper/list2.do");
  268 + pd.put("DEFAULTURL", "../homework/list.do");
269 269 }
270 270 mv.addObject("pd", pd);
271 271 return mv;
... ...