diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js
index 944ddb7c7..c9df31bb9 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>
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index 50c0569ca..08e1d4183 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -960,7 +960,7 @@ class Registration extends React.Component {
 						<Breadcrumb separator=">">
 							<Breadcrumb.Item><Link to={"/competitions"}>在线竞赛</Link></Breadcrumb.Item>
 							<Breadcrumb.Item><Link
-								to={`/competitions/${this.props.match.params.identifier}/common_header`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name}</Link></Breadcrumb.Item>
+								to={`/competitions/${this.props.match.params.identifier}`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name}</Link></Breadcrumb.Item>
 							{/*<Breadcrumb.Item*/}
 							{/*	href={`/competitions/${this.props.match.params.identifier}/common_header`}></Breadcrumb.Item>*/}
 							<Breadcrumb.Item>报名</Breadcrumb.Item>
diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index 92136229c..9a23f66c1 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -117,16 +117,14 @@ class CompetitionsIndex extends Component{
 									size="large"
 									dataSource={datas&&datas}
 									renderItem={(item,key) => (
-										<a target="_blank"
-											 href={item.competition_status === "ended" ? `/competitions/${item.identifier}/common_header` : item.competition_status === "nearly_published" ? item.permission.editable == true ? `/competitions/${item.identifier}/common_header` : null : item.competition_status === "progressing" ? `/competitions/${item.identifier}/common_header` : null}
-											 className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
-												 item.permission.editable == true ? "competitionstitlesshou" : "endedfont" : "competitionstitlesshou"}
+										<a target="_blank" href={item.competition_status==="ended"?`/competitions/${item.identifier}`:item.competition_status==="nearly_published"?item.permission.editable==true?`/competitions/${item.identifier}`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}`:null}
+											className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
+												 item.permission.editable==true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}
 										  >
 
 											<div className={"CompetitionsList"} >
 												{item.competition_status==="nearly_published"?
-													item.permission.editable == true ? "" :
-														<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div> : ""}
+													item.permission.editable==true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
 												{/*<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>*/}
 											{/*{item.description===null||item.description===undefined||item.description===""?<style>*/}
 												{/*{*/}
@@ -175,9 +173,9 @@ class CompetitionsIndex extends Component{
 											>
 												<List.Item.Meta
 													title={<a className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
-														item.permission.editable == true ? "competitionstitlesshou" : "endedfont" : "competitionstitlesshou"}>
-														<a target="_blank" className={"competitionstitles"}
-															 href={item.competition_status === "ended" ? `/competitions/${item.identifier}/common_header` : item.competition_status === "nearly_published" ? item.permission.editable == true ? `/competitions/${item.identifier}/common_header` : null : item.competition_status === "progressing" ? `/competitions/${item.identifier}/common_header` : null}
+														item.permission.editable==true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}>
+														<a target="_blank"  className={"competitionstitles"}
+																					href={item.competition_status==="ended"?`/competitions/${item.identifier}`:item.competition_status==="nearly_published"?	item.permission.editable==true?`/competitions/${item.identifier}`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}`:null}
 													>{item.name}{item.sub_title===null?"":`——${item.sub_title}`}</a>
 														{/*<span>{item.sub_title===null?"":*/}
 															{/*<Tag className="competitionsrelative" color="#87d068">{item.sub_title}</Tag>}*/}
diff --git a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js
index 5206476ef..a91e0fe61 100644
--- a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js
+++ b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js
@@ -3,7 +3,6 @@ import { Breadcrumb,Layout,Table, Divider, Tag,Badge,Tooltip} from 'antd';
 import { Link } from 'react-router-dom';
 import axios from 'axios';
 
-import NoneData from "../../courses/shixunHomework/shixunHomework";
 
 import './Competitionteams.css';
 const { Content } = Layout;
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 25b89695c..d5461b627 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -6,7 +6,6 @@ import {markdownToHTML,getImageUrl} from 'educoder';
 import CompetitionContents from './CompetitionContents';
 import CompetitionContentsChart from './CompetitionContentsChart';
 import CompetitionContentsMd from './CompetitionContentsMd';
-import NoneData from "../../courses/shixunHomework/shixunHomework";
 
 import './CompetitionCommon.css';
 
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
index d7da4677d..62c7140cd 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import {Button,Layout} from 'antd';
 import axios from 'axios';
 import {markdownToHTML,getImageUrl,AttachmentList} from 'educoder';
-import NoneData from "../../courses/shixunHomework/shixunHomework";
+
 
 const { Header, Footer, Sider, Content } = Layout;
 class CompetitionContents extends Component{
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
index af750e551..e0b360c97 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import {Button,Layout,Tabs,Icon, Card, Avatar, Row, Col ,Table} from 'antd';
 import {markdownToHTML,getImageUrl} from 'educoder';
 import axios from 'axios';
-import NoneData from "../../courses/shixunHomework/shixunHomework";
 
 const { Content } = Layout;
 const { TabPane } = Tabs;
diff --git a/public/react/src/modules/competitions/Competitions.js b/public/react/src/modules/competitions/Competitions.js
index 2a9ab6990..704b85ef9 100644
--- a/public/react/src/modules/competitions/Competitions.js
+++ b/public/react/src/modules/competitions/Competitions.js
@@ -69,7 +69,7 @@ class Competitions extends Component {
 					/>
 
 					{/*新版竞赛详情页面*/}
-					<Route path="/competitions/:identifier/common_header"
+					<Route path="/competitions/:identifier"
 								 render={
 									 (props) => (<CompetitionCommon {...this.props} {...props} {...this.state} />)
 								 }
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 75bfb4950..dc59d93ed 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -414,7 +414,7 @@ class ShixunhomeWorkItem extends Component{
                 {
                   discussMessage && discussMessage.upper_category_name &&
                   <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
-                    { <div className=" color-grey9 task-hide fr" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5||discussMessage.time_status===6?{"maxWidth":"268px"}:{"maxWidth":"550px"}} title={discussMessage.upper_category_name}>所属目录：{discussMessage.upper_category_name}</div>}
+                    { <div className=" color-grey9 task-hide fr" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5||discussMessage.time_status===6?{"maxWidth":"216px"}:{"maxWidth":"550px"}} title={discussMessage.upper_category_name}>所属目录：{discussMessage.upper_category_name}</div>}
                   </ConditionToolTip>
                 }
                 
diff --git a/public/react/src/modules/courses/statistics/Dynamiclist.js b/public/react/src/modules/courses/statistics/Dynamiclist.js
index 9b7da8e29..7ae31d7f9 100644
--- a/public/react/src/modules/courses/statistics/Dynamiclist.js
+++ b/public/react/src/modules/courses/statistics/Dynamiclist.js
@@ -1,5 +1,5 @@
-import React, {Component} from "react";
-import {Row, Col, Popover, Button, Icon} from "antd";
+import React,{ Component } from "react";
+import {Row, Col,Popover,Button,Icon} from "antd";
 import {
 	G2,
 	Chart,
@@ -16,20 +16,22 @@ import {
 	Util
 } from "bizcharts";
 
-class Dynamiclist extends Component {
-	constructor(props) {
+class Dynamiclist extends Component{
+	constructor(props){
 		super(props);
-		this.state = {}
+		this.state={
+
+		}
 	}
 
 
-	render() {
+	render(){
 		const data = []
-		let {course_members} = this.props;
-		if (course_members) {
-			if (course_members.length > 0) {
-				course_members.map((item, key) => {
-					data.push({'name': item.user_name, '活跃度': item.total_score})
+		let {course_members}=this.props;
+    if(course_members){
+    	if(course_members.length>0){
+				course_members.map((item,key)=>{
+					data.push({'name':item.user_name,'活跃度':item.total_score})
 				})
 			}
 		}
@@ -59,31 +61,30 @@ class Dynamiclist extends Component {
 				</p>
 			</div>
 		);
-		return (
+		return(
 			<React.Fragment>
 				<Row>
 					<Col span={12} className={"top10s"}>Top 10</Col>
 					<Col span={12} className={"Statisticsliboxjsgz"}>
 						<span className={"mr10"}>计算规则</span>
-						<Popover placement="bottom" content={content} trigger="hover">
-							<Icon type="exclamation-circle"/>
+						<Popover  placement="bottom" title={"活动规则计算说明"} content={content} trigger="hover">
+							<Icon type="info-circle" />
 						</Popover>
 					</Col>
 				</Row>
 				{/*scale={cols}*/}
 				<Chart height={400} data={data} forceFit>
-					<Axis name="name"/>
-					<Axis name="活跃度"/>
+					<Axis name="name" />
+					<Axis name="活跃度" />
 					<Tooltip
 						crosshairs={{
 							type: "y"
 						}}
 					/>
-					<Geom type="interval" position="name*活跃度"/>
+					<Geom type="interval" position="name*活跃度" />
 				</Chart>
 			</React.Fragment>
 		)
 	}
 }
-
 export default Dynamiclist;
diff --git a/public/react/src/modules/courses/statistics/Statistics.css b/public/react/src/modules/courses/statistics/Statistics.css
index ade776f3d..0281d3131 100644
--- a/public/react/src/modules/courses/statistics/Statistics.css
+++ b/public/react/src/modules/courses/statistics/Statistics.css
@@ -65,7 +65,7 @@
     font-size: 16px;
 }
 
-.Statisticsli {
+.Statisticsli{
     clear: both;
     margin: 0;
     padding: 5px 12px;
@@ -80,7 +80,7 @@
     transition: all 0.3s;
 }
 
-.StatisticsMenubox {
+.StatisticsMenubox{
     position: relative;
     margin: 0;
     padding: 4px 0;
@@ -90,39 +90,42 @@
     background-clip: padding-box;
     border-radius: 4px;
     outline: none;
-    -webkit-box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+    -webkit-box-shadow: 0 2px 8px rgba(0,0,0,0.15);
+    box-shadow: 0 2px 8px rgba(0,0,0,0.15);
     -webkit-transform: translate3d(0, 0, 0);
 }
 
-.Statisticslibox li label {
+.Statisticslibox li label{
     width: 200px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
-
-.Statisticslibox .ant-menu-item {
+.Statisticslibox .ant-menu-item{
     height: 20px;
     line-height: 20px;
     text-overflow: clip;
 }
 
-.top10s {
+.top10s{
     font-size: 16px;
     font-weight: bold;
-    color: rgba(51, 51, 51, 1);
+    color: rgba(51,51,51,1);
 }
 
-.Statisticsliboxjsgz {
-    font-size: 12px;
-    color: rgba(51, 51, 51, 1);
+.Statisticsliboxjsgz{
+    font-size:12px;
+    color:rgba(51,51,51,1);
     text-align: right;
 }
 
-.Statisticscircle p {
+.Statisticscircle p{
     height: 30px;
     font-size: 12px;
-    color: rgba(153, 153, 153, 1);
-    line-height: 30px;
+    color: rgba(153,153,153,1);
+    line-height: 20px;
+}
+.Statisticsmxxy{
+    font-size: 16px;
+    margin-left:15px;
 }
diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js
index 4cca21b9b..5564215ec 100644
--- a/public/react/src/modules/courses/statistics/Statistics.js
+++ b/public/react/src/modules/courses/statistics/Statistics.js
@@ -1,10 +1,12 @@
 import React,{ Component } from "react";
-import {Table, Pagination, Tooltip, Spin, Row, Col, Checkbox, Tabs, Menu, Dropdown, Icon, Input} from "antd";
-import {WordsBtn, on, off, trigger, getImageUrl, sortDirections} from 'educoder';
+import {Table, Pagination,Tooltip,Spin, Row, Col ,Checkbox,Tabs,Menu, Dropdown, Icon,Input} from "antd";
+import { WordsBtn,on, off, trigger ,getImageUrl,sortDirections} from 'educoder';
 import axios from'axios';
 import Dropdownbox from './Dropdownbox';
 import Dynamiclist from './Dynamiclist';
+import NoneData from "../../courses/coursesPublic/NoneData";
 import './Statistics.css';
+
 const { TabPane } = Tabs;
 class Statistics extends Component{
 	constructor(props){
@@ -12,165 +14,163 @@ class Statistics extends Component{
 		this.state={
 			nd1:60,
 			nd2:40,
-			nd3: 20,
-			data: undefined,
-			bomdata: undefined,
-			topisSpin: true,
-			bomisSpin: true,
-			sort: 'desc',
-			course_groups: [],
-			page: 1,
-			all_count: null,
-			activeKey: '1',
+			nd3:20,
+			data:undefined,
+			bomdata:undefined,
+			topisSpin:true,
+			bomisSpin:true,
+			sort:'desc',
+			course_groups:[],
+			page:1,
+			all_count:null,
+			activeKey:'1',
 			visible: false,
-			group_ids: [],
-			course_members: []
+			group_ids:[],
+			course_members:[]
 		}
 	}
 
 	componentDidMount() {
-		this.getdatas()
+    this.getdatas()
 	}
 
-	getdatas = () => {
-		let {page, group_ids, sort} = this.state;
-		let courseId = this.props.match.params.coursesId;
-		let url = `/courses/${courseId}/statistics.json`;
+	getdatas=()=>{
+		let {page,group_ids,sort}=this.state;
+		let courseId=this.props.match.params.coursesId;
+		let url=`/courses/${courseId}/statistics.json`;
 		axios.get(url).then((result) => {
 			if (result) {
 				this.setState({
-					data: result.data.top_scores,
-					topisSpin: false
+					data:result.data.top_scores,
+					topisSpin:false
 				})
 			}
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
-				topisSpin: false,
+				topisSpin:false,
 			})
 		})
-		let courseurl = `/courses/${courseId}/all_course_groups.json`;
+		let courseurl=`/courses/${courseId}/all_course_groups.json`;
 		axios.get(courseurl).then((result) => {
 			if (result) {
 				this.setState({
-					course_groups: result.data.course_groups
+					course_groups:result.data.course_groups
 				})
-				let list = result.data.course_groups;
-				if (list.length > 0) {
-					this.setState({
-						group_ids: [list[0].id],
-					})
-					this.getwork_scoredata(page, [list[0].id], sort);
-				}
+				let list=result.data.course_groups;
+				// if(list.length>0){
+				// 	this.setState({
+				// 		group_ids:[list[0].id],
+				// 	})
+				// }
+				this.getwork_scoredata(page,undefined,sort);
+
 			}
 		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
-	getDynamiclistdatas = (group_ids) => {
+	getDynamiclistdatas=(group_ids)=>{
 
-		let courseId = this.props.match.params.coursesId;
-		let url = `/courses/${courseId}/act_score.json`;
-		let data = {
-			group_ids: group_ids,
+		let courseId=this.props.match.params.coursesId;
+		let url=`/courses/${courseId}/act_score.json`;
+		let data={
+			group_ids:group_ids,
 		}
-		axios.get(url, {
-			params:
+		axios.get(url,{params:
 			data
 		}).then((result) => {
 			if (result) {
 				this.setState({
-					course_members: result.data.course_members,
-					bomisSpin: false
+					course_members:result.data.course_members,
+					bomisSpin:false
 				})
 			}
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
-				bomisSpin: false,
+				bomisSpin:false,
 			})
 		})
 	}
 
-	getwork_scoredata = (page, group_ids, sort) => {
-		let {activeKey} = this.state;
+	getwork_scoredata=(page,group_ids,sort)=>{
+		let {activeKey}=this.state;
 		this.setState({
-			page: page,
-			sort: sort,
-			group_ids: group_ids,
-			bomisSpin: true,
+			page:page,
+			sort:sort,
+			group_ids:this.props.isStudent()===true?undefined:group_ids,
+			bomisSpin:true,
 		})
 
-		if (activeKey === '1') {
-			let courseId = this.props.match.params.coursesId;
-			let url = `/courses/${courseId}/work_score.json`;
-			let data = {
-				limit: 20,
-				page: page,
-				group_ids: group_ids,
-				sort: sort
-			}
-			axios.get(url, {
-				params:
+  if(activeKey==='1'){
+		let courseId=this.props.match.params.coursesId;
+		let url=`/courses/${courseId}/work_score.json`;
+		let data={
+			limit:20,
+			page:page,
+			group_ids:this.props.isStudent()===true?undefined:group_ids,
+			sort:sort
+		}
+		axios.get(url,{params:
 			data
 		}).then((result) => {
 			if (result) {
 				this.setState({
-					bomdata: result.data.course_members,
-					all_count: result.data.all_count,
-					bomisSpin: false
+					bomdata:result.data.course_members,
+					all_count:result.data.all_count,
+					bomisSpin:false
 				})
 			}
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
-				bomisSpin: false,
+				bomisSpin:false,
 			})
 		})
-		} else {
-			this.getDynamiclistdatas(group_ids)
-		}
+	}else{
+		this.getDynamiclistdatas(group_ids)
+	}
 
 	}
 
 
-	activeKey = (key) => {
-		if (key === "1") {
-			let {page, group_ids, sort} = this.state;
+	activeKey=(key)=>{
+		if(key==="1"){
+			let {page,group_ids,sort}=this.state;
 			// this.getdatas()
-			this.getwork_scoredata(page, group_ids, sort)
-		} else {
-			let {group_ids} = this.state;
+			this.getwork_scoredata(page,group_ids,sort)
+		}else{
+			let{group_ids}=this.state;
 			this.getDynamiclistdatas(group_ids)
 		}
-		this.setState({
-			activeKey: key
-		})
-	}
+     this.setState({
+			 activeKey:key
+		 })
+	 }
 
 
-	PaginationCourse = (pageNumber) => {
-		let {group_ids, sort} = this.state;
+	PaginationCourse=(pageNumber)=>{
+		let {group_ids,sort}=this.state;
 
-		this.getwork_scoredata(pageNumber, group_ids, sort);
+		this.getwork_scoredata(pageNumber,group_ids,sort);
 	}
 
-	derivefun = (url) => {
-		let {group_ids} = this.state;
-		let data = {
-			group_id: group_ids
+	derivefun=(url)=>{
+		let{group_ids}=this.state;
+		let data={
+			group_id:group_ids
 		}
-		axios.get(url, {
-			params:
+		axios.get(url,{params:
 			data
-		}).then((response) => {
-			if (response === undefined) {
+		}).then((response)=>{
+			if(response === undefined){
 				return
 			}
-			if (response.data.status && response.data.status === -1) {
+			if(response.data.status&&response.data.status===-1){
 				this.props.showNotification(response.data.message);
-			} else if (response.data.status && response.data.status === -2) {
+			}else if(response.data.status&&response.data.status===-2){
 				// if(response.data.message === "100"){
 				// 	// 已超出文件导出的上限数量（100 ），建议：
 				//
@@ -186,7 +186,7 @@ class Statistics extends Component{
 				// 	})
 				// }
 				this.props.showNotification(response.data.message);
-			} else {
+			}else {
 				// this.props.showNotification(`正在下载中`);
 				// window.open("/api"+url, '_blank');
 				this.props.slowDownload(url);
@@ -198,31 +198,31 @@ class Statistics extends Component{
 
 
 	// 筛选
-	handleTableChange = (pagination, filters, data) => {
-		let order = data.order;
-		let {page, group_ids} = this.state;
-		if (order === "descend") {
-			this.getwork_scoredata(page, group_ids, 'desc')
-		} else {
-			this.getwork_scoredata(page, group_ids, 'asc')
+	handleTableChange =(pagination, filters, data)=>{
+		let order=data.order;
+		let {page,group_ids}=this.state;
+		if(order==="descend"){
+     this.getwork_scoredata(page,group_ids,'desc')
+		}else{
+			this.getwork_scoredata(page,group_ids,'asc')
 		}
 
 	}
 
 	render(){
-		let {nd1, nd2, nd3, data, bomdata} = this.state;
+		let {nd1,nd2,nd3,data,bomdata,course_members}=this.state;
 
 		const columns = [
 			{
-				title: this.props.isAdmin() === true ? '序号' : '排名',
+				title: this.props.isAdmin()===true?'序号':'排名',
 				dataIndex: 'index',
-				render: (text, record, index) => {
-					return this.props.isAdmin() === true ? (this.state.page - 1) * 20 + index + 1 : record.rank
+				render: (text, record,index) => {
+					return this.props.isAdmin()===true?(this.state.page - 1) * 20 + index + 1:record.rank
 				}
 			},
 			{
 				title: '姓名',
-				dataIndex: 'user_name',
+				dataIndex:'user_name',
 				render: (text, record) => (
 					<span>{record.user_name}</span>
 				)
@@ -231,68 +231,66 @@ class Statistics extends Component{
 				title: '分班',
 				dataIndex: 'course_group',
 				render: (text, record) => (
-					<span>{record.course_group}</span>
+					<span >{record.course_group}</span>
 				)
 			},
 			{
 				title: '实训作业',
 				dataIndex: 'practice_score',
 				render: (text, record) => (
-					<span>{record.practice_score.toFixed(2)}</span>
+		      <span >{record.practice_score.toFixed(2)}</span>
 				)
 			},
 			{
 				title: '普通作业',
 				dataIndex: 'common_score',
 				render: (text, record) => (
-					<span>{record.common_score.toFixed(2)}</span>
+					<span >{record.common_score.toFixed(2)}</span>
 				)
 			},
 			{
 				title: '分组作业',
 				dataIndex: 'group_score',
 				render: (text, record) => (
-					<span>{record.group_score.toFixed(2)}</span>
+					<span >{record.group_score.toFixed(2)}</span>
 				)
 			},
 			{
 				title: '毕设任务',
 				dataIndex: 'graduation_score',
 				render: (text, record) => (
-					<span>{record.graduation_score.toFixed(2)}</span>
+					<span >{record.graduation_score.toFixed(2)}</span>
 				)
 			},
 			{
 				title: '试卷',
 				dataIndex: 'exercise_score',
 				render: (text, record) => (
-					<span>{record.exercise_score}</span>
+					<span >{record.exercise_score}</span>
 				)
 			},
 			{
 				title: '总成绩',
 				dataIndex: 'total_score',
-				sorter: this.props.isAdmin() === true ? true : false,
+				sorter: this.props.isAdmin()===true?true:false,
 				defaultSortOrder: 'descend',
 				sortDirections: sortDirections,
 				render: (text, record) => (
-					<span>{record.total_score.toFixed(2)}</span>
+					<span >{record.total_score.toFixed(2)}</span>
 				)
 			},
 		];
 
-		let course_grouptype = false;
-		if (this.props && this.props.course_modules != undefined) {
-			{
-				this.props && this.props.course_modules.map((item, key) => {
-					if (item.type === "course_group") {
-						course_grouptype = true
-					}
-				})
-			}
+		let course_grouptype=false;
+		if(this.props&&this.props.course_modules!=undefined){
+			{this.props&&this.props.course_modules.map((item,key)=>{
+				if(item.type==="course_group"){
+					course_grouptype=true
+				}
+			})}
 		}
-		if (course_grouptype === false) {
-			columns.some((item, key) => {
+    if(course_grouptype===false){
+			columns.some((item,key)=> {
 					if (item.title === "分班") {
 						columns.splice(key, 1)
 						return true
@@ -317,168 +315,166 @@ class Statistics extends Component{
 			<Dropdownbox
 				{...this.props}
 				{...this.state}
-				postwork_scoredata={(group_idss) => this.getwork_scoredata(1, group_idss, 'desc')}
+				postwork_scoredata={(group_idss)=>this.getwork_scoredata(1,group_idss,'desc')}
 			/>
-			<a className={"ml20 ant-btn-link"}
-				 onClick={() => this.derivefun(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>导出</a>
+			<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>导出</a>
 		</React.Fragment>;
 		return(
 			<React.Fragment>
 					<div className="edu-back-white">
 						<Spin size="large" spinning={this.state.topisSpin}>
-							<p className="clearfix padding30">
-								<Row gutter={24}>
-									<Col>
-										明星学员
-									</Col>
-								</Row>
-
-								<Row type="flex" justify="center" align="bottom">
-									{data && data.map((item, key) => {
-										if (key === 3) {
-											return (
-												<Col span={3}>
-													<li className="pr rankingss">
-														<a href={`/users/${item.user_login}`} className="color-dark">
-															<img src={getImageUrl(`images/${item.avatar_url}`)}/>
-														</a>
-													</li>
-												</Col>
-											)
-										}
-
-									})}
-									{data && data.map((item, key) => {
-										if (key === 1) {
-											return (
-												<Col span={5}>
-													<li className="pr rankingss">
-														<a href={`/users/${item.user_login}`} className="color-dark">
-															<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10"}/>
-														</a>
-													</li>
-													<Col className={`height-${nd2}`}>
-
-													</Col>
-												</Col>
-											)
-										}
-
-									})}
-
-									{data && data.map((item, key) => {
-										if (key === 0) {
-											return (
-												<Col span={5} className={"relatives"}>
-													<li className="pr rankingss">
-														<img src="https://test-newweb.educoder.net/images/educoder/huangguan.png"
-																 className="huangguans mb5"/>
-														<a href={`/users/${item.user_login}`} className="color-dark">
-															<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10 mt5"}/>
-														</a>
-													</li>
-													<Col className={`height-${nd1}`}>
-
-													</Col>
+						<p className="clearfix padding30">
+							<Row gutter={24}>
+								<Col className={"Statisticsmxxy"}>
+									明星学员
+								</Col>
+							</Row>
+
+							<Row type="flex" justify="center" align="bottom">
+								{data&&data.map((item,key)=>{
+  								if(key===3){
+										return(
+											<Col span={3}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)}/>
+													</a>
+												</li>
+											</Col>
+										)
+									}
+
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===1){
+										return(
+											<Col  span={5}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10"}/>
+													</a>
+												</li>
+												<Col className={`height-${nd2}`}>
+
 												</Col>
-											)
-										}
-
-									})}
-
-									{data && data.map((item, key) => {
-										if (key === 2) {
-											return (
-												<Col span={5}>
-													<li className="pr rankingss">
-														<a href={`/users/${item.user_login}`} className="color-dark">
-															<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10"}/>
-														</a>
-													</li>
-													<Col className={`height-${nd3}`}>
-
-													</Col>
+											</Col>
+										)
+									}
+
+								})}
+
+								{data&&data.map((item,key)=>{
+									if(key===0){
+										return(
+											<Col  span={5} className={"relatives"}>
+												<li className="pr rankingss">
+													<img src="https://test-newweb.educoder.net/images/educoder/huangguan.png" className="huangguans mb5" />
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10 mt5"}/>
+													</a>
+												</li>
+												<Col className={`height-${nd1}`}>
+
 												</Col>
-											)
-										}
+											</Col>
+										)
+									}
 
-									})}
+								})}
 
+								{data&&data.map((item,key)=>{
+									if(key===2){
+										return(
+											<Col span={5}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10"}/>
+													</a>
+												</li>
+												<Col className={`height-${nd3}`}>
 
-									{data && data.map((item, key) => {
-										if (key === 4) {
-											return (
-												<Col span={3}>
-													<li className="pr rankingss">
-														<a href={`/users/${item.user_login}`} className="color-dark">
-															<img src={getImageUrl(`images/${item.avatar_url}`)}/>
-														</a>
-													</li>
 												</Col>
-											)
-										}
+											</Col>
+										)
+									}
 
-									})}
+								})}
 
 
-								</Row>
+								{data&&data.map((item,key)=>{
+									if(key===4){
+										return(
+											<Col span={3}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)}/>
+													</a>
+												</li>
+											</Col>
+										)
+									}
 
+								})}
 
-								<Row className="mt10" type="flex" justify="center" align="bottom">
 
-									{data && data.map((item, key) => {
-										if (key === 3) {
-											return (
-												<Col span={3} className={"Statisticscenter"}>
-													<Col>{item.user_name}</Col>
-													<Col>4th</Col>
-												</Col>
-											)
-										}
-									})}
-									{data && data.map((item, key) => {
-										if (key === 1) {
-											return (
-												<Col span={5} className={"Statisticscenter"}>
-													<Col>{item.user_name}</Col>
-													<Col>2th</Col>
-												</Col>
-											)
-										}
-									})}
-									{data && data.map((item, key) => {
-										if (key === 0) {
-											return (
-												<Col span={5} className={"Statisticscenter"}>
-													<Col>{item.user_name}</Col>
-													<Col>1th</Col>
-												</Col>
-											)
-										}
-									})}
-									{data && data.map((item, key) => {
-										if (key === 2) {
-											return (
-												<Col span={5} className={"Statisticscenter"}>
-													<Col>{item.user_name}</Col>
-													<Col>3th</Col>
-												</Col>
-											)
-										}
-									})}
-									{data && data.map((item, key) => {
-										if (key === 4) {
-											return (
-												<Col span={3} className={"Statisticscenter"}>
-													<Col>{item.user_name}</Col>
-													<Col>5th</Col>
-												</Col>
-											)
-										}
-									})}
+							</Row>
+
+
+							<Row className="mt10" type="flex" justify="center" align="bottom">
+
+								{data&&data.map((item,key)=>{
+									if(key===3){
+										return(
+											<Col span={3} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>4th</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===1){
+										return(
+											<Col span={5} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>2nd</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===0){
+										return(
+											<Col span={5} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>1st</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===2){
+										return(
+											<Col span={5} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>3rd</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===4){
+										return(
+											<Col span={3} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>5th</Col>
+											</Col>
+										)
+									}
+								})}
 
-								</Row>
-							</p>
+							</Row>
+						</p>
 						</Spin>
 					</div>
 
@@ -494,31 +490,30 @@ class Statistics extends Component{
 									}
 					       .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 											padding: 16px 0px;
+									    text-align: center;
 									}
 								`
 							}</style>
-							<Tabs className="statisticsTabs" activeKey={this.state.activeKey} onChange={this.activeKey}
-										tabBarExtraContent={this.props.isAdmin() === true ? operations : ""}>
-								<TabPane tab="学习成绩" key="1" className={"statisticsTabs1"}>
-									<Table
-										columns={columns}
-										dataSource={bomdata}
-										pagination={false}
-										onChange={this.handleTableChange}
-									/>
-								</TabPane>
-								<TabPane tab="课堂活跃度" key="2">
-									<Dynamiclist
-										{...this.state}
-										{...this.props}
-									/>
-								</TabPane>
-							</Tabs>
+						<Tabs  className="statisticsTabs" activeKey={this.state.activeKey} onChange={this.activeKey} tabBarExtraContent={this.props.isAdmin()===true?operations:""}>
+							<TabPane tab="学习成绩" key="1" className={"statisticsTabs1"} >
+								{bomdata===undefined||bomdata===null?"":bomdata.length===0?<NoneData/>:<Table
+									columns={columns}
+									dataSource={bomdata}
+									pagination={false}
+									onChange={this.handleTableChange}
+								/>}
+							</TabPane>
+							<TabPane tab="课堂活跃度" key="2">
+								{course_members===undefined||course_members===null?"":course_members.length===0?<NoneData/>:<Dynamiclist
+									{...this.state}
+									{...this.props}
+								/>}
+							</TabPane>
+						</Tabs>
 						</Spin>
 					</div>
 
-				{this.state.all_count === undefined || this.state.all_count === null || this.state.activeKey === "2" ? '' : this.state.all_count > 20 && this.props.isAdmin() === true ?
-					<div className="mb40 edu-txt-center padding20-30"
+				{this.state.all_count===undefined||this.state.all_count===null||this.state.activeKey==="2"?'':this.state.all_count >20&&this.props.isAdmin()===true?<div className="mb40 edu-txt-center padding20-30"
 
 					>
 
@@ -526,12 +521,12 @@ class Statistics extends Component{
 							showQuickJumper
 							defaultCurrent={1}
 							pageSize={20}
-							total={this.state.all_count === undefined ? 0 : this.state.all_count === null ? 0 : this.state.all_count}
+							total={this.state.all_count===undefined?0:this.state.all_count===null?0:this.state.all_count}
 							current={this.state.page}
 							onChange={this.PaginationCourse}
 						/>
 
-					</div> : ""}
+					</div>:""}
 
 			</React.Fragment>
 		)
diff --git a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
index 2905699e7..9da0b79f5 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
@@ -427,14 +427,14 @@ export default class TPMchallengesnew extends Component {
 
                         <Link to={go_back_url === undefined ? "" : go_back_url}
                               className="color-grey-6 fr font-15 mt3">返回</Link>
-
+											  { next_challenge===undefined?"":
+													<a href={next_challenge}className="fr color-blue mr15 mt4">下一关</a>
+												}
                         { prev_challenge===undefined?"":
                             <a href={prev_challenge} className="fr color-blue mr15 mt4">上一关</a>
                         }
 
-                        { next_challenge===undefined?"":
-                            <a href={next_challenge}className="fr color-blue mr15 mt4">下一关</a>
-                        }
+
 
 
                         <a href={practice_url === undefined ? "" : practice_url}