交互第一个版本

孙向锦
1 parent 28147ecc
Showing 11 changed files with 204 additions and 24 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
WebRoot/static/css/index-style.css
WebRoot/static/js/control.js
resources/mybatis1/api/V1Mapper.xml
resources/mybatis1/sunvote/PaperMapper.xml
src/com/fh/controller/base/BaseController.java
src/com/fh/controller/sunvote/paper/PaperController.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/controller/system/login/LoginController.java
src/com/fh/util/Const.java
@@ -216,6 +216,7 @@
 <script>
 	var testData = ${pd.JSON};
 	var URL = "<%=basePath%>api/v1/uploadpaper";
+	var JUMP_URL = "<%=basePath%>/main/teacher";
 	if(testData.questions.length>0){
 		$("title").html("浏览试卷");
 	}
@@ -98,7 +98,7 @@
 		<div class="test">测验</div>
 		<div class="analysis">分析</div>
 	</div>
-	<div style="width:70%;height:100%;margin-left:30%;">
+	<div style="width:70%;height:100%;margin-left:30%;" class="content_r">
 		<iframe name="mainFrame" id="mainFrame" frameborder="0" src="paper/list2.do?" ></iframe>
 	</div>
 </div>
@@ -198,9 +198,16 @@
 		$("#time_submit").click(function(){
 			var name = $("#enter_title").val();
 			var time = $("#enter_time").val();
-			window.open("<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time);
+			//window.open("<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time);
+			self.location.href = "<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time ;
 			$(".title_time").modal("hide");
 		});
+		$(".test").click(function(){
+			$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" src="paper/list2.do?" style="width:100%;height:'+$(".content_l").height()+'px;"></iframe>');
+		})
+		$(".analysis").click(function(){
+			$(".content_r").html('<img src="static/images/analysis.png" width="100%" />');
+		})
 	</script>
 </body>
-.content_l{width:30%;min-width:400px;}
-.info_box{width:100%;height:300px;background:#36c345;color:#fff;position:relative;}
-.info{display:table;width:70%;position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;}
-.info_l{width:120px;height:120px;float:left;border-radius:100px;overflow:hidden;position:relative;}
-.info_l img{width:100%;position:absolute;top:0;min-height:100%;}
-.info_r{margin-left:150px;}
-.info_r p{width:100%;text-align:left;}
-.info_r p:first-child{font-size:24px;}
-.class{background:#36c333;color:#fff;margin-top:12px;}
-.class p{margin:0;line-height:3em;box-sizing:border-box;padding-left:3em;font-size:20px;}
-.test{background:#36b733;font-size:32px;text-align:center;color:#fff;padding:3% 0;letter-spacing:1em;margin-top:12px;}
-.analysis{background:#36a733;font-size:32px;text-align:center;color:#fff;padding:3% 0;letter-spacing:1em;margin-top:12px;}
+.content_l {
+	width: 30%;
+	min-width: 400px;
+}
+
+.info_box {
+	width: 100%;
+	height: 300px;
+	background: #36c345;
+	color: #fff;
+	position: relative;
+}
+
+.info {
+	display: table;
+	width: 70%;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	margin: auto;
+}
+
+.info_l {
+	width: 120px;
+	height: 120px;
+	float: left;
+	border-radius: 100px;
+	overflow: hidden;
+	position: relative;
+}
+
+.info_l img {
+	width: 100%;
+	position: absolute;
+	top: 0;
+	min-height: 100%;
+}
+
+.info_r {
+	margin-left: 150px;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+	left: 150px;
+	right: 0;
+	display: table;
+}
+
+.info_r p {
+	width: 100%;
+	text-align: left;
+}
+
+.info_r p:first-child {
+	font-size: 24px;
+}
+
+.class {
+	background: #36c333;
+	color: #fff;
+	margin-top: 12px;
+}
+
+.class p {
+	margin: 0;
+	line-height: 3em;
+	box-sizing: border-box;
+	text-align:center;
+	font-size: 20px;
+}
+
+.test {
+	background: #36b733;
+	font-size: 32px;
+	text-align: center;
+	color: #fff;
+	padding: 3% 0;
+	letter-spacing: 1em;
+	margin-top: 12px;
+}
+
+.analysis {
+	background: #36a733;
+	font-size: 32px;
+	text-align: center;
+	color: #fff;
+	padding: 3% 0;
+	letter-spacing: 1em;
+	margin-top: 12px;
+}
 \ No newline at end of file
@@ -212,10 +212,10 @@
 		var data={
 			title: $(".text-center").html(),
 		    exam_time: parseInt($("#time").text()),
-		    paper_type: "1",
-		    subject_id: "1",
-		    grade_id: "1",
-		    user_id: "1",
+		    paper_type: testData.paper_type,
+		    subject_id: testData.subject_id,
+		    grade_id: testData.grade_id,
+		    user_id: testData.user_id,
 		    score:score,
 		    questions:[]
 		}
@@ -292,8 +292,9 @@ function ajax_submit(url,data){
 		success:function(data){
 			flag=1;
 			$(".loading").css("display","none");
-			alert("保存成功");
-			window.close();
+//			alert("保存成功");
+//			window.close();
+			window.location.href = JUMP_URL ;
 		}
 	})
 	return flag;
@@ -340,6 +341,7 @@ function fastSort(array,head,tail){
 function creatHtml(data){	
 		console.log(data);
 		if(data.questions.length>0){
+			$(".time").removeAttr("data-target");
 			$(".btn_box").remove();
 		}
 		$(".header_box h1").html(data.title);	
@@ -127,9 +127,13 @@
 		 	SELECT
 				sv_teacher.`NAME` AS TEACHER_NAME,
 				sv_grade.`NAME` AS GRADE_NAME,
+				sv_grade.ID AS GRADE_ID,
 				sv_sclass.CLASS_NAME AS CLASS_NAME,
+				sv_sclass.ID AS CLASS_ID,
 				sv_subject.CNAME AS SUBJECT_NAME,
-			  	sv_school.`NAME` as SCHOOL_NAME
+				sv_subject.ID AS SUBJECT_ID,
+			  	sv_school.`NAME` as SCHOOL_NAME,
+			  	sv_school.ID AS SCHOOL_ID
 			FROM
 				sv_coursemanagement AS couse
 			LEFT JOIN sv_term AS term ON couse.TERM_ID = term.TERM_ID
@@ -122,6 +122,10 @@
 				)
 		</if>
+		<if test="pd.USER_ID != null and pd.USER_ID != ''"><!-- 关键词检索 -->
+			and USER_ID = #{pd.USER_ID}
+		</if>
+		
 		order by CREATE_DATE DESC
 	</select>
@@ -82,5 +82,55 @@ public class BaseController {
 		return "ERROR";
 	}
+	public String getUserID(){
+		Session session = Jurisdiction.getSession();
+		User user = (User)session.getAttribute(Const.SESSION_USER);
+		if(user != null){
+			return user.getUSER_ID();
+		}
+		return "ERROR";
+	}
+	
+	
+	public String getSchoolID(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.SCHOOL_ID);
+		return schoolName;
+	}
+	public String getSchoolName(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.SCHOOL_NAME);
+		return schoolName;
+	}
+	public String getGradeID(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.GRADE_ID);
+		return schoolName;
+	}
+	public String getGradeName(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.GRADE_NAME);
+		return schoolName;
+	}
+	public String getSubjectId(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.SUBJECT_ID);
+		return schoolName;
+	}
+	public String getSubjectName(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.SUBJECT_NAME);
+		return schoolName;
+	}
+	public String getClassId(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.CLASS_ID);
+		return schoolName;
+	}
+	public String getClassName(){
+		Session session = Jurisdiction.getSession();
+		String schoolName = (String)session.getAttribute(getUsername() + Const.CLASS_NAME);
+		return schoolName;
+	}
 }
@@ -243,8 +243,8 @@ public class PaperController extends BaseController {
 		User user = (User)session.getAttribute(Const.SESSION_USER);
 		paper.setUser_id(user.getUSER_ID());
 		paper.setPaper_type("1");
-		paper.setSubject_id("1");
-		paper.setGrade_id("1");
+		paper.setSubject_id(getSubjectId());
+		paper.setGrade_id(getGradeID());
 		paper.setQuestions(new ArrayList<Question>());
 		pd.put("JSON", paper.toJson());
 		logger.info(paper.toJson());
@@ -272,6 +272,8 @@ public class PaperController extends BaseController {
 		if(null != keywords && !"".equals(keywords)){
 			pd.put("keywords", keywords.trim());
 		}
+		String userID = getUserID();
+		pd.put("USER_ID", userID);
 		page.setPd(pd);
 		List<PageData>	varList = paperService.list(page);	//列出Paper列表
 		mv.setViewName("sunvote/paper/paper_list2");
@@ -64,8 +64,8 @@ public class TeacherController extends BaseController {
 		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
-		pd.put("ID", this.get32UUID());
 		pd = this.getPageData();
+		pd.put("ID", this.get32UUID());
 		teacherService.save(pd);
 		pd.put("USER_ID", pd.getString("ID"));	//ID 主键
@@ -220,6 +220,25 @@ public class LoginController extends BaseController {
 					tpd.put("ID", user.getUSER_ID());
 					List<PageData> teacherInfos = v1Service.getTeacherInfo(tpd);
 					pd.put("TEACHER", teacherInfos);
+					if (teacherInfos != null && teacherInfos.size() > 0) {
+						PageData sData = teacherInfos.get(0);
+						session.setAttribute(USERNAME + Const.SCHOOL_ID,
+								sData.get("SCHOOL_ID"));
+						session.setAttribute(USERNAME + Const.SCHOOL_NAME,
+								sData.get("SCHOOL_NAME"));
+						session.setAttribute(USERNAME + Const.GRADE_ID,
+								sData.get("GRADE_ID"));
+						session.setAttribute(USERNAME + Const.GRADE_NAME,
+								sData.get("GRADE_NAME"));
+						session.setAttribute(USERNAME + Const.CLASS_ID,
+								sData.get("CLASS_ID"));
+						session.setAttribute(USERNAME + Const.CLASS_NAME,
+								sData.get("CLASS_NAME"));
+						session.setAttribute(USERNAME + Const.SUBJECT_ID,
+								sData.get("SUBJECT_ID"));
+						session.setAttribute(USERNAME + Const.SUBJECT_NAME,
+								sData.get("SUBJECT_NAME"));
+					}
 					mv.setViewName("sunvote/teacher/teacher_main");
 				}
 				mv.addObject("user", user);
@@ -16,6 +16,16 @@ public class Const {
 	public static final String DEPARTMENT_IDS = "DEPARTMENT_IDS";			//当前用户拥有的最高部门权限集合
 	public static final String DEPARTMENT_ID = "DEPARTMENT_ID";				//当前用户拥有的最高部门权限
 	public static final String TRUE = "T";
+	
+	public static final String SCHOOL_ID = "SCHOOL_ID";
+	public static final String SCHOOL_NAME = "SCHOOL_NAME";
+	public static final String GRADE_ID = "GRADE_ID";
+	public static final String GRADE_NAME = "GRADE_NAME";
+	public static final String CLASS_ID = "CLASS_ID";
+	public static final String CLASS_NAME = "CLASS_NAME";
+	public static final String SUBJECT_ID = "SUBJECT_ID";
+	public static final String SUBJECT_NAME = "SUBJECT_NAME";
+	
 	public static final String FALSE = "F";
 	public static final String LOGIN = "/login_toLogin.do";					//登录地址
 	public static final String SYSNAME = "admin/config/SYSNAME.txt";		//系统名称路径