diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index 0761cca..3b73da5 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -167,7 +167,7 @@

年级升级

  • -

    模板设置

    +

    模板设置

  • 其他配置

    @@ -268,6 +268,11 @@ $("#mainFrame").attr('src',path); window.top.loading.show(); } + function pagetemplate(school_id){ + var path = "../pagetemplate/listcs.do"; + $("#mainFrame").attr('src',path); + window.top.loading.show(); + } function coursemanager(school_id){ var path = "../coursemanagement/listcs.do?school_id=" + school_id ; diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp index ae73386..6dd554d 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp @@ -16,6 +16,9 @@ <%@ include file="../../system/index/top.jsp"%> + + + @@ -30,7 +33,7 @@
    - +
    - - - - +
    老师: @@ -52,16 +55,7 @@
    年级: - -
    科目: @@ -86,7 +80,7 @@
    保存 - 取消 + 取消
    diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp index db812a6..aa66c77 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp @@ -87,7 +87,7 @@
    - +
    @@ -117,8 +117,21 @@ diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties index 3b85b61..11d472b 100644 --- a/resources/dbconfig.properties +++ b/resources/dbconfig.properties @@ -1,13 +1,13 @@ #数据源 1 -#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 -url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +#url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 driverClassName:com.mysql.jdbc.Driver -username:root -password:ZrZxKeYp #username:root -#password:admin +#password:ZrZxKeYp +username:root +password:admin filters:stat maxActive:20 initialSize:1 diff --git a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java index c0961b2..546bd34 100644 --- a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java +++ b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java @@ -118,6 +118,31 @@ public class PageTemplateController extends BaseController { return mv; } + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/listcs") + public ModelAndView listcs(Page page) throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"列表PageTemplate"); + //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + String keywords = pd.getString("keywords"); //关键词检索条件 + if(null != keywords && !"".equals(keywords)){ + pd.put("keywords", keywords.trim()); + } + page.setPd(pd); + List varList = pagetemplateService.list(page); //列出PageTemplate列表 + mv.setViewName("sunvote/pagetemplate/pagetemplate_list2"); + mv.addObject("varList", varList); + mv.addObject("pd", pd); + mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 + return mv; + } + + /**去新增页面 * @param * @throws Exception