From d029379a7a8519290757f25d35fd21de23dfd2d4 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 15 Mar 2019 09:04:12 +0800 Subject: [PATCH] 1、增加模板列表页和详情页 --- WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- src/com/fh/controller/sunvote/grade/GradeController.java | 14 ++++++++++++++ src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 5 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index 3b73da5..ea842fc 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -269,7 +269,7 @@ window.top.loading.show(); } function pagetemplate(school_id){ - var path = "../pagetemplate/listcs.do"; + var path = "../pagetemplate/listcs.do?school_id=" + school_id ; $("#mainFrame").attr('src',path); window.top.loading.show(); } diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp index 92dcf02..25946a2 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp @@ -64,8 +64,8 @@ ${vs.index+1} - ${var.CNAME} - ${var.ENAME} + ${var.NAME} + ${var.DESC} @@ -82,10 +82,10 @@
- +
- +
@@ -115,6 +115,61 @@ $(document).ready(function(){ window.top.loading.remove(); }); + + function add(){ + window.top.modal.init({ + 'title':'添加班级', + 'url':'<%=basePath%>grade/goAdd2.do', + func:function() { + tosearch(); + } + }); + window.top.modal.show(); + } + + $('#ids').on('click', function(){ + var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header + + $(".table_box .table").find('tbody > tr').each(function(){ + var row = this; + if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true); + else $(row).find('input[type=checkbox]').eq(0).prop('checked', false); + }); + }); + + function del(Id){ + window.top.remove.init({"title":"删除","func":function(success){ + if(success){ + var str = ''; + for(var i=0;i < document.getElementsByName('ids').length;i++){ + if(document.getElementsByName('ids')[i].checked){ + if(str=='') str += document.getElementsByName('ids')[i].value; + else str += ',' + document.getElementsByName('ids')[i].value; + } + } + if(str==''){ + + }else{ + $.ajax({ + type: "POST", + url: '<%=basePath%>grade/deleteAll.do?tm='+new Date().getTime(), + data: {DATA_IDS:str}, + dataType:'json', + //beforeSend: validateData, + cache: false, + success: function(data){ + tosearch(); + } + }); + } + } + else{ + console.log("false"); + } + }}); + window.top.remove.show(); + } + diff --git a/src/com/fh/controller/sunvote/grade/GradeController.java b/src/com/fh/controller/sunvote/grade/GradeController.java index 17d9972..0bf4994 100644 --- a/src/com/fh/controller/sunvote/grade/GradeController.java +++ b/src/com/fh/controller/sunvote/grade/GradeController.java @@ -153,6 +153,20 @@ public class GradeController extends BaseController { mv.addObject("pd", pd); return mv; } + /**去新增页面 + * @param + * @throws Exception + */ + @RequestMapping(value="/goAdd2") + public ModelAndView goAdd2()throws Exception{ + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + mv.setViewName("sunvote/grade/grade_edit2"); + mv.addObject("msg", "save"); + mv.addObject("pd", pd); + return mv; + } /**去修改页面 * @param diff --git a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java index fdfb00a..e307b5f 100644 --- a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java +++ b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java @@ -11,6 +11,7 @@ import java.util.Map; import javax.annotation.Resource; +import org.apache.shiro.session.Session; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; @@ -19,9 +20,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import com.fh.bean.Paper; +import com.fh.bean.Question; import com.fh.controller.base.BaseController; import com.fh.entity.Page; +import com.fh.entity.system.User; import com.fh.util.AppUtil; +import com.fh.util.Const; import com.fh.util.ObjectExcelView; import com.fh.util.PageData; import com.fh.util.Jurisdiction; @@ -251,6 +256,53 @@ public class PageTemplateController extends BaseController { return mv; } + @RequestMapping(value="/npaper") + public ModelAndView newpaper() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"Paper详细信息"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + String paperType = pd.getString("PAPER_TYPE") ; + Paper paper = new Paper(); + paper.setTitle(pd.getString("NAME")); + paper.setExam_time(pd.getString("TIME")); + Session session = Jurisdiction.getSession(); + User user = (User)session.getAttribute(Const.SESSION_USER); + paper.setUser_id(user.getUSER_ID()); + paper.setPaper_type(paperType == null || "".equals(paperType.trim()) ? "1" :paperType); + String subjectId = pd.getString("SUBJECT_ID"); + paper.setSubject_id(subjectId == null || "".equals(subjectId.trim())? getSubjectId():subjectId); + String gradeId = pd.getString("GRADE_ID"); + paper.setGrade_id( gradeId== null || "".equals(gradeId.trim())? getGradeID() : gradeId); + String schoolId = pd.getString("SCHOOL_ID") ; + paper.setSchool_id(schoolId == null || "".equals(schoolId.trim())? getSchoolID() : schoolId); + paper.setQuestions(new ArrayList()); + + pd.put("JSON", paper.toJson()); + logger.info(paper.toJson()); + + String TEMPLATE_ID = pd.getString("TEMPLATE_ID"); + if(TEMPLATE_ID != null && !"".equals(TEMPLATE_ID)){ + pd.put("PAGETEMPLATE_ID", TEMPLATE_ID); + PageData template = pagetemplateService.findById(pd); + mv.addObject("TEMPLEATE", template); + } + + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/teacher/creat_template"); + }else{ + mv.setViewName("sunvote/teacher/en_creat_question"); + } + mv.addObject("pd", pd); + if(paperType != null && "2".equals(paperType)){ + mv.addObject("JUMP_URL", "/main/admin"); + }else{ + mv.addObject("JUMP_URL", "/main/teacher"); + } + mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 + return mv; + } + @InitBinder public void initBinder(WebDataBinder binder){ DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); -- libgit2 0.21.4