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 | 52 | </div> |
| 53 | 53 | <div style="padding:0 5%;background:#fff;"> |
| 54 | 54 | <table class="table table-striped"> |
| 55 | - <col style="width: 5%" /> | |
| 55 | + <col style="width: 10%" /> | |
| 56 | 56 | <col style="width: 15%" /> |
| 57 | 57 | <col style="width: 15%" /> |
| 58 | + <col style="width: 10%" /> | |
| 59 | + <col style="width: 10%" /> | |
| 58 | 60 | <col style="width: 15%" /> |
| 59 | 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 | 63 | <thead> |
| 64 | 64 | <tr> |
| 65 | 65 | <th><input type="checkbox" name='ids' id="ids" />序号</th> |
| ... | ... | @@ -77,14 +77,14 @@ |
| 77 | 77 | </div> |
| 78 | 78 | <div class="table_box"> |
| 79 | 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 | 81 | <col style="width: 15%" /> |
| 84 | 82 | <col style="width: 15%" /> |
| 83 | + <col style="width: 10%" /> | |
| 84 | + <col style="width: 10%" /> | |
| 85 | 85 | <col style="width: 15%" /> |
| 86 | 86 | <col style="width: 15%" /> |
| 87 | - <col style="width: 5%" /> | |
| 87 | + <col style="width: 10%" /> | |
| 88 | 88 | <tbody> |
| 89 | 89 | <c:choose> |
| 90 | 90 | <c:when test="${not empty varList}"> | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
| ... | ... | @@ -46,6 +46,7 @@ li { |
| 46 | 46 | <div class="header"> |
| 47 | 47 | <nav class="navbar navbar-default navbar-fixed-top"> |
| 48 | 48 | <div class="container"> |
| 49 | + <input type="hidden" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}"/> | |
| 49 | 50 | <input type="text" class="date-picker" placeholder="开始日期" name="starDate" id="starDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${start_date}"/> |
| 50 | 51 | <input type="text" class="date-picker" placeholder="结束日期" name="endDate" id="endDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${end_date}"/> |
| 51 | 52 | <input type="button" value="查询" id="search" /> |
| ... | ... | @@ -116,7 +117,7 @@ li { |
| 116 | 117 | <script type=""> |
| 117 | 118 | var URL = '<%=basePath%>${URL}'; |
| 118 | 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 | 122 | <script> |
| 122 | 123 | //lay('#version').html('-v'+ laydate.v); |
| ... | ... | @@ -126,7 +127,7 @@ li { |
| 126 | 127 | // ,range: true |
| 127 | 128 | // }); |
| 128 | 129 | $(document).ready(function(){ |
| 129 | - window.top.loading.remove(); | |
| 130 | + // window.top.loading.remove(); | |
| 130 | 131 | }); |
| 131 | 132 | |
| 132 | 133 | $('.date-picker').datepicker({ | ... | ... |
WebRoot/static/js/control1.js
| ... | ... | @@ -16,7 +16,6 @@ |
| 16 | 16 | $.ajax({ |
| 17 | 17 | url:URL+ attend, |
| 18 | 18 | type:"get", |
| 19 | - async:false, | |
| 20 | 19 | dataType:"json", |
| 21 | 20 | success:function(data){ |
| 22 | 21 | data_temp=data; |
| ... | ... | @@ -29,13 +28,14 @@ |
| 29 | 28 | } |
| 30 | 29 | $(".content_l ul").html(_html); |
| 31 | 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 | 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 | 40 | $( document ).ready(function() { |
| 41 | 41 | //alert($("input[type=radio][checked]").val()); |
| ... | ... | @@ -52,12 +52,12 @@ |
| 52 | 52 | $(this).siblings().removeClass("on"); |
| 53 | 53 | $(this).addClass("on"); |
| 54 | 54 | _index=$(this).index(); |
| 55 | - data(_index,data_temp); | |
| 55 | + dataMethod(_index,data_temp); | |
| 56 | 56 | studentid = 0; |
| 57 | 57 | }) |
| 58 | 58 | $("input[type=radio]").change(function(){ |
| 59 | 59 | //alert($("input[type='radio']:checked").val()); |
| 60 | - data(_index,data_temp); | |
| 60 | + dataMethod(_index,data_temp); | |
| 61 | 61 | }) |
| 62 | 62 | |
| 63 | 63 | $("#search").click(function(){ |
| ... | ... | @@ -79,7 +79,7 @@ |
| 79 | 79 | } |
| 80 | 80 | $(".content_l li").eq(_index).siblings().removeClass("on"); |
| 81 | 81 | $(".content_l li").eq(_index).addClass("on"); |
| 82 | - data(_index,data_temp); | |
| 82 | + dataMethod(_index,data_temp); | |
| 83 | 83 | }) |
| 84 | 84 | $(".next").click(function(){ |
| 85 | 85 | _index+=1; |
| ... | ... | @@ -88,12 +88,12 @@ |
| 88 | 88 | } |
| 89 | 89 | $(".content_l li").eq(_index).siblings().removeClass("on"); |
| 90 | 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 | 97 | console.log(data); |
| 98 | 98 | //data0=[];data1=[];data2=[];data3=[]; |
| 99 | 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 | 169 | mv.setViewName("sunvote/teacher/stduent_report"); |
| 170 | 170 | mv.addObject("start_date", pd.get("START_DATE")); |
| 171 | 171 | mv.addObject("end_date", pd.get("END_DATE")); |
| 172 | + mv.addObject("pd", pd); | |
| 172 | 173 | return mv; |
| 173 | 174 | } |
| 174 | 175 | ... | ... |