孙向锦 / SunvoteEducation

Commit 3e7c9ecece47df279fb880ec2f4da77b31c58c87

Authored by jack
1 parent d7525cae

1.隐藏即时测，课后练 

2.修改学生老师导入导出字段
Inline Side-by-side
Showing 7 changed files with 17 additions and 11 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @3e7c9ec
... ... @@ -111,8 +111,8 @@
111 111 <li>
112 112 <p>试卷管理</p>
113 113 <ul class="menu_2">
114   - <li><p id="new_paper">出卷</p></li>
115   - <li><p id="qingsongkao_paper">查看所有试卷</p></li>
  114 + <li><p id="new_paper">年级卷</p></li>
  115 + <li><p id="qingsongkao_paper">个人卷</p></li>
116 116  
117 117 </ul>
118 118 </li>
... ... @@ -132,7 +132,7 @@
132 132 </ul>
133 133  
134 134 </div>
135   - <div class="analyse tab1">
  135 + <%--<div class="analyse tab1">
136 136 <p>
137 137 即时测<span class="right jiao"></span>
138 138 </p>
... ... @@ -178,7 +178,7 @@
178 178 </ul>
179 179  
180 180  
181   - </div>
  181 + </div>--%>
182 182  
183 183 <div class="analyse tab1">
184 184 <p>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @3e7c9ec
... ... @@ -75,7 +75,7 @@
75 75 </ul>
76 76  
77 77 </div>
78   - <div class="analyse tab1">
  78 + <%--<div class="analyse tab1">
79 79 <p>
80 80 即时测<span class="right jiao"></span>
81 81 </p>
... ... @@ -116,8 +116,8 @@
116 116 </li>
117 117 </c:if>
118 118 </ul>
119   - </div>
120   - </div>
  119 + </div>--%>
  120 + </div>
121 121 <div class="content_r">
122 122 <iframe name="mainFrame" id="mainFrame" frameborder="0" width="100%"
123 123 height="100%"></iframe>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
  View file @3e7c9ec
... ... @@ -62,9 +62,9 @@
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
  65 + <td style="vertical-align:top;padding-left:2px"><a style="height:30px;"
66 66 class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
67   - id="nav-search-icon"
  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>
69 69 </tr>
70 70 </table>
... ...
WebRoot/static/files/Template1.xls
View file @3e7c9ec
No preview for this file type
resources/dbconfig.properties
  View file @3e7c9ec
1 1 #数据源 1
2   -url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
  2 +#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
3 3 #url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
4 4 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
5 5 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
6 6 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
  7 +url:jdbc:mysql://121.40.201.117:3306/luming?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
7 8 driverClassName:com.mysql.jdbc.Driver
8 9 #username:root
9 10 #password:ZrZxKeYp
... ...
resources/mybatis1/sunvote/StudentMapper.xml
  View file @3e7c9ec
... ... @@ -187,11 +187,13 @@
187 187 sv_student.KEYPAD_ID,
188 188 sv_student.REMARK,
189 189 sv_student.ID,
190   - sv_sclass.CLASS_NAME
  190 + sv_sclass.CLASS_NAME,
  191 + sv_grade.`NAME` AS GRADE_NAME
191 192 from sv_student
192 193 LEFT JOIN sv_classroster cr ON sv_student.ID = cr.STUDENT_ID
193 194 LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID
194 195 LEFT JOIN sv_sclass ON cr.SCLASS_ID = sv_sclass.ID
  196 + LEFT JOIN sv_grade ON sv_sclass.GRADE_ID = sv_grade.ID
195 197 WHERE
196 198 1 = 1
197 199 AND sv_term.START_DATE &lt; NOW()
... ...
src/com/fh/controller/sunvote/student/StudentController.java
  View file @3e7c9ec
... ... @@ -393,6 +393,7 @@ public class StudentController extends BaseController {
393 393 titles.add("学号"); //2
394 394 titles.add("键盘ID"); //3
395 395 titles.add("年级"); //4
  396 + titles.add("班级"); //4
396 397 // titles.add("组号"); //5
397 398 // titles.add("签到码"); //6
398 399 // titles.add("家长姓名"); //7
... ... @@ -407,7 +408,9 @@ public class StudentController extends BaseController {
407 408 vpd.put("var1", varOList.get(i).getString("NAME"));
408 409 vpd.put("var2", varOList.get(i).getString("NUMBER"));
409 410 vpd.put("var3", varOList.get(i).getString("KEYPAD_ID"));
  411 + vpd.put("var5", varOList.get(i).getString("GRADE_NAME"));
410 412 vpd.put("var4", varOList.get(i).getString("CLASS_NAME"));
  413 +
411 414 // vpd.put("var1", varOList.get(i).getString("NAME")); //1
412 415 // vpd.put("var2", varOList.get(i).getString("SNO")); //2
413 416 // vpd.put("var3", varOList.get(i).getString("NUMBER")); //3
... ...