Commit 58e024aeefe61a6112337937e5af46901d4b0df2
1 parent
eb3c9269
1.修改logo
2.添加按学生分析接口
Showing
11 changed files
with
104 additions
and
6 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | <meta charset="utf-8"> | 14 | <meta charset="utf-8"> |
15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
16 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
17 | -<title>鹿鸣周测管理系统</title> | 17 | +<title>中天电子-教育管理系统</title> |
18 | 18 | ||
19 | <!-- Bootstrap --> | 19 | <!-- Bootstrap --> |
20 | <!-- <link | 20 | <!-- <link |
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | <meta charset="utf-8"> | 14 | <meta charset="utf-8"> |
15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
16 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
17 | -<title>鹿鸣周测管理系统</title> | 17 | +<title>中天电子-教育管理系统</title> |
18 | 18 | ||
19 | <!-- Bootstrap --> | 19 | <!-- Bootstrap --> |
20 | <link href="../static/css/bootstrap.min.css" rel="stylesheet"> | 20 | <link href="../static/css/bootstrap.min.css" rel="stylesheet"> |
WebRoot/WEB-INF/jsp/system/index/en_login.jsp
@@ -81,6 +81,8 @@ html,body{ | @@ -81,6 +81,8 @@ html,body{ | ||
81 | <svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg> | 81 | <svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg> |
82 | </div> | 82 | </div> |
83 | <div class="psw_box"> | 83 | <div class="psw_box"> |
84 | + <input type="text" id="username1" placeholder="账号" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/> | ||
85 | + <input type="password" id="password1" placeholder="密 码" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/> | ||
84 | <input type="text" id="password" placeholder="Password" value="" autoComplete="off"/> | 86 | <input type="text" id="password" placeholder="Password" value="" autoComplete="off"/> |
85 | <div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;"> | 87 | <div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;"> |
86 | <input type="checkbox" id="rem_flag"/> | 88 | <input type="checkbox" id="rem_flag"/> |
WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | <meta charset="utf-8"> | 14 | <meta charset="utf-8"> |
15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
16 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
17 | -<title>鹿鸣周测管理系统</title> | 17 | +<title>中天电子-教育管理系统</title> |
18 | 18 | ||
19 | <!-- Bootstrap --> | 19 | <!-- Bootstrap --> |
20 | <link href="static/css/bootstrap.min.css" rel="stylesheet"> | 20 | <link href="static/css/bootstrap.min.css" rel="stylesheet"> |
@@ -80,17 +80,19 @@ body{ | @@ -80,17 +80,19 @@ body{ | ||
80 | <svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg> | 80 | <svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg> |
81 | </div> | 81 | </div> |
82 | <div class="psw_box"> | 82 | <div class="psw_box"> |
83 | + <input type="text" id="username1" placeholder="账号" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/> | ||
84 | + <input type="password" id="password1" placeholder="密 码" value="" style="opacity:1;position: absolute;top:0;height:50px;z-index:-1" autoComplete="off"/> | ||
83 | <input type="text" id="password" placeholder="密 码" value="" autoComplete="off"/> | 85 | <input type="text" id="password" placeholder="密 码" value="" autoComplete="off"/> |
84 | <div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;"> | 86 | <div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;"> |
85 | <input type="checkbox" id="rem_flag"/> | 87 | <input type="checkbox" id="rem_flag"/> |
86 | <span>记住密码</span> | 88 | <span>记住密码</span> |
87 | </div> | 89 | </div> |
88 | - <!-- <div class="language" style="display:none;width:50%;margin-top:10px;text-align:right;"> | 90 | + <div class="language" style="display:inline-block;width:50%;margin-top:10px;text-align:right;"> |
89 | <select name="language" id="language" style="line-height:34px;height:34px;width:120px;"> | 91 | <select name="language" id="language" style="line-height:34px;height:34px;width:120px;"> |
90 | <option value="zh">中文</option> | 92 | <option value="zh">中文</option> |
91 | <option value="en">English</option> | 93 | <option value="en">English</option> |
92 | </select> | 94 | </select> |
93 | - </div> --> | 95 | + </div> |
94 | </div> | 96 | </div> |
95 | <a href="#" onclick="severCheck();" class="login_btn">登录</a> | 97 | <a href="#" onclick="severCheck();" class="login_btn">登录</a> |
96 | 98 |
WebRoot/static/images/logo.png
WebRoot/static/login/title.png
resources/mybatis1/sunvote/StudentTestMapper.xml
@@ -87,6 +87,29 @@ | @@ -87,6 +87,29 @@ | ||
87 | STUDENTTEST_ID = #{STUDENTTEST_ID} | 87 | STUDENTTEST_ID = #{STUDENTTEST_ID} |
88 | </select> | 88 | </select> |
89 | 89 | ||
90 | + <!-- 通过试卷ID获取数据 --> | ||
91 | + <select id="findTestInfoByPid" parameterType="pd" resultType="pd"> | ||
92 | + select | ||
93 | + sv_studenttest.STUDENT_ID, | ||
94 | + sv_studenttest.TEST_ID, | ||
95 | + sv_studenttest.PAPER_ID as pid, | ||
96 | + sv_studenttest.SCORE, | ||
97 | + sv_studenttest.CLASS_ID, | ||
98 | + sv_studenttest.LOST_TEST, | ||
99 | + sv_testpaper.AVG_SCORE, | ||
100 | + sv_testpaper.CREATE_DATE, | ||
101 | + sv_testpaper.`NAME` AS PAPER_NAME, | ||
102 | + sv_sclass.CLASS_NAME, | ||
103 | + sv_student.`NAME` as STUDENT_NAME | ||
104 | + from | ||
105 | + `sv_studenttest` | ||
106 | + LEFT JOIN sv_testpaper ON sv_studenttest.TEST_ID = sv_testpaper.TESTPAPER_ID | ||
107 | + LEFT JOIN sv_sclass on sv_studenttest.CLASS_ID = sv_sclass.ID | ||
108 | + LEFT JOIN sv_student on sv_studenttest.STUDENT_ID = sv_student.ID | ||
109 | + where | ||
110 | + sv_studenttest.PAPER_ID = = #{PAPER_ID} | ||
111 | + </select> | ||
112 | + | ||
90 | <!-- 列表 --> | 113 | <!-- 列表 --> |
91 | <select id="datalistPage" parameterType="page" resultType="pd"> | 114 | <select id="datalistPage" parameterType="page" resultType="pd"> |
92 | select | 115 | select |
src/com/fh/controller/base/BaseController.java
1 | package com.fh.controller.base; | 1 | package com.fh.controller.base; |
2 | 2 | ||
3 | +import java.util.List; | ||
4 | + | ||
3 | import javax.servlet.http.Cookie; | 5 | import javax.servlet.http.Cookie; |
4 | import javax.servlet.http.HttpServletRequest; | 6 | import javax.servlet.http.HttpServletRequest; |
5 | import javax.servlet.http.HttpServletResponse; | 7 | import javax.servlet.http.HttpServletResponse; |
@@ -216,5 +218,14 @@ public class BaseController { | @@ -216,5 +218,14 @@ public class BaseController { | ||
216 | } | 218 | } |
217 | return "zh".equals(getLang()); | 219 | return "zh".equals(getLang()); |
218 | } | 220 | } |
219 | - | 221 | + |
222 | + /** | ||
223 | + * 判断List中是否含有指定字符串 | ||
224 | + */ | ||
225 | + public Integer indexOfStrInList(List<String> list,String str){ | ||
226 | + for(int i = 0 ;i<list.size();i++){ | ||
227 | + if(list.get(i).indexOf(str) !=-1 ) return list.get(i).indexOf(str); | ||
228 | + } | ||
229 | + return -1; | ||
230 | + } | ||
220 | } | 231 | } |
src/com/fh/controller/sunvote/paper/PaperController.java
@@ -643,6 +643,52 @@ public class PaperController extends BaseController { | @@ -643,6 +643,52 @@ public class PaperController extends BaseController { | ||
643 | return mv; | 643 | return mv; |
644 | } | 644 | } |
645 | 645 | ||
646 | + /** | ||
647 | + * 按学生分析 | ||
648 | + * @return | ||
649 | + * @throws Exception | ||
650 | + */ | ||
651 | + @RequestMapping(value="/paperRep3") | ||
652 | + public ModelAndView paperRep3() throws Exception{ | ||
653 | + ModelAndView mv = this.getModelAndView(); | ||
654 | + PageData pd = new PageData(); | ||
655 | + List<PageData> templist = new ArrayList<PageData>(); | ||
656 | + PageData saveData = new PageData(); | ||
657 | + | ||
658 | + ResponseGson<PageData> res = new ResponseGson(); | ||
659 | + pd = this.getPageData(); | ||
660 | + if(pd.containsKey("PAPER_ID")){ | ||
661 | + List<PageData> list = studenttestService.findTestInfoByPid(pd); | ||
662 | + List<PageData> temp = new ArrayList<PageData>(); | ||
663 | + List<String> sid = new ArrayList<String>(); | ||
664 | + for(PageData item : list){ | ||
665 | + | ||
666 | + Integer index = this.indexOfStrInList(sid, item.getString("STUDENT_ID")); | ||
667 | + if(index!=-1){ | ||
668 | + | ||
669 | + }else{ | ||
670 | + PageData stu = new PageData(); | ||
671 | + stu.put("STUDENT_NAME", item.get("STUDENT_NAME")); | ||
672 | + stu.put("CLASS_NAME", item.get("CLASS_NAME")); | ||
673 | + List<PageData> test = new ArrayList<PageData>(); | ||
674 | + test.get(0).put("CREAT_DATE", item.get("CREAT_DATE")); | ||
675 | + test.get(0).put("SCORE", item.get("SCORE")); | ||
676 | + test.get(0).put("AVG_SCORE", item.get("AVG_SCORE")); | ||
677 | + stu.put("TEST_LIST", test); | ||
678 | + temp.add(stu); | ||
679 | + } | ||
680 | + | ||
681 | + | ||
682 | + } | ||
683 | + } | ||
684 | + mv.setViewName("sunvote/paper/test_list3"); | ||
685 | + mv.addObject("varList", templist); | ||
686 | + mv.addObject("pd",pd); | ||
687 | + res.setData(saveData); | ||
688 | + return mv; | ||
689 | + } | ||
690 | + | ||
691 | + | ||
646 | @RequestMapping(value="/iteminfo") | 692 | @RequestMapping(value="/iteminfo") |
647 | public ModelAndView iteminfo() throws Exception{ | 693 | public ModelAndView iteminfo() throws Exception{ |
648 | logBefore(logger, Jurisdiction.getUsername()+"Paper详细信息"); | 694 | logBefore(logger, Jurisdiction.getUsername()+"Paper详细信息"); |
src/com/fh/service/sunvote/studenttest/StudentTestManager.java
@@ -54,6 +54,12 @@ public interface StudentTestManager{ | @@ -54,6 +54,12 @@ public interface StudentTestManager{ | ||
54 | */ | 54 | */ |
55 | public PageData findById(PageData pd)throws Exception; | 55 | public PageData findById(PageData pd)throws Exception; |
56 | 56 | ||
57 | + /**通过试卷id获取数据 | ||
58 | + * @param pd | ||
59 | + * @throws Exception | ||
60 | + */ | ||
61 | + public List<PageData> findTestInfoByPid(PageData pd)throws Exception; | ||
62 | + | ||
57 | /**批量删除 | 63 | /**批量删除 |
58 | * @param ArrayDATA_IDS | 64 | * @param ArrayDATA_IDS |
59 | * @throws Exception | 65 | * @throws Exception |
src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
@@ -73,6 +73,14 @@ public class StudentTestService implements StudentTestManager{ | @@ -73,6 +73,14 @@ public class StudentTestService implements StudentTestManager{ | ||
73 | return (PageData)dao.findForObject("StudentTestMapper.findById", pd); | 73 | return (PageData)dao.findForObject("StudentTestMapper.findById", pd); |
74 | } | 74 | } |
75 | 75 | ||
76 | + /**通过试卷id获取数据 | ||
77 | + * @param pd | ||
78 | + * @throws Exception | ||
79 | + */ | ||
80 | + public List<PageData> findTestInfoByPid(PageData pd)throws Exception{ | ||
81 | + return (List<PageData>)dao.findForObject("StudentTestMapper.findTestInfoByPid", pd); | ||
82 | + } | ||
83 | + | ||
76 | /**批量删除 | 84 | /**批量删除 |
77 | * @param ArrayDATA_IDS | 85 | * @param ArrayDATA_IDS |
78 | * @throws Exception | 86 | * @throws Exception |