yin 1 tahun lalu
induk
melakukan
f8f23540b9

+ 2 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -217,12 +217,13 @@ public class ReportSubjectRangeController extends BaseExamController {
             if (objective!=null && objective) {
             if (objective!=null && objective) {
                 ScoreReportObjectiveThread thread = new ScoreReportObjectiveThread(map, reportService, false);
                 ScoreReportObjectiveThread thread = new ScoreReportObjectiveThread(map, reportService, false);
                 taskExecutor.submit(thread);
                 taskExecutor.submit(thread);
+                return "redirect:/admin/exam/reportSubjectRange?subjectCode=" + subjectCode + "&range=" + 10 +"&objective="+objective;
             } else {
             } else {
                 ScoreReportThread thread = new ScoreReportThread(map, reportService, false);
                 ScoreReportThread thread = new ScoreReportThread(map, reportService, false);
                 taskExecutor.submit(thread);
                 taskExecutor.submit(thread);
             }
             }
         }
         }
-        return "redirect:/admin/exam/reportSubjectRange?subjectCode=" + subjectCode + "&range=" + 10 +"&objective="+objective;
+        return "redirect:/admin/exam/reportSubjectRange?subjectCode=" + subjectCode + "&range=" + 10;
     }
     }
 
 
     private JSONArray getScoreRange(String scoreRange, double totalScore, Integer totalCount, int range) {
     private JSONArray getScoreRange(String scoreRange, double totalScore, Integer totalCount, int range) {

+ 10 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectRange.jsp

@@ -132,6 +132,16 @@ $('#subjectCode').change(function () {
     }
     }
 });
 });
 
 
+$("#refresh").click(function(){
+    var locked = "${locked}";
+    if(locked!='false'){
+        return;
+    }
+    var code = $("#subjectCode").val();
+    var objective = $("#objective").is(':checked');
+    $("#refresh").attr("href","${ctx}/admin/exam/reportSubjectRange/report?subjectCode="+code+"&objective="+objective);
+});
+
 $("#export-button").click(function(){
 $("#export-button").click(function(){
 	if ($("#subjectCode").val() == null || $("#subjectCode").val() == '') {
 	if ($("#subjectCode").val() == null || $("#subjectCode").val() == '') {
         alert('请选择科目');
         alert('请选择科目');