1.隐藏即时测，课后练

2.修改学生老师导入导出字段

1.隐藏即时测，课后练
2.修改学生老师导入导出字段
jack
1 parent d7525cae
Showing 7 changed files with 17 additions and 11 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
WebRoot/static/files/Template1.xls
resources/dbconfig.properties
resources/mybatis1/sunvote/StudentMapper.xml
src/com/fh/controller/sunvote/student/StudentController.java
@@ -111,8 +111,8 @@
 					<li>
 						<p>试卷管理</p>
 						<ul class="menu_2">
-							<li><p id="new_paper">出卷</p></li>
-							<li><p id="qingsongkao_paper">查看所有试卷</p></li>
+							<li><p id="new_paper">年级卷</p></li>
+							<li><p id="qingsongkao_paper">个人卷</p></li>
 						</ul>
 					</li>
@@ -132,7 +132,7 @@
 				</ul>
 			</div>
-			<div class="analyse tab1">
+			<%--<div class="analyse tab1">
 				<p>
 					即时测<span class="right jiao"></span>
 				</p>
@@ -178,7 +178,7 @@
 				</ul>
-			</div>
+			</div>--%>
 			<div class="analyse tab1">
 				<p>
@@ -75,7 +75,7 @@
 				</ul>
 			</div>
-			<div class="analyse tab1">
+			<%--<div class="analyse tab1">
 				<p>
 					即时测<span class="right jiao"></span>
 				</p>
@@ -116,8 +116,8 @@
 					</li>
 					</c:if>
 				</ul>
-			</div>
-		</div>
+			</div>--%>
+		</div> 
 		<div class="content_r">
 			<iframe name="mainFrame" id="mainFrame" frameborder="0" width="100%"
 				height="100%"></iframe>
@@ -62,9 +62,9 @@
 						class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
 						type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
 						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
-					<td style="vertical-align:top;padding-left:2px"><a
+					<td style="vertical-align:top;padding-left:2px"><a style="height:30px;"
 						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
-							id="nav-search-icon"
+							id="nav-search-icon" style="line-height:20px"
 							class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
 				</tr>
 			</table>
 #数据源 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/edu?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://121.40.201.117:3306/luming?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 driverClassName:com.mysql.jdbc.Driver
 #username:root
 #password:ZrZxKeYp
@@ -187,11 +187,13 @@
 			sv_student.KEYPAD_ID,
 			sv_student.REMARK,
 			sv_student.ID,
-			sv_sclass.CLASS_NAME
+			sv_sclass.CLASS_NAME,
+			sv_grade.`NAME` AS GRADE_NAME
 		from sv_student
 		LEFT JOIN sv_classroster cr ON sv_student.ID = cr.STUDENT_ID
 		LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID
 		LEFT JOIN sv_sclass ON cr.SCLASS_ID = sv_sclass.ID
+		LEFT JOIN sv_grade ON sv_sclass.GRADE_ID = sv_grade.ID
 		WHERE
 			1 = 1
 		AND sv_term.START_DATE &lt; NOW()
@@ -393,6 +393,7 @@ public class StudentController extends BaseController {
 		titles.add("学号");	//2
 		titles.add("键盘ID");	//3
 		titles.add("年级");	//4
+		titles.add("班级");	//4
 //		titles.add("组号");	//5
 //		titles.add("签到码");	//6
 //		titles.add("家长姓名");	//7
@@ -407,7 +408,9 @@ public class StudentController extends BaseController {
 			vpd.put("var1", varOList.get(i).getString("NAME"));
 			vpd.put("var2", varOList.get(i).getString("NUMBER"));
 			vpd.put("var3", varOList.get(i).getString("KEYPAD_ID"));
+			vpd.put("var5", varOList.get(i).getString("GRADE_NAME"));
 			vpd.put("var4", varOList.get(i).getString("CLASS_NAME"));
+			
 //			vpd.put("var1", varOList.get(i).getString("NAME"));	    //1
 //			vpd.put("var2", varOList.get(i).getString("SNO"));	    //2
 //			vpd.put("var3", varOList.get(i).getString("NUMBER"));	    //3