";
- nNext.html(html);
- });
-
// 选择题提交评测
// answer 选择的答案
function choice_submmit(){
diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb
index c18486db3..7d69d3d5a 100644
--- a/app/views/games/_game_results.html.erb
+++ b/app/views/games/_game_results.html.erb
@@ -143,20 +143,7 @@
$("#blacktab_nav_1").trigger("click");
});
- // 公开的测试集允许展开与隐藏
- function toggle_test_case(t_case, id){
- if(true){
- var nTest = $("#test_case_"+id).prev(".-task-ces-top").children("i:first-child"); //图标节点
- if (nTest.hasClass("fa-caret-down")){
- nTest.addClass("fa-caret-right");
- nTest.removeClass("fa-caret-down");
- }else if( nTest.hasClass("fa-caret-right") ){
- nTest.addClass("fa-caret-down");
- nTest.removeClass("fa-caret-right");
- }
- $("#test_case_"+id).toggle();
- }
- }
+
function g_new(o){return document.getElementById(o);}
function HoverLi(n){
for(var i=1;i<=3;i++){
diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb
index a0fa4bff3..2d00901ba 100644
--- a/app/views/games/_game_show.html.erb
+++ b/app/views/games/_game_show.html.erb
@@ -120,117 +120,6 @@
\ No newline at end of file
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 74a8fca4d..55a9bd559 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -68,22 +68,4 @@
control_1 = 0;
}
}
-
- /* --------------------------------点击全部任务向右侧展开-----------------------------------------*/
- $("#all_task_show").on("click", function(e){
- c = 0;
- $("#all_task_tab").removeClass('leftnav-active');
- $("#all_task_show").css("background","rgba(0,0,0,0)");
- $("#all_task_index").css("left", 0).stop().animate({
- left: "-505px"
- }, 400, function(){
- $("#all_task_show").hide();
- fadein = 0;
- });
- });
- // 列表区域阻止事件冒泡
- $("#all_task_index").on("click", function(e){
- e.stopPropagation();
- });
-
\ No newline at end of file
diff --git a/app/views/shixuns/shixun_discuss.js.erb b/app/views/shixuns/shixun_discuss.js.erb
index 6c916820f..fac26ce2e 100644
--- a/app/views/shixuns/shixun_discuss.js.erb
+++ b/app/views/shixuns/shixun_discuss.js.erb
@@ -2,4 +2,12 @@ $("#shixun_comment_block").replaceWith("<%= j(render :partial => "games/shixun_c
$(".-tab-nav li").removeClass("tab_hover");
$('#tab_nav_4').addClass("tab_hover");
$(".tab-info").hide();
-$('#tab_con_4').show().html("<%= j(render :partial => "games/shixun_comment_list") %>");
\ No newline at end of file
+$('#tab_con_4').show().html("<%= j(render :partial => "games/shixun_comment_list") %>");
+
+// 评论区域的回复按钮
+function reply_to_dis(id, name){
+ $("#comment_news").attr("placeholder", "回复"+name+":");
+ $("#dis_reply_id").val(id);
+ $("#comment_news").focus();
+}
+// end
\ No newline at end of file
diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js
index 1f7d358f0..ac26c9931 100644
--- a/public/javascripts/edu/edu_tpi.js
+++ b/public/javascripts/edu/edu_tpi.js
@@ -1,5 +1,140 @@
// 实训游戏需要的js功能
-
+var EXPAND = 0; // 放大
+var SHRINK = 1; // 缩小
$(function(){
-
-});
\ No newline at end of file
+ // TPI拖拽功能 begin
+ var doc = $(document);
+ var lab = $(".b-label");
+ var cen = $(".h-center");
+ var nextW2,nextW1;
+ var dragging = false;
+ var flag = false;
+ var wrapWidth;
+ var wrapHeight;
+ lab.bind('mousedown',function(){
+ dragging = true;
+ leftOffset = $(".labelN").offset().left;
+ wrapWidth = $(".labelN").width();
+ return false;
+ }
+ );
+ cen.bind('mousedown',function(){
+ flag = true;
+ topOffset = $(".centerH").offset().top;
+ wrapHeight = $(".centerH").height();
+ return false;
+ }
+ );
+ doc.bind('mousemove',function(e){
+
+ $(".-brother").show();// 代码行的遮罩显示
+ if(dragging) {
+ clickX = e.pageX;
+ if(clickX > leftOffset+300&&clickX";
+ nNext.html(html);
+ });
+});
From 0e4287710e35fd0880b6afd0ba5a146bb64fc60f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 8 Aug 2017 17:13:50 +0800
Subject: [PATCH 03/40] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPI=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/games/_game_show.html.erb | 10 ++----
app/views/games/_repository.html.erb | 43 +----------------------
public/javascripts/edu/edu_tpi.js | 51 +++++++++++++++++++++++++++-
3 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb
index 2d00901ba..54ec33729 100644
--- a/app/views/games/_game_show.html.erb
+++ b/app/views/games/_game_show.html.erb
@@ -20,7 +20,7 @@
背景知识
<% unless @game_challenge.answer.blank? %>
- ";
nNext.html(html);
});
+ // end
});
+
+// 查看参考答案
+function open_answer(game, myshixun){
+ $.ajax({
+ url: "/myshixuns/" + myshixun + "/stages/" + game + "/answer",
+ dataType: "script"
+ })
+}
+
+// 代码/webssh的tab点击事件
+function g_l(o){return document.getElementById(o);}
+function HoverLi_new(n){
+ for(var i=1;i<=2;i++){
+ g_l('codetab_nav_'+i).className='blacktab_nomal';
+ g_l('codetab_con_'+i).className='undis';
+
+ }
+ if(n==2){
+ $("#games_repository_contents").removeClass("-bg-black").addClass("-bg-weightblack");
+ $("#-bg-change-color").removeClass("-bg-black").addClass("-bg-weightblack");
+ }else{
+ $("#games_repository_contents").removeClass("-bg-weightblack").addClass("-bg-black");
+ $("#-bg-change-color").removeClass("-bg-weightblack").addClass("-bg-black");
+ }
+ g_l('codetab_con_'+n).className='dis -relative';
+ g_l('codetab_nav_'+n).className='blacktab_hover';
+};
+
+// webssh连接
+function webssh_connect(myshixun){
+ $.ajax({
+ url: "/myshixuns/" + myshixun + '/open_webssh',
+ success: function(data){
+ if(data.error){
+ return;
+ }else{
+ // 测试版
+ var html = "";
+ // 本地版
+ var html_local ="";
+ $("#codotab_con_2").html(html);
+ HoverLi_new(2);
+ }
+ }
+ })
+}
+// end
+
From f5551c78f47d129a4940ce3181eec410d747f016 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 9 Aug 2017 09:09:51 +0800
Subject: [PATCH 04/40] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPI=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/games/_repository.html.erb | 7 ++-----
public/javascripts/edu/edu_tpi.js | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb
index c2064b257..39179090c 100644
--- a/app/views/games/_repository.html.erb
+++ b/app/views/games/_repository.html.erb
@@ -2,7 +2,7 @@
"+ + ""+ + " "+ had_passed_testsests_error_count / test_sets_count +""+ + " latest_output "+ + "
"; + }else{ + $d = ""+ + ""+ + ""+ test_sets_count / test_sets_count +" 全部通过
"; + } + $("#evaluating_contents").append($d); +} + +for(var i = 0; i < test_sets.length; i++ ){ + $e = ""; + $f = ""+ test_sets[i].input == null ?"+空+" : test_sets[i].input.replace(/\r\n/g,"
")+"
"+ test_sets[i].output == null ? "+空+" : test_sets[i].output.replace(/\r\n/g,"
")+"
"+ test_sets[i].actual_output == null ? "+空+" : test_sets[i].actual_output.replace(/\r\n/g,"
") +"
此为隐藏测试项，暂不支持查看
"+ + ""+ + ""+ + ""+had_passed_testsests_error_count / test_sets_count +" "+ latest_output +"
"; + + }else{ + $n = ""+ + ""+ + ""+ test_sets_count / test_sets_count +" 全部通过
"; + } + $("#evaluating_info").append($n); +} + + // end From d2eaff399954a5efb4cbe58fe07212e5774e73c7 Mon Sep 17 00:00:00 2001 From: miss <994230062@qq.com> Date: Wed, 9 Aug 2017 17:02:27 +0800 Subject: [PATCH 07/40] =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/edu/edu_tpi.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index 6dadd829a..cdd99caf6 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -204,6 +204,10 @@ function webssh_connect(myshixun, url){ +function code_evaluation(language, had_done_test, had_passed_testsests_error_count,test_sets_count,test_sets,had_passed_testsests_public_count,test_sets_public_count,had_passed_testsests_hidden_count,test_sets_hidden_count,final_score,latest_output,test_sets_count){ + +} + //动态加载评测区域 /** * Created by wang on 2017/8/9. From f31b92a2cb4bb730050891b0d08ba20997d695ec Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 9 Aug 2017 17:03:25 +0800 Subject: [PATCH 08/40] =?UTF-8?q?TPiJS=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 7d69d3d5a..931ccea6b 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -117,6 +117,12 @@ \ No newline at end of file diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index 0900c8e08..61aa2584c 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -202,6 +202,19 @@ function webssh_connect(myshixun, url){ }) } +// 评测区域点击TAB切换样式 +function check_tab(allClassName,addClassName,item){ + //点击tab添加样式 + $("."+allClassName).removeClass(addClassName); + $(item).addClass(addClassName); + //获取当前点击的tab的索引位置 + var index=$(item).index()+1; + //显示或隐藏对应的内容块 + $("#"+allClassName+"_"+index).siblings().addClass("undis"); + $("#"+allClassName+"_"+index).removeClass("undis"); +} +// end + // test_sets：测试集；had_test_count：输出集的个数；test_sets_count：测试集的个数；had_passed_testsests_error_count：测试集报错数；test_sets_hidden_count：隐藏测试集的个数 // test_sets_public_count：公开测试集的个人；had_passed_testsests_hidden_count：通过的隐藏集个数；had_passed_testsests_public_count：通过的公开测试集个数 // final_score：最终得分；latest_output：最新的输出；language：实训的语言 From dca686ef3aceb92541f6d70fd82ab37c3c9825ff Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 10 Aug 2017 10:12:08 +0800 Subject: [PATCH 16/40] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 1 - public/javascripts/edu/edu_tpi.js | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 99c46310e..2321bda0b 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -134,7 +134,6 @@ [<%= @latest_output.html_safe unless @latest_output.blank? %>], '<%= @language %>' ); - $("#game_test_set_results").html(html); $("#blacktab_nav_1").trigger("click"); }); diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index 5937a6cc8..b16cca0df 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -279,6 +279,11 @@ function code_evaluation(test_sets, } for (var i = 0; i < test_sets.length; i++) { + console.log("test_sets: " + test_sets[i].result); + console.log("test_sets: " + test_sets[i].is_public); + console.log("test_sets: " + test_sets[i].actual_output); + console.log("test_sets: " + test_sets[i].output); + console.log("test_sets: " + test_sets[i].input); $e = ""; $f = "" + "" + - " " + had_passed_testsests_error_count / test_sets_count + "" + - " latest_output " + - "
"; + " " + had_passed_testsests_error_count / test_sets_count + "" + latest_output + ""; + } else { $d = "" + "" + @@ -277,13 +275,13 @@ function code_evaluation(test_sets, } $("#evaluating_contents").html($d); } - + console.log(test_sets.length); for (var i = 0; i < test_sets.length; i++) { - console.log("test_sets: " + test_sets[i].result); - console.log("test_sets: " + test_sets[i].is_public); - console.log("test_sets: " + test_sets[i].actual_output); - console.log("test_sets: " + test_sets[i].output); - console.log("test_sets: " + test_sets[i].input); + console.log("test_sets[" +i+"]" + test_sets[i].result); + console.log("test_sets[" +i+"]" + test_sets[i].is_public); + console.log("test_sets[" +i+"]" + test_sets[i].actual_output); + console.log("test_sets[" +i+"]" + test_sets[i].output); + console.log("test_sets[" +i+"]" + test_sets[i].input); $e = "
"; $f = "" + @@ -273,20 +262,14 @@ function code_evaluation(test_sets, "" + "" + test_sets_count / test_sets_count + " 全部通过
"; } - $("#evaluating_contents").html($d); + } - console.log(test_sets.length); for (var i = 0; i < test_sets.length; i++) { console.log("test_sets[" +i+"]" + test_sets[i].result); console.log("test_sets[" +i+"]" + test_sets[i].is_public); console.log("test_sets[" +i+"]" + test_sets[i].actual_output); console.log("test_sets[" +i+"]" + test_sets[i].output); console.log("test_sets[" +i+"]" + test_sets[i].input); - $e = ""; - $f = "" + test_sets[i].input == null ? "+空+" : test_sets[i].input.replace(/\r\n/g, "
") + "
" + test_sets[i].output == null ? "+空+" : test_sets[i].output.replace(/\r\n/g, "
") + "
" + test_sets[i].actual_output == null ? "+空+" : test_sets[i].actual_output.replace(/\r\n/g, "
") + "
此为隐藏测试项，暂不支持查看
" + + "" + + "" + + "" + had_passed_testsests_error_count / test_sets_count + " " + latest_output + "
"; + + } else { + $n = "" + + "" + + "" + test_sets_count / test_sets_count + " 全部通过
"; + } + // $("#evaluating_info").html($n); + } $EvaluationInformation = "" + - "" + - "" + had_passed_testsests_error_count / test_sets_count + " " + latest_output + "
"; - } else { - $n = "" + - "" + - "" + test_sets_count / test_sets_count + " 全部通过
"; - } - $("#evaluating_info").html($n); - } var $html = $EffectDisplay + $TestResult + $EvaluationInformation; console.log("第一块区域：" + $EffectDisplay); console.log("第二块区域：" + $TestResult); console.log("第三块区域：" + $EvaluationInformation); + console.log($("#evaluating_info")); + console.log($(".-task-ces-box")); console.log("had_test_count: " + had_test_count); console.log("test_sets_count: " + test_sets_count); console.log("had_passed_testsests_error_count: " + had_passed_testsests_error_count); @@ -402,5 +445,7 @@ function code_evaluation(test_sets, console.log("language: " + language); $("#game_test_set_results").html($html); } +console.log($("#evaluating_info")); +console.log($(".-task-ces-box")); // end From a0c2282fba6a4e2b05e06d26709baeaddd3f47ed Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 10 Aug 2017 15:42:27 +0800 Subject: [PATCH 19/40] =?UTF-8?q?tpi=E8=AF=84=E6=B5=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/edu/edu_tpi.js | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index 4fff6f170..5437de04c 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -115,22 +115,6 @@ $(function(){ }); // end - // 选择题选择答案 - function choice_answer(st, nThis){ - if(st == "1"){ - //$(nThis).hasClass("card-check") ? $(nThis).removeClass("card-check") : $(nThis).addClass("card-check"); - $(nThis).toggleClass("card-check"); - $(nThis).toggleClass("color_white"); - } else if (st == "2"){ - var choice = $(".color_white"); - choice.removeClass("card-check"); - choice.removeClass("color_white"); - $(nThis).addClass("card-check"); - $(nThis).toggleClass("color_white"); - } - } - // end - // 下一关增加loading效果 $("#next_step").live("click", function(){ nNext = $("#code_estimate"); @@ -202,6 +186,22 @@ function webssh_connect(myshixun, url){ }) } +// 选择题选择答案 +function choice_answer(st, nThis){ + if(st == "1"){ + //$(nThis).hasClass("card-check") ? $(nThis).removeClass("card-check") : $(nThis).addClass("card-check"); + $(nThis).toggleClass("card-check"); + $(nThis).toggleClass("color_white"); + } else if (st == "2"){ + var choice = $(".color_white"); + choice.removeClass("card-check"); + choice.removeClass("color_white"); + $(nThis).addClass("card-check"); + $(nThis).toggleClass("color_white"); + } +} +// end + // 评测区域点击TAB切换样式 function check_tab(allClassName,addClassName,item){ //点击tab添加样式 From e2c9a094ff39b50b9069f5ee87c88491fe97bfa0 Mon Sep 17 00:00:00 2001 From: miss <994230062@qq.com> Date: Thu, 10 Aug 2017 16:23:12 +0800 Subject: [PATCH 20/40] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/edu/edu_tpi.js | 56 ++++--------------------------- 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index ab0806cff..35c3941bc 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -264,6 +264,8 @@ function code_evaluation(test_sets, } } + var $forHtml = ""; + var $Bear = ""; for (var i = 0; i < test_sets.length; i++) { console.log("test_sets[" +i+"]" + test_sets[i].result); console.log("test_sets[" +i+"]" + test_sets[i].is_public); @@ -318,62 +320,16 @@ function code_evaluation(test_sets, $e = "" + test_sets[i].input == null ? "+空+" : test_sets[i].input.replace(/\r\n/g, "
") + "
" + test_sets[i].output == null ? "+空+" : test_sets[i].output.replace(/\r\n/g, "
") + "
" + test_sets[i].actual_output == null ? "+空+" : test_sets[i].actual_output.replace(/\r\n/g, "
") + "
此为隐藏测试项，暂不支持查看
" + - "" + "" + - " " + had_passed_testsests_error_count / test_sets_count + "" + latest_output + "
"; + " " + had_passed_testsests_error_count + '/' + test_sets_count + "" + latest_output + ""; } else { $d = "" + "" + - "" + test_sets_count / test_sets_count + " 全部通过
"; + "" + test_sets_count + "/" + test_sets_count + " 全部通过"; } } @@ -288,19 +288,19 @@ function code_evaluation(test_sets, "" + test_sets[i].input == null ? "+空+" : test_sets[i].input.replace(/\r\n/g, "
") + "
" + ( test_sets[i].input == null ? "+空+" : test_sets[i].input.replace(/\r\n/g, "
") ) + "
" + test_sets[i].output == null ? "+空+" : test_sets[i].output.replace(/\r\n/g, "
") + "
" + ( test_sets[i].output == null ? "+空+" : test_sets[i].output.replace(/\r\n/g, "
") ) + "
" + test_sets[i].actual_output == null ? "+空+" : test_sets[i].actual_output.replace(/\r\n/g, "
") + "
" + (test_sets[i].actual_output == null ? "+空+" : test_sets[i].actual_output.replace(/\r\n/g, "
")) + "
" + "" + - "" + had_passed_testsests_error_count / test_sets_count + " " + latest_output + "
"; + "" + had_passed_testsests_error_count + "/" + test_sets_count + " " + latest_output + ""; } else { $n = "" + "" + - "" + test_sets_count / test_sets_count + " 全部通过
"; + "" + test_sets_count + "/" + test_sets_count + " 全部通过"; } // $("#evaluating_info").html($n); } @@ -361,11 +361,11 @@ function code_evaluation(test_sets, "