Commit 90d4858f24598bf77114d3a3a43304b6cba73b03
1 parent
b9dc59e6
修改管理员界面搜素功能
Showing
4 changed files
with
21 additions
and
19 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
| @@ -52,14 +52,14 @@ | @@ -52,14 +52,14 @@ | ||
| 52 | </div> | 52 | </div> |
| 53 | <div style="padding:0 5%;background:#fff;"> | 53 | <div style="padding:0 5%;background:#fff;"> |
| 54 | <table class="table table-striped"> | 54 | <table class="table table-striped"> |
| 55 | - <col style="width: 5%" /> | 55 | + <col style="width: 10%" /> |
| 56 | <col style="width: 15%" /> | 56 | <col style="width: 15%" /> |
| 57 | <col style="width: 15%" /> | 57 | <col style="width: 15%" /> |
| 58 | + <col style="width: 10%" /> | ||
| 59 | + <col style="width: 10%" /> | ||
| 58 | <col style="width: 15%" /> | 60 | <col style="width: 15%" /> |
| 59 | <col style="width: 15%" /> | 61 | <col style="width: 15%" /> |
| 60 | - <col style="width: 15%" /> | ||
| 61 | - <col style="width: 15%" /> | ||
| 62 | - <col style="width: 5%" /> | 62 | + <col style="width: 10%" /> |
| 63 | <thead> | 63 | <thead> |
| 64 | <tr> | 64 | <tr> |
| 65 | <th><input type="checkbox" name='ids' id="ids" />序号</th> | 65 | <th><input type="checkbox" name='ids' id="ids" />序号</th> |
| @@ -77,14 +77,14 @@ | @@ -77,14 +77,14 @@ | ||
| 77 | </div> | 77 | </div> |
| 78 | <div class="table_box"> | 78 | <div class="table_box"> |
| 79 | <table class="table table-striped"> | 79 | <table class="table table-striped"> |
| 80 | - <col style="width: 5%" /> | ||
| 81 | - <col style="width: 15%" /> | ||
| 82 | - <col style="width: 15%" /> | 80 | + <col style="width: 10%" /> |
| 83 | <col style="width: 15%" /> | 81 | <col style="width: 15%" /> |
| 84 | <col style="width: 15%" /> | 82 | <col style="width: 15%" /> |
| 83 | + <col style="width: 10%" /> | ||
| 84 | + <col style="width: 10%" /> | ||
| 85 | <col style="width: 15%" /> | 85 | <col style="width: 15%" /> |
| 86 | <col style="width: 15%" /> | 86 | <col style="width: 15%" /> |
| 87 | - <col style="width: 5%" /> | 87 | + <col style="width: 10%" /> |
| 88 | <tbody> | 88 | <tbody> |
| 89 | <c:choose> | 89 | <c:choose> |
| 90 | <c:when test="${not empty varList}"> | 90 | <c:when test="${not empty varList}"> |
WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
| @@ -46,6 +46,7 @@ li { | @@ -46,6 +46,7 @@ li { | ||
| 46 | <div class="header"> | 46 | <div class="header"> |
| 47 | <nav class="navbar navbar-default navbar-fixed-top"> | 47 | <nav class="navbar navbar-default navbar-fixed-top"> |
| 48 | <div class="container"> | 48 | <div class="container"> |
| 49 | + <input type="hidden" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}"/> | ||
| 49 | <input type="text" class="date-picker" placeholder="开始日期" name="starDate" id="starDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${start_date}"/> | 50 | <input type="text" class="date-picker" placeholder="开始日期" name="starDate" id="starDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${start_date}"/> |
| 50 | <input type="text" class="date-picker" placeholder="结束日期" name="endDate" id="endDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${end_date}"/> | 51 | <input type="text" class="date-picker" placeholder="结束日期" name="endDate" id="endDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${end_date}"/> |
| 51 | <input type="button" value="查询" id="search" /> | 52 | <input type="button" value="查询" id="search" /> |
| @@ -116,7 +117,7 @@ li { | @@ -116,7 +117,7 @@ li { | ||
| 116 | <script type=""> | 117 | <script type=""> |
| 117 | var URL = '<%=basePath%>${URL}'; | 118 | var URL = '<%=basePath%>${URL}'; |
| 118 | </script> | 119 | </script> |
| 119 | - <script src="../static/js/control1.js?a=2"></script> | 120 | + <script src="../static/js/control1.js?a=1"></script> |
| 120 | <!-- 日期框 --> | 121 | <!-- 日期框 --> |
| 121 | <script> | 122 | <script> |
| 122 | //lay('#version').html('-v'+ laydate.v); | 123 | //lay('#version').html('-v'+ laydate.v); |
| @@ -126,7 +127,7 @@ li { | @@ -126,7 +127,7 @@ li { | ||
| 126 | // ,range: true | 127 | // ,range: true |
| 127 | // }); | 128 | // }); |
| 128 | $(document).ready(function(){ | 129 | $(document).ready(function(){ |
| 129 | - window.top.loading.remove(); | 130 | + // window.top.loading.remove(); |
| 130 | }); | 131 | }); |
| 131 | 132 | ||
| 132 | $('.date-picker').datepicker({ | 133 | $('.date-picker').datepicker({ |
WebRoot/static/js/control1.js
| @@ -16,7 +16,6 @@ | @@ -16,7 +16,6 @@ | ||
| 16 | $.ajax({ | 16 | $.ajax({ |
| 17 | url:URL+ attend, | 17 | url:URL+ attend, |
| 18 | type:"get", | 18 | type:"get", |
| 19 | - async:false, | ||
| 20 | dataType:"json", | 19 | dataType:"json", |
| 21 | success:function(data){ | 20 | success:function(data){ |
| 22 | data_temp=data; | 21 | data_temp=data; |
| @@ -29,13 +28,14 @@ | @@ -29,13 +28,14 @@ | ||
| 29 | } | 28 | } |
| 30 | $(".content_l ul").html(_html); | 29 | $(".content_l ul").html(_html); |
| 31 | console.log(_index); | 30 | console.log(_index); |
| 31 | + dataMethod(_index,data_temp); | ||
| 32 | + $(".content_l li").eq(_index).siblings().removeClass("on"); | ||
| 33 | + $(".content_l li").eq(_index).addClass("on"); | ||
| 32 | window.top.loading.remove(); | 34 | window.top.loading.remove(); |
| 33 | } | 35 | } |
| 34 | 36 | ||
| 35 | }); | 37 | }); |
| 36 | - data(_index,data_temp); | ||
| 37 | - $(".content_l li").eq(_index).siblings().removeClass("on"); | ||
| 38 | - $(".content_l li").eq(_index).addClass("on"); | 38 | + |
| 39 | } | 39 | } |
| 40 | $( document ).ready(function() { | 40 | $( document ).ready(function() { |
| 41 | //alert($("input[type=radio][checked]").val()); | 41 | //alert($("input[type=radio][checked]").val()); |
| @@ -52,12 +52,12 @@ | @@ -52,12 +52,12 @@ | ||
| 52 | $(this).siblings().removeClass("on"); | 52 | $(this).siblings().removeClass("on"); |
| 53 | $(this).addClass("on"); | 53 | $(this).addClass("on"); |
| 54 | _index=$(this).index(); | 54 | _index=$(this).index(); |
| 55 | - data(_index,data_temp); | 55 | + dataMethod(_index,data_temp); |
| 56 | studentid = 0; | 56 | studentid = 0; |
| 57 | }) | 57 | }) |
| 58 | $("input[type=radio]").change(function(){ | 58 | $("input[type=radio]").change(function(){ |
| 59 | //alert($("input[type='radio']:checked").val()); | 59 | //alert($("input[type='radio']:checked").val()); |
| 60 | - data(_index,data_temp); | 60 | + dataMethod(_index,data_temp); |
| 61 | }) | 61 | }) |
| 62 | 62 | ||
| 63 | $("#search").click(function(){ | 63 | $("#search").click(function(){ |
| @@ -79,7 +79,7 @@ | @@ -79,7 +79,7 @@ | ||
| 79 | } | 79 | } |
| 80 | $(".content_l li").eq(_index).siblings().removeClass("on"); | 80 | $(".content_l li").eq(_index).siblings().removeClass("on"); |
| 81 | $(".content_l li").eq(_index).addClass("on"); | 81 | $(".content_l li").eq(_index).addClass("on"); |
| 82 | - data(_index,data_temp); | 82 | + dataMethod(_index,data_temp); |
| 83 | }) | 83 | }) |
| 84 | $(".next").click(function(){ | 84 | $(".next").click(function(){ |
| 85 | _index+=1; | 85 | _index+=1; |
| @@ -88,12 +88,12 @@ | @@ -88,12 +88,12 @@ | ||
| 88 | } | 88 | } |
| 89 | $(".content_l li").eq(_index).siblings().removeClass("on"); | 89 | $(".content_l li").eq(_index).siblings().removeClass("on"); |
| 90 | $(".content_l li").eq(_index).addClass("on"); | 90 | $(".content_l li").eq(_index).addClass("on"); |
| 91 | - data(_index,data_temp); | 91 | + dataMethod(_index,data_temp); |
| 92 | }) | 92 | }) |
| 93 | }); | 93 | }); |
| 94 | 94 | ||
| 95 | 95 | ||
| 96 | - function data(index,data){ | 96 | + function dataMethod(index,data){ |
| 97 | console.log(data); | 97 | console.log(data); |
| 98 | //data0=[];data1=[];data2=[];data3=[]; | 98 | //data0=[];data1=[];data2=[];data3=[]; |
| 99 | var GETSCORE = parseInt(data.data.studentList[index].GETSCORE); | 99 | var GETSCORE = parseInt(data.data.studentList[index].GETSCORE); |
src/com/fh/controller/sunvote/report/ReportController.java
| @@ -169,6 +169,7 @@ public class ReportController extends BaseController { | @@ -169,6 +169,7 @@ public class ReportController extends BaseController { | ||
| 169 | mv.setViewName("sunvote/teacher/stduent_report"); | 169 | mv.setViewName("sunvote/teacher/stduent_report"); |
| 170 | mv.addObject("start_date", pd.get("START_DATE")); | 170 | mv.addObject("start_date", pd.get("START_DATE")); |
| 171 | mv.addObject("end_date", pd.get("END_DATE")); | 171 | mv.addObject("end_date", pd.get("END_DATE")); |
| 172 | + mv.addObject("pd", pd); | ||
| 172 | return mv; | 173 | return mv; |
| 173 | } | 174 | } |
| 174 | 175 |