kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

评测区域代码优化

This commit is contained in:
daiao 2017-08-11 10:38:57 +08:00
parent f0b4b091b6
commit d93ef96d66
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/views/games/_code_actions.html.erb
View File

@ -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("<embed src='/images/bigdata/loading2.svg' />");
nInfoAjaxLoading.html("<embed src='/images/bigdata/loading2.svg' />");
//nHtmlAjaxLoading.html("<embed src='/images/bigdata/loading2.svg' />");
$("#code_test").html("<a class='task-btn mt8 mr15'>评测中..</a>");
$(".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 = "<a href='javascript:void(0)' class='task-btn task-btn-blue mr15 mt8' onclick='training_task_submmit();'>评测</a>";
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);
}}

2
public/javascripts/edu/edu_tpi.js
View File

@ -384,8 +384,6 @@ function code_evaluation(test_sets,
"</div>" +
"</div>";
var $html = $EffectDisplay + $TestResult + $EvaluationInformation;
console.log("第一块区域：" + $EffectDisplay);
console.log("第二块区域：" + $TestResult);