From ae34273f4293a8f176d7145a8ae90a20ae00a7b8 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 25 Oct 2019 15:03:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/competition_settings/index.js      |  8 +++---
 .../competition_settings/index.html.erb       | 26 +++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js
index 35ced0197..9eb53d529 100644
--- a/app/assets/javascripts/admins/competition_settings/index.js
+++ b/app/assets/javascripts/admins/competition_settings/index.js
@@ -185,10 +185,8 @@ $(function () {
             '          <span class="mt-2">人</span>\n' +
             '          <div class="col-2 mt-1">\n' +
             '            <select class="form-control" name="competition_staffs[][category]">\n' +
-            '              <option value="all">不限</option>\n' +
-            '              <option value="teacher">教师</option>\n' +
             '              <option value="student">学生</option>\n' +
-            '              <option value="profession">专业人士</option>\n' +
+            '              <option value="teacher">教师</option>\n' +
             '            </select>\n' +
             '          </div>\n' +
             '          <div class="col-2 mt-1">\n' +
@@ -457,11 +455,11 @@ function addNewTab() {
     var html = '<div class="large_panel_part" attr_line="'+count+'"><div class="row d-flex mt-3">\n' +
         '          <span class="col-1 mt-2">tab标题</span>\n' +
         '          <div class="col-2 no_padding">\n' +
-        '            <input type="text" class="form-control" name="tab_title_1"/>\n' +
+        '            <input type="text" class="form-control" name="stage_name"/>\n' +
         '          </div>\n' +
         '          <span class="col-1 text-right mt-2 no_padding">总排行榜占比:</span>\n' +
         '          <div class="col-1 no_padding">\n' +
-        '            <input type="number" class="form-control" name="tab_percent_'+count+'"/>\n' +
+        '            <input type="number" class="form-control" name="score_rate" value="100"/>\n' +
         '          </div><span class=" mt-2">%</span>\n' +
         '          <div class="flex-1">\n' +
         '            <a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add_task_sub" onclick="add_task_sub(this)">新增子阶段</a>\n' +
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 21ca680c2..44e3da7ee 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -238,10 +238,8 @@
                   <span class="mt-2">人</span>
                   <div class="col-2 mt-1">
                     <select class="form-control" name="competition_staffs[][category]">
-                      <option value="all" <%= staff.category == "all" ? "selected='selected'" : "" %>>不限</option>
-                      <option value="teacher" <%= staff.category == "teacher" ? "selected='selected'" : "" %>>教师</option>
                       <option value="student" <%= staff.category == "student" ? "selected='selected'" : "" %>>学生</option>
-                      <option value="profession" <%= staff.category == "profession" ? "selected='selected'" : "" %>>专业人士</option>
+                      <option value="teacher" <%= staff.category == "teacher" ? "selected='selected'" : "" %>>教师</option>
                     </select>
                   </div>
                   <div class="col-2 mt-1">
@@ -417,7 +415,7 @@
             <% end %>
           <% end %>
         <% else %>
-          <%= form_tag(admins_competition_competition_stages_path(competition_id: @competition.id), method: :post, class: 'stage_update_form flex-1', remote: true) do %>
+          <%= form_tag(admins_competition_competition_stages_path(competition_id: @competition.id), method: :post, class: 'stage-update-form new-stage-form flex-1', remote: true) do %>
             <div class="large_panel_part" attr_line="1">
               <div class="row d-flex">
                 <span class="col-1 mt-2">tab标题</span>
@@ -426,7 +424,7 @@
                 </div>
                 <span class="col-1 text-right mt-2 no_padding">总排行榜占比:</span>
                 <div class="col-1 no_padding">
-                  <input type="number" class="form-control" name="tab_percent_1"/>
+                  <input type="number" class="form-control" name="score_rate" value="100"/>
                 </div><span class=" mt-2">%</span>
                 <div class="flex-1">
                   <a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add_task_sub" onclick="add_task_sub(this)">新增子阶段</a>
@@ -435,36 +433,36 @@
                 <a href="javascript:void(0)" class="btn btn-outline-primary export-action ml20">保存</a>
               </div>
               <div id="small_panel_1" class="small_panel">
-                <div class="row d-flex small_panel_item" attr_line="sub_1_1" count="1">
+                <div class="row d-flex small_panel_item" attr_line="sub_new_new" count="1">
                   <span class="col-1 mt-2 subName">第1阶段</span>
                   <div class="flex-1">
                     <div class="row">
                       <span class="mt-2 ml20">有效时间:</span>
                       <div class="col-2 no_padding input_middle">
-                        <input class="use_time_begin_1_1 form-control" placeholder="有效开始时间"/>
+                        <%= 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">
-                        <input class="use_time_end_1_1 form-control" placeholder="有效结束时间"/>
+                        <%= text_field_tag 'stage[][end_time]', '', autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %>
                       </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" name="task_require_small_1_1"/>
+                        <input type="number" class="form-control" name="stage[][mission_count]" value="1"/>
                       </div>
                       <span class="mt-2 ml10 mr10">/</span>
                       <div class="col-1 no_padding input_small">
-                        <input type="number" class="form-control task_all" onchange="change_total(this)" name="task_require_all_1_1"/>
+                        <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]"/>
                       </div>
                       <span class=" mt-2">(总任务)</span>
                       <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>
                       <div class="col-2 no_padding input_middle">
-                        <select class="form-control" name="source_1_1">
-                          <option>经验值</option>
-                          <option>预测准确率</option>
+                        <select class="form-control" name="stage[][score_source]">
+                          <option value="0">经验值</option>
+                          <option value="1">预测准确率</option>
                         </select>
                       </div>
                     </div>
-                    <div class="row mt-2" id="task_Input_sub_1_1"></div>
+                    <div class="row mt-2" id="task_Input_sub_new_new"></div>
                   </div>
                   <span>
               <a href="javascript:void(0)" class="btn btn-default ml20 small_panel_item_del">删除</a>