From e8c9e6d9c0fa335758981345ca5e9afde0527a47 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 31 Oct 2019 09:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98-?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/competition_settings/index.js      | 106 +++++++++---------
 .../admins/competition_settings.scss          |  25 +++++
 .../competition_settings/index.html.erb       |  96 +++++++++-------
 3 files changed, 132 insertions(+), 95 deletions(-)

diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js
index 81fbf7519..92ecf2440 100644
--- a/app/assets/javascripts/admins/competition_settings/index.js
+++ b/app/assets/javascripts/admins/competition_settings/index.js
@@ -471,45 +471,45 @@ $(document).on('turbolinks:load', function(){
                     '        </div>\n' +
                     '        <div id="small_panel_'+count+'" class="small_panel">\n' +
                     '                <div class="row d-flex small_panel_item" attr_line="sub_new_new" count="1">\n' +
-                    '                  <span class="col-1 mt-2 subName">第1阶段</span>\n' +
+                    '                  <span class="mt-2 subName mr10">第1阶段</span>\n' +
                     '                  <div class="flex-1">\n' +
                     '                    <div class="row">\n' +
-                    '                      <span class="mt-2 ml20">有效时间:</span>\n' +
-                    '                      <div class="col-2 no_padding input_middle">\n' +
+                    '                      <div class="row col-6"><span class="mt-2 ml20">有效时间:</span>\n' +
+                    '                      <div class="col-4 no_padding">\n' +
                     '                        <input type="text" name="stage[][start_time]" id="stage__start_time" value="" autocomplete="off" class="section-start-time form-control" placeholder="有效开始时间">\n' +
                     '                      </div>\n' +
                     '                      <span class="mt-2">~</span>\n' +
-                    '                      <div class="col-2 no_padding input_middle">\n' +
+                    '                      <div class="col-4 no_padding ">\n' +
                     '                        <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' +
-                    '                      </div>\n' +
-                    '                      <span class="col-2 text-right mt-2 no_padding">总任务数:</span>\n' +
-                    '                      <div class="col-1 no_padding input_small">\n' +
+                    '                      </div></div>\n' +
+                    '                      <div class="row col-3"><span class="col-4 text-right mt-2 no_padding">总任务数:</span>\n' +
+                    '                      <div class="col-6 no_padding ">\n' +
                     '                        <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
-                    '                      </div>\n' +
-                    '                      <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' +
-                    '                      <div class="col-2 no_padding input_middle">\n' +
+                    '                      </div></div>\n' +
+                    '                      <div class="row col-4"><span class="col-3 text-right mt-2 no_padding">成绩来源:</span>\n' +
+                    '                      <div class="col-7 no_padding ">\n' +
                     '                        <select class="form-control" name="stage[][score_source]">\n' +
                     '                          <option value="0">经验值</option>\n' +
                     '                          <option value="1">预测准确率</option>\n' +
                     '                        </select>\n' +
-                    '                      </div>\n' +
+                    '                      </div></div>\n' +
                     '                    </div>\n' +
                     '                    <div class="row mt-2" id="task_Input_sub_new_new">\n' +
                     '                      <div class="col-4 row task_Input_div">\n' +
-                    '                        <span class="col-3 text-center mt-3">任务1</span>\n' +
-                    '                        <div class="col-8">\n' +
+                    '                        <span class="col-4 text-right mt-3 no_padding mr10">任务1</span>\n' +
+                    '                        <div class="col-6 no_padding">\n' +
                     '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
                     '                        </div>\n' +
                     '                      </div>\n' +
                     '                      <div class="col-4 row task_Input_div">\n' +
-                    '                        <span class="col-3 text-center mt-3">任务2</span>\n' +
-                    '                        <div class="col-8">\n' +
+                    '                        <span class="col-4 text-right mt-3 no_padding mr10">任务2</span>\n' +
+                    '                        <div class="col-6 no_padding">\n' +
                     '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
                     '                        </div>\n' +
                     '                      </div>\n' +
                     '                      <div class="col-4 row task_Input_div">\n' +
-                    '                        <span class="col-3 text-center mt-3">任务3</span>\n' +
-                    '                        <div class="col-8">\n' +
+                    '                        <span class="col-4 text-right mt-3 no_padding mr10">任务3</span>\n' +
+                    '                        <div class="col-6 no_padding">\n' +
                     '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
                     '                        </div>\n' +
                     '                      </div>\n' +
@@ -547,45 +547,45 @@ $(document).on('turbolinks:load', function(){
 
 
             var html='<div class="row d-flex small_panel_item" attr_line="sub_'+index+'_'+count+'" count="'+count+'">\n' +
-                '            <span class="col-1 mt-2 subName">第'+showCount+'阶段</span>\n' +
+                '            <span class="mr10 mt-2 subName">第'+showCount+'阶段</span>\n' +
                 '            <div class="flex-1">\n' +
                 '                    <div class="row">\n' +
-                '                      <span class="mt-2 ml20">有效时间:</span>\n' +
-                '                      <div class="col-2 no_padding input_middle">\n' +
+                '                      <div class="row col-6"><span class="mt-2 ml20 mr10">有效时间:</span>\n' +
+                '                      <div class="col-4 no_padding ">\n' +
                 '                        <input type="text" name="stage[][start_time]" id="stage__start_time" value="" autocomplete="off" class="section-start-time form-control" placeholder="有效开始时间">\n' +
                 '                      </div>\n' +
                 '                      <span class="mt-2">~</span>\n' +
-                '                      <div class="col-2 no_padding input_middle">\n' +
+                '                      <div class="col-4 no_padding ">\n' +
                 '                        <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' +
-                '                      </div>\n' +
-                '                      <span class="col-2 text-right mt-2 no_padding">总任务数:</span>\n' +
-                '                      <div class="col-1 no_padding input_small">\n' +
+                '                      </div></div>\n' +
+                '                      <div class="row col-3"><span class="col-4 text-right mt-2 no_padding mr10">总任务数:</span>\n' +
+                '                      <div class="col-6 no_padding ">\n' +
                 '                        <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
-                '                      </div>\n' +
-                '                      <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' +
-                '                      <div class="col-2 no_padding input_middle">\n' +
+                '                      </div></div>\n' +
+                '                      <div class="row col-4"><span class="col-3 mr10 text-right mt-2 no_padding">成绩来源:</span>\n' +
+                '                      <div class="col-7 no_padding ">\n' +
                 '                        <select class="form-control" name="stage[][score_source]">\n' +
                 '                          <option value="0">经验值</option>\n' +
                 '                          <option value="1">预测准确率</option>\n' +
                 '                        </select>\n' +
-                '                      </div>\n' +
+                '                      </div></div>\n' +
                 '                    </div>\n' +
                 '              <div class="row mt-2" id="task_Input_sub_'+index+'_'+count+'">\n'+
                 '                      <div class="col-4 row task_Input_div">\n' +
-                '                        <span class="col-3 text-center mt-3">任务1</span>\n' +
-                '                        <div class="col-8">\n' +
+                '                        <span class="col-4 text-right mt-3 no_padding mr10">任务1</span>\n' +
+                '                        <div class="col-6 no_padding">\n' +
                 '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
                 '                        </div>\n' +
                 '                      </div>\n' +
                 '                      <div class="col-4 row task_Input_div">\n' +
-                '                        <span class="col-3 text-center mt-3">任务2</span>\n' +
-                '                        <div class="col-8">\n' +
+                '                        <span class="col-4 text-right mt-3 no_padding mr10">任务2</span>\n' +
+                '                        <div class="col-6 no_padding">\n' +
                 '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
                 '                        </div>\n' +
                 '                      </div>\n' +
                 '                      <div class="col-4 row task_Input_div">\n' +
-                '                        <span class="col-3 text-center mt-3">任务3</span>\n' +
-                '                        <div class="col-8">\n' +
+                '                        <span class="col-4 text-right mt-3 no_padding mr10">任务3</span>\n' +
+                '                        <div class="col-6 no_padding">\n' +
                 '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
                 '                        </div>\n' +
                 '                      </div>\n' +
@@ -633,8 +633,8 @@ function change_total(item) {
     var html = "";
     if(count > divCount){
         for(var i=0;i < count-divCount ;i++){
-            html+='<div class="col-4 row task_Input_div"><span class="col-3 text-center mt-3">任务'+(divCount+i+1)+'</span>\n' +
-                '<div class="col-8">\n' +
+            html+='<div class="col-4 row task_Input_div"><span class="col-4 text-right mt-3 no_padding mr10">任务'+(divCount+i+1)+'</span>\n' +
+                '<div class="col-6 no_padding">\n' +
                 '<input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
                 '</div>\n' +
                 '</div>';
@@ -688,45 +688,45 @@ function addNewTab(competition_id) {
             '        </div>\n' +
             '        <div id="small_panel_'+count+'" class="small_panel">\n' +
             '                <div class="row d-flex small_panel_item" attr_line="sub_new_new" count="1">\n' +
-            '                  <span class="col-1 mt-2 subName">第1阶段</span>\n' +
+            '                  <span class="mt-2 subName mr10">第1阶段</span>\n' +
             '                  <div class="flex-1">\n' +
             '                    <div class="row">\n' +
-            '                      <span class="mt-2 ml20">有效时间:</span>\n' +
-            '                      <div class="col-2 no_padding input_middle">\n' +
+            '                      <div class="row col-6"><span class="mt-2 ml20 mr10">有效时间:</span>\n' +
+            '                      <div class="col-4 no_padding ">\n' +
             '                        <input type="text" name="stage[][start_time]" id="stage__start_time" value="" autocomplete="off" class="section-start-time form-control" placeholder="有效开始时间">\n' +
             '                      </div>\n' +
             '                      <span class="mt-2">~</span>\n' +
-            '                      <div class="col-2 no_padding input_middle">\n' +
+            '                      <div class="col-4 no_padding input_middle">\n' +
             '                        <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' +
-            '                      </div>\n' +
-            '                      <span class="col-2 text-right mt-2 no_padding">总任务数:</span>\n' +
-            '                      <div class="col-1 no_padding input_small">\n' +
+            '                      </div></div>\n' +
+            '                      <div class="row col-3"><span class="col-4 text-right mt-2 no_padding mr10">总任务数:</span>\n' +
+            '                      <div class="col-6 no_padding ">\n' +
             '                        <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
-            '                      </div>\n' +
-            '                      <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' +
-            '                      <div class="col-2 no_padding input_middle">\n' +
+            '                      </div></div>\n' +
+            '                      <div class="row col-4"><span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>\n' +
+            '                      <div class="col-7 no_padding ">\n' +
             '                        <select class="form-control" name="stage[][score_source]">\n' +
             '                          <option value="0">经验值</option>\n' +
             '                          <option value="1">预测准确率</option>\n' +
             '                        </select>\n' +
-            '                      </div>\n' +
+            '                      </div></div>\n' +
             '                    </div>\n' +
             '                    <div class="row mt-2" id="task_Input_sub_new_new">\n' +
             '                      <div class="col-4 row task_Input_div">\n' +
-            '                        <span class="col-3 text-center mt-3">任务1</span>\n' +
-            '                        <div class="col-8">\n' +
+            '                        <span class="col-3 text-right mt-3 no_padding mr10">任务1</span>\n' +
+            '                        <div class="col-8 no_padding">\n' +
             '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
             '                        </div>\n' +
             '                      </div>\n' +
             '                      <div class="col-4 row task_Input_div">\n' +
-            '                        <span class="col-3 text-center mt-3">任务2</span>\n' +
-            '                        <div class="col-8">\n' +
+            '                        <span class="col-3 text-right mt-3 no_padding mr10">任务2</span>\n' +
+            '                        <div class="col-8 no_padding">\n' +
             '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
             '                        </div>\n' +
             '                      </div>\n' +
             '                      <div class="col-4 row task_Input_div">\n' +
-            '                        <span class="col-3 text-center mt-3">任务3</span>\n' +
-            '                        <div class="col-8">\n' +
+            '                        <span class="col-3 text-right no_padding mr10 mt-3">任务3</span>\n' +
+            '                        <div class="col-8 no_padding">\n' +
             '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
             '                        </div>\n' +
             '                      </div>\n' +
diff --git a/app/assets/stylesheets/admins/competition_settings.scss b/app/assets/stylesheets/admins/competition_settings.scss
index cef12cae3..481a2d9b0 100644
--- a/app/assets/stylesheets/admins/competition_settings.scss
+++ b/app/assets/stylesheets/admins/competition_settings.scss
@@ -87,5 +87,30 @@
     .row:last-child{
       border:none;
     }
+
+    .task_Input_div:nth-child(3n-2) > span.col-4{
+      flex: 0 0 81px;
+      max-width: 81px;
+    }
+    .task_Input_div:nth-child(3n-2){
+      flex: 0 0 50%;
+      max-width: 50%;
+    }
+    .task_Input_div:nth-child(3n-1){
+      flex: 0 0 25%;
+      max-width: 25%;
+    }
+    .task_Input_div:nth-child(3n){
+      flex: 0 0 33.3%;
+      max-width: 33.3%;
+    }
+    .task_Input_div:nth-child(3n) > span.col-4{
+      flex: 0 0 25%;
+      max-width: 25%;
+    }
+    .task_Input_div:nth-child(3n) > div.col-6{
+      flex: 0 0 58.3%;
+      max-width: 58.3%;
+    }
   }
 }
\ No newline at end of file
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 225f05573..1c60f0601 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -386,34 +386,40 @@
                 <div id="small_panel_<%= index + 1 %>" class="small_panel">
                   <% stage.competition_stage_sections.each_with_index do |section, j| %>
                     <div class="row d-flex small_panel_item" attr_line="sub_<%= index %>_<%= j %>" count="<%= j + 1 %>">
-                      <span class="col-1 mt-2 subName">第<%= j + 1 %>阶段</span>
+                      <span class="mt-2 subName mr10">第<%= j + 1 %>阶段</span>
                       <div class="flex-1">
                         <div class="row">
-                          <span class="mt-2 ml20">有效时间:</span>
-                          <div class="col-2 no_padding input_middle">
-                            <%= text_field_tag 'stage[][start_time]', section.start_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'section-start-time form-control', placeholder: '有效开始时间' %>
-                          </div>
-                          <span class="mt-2">~</span>
-                          <div class="col-2 no_padding input_middle">
-                            <%= text_field_tag 'stage[][end_time]', section.end_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %>
+                          <div class="row col-6">
+                            <span class="ml20 mt-2 mr10">有效时间:</span>
+                            <div class="col-4 no_padding">
+                              <%= text_field_tag 'stage[][start_time]', section.start_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'section-start-time form-control', placeholder: '有效开始时间' %>
+                            </div>
+                            <span class="mt-2">~</span>
+                            <div class="col-4 no_padding">
+                              <%= text_field_tag 'stage[][end_time]', section.end_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %>
+                            </div>
                           </div>
-                          <span class="col-2 text-right mt-2 no_padding">总任务数:</span>
-                          <div class="col-1 no_padding input_small">
-                            <input type="number" class="form-control task_all" value="<%= section.entry %>" onchange="change_total(this)" name="stage[][entry]"/>
+                          <div class="row col-3">
+                            <span class="col-4 text-right mt-2 no_padding mr10">总任务数:</span>
+                            <div class="col-6 no_padding">
+                              <input type="number" class="form-control task_all" value="<%= section.entry %>" onchange="change_total(this)" name="stage[][entry]"/>
+                            </div>
                           </div>
-                          <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>
-                          <div class="col-2 no_padding input_middle">
-                            <select class="form-control" name="stage[][score_source]">
-                              <option value="0" <%= section.score_source == 0 ? "selected='selected'" : "" %>>经验值</option>
-                              <option value="1" <%= section.score_source == 1 ? "selected='selected'" : "" %>>预测准确率</option>
-                            </select>
+                          <div class="row col-4">
+                            <span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>
+                            <div class="col-7 no_padding">
+                              <select class="form-control" name="stage[][score_source]">
+                                <option value="0" <%= section.score_source == 0 ? "selected='selected'" : "" %>>经验值</option>
+                                <option value="1" <%= section.score_source == 1 ? "selected='selected'" : "" %>>预测准确率</option>
+                              </select>
+                            </div>
                           </div>
                         </div>
                         <div class="row mt-2" id="task_Input_sub_<%= index %>_<%= j %>">
                           <% section.competition_entries.each_with_index do |entry, z| %>
                             <div class="col-4 row task_Input_div">
-                              <span class="col-3 text-center mt-3">任务<%= z+1 %></span>
-                              <div class="col-8">
+                              <span class="col-4 text-right mt-3 no_padding mr10">任务<%= z+1 %></span>
+                              <div class="col-6 no_padding">
                                 <input type="text" class="form-control mt-2" value="<%= entry.shixun_identifier %>" name="stage[][identifiers][]" placeholder="请填写实训ID">
                               </div>
                             </div>
@@ -450,45 +456,51 @@
               </div>
               <div id="small_panel_1" class="small_panel">
                 <div class="row d-flex small_panel_item" attr_line="sub_new_new" count="1">
-                  <span class="col-1 mt-2 subName">第1阶段</span>
+                  <span class="mt-2 subName mr10">第1阶段</span>
                   <div class="flex-1">
                     <div class="row">
-                      <span class="mt-2 ml20">有效时间:</span>
-                      <div class="col-2 no_padding input_middle">
-                        <%= text_field_tag 'stage[][start_time]', '', autocomplete: 'off', class: 'section-start-time form-control', placeholder: '有效开始时间' %>
-                      </div>
-                      <span class="mt-2">~</span>
-                      <div class="col-2 no_padding input_middle">
-                        <%= text_field_tag 'stage[][end_time]', '', autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %>
+                      <div class="row col-6">
+                        <span class="mt-2 ml20 mr10">有效时间:</span>
+                        <div class="col-4 no_padding">
+                          <%= text_field_tag 'stage[][start_time]', '', autocomplete: 'off', class: 'section-start-time form-control', placeholder: '有效开始时间' %>
+                        </div>
+                        <span class="mt-2">~</span>
+                        <div class="col-4 no_padding">
+                          <%= text_field_tag 'stage[][end_time]', '', autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %>
+                        </div>
                       </div>
-                      <span class="col-2 text-right mt-2 no_padding">总任务数:</span>
-                      <div class="col-1 no_padding input_small">
-                        <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]"/>
+                      <div class="row col-3">
+                        <span class="col-4 text-right mt-2 no_padding mr10">总任务数:</span>
+                        <div class="col-6 no_padding">
+                          <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]"/>
+                        </div>
                       </div>
-                      <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>
-                      <div class="col-2 no_padding input_middle">
-                        <select class="form-control" name="stage[][score_source]">
-                          <option value="0">经验值</option>
-                          <option value="1">预测准确率</option>
-                        </select>
+                      <div class="row col-4">
+                        <span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>
+                        <div class="col-7 no_padding">
+                          <select class="form-control" name="stage[][score_source]">
+                            <option value="0">经验值</option>
+                            <option value="1">预测准确率</option>
+                          </select>
+                        </div>
                       </div>
                     </div>
                     <div class="row mt-2" id="task_Input_sub_new_new">
                       <div class="col-4 row task_Input_div">
-                        <span class="col-3 text-center mt-3">任务1</span>
-                        <div class="col-8">
+                        <span class="col-4 text-right mt-3 no_padding mr10">任务1</span>
+                        <div class="col-6 no_padding">
                           <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">
                         </div>
                       </div>
                       <div class="col-4 row task_Input_div">
-                        <span class="col-3 text-center mt-3">任务2</span>
-                        <div class="col-8">
+                        <span class="col-4 text-right mt-3 no_padding mr10">任务2</span>
+                        <div class="col-6 no_padding">
                           <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">
                         </div>
                       </div>
                       <div class="col-4 row task_Input_div">
-                        <span class="col-3 text-center mt-3">任务3</span>
-                        <div class="col-8">
+                        <span class="col-4 text-right mt-3 no_padding mr10">任务3</span>
+                        <div class="col-6 no_padding">
                           <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">
                         </div>
                       </div>