Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_local

app/views/challenges/_edit_evaluating_page.html.erb

@@ -165,9 +165,9 @@
         <li class="clearfix">
 
           <label class="panel-form-label fl">得分规范：</label>
-          <div class="radioStyle ml10">
+          <div class="radioStyle ml10 maxwidth600">
             <input type="radio" name="challenge[test_set_score]" <%= @challenge.test_set_score ? "" : "checked" %> value="0" id="All_tests" class="ml-3 mr5 magic-radio" onchange="hideSystem_score_percentage()"/>
-            <label class="mt3 maxwidth600" for="All_tests">通过全部测试集
+            <label class="mt3" for="All_tests">通过全部测试集
               <span class="color979797">（学员评测，仅当所有测试集都正确时，才获得一次性奖励）</span>
             </label>
           </div>
@@ -177,9 +177,9 @@
         <li class="clearfix">
 
           <label class="panel-form-label fl transparent">得分规范：</label>
-          <div class="fl ml10">
+          <div class="fl ml10 maxwidth600">
             <input type="radio" name="challenge[test_set_score]" <%= @challenge.test_set_score ? "checked" : "" %> value="1" id="Partial_test" class="ml5 mr5 magic-radio"  onchange="showSystem_score_percentage()"/>
-            <label class="mt3 maxwidth600" for="Partial_test">通过部分测试集
+            <label class="mt3" for="Partial_test">通过部分测试集
               <span class="color979797">（学员评测，当至少有一组测试集正确时，即可获得其对应比例的奖励）</span>
             </label>
           </div>
@@ -267,6 +267,9 @@
           </div>
         </div>
       </div>
+      <div>
+        <span class="color-orange mt8 fl ml20 mb20 none" id="occupy_type"><i class="fa fa-exclamation-circle mr3"></i>评分占比总和必须为100</span>
+      </div>
     </div>
     <div class="clearfix mt30">
       <a href="javascript:void(0)" class="defalutSubmitbtn fl mr20" onclick="challenge_evalute_submit()">提交</a>
@@ -416,6 +419,23 @@
     }
 
     function challenge_evalute_submit(){
+        var maxnum=0;
+        var percentagelist = document.getElementsByName("test_set[score][]");
+
+        if($("#Partial_test").is(":checked")) {
+            if ($("#Custom_ratio").is(":checked")) {
+                for (var i = 0; i < percentagelist.length; i++) {
+                    maxnum = maxnum+parseInt($(percentagelist[i]).val());
+
+                }
+            }
+        }
+
+        if(maxnum != 100){
+            $("#occupy_type").show()
+            return
+        }
+
         test_set_whether_lock();
         var path = $("#shixun_file_path");
         var exec_path = $("#shixun_file_path_play");

app/views/challenges/_evaluate_show.html.erb

@@ -84,7 +84,7 @@
       <label class="panel-form-label fl">得分规范：</label>
       <div class="radioStyle ml10">
         <input type="radio" name="specification" <%= @challenge.test_set_score ? "" : "checked" %> value="All_tests" id="All_tests" disabled class="ml-3 mr5 magic-radio" onchange="hideSystem_score_percentage()"/>
-        <label class="mt3 maxwidth600" for="All_tests">通过全部测试集
+        <label class="mt3" for="All_tests">通过全部测试集
           <span class="color979797">（学员评测，仅当所有测试集都正确时，才获得一次性奖励）</span>
         </label>
       </div>
@@ -96,7 +96,7 @@
       <label class="panel-form-label fl transparent">得分规范：</label>
       <div class="fl ml10">
         <input type="radio" name="specification" <%= @challenge.test_set_score ? "checked" : "" %> value="Partial_test" id="Partial_test" disabled class="ml5 mr5 magic-radio"  onchange="showSystem_score_percentage()"/>
-        <label class="mt3 maxwidth600" for="Partial_test">通过部分测试集
+        <label class="mt3" for="Partial_test">通过部分测试集
           <span class="color979797">（学员评测，当至少有一组测试集正确时，即可获得其对应比例的奖励）</span>
         </label>
       </div>

public/stylesheets/educoder/edu-main.css

@@ -1069,5 +1069,5 @@ html>body #ajax-indicator { position: fixed; }
 }
 
 .maxwidth600{
-    max-width: 600px;
+    width: 700px;
 }