孙向锦 / SunvoteEducation

Commit c33910d6f239da5a0bd4fbe89025924c941ad022

Authored by jack
1 parent d6117fe9

1.bug修复

Inline Side-by-side
Showing 8 changed files with 39 additions and 24 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
  View file @c33910d
... ... @@ -68,16 +68,16 @@
68 68 <th><div style="width:80px">序号</div></th>
69 69 <th><div style="width:80px">班级名称</div></th>
70 70 <th><div style="width:80px">考试时间</div></th>
71   - <th><div style="width:80px">平均分</div></th>
  71 + <th><div style="width:80px" title="平均分=参考人总得分/参考人数">平均分<img src="../static/images/tip.png" style="width:16px"></div></th>
72 72 <th><div style="width:80px">班级总人数</div></th>
73 73 <th><div style="width:80px" title="得分>=80%">优秀人数<img src="../static/images/tip.png" style="width:16px"></div></th>
74   - <th><div style="width:80px">优秀率</div></th>
  74 + <th><div style="width:80px" title="优秀率=优秀人数/班级人数">优秀率<img src="../static/images/tip.png" style="width:16px"></div></th>
75 75 <th><div style="width:80px" title="得分>=70%">良好人数<img src="../static/images/tip.png" style="width:16px"></div></th>
76   - <th><div style="width:80px">良好率</div></th>
  76 + <th><div style="width:80px" title="良好率=良好人数/班级人数">良好率<img src="../static/images/tip.png" style="width:16px"></div></th>
77 77 <th><div style="width:80px" title="得分>=60%">及格人数<img src="../static/images/tip.png" style="width:16px"></div></th>
78   - <th><div style="width:80px">及格率</div></th>
  78 + <th><div style="width:80px" title="及格率=及格人数/班级人数">及格率<img src="../static/images/tip.png" style="width:16px"></div></th>
79 79 <th><div style="width:80px" title="得分<=30%">低分人数<img src="../static/images/tip.png" style="width:16px"></div></th>
80   - <th><div style="width:80px">低分率</div></th>
  80 + <th><div style="width:80px" title="低分率=低分人数/班级人数">低分率<img src="../static/images/tip.png" style="width:16px"></div></th>
81 81 <th><div style="width:80px">操作</div></th>
82 82 </tr>
83 83 </thead>
... ...
WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
  View file @c33910d
... ... @@ -82,12 +82,12 @@
82 82 <th><div style="width:80px">答案</div></th>
83 83 <th><div style="width:80px">答题人数</div></th>
84 84 <th><div style="width:80px">正确人数</div></th>
85   - <th><div style="width:80px">正确率</div></th>
  85 + <th><div style="width:80px" title="正确率=正确人数/答题人数">正确率<img src="../static/images/tip.png" style="width:16px"></div></th>
86 86 <th><div style="width:80px">满分值</div></th>
87   - <th><div style="width:80px">平均分</div></th>
  87 + <th><div style="width:80px" title="平均分=正确人数/答题人数*题目分数">平均分<img src="../static/images/tip.png" style="width:16px"></div></th>
88 88 <c:forEach begin="0" end="${pd.MAX-1}" var="var" varStatus="vs">
89 89 <th><div style="width:80px">选 ${myelfun:jstlInt2Char(var+1)}人数</div></th>
90   - <th><div style="width:80px">选${myelfun:jstlInt2Char(var+1)}比例</div></th>
  90 + <th><div style="width:80px" title="选${myelfun:jstlInt2Char(var+1)}比例=选${myelfun:jstlInt2Char(var+1)}人数/答题人数*100">选${myelfun:jstlInt2Char(var+1)}比例<img src="../static/images/tip.png" style="width:16px"></div></th>
91 91 </c:forEach>
92 92 <th><div style="width:80px">漏选人数</div></th>
93 93 <th><div style="width:80px">漏选比例</div></th>
... ... @@ -99,13 +99,13 @@
99 99 <c:when test="${not empty varList}">
100 100 <c:forEach items="${varList}" var="var" varStatus="vs">
101 101  
102   - <c:set var="right" value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM * 100)}"></c:set>
  102 + <c:set var="right" value="${var.ANSWERNUM2 == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM2 * 100)}"></c:set>
103 103  
104 104 <tr>
105 105  
106 106 <td>${var.QUESTION_RANK}</td>
107 107 <td>${var.ANSWER}</td>
108   - <td >${var.ANSWERNUM}</td>
  108 + <td >${var.ANSWERNUM2}</td>
109 109 <td >${var.RIGHTNUM}</td>
110 110 <td >
111 111 <c:if test="${right<=50}">
... ... @@ -124,7 +124,7 @@
124 124 <td >${var.QUESTION_SCORE}</td>
125 125 <td >
126 126 <fmt:formatNumber type="number"
127   - value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM)*var.QUESTION_SCORE}"
  127 + value="${var.ANSWERNUM2 == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM2)*var.QUESTION_SCORE}"
128 128 maxFractionDigits="2" />
129 129 </td>
130 130 <c:set var="lth" value="${fn:length(var.optin_info)-1}"></c:set>
... ... @@ -134,7 +134,7 @@
134 134 <td>${optin_info[vs.index]}</td>
135 135 <td>
136 136 <fmt:formatNumber type="number"
137   - value="${var.ANSWERNUM == 0 ? 0: (optin_info[vs.index] / var.ANSWERNUM * 100)}"
  137 + value="${var.ANSWERNUM2 == 0 ? 0: (optin_info[vs.index] / var.ANSWERNUM2 * 100)}"
138 138 maxFractionDigits="2" />%
139 139 </td>
140 140 </c:if>
... ... @@ -147,7 +147,7 @@
147 147 <td>${var.optin_info[lth]}</td>
148 148 <td>
149 149 <fmt:formatNumber type="number"
150   - value="${var.ANSWERNUM == 0 ? 0: (var.optin_info[lth] / var.ANSWERNUM * 100)}"
  150 + value="${var.ANSWERNUM2 == 0 ? 0: (var.optin_info[lth] / var.ANSWERNUM2 * 100)}"
151 151 maxFractionDigits="2" />%
152 152 </td>
153 153 </tr>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @c33910d
... ... @@ -69,7 +69,7 @@
69 69 <p id="qingsongkao_paper">试卷管理</p>
70 70 </li>
71 71 <li>
72   - <p>测验分析</p>
  72 + <p>考试情况</p>
73 73 <ul class="menu_2">
74 74 <c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
75 75 <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p title="${var.CLASS_NAME}${var.CNAME}">${var.CLASS_NAME}${var.CNAME}
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
  View file @c33910d
... ... @@ -37,7 +37,7 @@
37 37 <table style="margin-top:5px;margin-bottom:20px;">
38 38 <tr>
39 39 <td><div style="width:150px;text-align:center;">考试次数: ${info.testsize}</div></td>
40   - <td><div style="width:150px;text-align:center;">班级名册: ${info.CLASS_NAME}</div></td>
  40 + <td><div style="width:250px;text-align:center;">班级名册: ${info.CLASS_NAME}</div></td>
41 41  
42 42 <td><div style="width:150px;text-align:center;"><span>学生人数: ${info.STUDENT_NUM}</span></div></td>
43 43 <td></td>
... ... @@ -62,7 +62,7 @@
62 62 class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
63 63 type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
64 64 style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
65   - <td style="vertical-align:top;padding-left:2px"><a style="height:30px;"
  65 + <td style="padding-left:2px"><a style="height:30px;"
66 66 class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
67 67 id="nav-search-icon" style="line-height:20px"
68 68 class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
... ... @@ -78,7 +78,7 @@
78 78 <thead>
79 79 <tr>
80 80 <th class="center th_name"><div style="width:150px;">姓名</div></th>
81   - <th class="center "><div style="width:150px;" title="个人平均得分率=个人总分/试卷总分">个人平均得分率<img src="static/images/tip.png" style="width:16px"></div></th>
  81 + <th class="center "><div style="width:150px;" title="个人平均得分率=个人总分/参考试卷总分">个人平均得分率<img src="static/images/tip.png" style="width:16px"></div></th>
82 82 <th class="center"><div style="width:80px;" title="得分汇总=学生历史考试得分之和">得分汇总<img src="static/images/tip.png" style="width:16px"></div></th>
83 83 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
84 84 <th class="center kc"><a
... ... @@ -104,7 +104,7 @@
104 104 </c:forEach>
105 105 </tr>
106 106 <tr>
107   - <td class="center"><div style="width:150px;">平均正确率</div></td>
  107 + <td class="center"><div style="width:150px;">平均得分率</div></td>
108 108 <td class="center"><div style="width:150px;"></div></td>
109 109 <td class="center"><div style="width:80px;"></div></td>
110 110 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
... ... @@ -121,8 +121,10 @@
121 121 <%-- <td class="center"><a
122 122 href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
123 123 </td> --%>
124   - <td class="center"><div style="width:150px;cursor:hand"><a
125   - onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a></div>
  124 + <td class="center"><div style="width:150px;">
  125 + <%-- <a onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a> --%>
  126 + ${var.NAME}
  127 + </div>
126 128 </td>
127 129 <td class="center"><div style="width:150px;"><fmt:formatNumber type="number"
128 130 value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
  View file @c33910d
... ... @@ -28,7 +28,7 @@
28 28 </style>
29 29 </head>
30 30  
31   -<body style="background:#fff;/* overflow-y:hidden; */">
  31 +<body style="background:#fff;overflow-x:auto;/* overflow-y:hidden; */">
32 32 <div style="padding:20px 20px;">
33 33  
34 34 <form action="report/report_test.do" method="post" name="Form" id="Form">
... ...
WebRoot/static/css/teach.css
  View file @c33910d
... ... @@ -37,7 +37,13 @@ input[type=&quot;checkbox&quot;]{margin-right:10px;}
37 37 .menu_1 li{background:#1b535b;border-bottom: 1px solid #80afb4;}
38 38 .menu_2 li{background:#333333;border-bottom: 1px dashed #80afb4;}
39 39 .content .content_l .tab1 ul li:last-child{border:0;}
40   -.content .content_l .tab1 ul li p{padding-left:15%;font-size:18px;}
  40 +.content .content_l .tab1 ul li p{padding-left: 15%;
  41 + font-size: 18px;
  42 + box-sizing: border-box;
  43 + width: 100%;
  44 + overflow: hidden;
  45 + text-overflow: ellipsis;
  46 + white-space: nowrap;}
41 47 .content .content_r{margin-left:18%;height:100%;overflow-y:hidden;}
42 48  
43 49  
... ...
src/com/fh/controller/sunvote/paper/PaperController.java
  View file @c33910d
... ... @@ -442,6 +442,7 @@ public class PaperController extends BaseController {
442 442 temp.put("TEST_ID", tpListArray);
443 443  
444 444 List<PageData> queInfo = testpaperinfoService.listTestPaperQuestionIDinfo(temp);
  445 + List<PageData> answer_num = testpaperService.listAll(pd);
445 446 int answer[] = new int[option_num+1];
446 447 int right = 0;
447 448 for(int j=0;j<queInfo.size();j++){
... ... @@ -464,6 +465,7 @@ public class PaperController extends BaseController {
464 465 }
465 466 temp.put("RIGHTNUM", right);
466 467 temp.put("ANSWERNUM",queInfo.size());
  468 + temp.put("ANSWERNUM2",answer_num.size());
467 469 temp.put("optin_info", answer);
468 470 templist.add(temp);
469 471 }
... ...
src/com/fh/controller/sunvote/report/ReportController.java
  View file @c33910d
... ... @@ -108,7 +108,9 @@ public class ReportController extends BaseController {
108 108 String totalScoreStr = item.getString("TOTAL_SCORE");
109 109 if(totalScoreStr != null){
110 110 try{
111   - totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
  111 + if(lost.isEmpty()){
  112 + totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
  113 + }
112 114 }catch(Exception ex){
113 115 logger.info(ex);
114 116 }
... ... @@ -116,6 +118,7 @@ public class ReportController extends BaseController {
116 118 if(score != null){
117 119 try{
118 120 getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
  121 + //getScore += Float.valueOf(score);
119 122 }catch(Exception ex){
120 123 logger.info(ex);
121 124 }
... ... @@ -141,7 +144,9 @@ public class ReportController extends BaseController {
141 144 String totalScoreStr = item.getString("TOTAL_SCORE");
142 145 if(totalScoreStr != null){
143 146 try{
144   - totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
  147 + if(lost.isEmpty()){
  148 + totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
  149 + }
145 150 }catch(Exception ex){
146 151 logger.info(ex);
147 152 }
... ...