孙向锦 / SunvoteEducation

Commit d4d5b6a23e3ca73f766d9ac69f3ca0347556d615

Authored by 孙向锦
2 parents 8dccad91 9b7b8b9b

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

Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
  View file @d4d5b6a
... ... @@ -46,13 +46,13 @@
46 46 </c:if>
47 47 </tr>
48 48 <tr style="height: 30px">
49   - <td>练习说明: ${pd.END_DATE}</td>
  49 + <td>练习说明: ${pd.HOMEWORKINFO.HOMEWORK_DESC}</td>
50 50 </tr>
51 51 <tr style="height: 30px">
52   - <td>班级完成情况: ${pd.END_DATE}</td>
  52 + <td>班级完成情况: ${pd.HOMEWORKINFO.COMPLETE_DESC}</td>
53 53 </tr>
54 54 <tr style="height: 30px">
55   - <td>收卷时间: ${pd.END_DATE}</td>
  55 + <td>收卷时间: ${pd.HOMEWORKINFO.COMPLETE_DATE}</td>
56 56 </tr>
57 57 <tr style="height: 30px">
58 58 <td>班级名册：${myelfun:findClassName(pd.CLASS_ID)}</td>
... ... @@ -62,7 +62,7 @@
62 62 </tr>
63 63 </table>
64 64 <table id="simple-table"
65   - class="table table-striped table-bordered table-hover"
  65 + class="table table-bordered table-hover"
66 66 style="margin-top:0px;margin-bottom:0;">
67 67 <thead>
68 68 <tr>
... ... @@ -95,7 +95,7 @@
95 95  
96 96 <c:forEach items="${ANSWER}" var="var1" varStatus="vs1">
97 97 <c:set value="${ fn:split(ANSWER[vs1.index], ',') }" var="ANSWER1" />
98   - <td class="center" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>div style="width:80px;margin:0 auto;">${ANSWER1[0]}</div></td>
  98 + <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>
99 99 </c:forEach>
100 100  
101 101  
... ... @@ -128,19 +128,19 @@
128 128 $(document).ready(function(){
129 129 window.top.loading.remove();
130 130  
131   - var _heigh = $('#mainFrame', parent.document).height()-120;
  131 + var _heigh = $('#mainFrame', parent.document).height()-220;
132 132 //console.log(_heigh);
133 133  
134 134 var options = {
135 135 width: '100%',
136 136 height: _heigh,
137   - pinnedRows: 2,
138   - pinnedCols: 5,
  137 + pinnedRows: 1,
  138 + pinnedCols: 6,
139 139 container: "#scrollableTable",
140 140 removeOriginal: true
141 141 };
142 142  
143   -// $("#simple-table").tablescroller(options);
  143 + $("#simple-table").tablescroller(options);
144 144 });
145 145 $(function() {
146 146  
... ...