diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index e5d0ed3df..94ea207d1 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -136,22 +136,16 @@ // 加载页面 nEvalContent = $("#evaluating_contents"); nEvalInfo = $("#evaluating_info"); - //nHtmlContent = $("#html_contents"); nAjaxLoading = $("#evaluating_ajax_loading"); - //nHtmlAjaxLoading = $("#html_ajax_loading"); nInfoAjaxLoading = $("#info_ajax_loading"); nAjaxLoading.css("display","flex"); nInfoAjaxLoading.css("display","flex"); - //nHtmlAjaxLoading.css("display","flex"); nEvalContent.hide(); nEvalInfo.hide(); - //nHtmlContent.hide(); nAjaxLoading.show(); nInfoAjaxLoading.show(); - // nHtmlAjaxLoading.show(); nAjaxLoading.html(""); nInfoAjaxLoading.html(""); - //nHtmlAjaxLoading.html(""); $("#code_test").html("评测中.."); $(".blacktab_con").eq(1).trigger("click"); // 回到测试结果页面 // 保存版本库代码 @@ -184,14 +178,13 @@ clearInterval(intId); nEvalContent.show(); nEvalInfo.show(); - //nHtmlContent.show(); nAjaxLoading.val(""); nInfoAjaxLoading.val(""); nAjaxLoading.hide(); nInfoAjaxLoading.hide(); - //nHtmlAjaxLoading.hide(); // test_sets 公开测,hide_test_sets 隐藏测试集 - var html = bt('t:exec_results_1',{ + + /* var html = bt('t:exec_results_1',{ "test_sets": eval('[' + data.test_sets + ']'), had_test_count: data.had_test_count, test_sets_count: data.test_sets_count, @@ -205,7 +198,21 @@ language: data.language }); $("#game_test_set_results").html(html); - $(".blacktab_con").eq(1).trigger("click"); // 回到测试结果页面 + $(".blacktab_con").eq(1).trigger("click"); // 回到测试结果页面*/ + code_evaluation( + eval('[' + data.test_sets + ']'), + data.had_test_count, + data.test_sets_count, + data.had_passed_testsests_error_count, + data.test_sets_hidden_count, + data.test_sets_public_count, + data.had_passed_testsests_hidden_count, + data.had_passed_testsests_public_count, + data.final_score, + data.latest_output, + data.language + ); + $("#blacktab_nav_1").trigger("click"); if(data.status == 2){ clearInterval(cm); clearInterval(intId); @@ -231,12 +238,10 @@ clearInterval(intId); nEvalContent.show(); nEvalInfo.show(); - //nHtmlContent.show(); nAjaxLoading.val(""); nInfoAjaxLoading.val(""); nAjaxLoading.hide(); nInfoAjaxLoading.hide(); - //nHtmlAjaxLoading.hide(); var html = "评测"; var html_1 = "实训云平台繁忙(繁忙等级:88)"; $("#code_test").html(html); @@ -246,13 +251,11 @@ complete: function(XMLHttpRequest,status){if(status=='timeout'){ clearInterval(intId); nEvalContent.show(); - //nHtmlContent.show(); nEvalInfo.show(); nAjaxLoading.val(""); nInfoAjaxLoading.val(""); nAjaxLoading.hide(); nInfoAjaxLoading.hide(); - //nHtmlAjaxLoading.hide(); ajaxTimeoutTest.abort(); clearInterval(intId); }} diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index b5f3be4aa..94e6253e7 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -384,8 +384,6 @@ function code_evaluation(test_sets, "" + ""; - - var $html = $EffectDisplay + $TestResult + $EvaluationInformation; console.log("第一块区域:" + $EffectDisplay); console.log("第二块区域:" + $TestResult);