|
@@ -55,7 +55,7 @@
|
|
|
<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"
|
|
|
data-i18n-value="report.group.search"/>
|
|
|
<c:if test="${query.subjectCode!=null && oldSubjectCode!=null}">
|
|
|
- <input class="btn" type="button" value="刷新" <c:if test="${locked}">disabled="disabled"</c:if> id="refresh"/>
|
|
|
+ <a id="refresh" href="<c:if test="${locked}">#</c:if><c:if test="${!locked}">${ctx}/admin/exam/reportSubjectRange/report?subjectCode=${query.subjectCode}&objective=${query.objective}</c:if>" class="btn" <c:if test="${locked}">disabled="disabled"</c:if>>刷新</a>
|
|
|
</c:if>
|
|
|
|
|
|
<div class="btn-group">
|
|
@@ -117,11 +117,19 @@
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
- $('#refresh').click(function () {
|
|
|
- var subjectCode = $('#subjectCode').val();
|
|
|
+
|
|
|
+ $("#refresh").click(function(){
|
|
|
+ var locked = "${locked}";
|
|
|
+ if(locked!='false'){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var code = $("#subjectCode").val();
|
|
|
var range = $('#range').val();
|
|
|
- window.location.href ='${ctx}/admin/exam/reportSubjectRange/report?subjectCode=' + subjectCode + '&range=' + range;
|
|
|
- return true;
|
|
|
+ if (!isQuarterMultiple(range) || range == null || range == ''||range<=0) {
|
|
|
+ alert("分数间隔必须是0.25的倍数");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ $("#refresh").attr("href","${ctx}/admin/exam/reportSubjectRange/report?subjectCode="+code+"&range="+range);
|
|
|
});
|
|
|
$('#subjectCode').change(function () {
|
|
|
var code = $(this).val();
|
|
@@ -164,7 +172,7 @@
|
|
|
|
|
|
function goSearch() {
|
|
|
var range = $("#range").val();
|
|
|
- if (!isQuarterMultiple(range) || range == null || range == '') {
|
|
|
+ if (!isQuarterMultiple(range) || range == null || range == ''||range<=0) {
|
|
|
alert("分数间隔必须是0.25的倍数");
|
|
|
return false;
|
|
|
}
|