Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/admins/myshixuns_controller.rb

@@ -6,6 +6,7 @@ class Admins::MyshixunsController < Admins::BaseController
     myshixuns = Admins::MyshixunQuery.call(params)
 
     @myshixuns = paginate myshixuns.includes(:last_executable_task, :last_task, shixun: :user, user: { user_extension: :school })
+    @params_page = params[:page] || 1
 
     myshixun_ids = @myshixuns.map(&:id)
     @finish_game_count = Game.where(myshixun_id: myshixun_ids, status: 2).group(:myshixun_id).count

app/views/admins/myshixuns/shared/_list.html.erb

@@ -1,9 +1,10 @@
 <table class="table table-hover text-center myshixun-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="6%">ID</th>
     <th width="10%">标识</th>
-    <th width="22%" class="text-left">实训名称</th>
+    <th width="18%" class="text-left">实训名称</th>
     <th width="10%">实训老师</th>
     <th width="6%">完成</th>
     <th width="6%">经验值</th>
@@ -14,8 +15,9 @@
   </thead>
   <tbody>
   <% if myshixuns.present? %>
-    <% myshixuns.each do |myshixun| %>
+    <% myshixuns.each_with_index do |myshixun, index| %>
       <tr class="myshixun-item-<%= myshixun.id %>">
+        <td><%= list_index_no(@params_page.to_i, index) %></td>
         <td><%= myshixun.id %></td>
         <td><%= myshixun.identifier %></td>
         <td class="text-left">