调整

6 years ago · 5b629fb285
parent 1447be54d2
commit 5b629fb285
2 changed files with 11 additions and 9 deletions
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -1255,15 +1255,16 @@ class CoursesController < ApplicationController
          u_2: user_login,
          u_2_1: user_mail,
          u_3: user_stu_id,
-          u_4: user_course_group,
-          u_5: c_works_num,
-          u_6: c_exercise_num,
-          u_7: c_poll_num,
-          u_8: c_file_num,
-          u_9: c_message_num,
-          u_10: c_reply_num,
-          u_11: user_work_reply_num,
-          u_12: user_activity_levels
+          u_4: user_school,
+          u_5: user_course_group,
+          u_6: c_works_num,
+          u_7: c_exercise_num,
+          u_8: c_poll_num,
+          u_9: c_file_num,
+          u_10: c_message_num,
+          u_11: c_reply_num,
+          u_12: user_work_reply_num,
+          u_13: user_activity_levels
      }
      course_user_level.push(user_ac_level)

--- a/app/views/courses/export_member_scores_excel.xlsx.axlsx
+++ b/app/views/courses/export_member_scores_excel.xlsx.axlsx
@ -59,6 +59,7 @@ wb.styles do |s|
    sheet.merge_cells("D1:D2")
    sheet.merge_cells("E1:E2")
    sheet.merge_cells("F1:F2")
+    sheet.merge_cells("G1:G2")
    sheet.merge_cells (Axlsx::cell_r(sheet_length-1,0) + ':' + Axlsx::cell_r(sheet_length-1,1))   #最后一行的合并
    sheet_first = sheet.rows.first  #第一行
    sheet_second = sheet.rows.second  #第二行