Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

孙向锦
2 parents 5b1fa3bc d6f1304c
Showing 8 changed files with 66 additions and 43 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
WebRoot/static/images/psw_edit.png
WebRoot/static/js/home_control1.js
@@ -25,42 +25,34 @@
 <%@ include file="../../system/index/top.jsp"%>
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
+<link rel="stylesheet" href="static/css/teach.css" />
 <style>
 .table{padding-bottom:0 !important;}
+.dec{font-size:14px;}
 </style>
 </head>
 <body style="background:#fff;/* overflow-y:hidden; */">
+	<div class="box_header">
+		<div class="head_box_l">
+			<p>
+				<span class="right_b"></span>${pd.HOMEWORKINFO.NAME}
+			</p>
+			<p class="dec">练习说明: ${pd.HOMEWORKINFO.HOMEWORK_DESC}</p>
+			<p class="dec">收卷时间: ${pd.HOMEWORKINFO.COMPLETE_DATE}</p>
+			
+		</div>	
+		<div class="head_box_r">
+			<p class="dec">班级完成情况: ${pd.HOMEWORKINFO.COMPLETE_DESC}</p>
+			<p class="dec">班级名册：${myelfun:findClassName(pd.CLASS_ID)}</p>
+			<p class="dec">学生人数: ${fn:length(pd.STUDENTS)}</p>
+		</div>					
+		<div class="clear"></div>
+	</div>
 	<div style="padding:20px 20px;">
-
 		<form action="report/report_test.do" method="post" name="Form" id="Form">
 			<input type="hidden" name="CLASSID" id="CLASSID" value="${pd.CLASS_ID}" />
-			<table style="margin-top:5px;">
-				<tr style="height: 30px">
-					<td>测验名称: ${pd.DATA[0].NAME}</td>  
-					<c:if test="${display}">
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-					<td>教师: ${teacherPd.NAME}</td> 
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-					<td>科目名称: ${subjectPd.CNAME}</td>
-					</c:if>
-				</tr>
-				<tr style="height: 30px">
-					<td>练习说明: ${pd.HOMEWORKINFO.HOMEWORK_DESC}</td>
-				</tr>
-				<tr style="height: 30px">
-					<td>班级完成情况: ${pd.HOMEWORKINFO.COMPLETE_DESC}</td>
-				</tr>
-				<tr style="height: 30px">
-					<td>收卷时间: ${pd.HOMEWORKINFO.COMPLETE_DATE}</td>
-				</tr>
-				<tr style="height: 30px">
-					<td>班级名册：${myelfun:findClassName(pd.CLASS_ID)}</td>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-					<td><span>学生人数: ${fn:length(pd.STUDENTS)}</span></td>
-					
-				</tr>
-			</table>
+			
 			<table id="simple-table"
 				class="table table-bordered table-hover"
 				style="margin-top:0px;margin-bottom:0;">
@@ -74,7 +66,7 @@
 						<th class="center"><div style="width:80px;">得分</div></th>						
 						<c:set value="${ fn:split(pd.DATA[0].ANSWER, ';') }" var="ANSWER" />
 						<c:forEach items="${ANSWER}" var="var" varStatus="vs">
-							<th class="center"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th>
+							<th class="center th_w"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th>
 						</c:forEach>
 					</tr>
@@ -86,16 +78,16 @@
 						<c:when test="${not empty pd.STUDENTS}">
 							<c:forEach items="${pd.STUDENTS}" var="var" varStatus="vs">
 								<tr>
-									<td class="center"><div style="width:80px;">${var.RANK_NUM}</div></td>
+									<td class="center"><div style="width:80px;">${pd.DATA[vs.index].RANK}</div></td>
 									<td class="center"><div style="width:80px;">${var.NAME}</div></td>
 									<td class="center"><div style="width:80px;">${var.SNO}</div></td>
 									<td class="center"><div style="width:80px;">${var.KEYPAD_ID}</div></td>
-									<td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="#.00"/>%</div></td>
+									<td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="0.00"/>%</div></td>
 									<td class="center"><div style="width:80px;">${pd.DATA[vs.index].STUDENT_SCORE}</div></td>
 									<c:forEach items="${ANSWER}" var="var1" varStatus="vs1">
 										<c:set value="${ fn:split(ANSWER[vs1.index], ',') }" var="ANSWER1" />
-										<td class="center" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>><div style="width:80px;margin:0 auto;">${ANSWER1[0]==""?"--":ANSWER1[0]}</div></td>
+										<td class="center td_w" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>><div style="width:80px;margin:0 auto;">${ANSWER1[0]==""?"--":ANSWER1[0]}</div></td>
 									</c:forEach>
@@ -141,6 +133,9 @@
         	};
        		$("#simple-table").tablescroller(options);
+       		
+       		$(".scrollable-columns-table").css("width","100%");
+       		
 		});
 		$(function() {
@@ -100,9 +100,12 @@
 								<td>
 								<c:if test="${var.COMPLETE_COUNT == '0'}">
 									<a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a>
+									<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
 								</c:if>
-								<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
-								</td>
+								<c:if test="${var.COMPLETE_COUNT == '1'}">
+									<a onclick="del('${var.HOMEWORK_ID}');" style="margin-left: 28px"><img src="static/images/remove.png" /></a>
+								</c:if>
+								
 							</tr>
@@ -118,7 +118,7 @@ li {
 		var URL = '<%=basePath%>${URL}';
 		var data = ${data};
 	</script>
-	<script src="../static/js/home_control1.js?a=2"></script>
+	<script src="../static/js/home_control1.js?a=3"></script>
 	<!-- 日期框 -->
 	<script>	
 	//lay('#version').html('-v'+ laydate.v);
@@ -137,7 +137,7 @@ li {
 		autoclose : true,
 		todayHighlight : true
 	});
-function student(classid,studentid){
+	function student(classid,studentid){
 		var url = "<%=basePath%>homework/student.do?STUDENT_ID=" + studentid + "&CLASS_ID=" + classid ;
 		var startDate = $("#starDate").val();
@@ -20,10 +20,11 @@
 	<!-- 日期框 -->
 	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
-	
+	<link rel="stylesheet" href="static/css/teach.css" />
 	<link rel="stylesheet" href="static/css/edit.css" />
 	<style>
-		
+		.box_header{position:fixed;top:0;left:0;width:100%;}
+		#Form{margin-top:102px;}
 	</style>
 </head>
@@ -36,7 +37,14 @@
 			<div class="page-content">
 				<div class="row">
 					<div class="col-xs-12">
-					
+					<div class="box_header">
+						<div class="head_box_l">
+							<p>
+								<span class="right_b"></span>练习预览
+							</p>
+						</div>						
+						<div class="clear"></div>
+					</div>
 					<form action="homework/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}"/>
 						<div id="zhongxin" style="padding-top: 13px;width:80%;margin:0 auto;">
@@ -29,7 +29,6 @@
 			<div class="page-content">
 				<div class="row">
 					<div class="col-xs-12">
-					
 					<form action="teacher/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
 						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
@@ -38,6 +38,9 @@
 		<div class="out">
 			<a href="../logout"><img src="../static/images/close.png" />退出登录</a>
 		</div>
+		<div class="out" style="margin-right:20px;">
+			<a onclick="editInfo()"><img src="../static/images/psw_edit.png" />个人设置</a>
+		</div>
 		<div class="clear"></div>
 	</div>
 	<div class="content">
@@ -51,8 +54,8 @@
 					<p id="name">${pd.TEACHER.TNAME }</p>
 					<p id="school">${pd.TEACHER.SNAME }</p>
 				</div>
-					<br/>
 			<br/>
+			<br />
 			<br/>
 			</div>
@@ -217,6 +220,17 @@
 			//}
 		}
+		function editInfo(){
+			window.top.modal.init({
+				'title':'个人设置',
+				'url':'<%=basePath%>teacher/goEdit3.do?teacher_id=${pd.TEACHER.ID}',
+				func:function() {
+					//tosearch();
+				}
+				});
+				window.top.modal.show();
+		}
+		
 		$("#time_submit").click(function(){
 			var name = $("#enter_title").val();
 			var time = $("#enter_time").val();
@@ -249,6 +263,8 @@
 			//}
 		});
+		
+		
 		var defaultUrl = '${pd.DEFAULTURL}' ;
 		if(defaultUrl != '' && defaultUrl != ''){
 			$("#mainFrame").attr('src',defaultUrl);
@@ -60,9 +60,11 @@
 		$("#search").click(function(){
 			window.top.loading.show();
-			startDate = $("#starDate").val();
-			endDate = $("#endDate").val();
-			getData(startDate,endDate);
+			//startDate = $("#starDate").val();
+			//endDate = $("#endDate").val();
+			//getData(startDate,endDate);
+			
+			 student(data.STUDENTS[_index].CLASS_ID,data.STUDENTS[_index].ID);
 		})