From c1c45d642e553d6dc3d1363ce27a86928f3486ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sun, 5 May 2019 11:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E6=A4=8D=E6=96=B0=E7=89=88=E5=AE=9E?=
 =?UTF-8?q?=E8=AE=AD=E5=85=B3=E5=8D=A1=E6=8C=89=E6=B5=8B=E8=AF=95=E9=9B=86?=
 =?UTF-8?q?=E7=BB=99=E5=88=86=E5=90=8C=E6=AD=A5=E5=88=B0=E6=97=A7=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../challenges/_edit_evaluating_page.html.erb |  7 +-
 app/views/challenges/_evaluate_show.html.erb  | 73 +++++++++++++++++--
 public/stylesheets/educoder/edu-main.css      |  4 +
 3 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/app/views/challenges/_edit_evaluating_page.html.erb b/app/views/challenges/_edit_evaluating_page.html.erb
index 26e4d5e2..2a864787 100644
--- a/app/views/challenges/_edit_evaluating_page.html.erb
+++ b/app/views/challenges/_edit_evaluating_page.html.erb
@@ -134,7 +134,7 @@
             <input type="text" class="input-100-45 greyInput" autocomplete="off" id="shixun_file_standard_picture_path"
                    name="challenge[expect_picture_path]"  value="<%= @challenge.expect_picture_path %>"
                    placeholder ="请选择版本库中存储了标准答案代码输出文件的路径。例：src/step1/expectedimages"/>
-            <p class="color-grey-9 mt15">
+            <p class="color-grey-9 mt15 ">
               该路径下的文件将在学员评测本关任务时，作为参考答案显示在查看效果页，供学员参考任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开
             </p>
           </div>
@@ -161,12 +161,13 @@
     <div class="edu-back-white mb10 clearfix">
       <div class="padding40-20">
         <p class="color-grey-6 font-16">测试集和系统评分规则</p>
+
         <li class="clearfix">
 
           <label class="panel-form-label fl">得分规范：</label>
           <div class="radioStyle ml10">
             <input type="radio" name="specification" value="All_tests" id="All_tests" class="ml-3 mr5 magic-radio" onchange="hideSystem_score_percentage()"/>
-            <label class="mt3" for="All_tests">通过全部测试集
+            <label class="mt3 maxwidth600" for="All_tests">通过全部测试集
               <span class="color979797">（学员评测，仅当所有测试集都正确时，才获得一次性奖励）</span>
             </label>
           </div>
@@ -178,7 +179,7 @@
           <label class="panel-form-label fl transparent">得分规范：</label>
           <div class="fl ml10">
             <input type="radio" name="specification" value="Partial_test" id="Partial_test" class="ml5 mr5 magic-radio"  onchange="showSystem_score_percentage()"/>
-            <label class="mt3" for="Partial_test">通过部分测试集
+            <label class="mt3 maxwidth600" for="Partial_test">通过部分测试集
               <span class="color979797">（学员评测，当至少有一组测试集正确时，即可获得其对应比例的奖励）</span>
             </label>
           </div>
diff --git a/app/views/challenges/_evaluate_show.html.erb b/app/views/challenges/_evaluate_show.html.erb
index ddf20507..bb5e6a4c 100644
--- a/app/views/challenges/_evaluate_show.html.erb
+++ b/app/views/challenges/_evaluate_show.html.erb
@@ -78,7 +78,48 @@
   </div>
 </div>
 <div class="edu-back-white mb10 clearfix padding40-20">
-  <p class="color-grey-6 font-16">测试集设置</p>
+  <p class="color-grey-6 font-16">测试集和系统评分规则</p>
+    <li class="clearfix">
+
+      <label class="panel-form-label fl">得分规范：</label>
+      <div class="radioStyle ml10">
+        <input type="radio" name="specification" value="All_tests" id="All_tests" disabled class="ml-3 mr5 magic-radio" onchange="hideSystem_score_percentage()"/>
+        <label class="mt3 maxwidth600" for="All_tests">通过全部测试集
+          <span class="color979797">（学员评测，仅当所有测试集都正确时，才获得一次性奖励）</span>
+        </label>
+      </div>
+
+    </li>
+
+    <li class="clearfix">
+
+      <label class="panel-form-label fl transparent">得分规范：</label>
+      <div class="fl ml10">
+        <input type="radio" name="specification" value="Partial_test" id="Partial_test" disabled class="ml5 mr5 magic-radio"  onchange="showSystem_score_percentage()"/>
+        <label class="mt3 maxwidth600" for="Partial_test">通过部分测试集
+          <span class="color979797">（学员评测，当至少有一组测试集正确时，即可获得其对应比例的奖励）</span>
+        </label>
+      </div>
+
+    </li>
+
+    <li class="clearfix" id="System_score_percentage">
+
+      <label class="panel-form-label fl">系统评分占比：</label>
+
+      <span class="fl mr20 ml10">
+                    <input type="radio" name="Proportion" value="Equal_proportion" disabled id="Equal_proportion" class="ml5 mr5 magic-radio"/>
+                    <label class="mt3" for="Equal_proportion">均分比例</label>
+              </span>
+
+      <span class="fl mr20">
+                    <input type="radio" name="Proportion" value="Custom_ratio" disabled id="Custom_ratio" class="ml5 mr5 magic-radio"/>
+                    <label class="mt3" for="Custom_ratio">自定义比例</label>
+              </span>
+
+    </li>
+
+
   <div class="df">
     <div class="flex1 mr20">
       <div class="test_array_item mb15">
@@ -86,10 +127,17 @@
             <% @test_sets.each_with_index do |test, index| %>
                 <p class="clearfix pr mb20 mt20">
                   <span class="fl mt5 mr10 color-orange">*</span>
-                  <span class="color-blue font-16 fl" name="sample_inputs_label">组<%= index+1 %></span>
-                  <span class="fl ml20 color-grey-6">
+                  <span class="color-blue font-16 fl mr20" name="sample_inputs_label">组<%= index+1 %></span>
+
+                  <span class="fl color-grey-6 width90px mt3" name="percentagenumbox">
+                        <input class="fl martopf4 width44pxinline" disabled name="percentagenum">
+                        <span class="mr15 wid10px">%</span>
+                 </span>
+
+
+                  <span class="fl  color-grey-6">
                     <input type="checkbox" name="test_set[lock][]" <%= test.is_public? ? '' : 'checked' %> disabled class="magic-checkbox" id="hide-<%= index %>"/>
-                    <label for="hide-<%= index %>" style="top:2px">隐藏</label>
+                    <label for="hide-<%= index %>" style="top:4px">隐藏</label>
                   </span>
                 </p>
                 <div class="clearfix show_content_grey mb20">
@@ -111,4 +159,19 @@
     </div>
     <div style="width: 57px;"></div>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+    $(function(){
+
+        //填写百分比初始化
+        $("#All_tests").attr('checked', 'checked');
+        if($("#All_tests").is(":checked")){
+            $("#System_score_percentage").hide() //控制系统评分占比的显示
+        }
+
+        var percentagenumbox = document.getElementsByName("percentagenumbox"); //控制获取所有的input 的显示
+        var percentagelist = document.getElementsByName("percentagenum"); //获取所有的input 百分比框
+
+    })
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index d7445c10..7b0fa0ec 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -1066,4 +1066,8 @@ html>body #ajax-indicator { position: fixed; }
 .wid10px{
     display: inline-block;
     margin-left: 10px;
+}
+
+.maxwidth600{
+    max-width: 600px;
 }
\ No newline at end of file