孙向锦 / SunvoteEducation

Commit a7551346a87d4bd3717529def6be1add5c2b0d16

Authored by 孙向锦
1 parent f0689229

报表显示时间

Inline Side-by-side
Showing 2 changed files with 9 additions and 4 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
  View file @a755134
... ... @@ -116,7 +116,7 @@ li {
116 116 <script type="">
117 117 var URL = '<%=basePath%>${URL}';
118 118 </script>
119   - <script src="../static/js/control1.js?a=1"></script>
  119 + <script src="../static/js/control1.js?a=2"></script>
120 120 <!-- 日期框 -->
121 121 <script>
122 122 //lay('#version').html('-v'+ laydate.v);
... ...
WebRoot/static/js/control1.js
  View file @a755134
... ... @@ -29,7 +29,7 @@
29 29 }
30 30 $(".content_l ul").html(_html);
31 31 console.log(_index);
32   -
  32 + window.top.loading.remove();
33 33 }
34 34  
35 35 });
... ... @@ -65,9 +65,11 @@
65 65 // var date_arry=date_string.split(' - ');
66 66 // startDate=date_arry[0];
67 67 // endDate=date_arry[1];
  68 + window.top.loading.show();
68 69 startDate = $("#starDate").val();
69 70 endDate = $("#endDate").val();
70 71 getData(startDate,endDate);
  72 +
71 73 })
72 74  
73 75 $(".prev").click(function(){
... ... @@ -112,7 +114,7 @@
112 114 if($("input[type='radio']:checked").val()==1){
113 115 for(var i=0;i<test_num;i++){
114 116 if(data.data.studentList[index].testList[i].TOTAL_SCORE>0){
115   - data0[i]=data.data.studentList[index].testList[i].NAME;
  117 + data0[i]=data.data.studentList[index].testList[i].NAME + "\n" + data.data.studentList[index].testList[i].CREATE_DATE;
116 118 data1[i]=(data.data.studentList[index].testList[i].AVG_SCORE/data.data.studentList[index].testList[i].TOTAL_SCORE*100).toFixed(2);
117 119 data2[i]=(data.data.studentList[index].testList[i].SCORE/data.data.studentList[index].testList[i].TOTAL_SCORE*100).toFixed(2);
118 120 data3[i]=(data.data.studentList[index].testList[i].MAX_SCORE/data.data.studentList[index].testList[i].TOTAL_SCORE*100).toFixed(2);
... ... @@ -154,9 +156,12 @@
154 156 xAxis: {
155 157 type: 'category',
156 158 data: data0
  159 + /*,
  160 + axisLabel:{interval: 0}*/
157 161 },
158 162 yAxis: {
159   - type: 'value'
  163 + type: 'value',
  164 + splitArea: {show: true}
160 165 },
161 166 series: [{
162 167 data: data1,
... ...