From 90d4858f24598bf77114d3a3a43304b6cba73b03 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Fri, 2 Nov 2018 17:11:50 +0800
Subject: [PATCH] 修改管理员界面搜素功能

---
 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp          | 16 ++++++++--------
 WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp     |  5 +++--
 WebRoot/static/js/control1.js                              | 18 +++++++++---------
 src/com/fh/controller/sunvote/report/ReportController.java |  1 +
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
index 3aff9f0..b49d3d9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
@@ -52,14 +52,14 @@
 			</div>
 			<div style="padding:0 5%;background:#fff;">
 				<table class="table table-striped">
-				<col style="width: 5%" />
+				<col style="width: 10%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
-				<col style="width: 15%" />
-				<col style="width: 15%" />
-				<col style="width: 5%" />
+				<col style="width: 10%" />
 				<thead>
 					<tr>
 						<th><input type="checkbox"  name='ids' id="ids" />序号</th>
@@ -77,14 +77,14 @@
 		</div>
 		<div class="table_box">
 			<table class="table table-striped">
-				<col style="width: 5%" />
-				<col style="width: 15%" />
-				<col style="width: 15%" />
+				<col style="width: 10%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
-				<col style="width: 5%" />
+				<col style="width: 10%" />
 				<tbody>
 				<c:choose>
 					<c:when test="${not empty varList}">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
index 186115f..06b8f57 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
@@ -46,6 +46,7 @@ li {
 	<div class="header">
 		<nav class="navbar navbar-default navbar-fixed-top">
 			<div class="container">
+				<input type="hidden" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}"/>
 				<input type="text" class="date-picker" placeholder="开始日期"	name="starDate" id="starDate" data-date-format="yyyy-mm-dd"	readonly="readonly" value="${start_date}"/> 
 				<input type="text" class="date-picker" placeholder="结束日期" name="endDate" id="endDate"  data-date-format="yyyy-mm-dd"	readonly="readonly" value="${end_date}"/>
 				<input type="button" value="查询" id="search" />
@@ -116,7 +117,7 @@ li {
 	<script type="">
 		var URL = '<%=basePath%>${URL}';
 	</script>
-	<script src="../static/js/control1.js?a=2"></script>
+	<script src="../static/js/control1.js?a=1"></script>
 	<!-- 日期框 -->
 	<script>
 	//lay('#version').html('-v'+ laydate.v);
@@ -126,7 +127,7 @@ li {
 	//  ,range: true
 	// });
 		$(document).ready(function(){
-			window.top.loading.remove();
+		//	window.top.loading.remove();
 		});
 		
 	$('.date-picker').datepicker({
diff --git a/WebRoot/static/js/control1.js b/WebRoot/static/js/control1.js
index 64ae602..75a036c 100644
--- a/WebRoot/static/js/control1.js
+++ b/WebRoot/static/js/control1.js
@@ -16,7 +16,6 @@
 		$.ajax({
 			url:URL+ attend,
 			type:"get",
-			async:false,
 			dataType:"json",
 			success:function(data){
 				data_temp=data;
@@ -29,13 +28,14 @@
 				}
 				$(".content_l ul").html(_html);
 				console.log(_index);
+				dataMethod(_index,data_temp);
+				$(".content_l li").eq(_index).siblings().removeClass("on");
+				$(".content_l li").eq(_index).addClass("on");
 				window.top.loading.remove();
 			}
 			
 		});
-		data(_index,data_temp);
-		$(".content_l li").eq(_index).siblings().removeClass("on");
-		$(".content_l li").eq(_index).addClass("on");
+	
 	}		
 	$( document ).ready(function() {
 		//alert($("input[type=radio][checked]").val());
@@ -52,12 +52,12 @@
 		 $(this).siblings().removeClass("on");
 			$(this).addClass("on");
 			_index=$(this).index();
-			data(_index,data_temp);
+			dataMethod(_index,data_temp);
 			studentid = 0;
 		 })
 		 $("input[type=radio]").change(function(){
 			//alert($("input[type='radio']:checked").val());
-			data(_index,data_temp);
+			 dataMethod(_index,data_temp);
 		})
 		
 		$("#search").click(function(){
@@ -79,7 +79,7 @@
 			 }
 			$(".content_l li").eq(_index).siblings().removeClass("on");
 			$(".content_l li").eq(_index).addClass("on");
-			 data(_index,data_temp);
+			dataMethod(_index,data_temp);
 		 })
 		 $(".next").click(function(){
 			 _index+=1;
@@ -88,12 +88,12 @@
 			 }
 			$(".content_l li").eq(_index).siblings().removeClass("on");
 			$(".content_l li").eq(_index).addClass("on");
-			 data(_index,data_temp);
+			dataMethod(_index,data_temp);
 		 })
     });
 	
 	
-	function data(index,data){
+	function dataMethod(index,data){
 		console.log(data);
 		//data0=[];data1=[];data2=[];data3=[];
 		var GETSCORE = parseInt(data.data.studentList[index].GETSCORE);
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 2970888..a764aab 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -169,6 +169,7 @@ public class ReportController extends BaseController {
 		mv.setViewName("sunvote/teacher/stduent_report");
 		mv.addObject("start_date", pd.get("START_DATE"));
 		mv.addObject("end_date", pd.get("END_DATE"));
+		mv.addObject("pd", pd);
 		return mv;
 	}
 	
--
libgit2 0.21.4