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

app/views/ec_years/graduation_requirement.html.erb

@@ -22,7 +22,7 @@
       <div class="ListTableLine">
         <p class="clearfix">
           <span class="column-second">指标点</span>
-          <span class="flex1">内容</span>
+          <span class="column-second">内容</span>
           <span class="fr edu-txt-right">
             <% if @template_major %>
               <a href="javascript:void(0)" class="newAddSubentry" onclick="ShowPanel();" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>

app/views/libraries/index.html.erb

@@ -1,4 +1,4 @@
-<img src="/images/educoder/teach_ex.jpg" width="100%"/>
+<img src="/images/educoder/teach_ex.jpg" class="teach_ex" width="100%"/>
 <div class="educontent">
   <div class="edu-back-white mb30 mt30">
     <p class="padding20-30 clearfix bor-bottom-greyE">

app/views/managements/evaluate_simple.html.erb

@@ -36,7 +36,8 @@
           <td><%= record.front_js %></td>
           <td><%= record.test_cases %></td>
           <td><%= format_time record.created_at %></td>
-          <td><%= record.shixun.try(:exec_time) %></td>
+          <% challenge = Game.find(record.game_id).challenge %>
+          <td><%= challenge.try(:exec_time) %></td>
           <td><%= record.shixun.try(:identifier) %></td>
           <td><%= link_to record.shixun.try(:name), task_path(record.game), :target => "_blank", :title => "#{record.shixun.try(:name)}" %></td>
         </tr>

public/react/src/modules/tpm/NewHeader.js

@@ -526,9 +526,9 @@ class NewHeader extends Component {
                                        }
 
                                 </li>
-                                {/* <li>
+                                 <li>
                                     <a href="/applied_project/applied_join" data-remote="true">加入项目</a>
-                                </li> */}
+                                </li>
                             </ul>
 				      	</div>
 				    </div>

public/stylesheets/educoder/edu-main.css

@@ -1260,4 +1260,13 @@ html>body #ajax-indicator { position: fixed; }
 #trophyreturn i{
     font-size: 16px!important;
     color: #AAAAAA;
+}
+
+/* md多空格 */
+.markdown-body p {
+    white-space: pre-wrap;
+}
+.teach_ex{
+    object-fit: cover;
+    height: 300px;
 }