合并aliyun

app/assets/javascripts/admins/competition_settings/index.js

@@ -154,7 +154,7 @@ $(document).on('turbolinks:load', function(){
           },
           templateResult: function (item) {
             if(!item.id || item.id === '') return item.text;
-            return $("<span>" + item.real_name + " <span class='font-12'>" + item.school_name + ' ' + item.hidden_phone + "</span></span>");
+						return $("<div class='row px-0'><span class='col-3'>" + item.real_name + "</span><span class='col-5 font-12'>" + item.school_name + "</span><span class='col-4 font-12'>" + item.hidden_phone + "</span></div>");
           },
           templateSelection: function(item){
             if (item.id) {

app/assets/javascripts/admins/modals/admin-edit-subject-modal.js

@@ -0,0 +1,18 @@
+$(document).on('turbolinks:load', function () {
+	$('.admin-modal-container').on('show.bs.modal', '.modal.admin-edit-subject-modal', function () {
+		var $modal = $('.modal.admin-edit-subject-modal');
+		var $form = $modal.find('form.admin-edit-subject-form');
+
+		$modal.on('click', '.submit-btn', function () {
+			$form.find('.error').html('');
+			var url = $form.attr('action');
+
+			$.ajax({
+				method: 'PATCH',
+				dataType: 'script',
+				url: url,
+				data: $form.serialize()
+			});
+		});
+	})
+});

app/assets/javascripts/admins/subjects/index.js

@@ -0,0 +1,107 @@
+$(document).on('turbolinks:load', function () {
+	if ($('body.admins-subjects-index-page').length > 0) {
+		var $form = $('.subject-list-form');
+
+		// ************** 学校选择 *************
+		$form.find('.school-select').select2({
+			theme: 'bootstrap4',
+			placeholder: '请选择创建者单位',
+			minimumInputLength: 1,
+			ajax: {
+				delay: 500,
+				url: '/api/schools/for_option.json',
+				dataType: 'json',
+				data: function (params) {
+					return {keyword: params.term};
+				},
+				processResults: function (data) {
+					return {results: data.schools}
+				}
+			},
+			templateResult: function (item) {
+				if (!item.id || item.id === '') return item.text;
+				return item.name;
+			},
+			templateSelection: function (item) {
+				if (item.id) {
+				}
+				return item.name || item.text;
+			}
+		});
+
+		// 清空
+		$form.on('click', '.clear-btn', function () {
+			$form.find('select[name="status"]').val('');
+			$form.find('.school-select').val('').trigger('change');
+			$form.find('input[name="keyword"]').val('');
+			$form.find('#homepage_show').attr('checked', false);
+			$form.find('#excellent').attr('checked', false);
+			$form.find('input[type="submit"]').trigger('click');
+		})
+
+		// 上传图片
+		$('.modal.admin-upload-file-modal').on('upload:success', function (e, data) {
+			var $imageElement = $('.subject-image-' + data.source_id);
+			$imageElement.attr('src', data.url);
+			$imageElement.show();
+			$imageElement.next().html('重新上传');
+		})
+
+		// 定义状态切换监听事件
+		var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
+			$('.subject-list-container').on('click', doElement, function () {
+				var $doAction = $(this);
+				var $undoAction = $doAction.siblings(undoElement);
+
+				var subjectId = $doAction.data('id');
+				customConfirm({
+					content: '确认进行该操作吗？',
+					ok: function () {
+						$.ajax({
+							url: '/admins/subjects/' + subjectId + url,
+							method: 'POST',
+							dataType: 'json',
+							success: function () {
+								show_success_flash();
+								$doAction.hide();
+								$undoAction.show();
+								if (callback && typeof callback === "function") {
+									callback(subjectId, url);
+								}
+							}
+						});
+					}
+				});
+			});
+		}
+		// 隐藏与取消隐藏
+		defineStatusChangeFunc('.hide-action', '.active-action', '/hide');
+		defineStatusChangeFunc('.active-action', '.hide-action', '/cancel_hide');
+
+		// 首页展示与取消首页展示
+		var homepageShowCallback = function (subjectId, url) {
+			var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
+
+			if (url === '/homepage_show') {
+				$subjectItem.find('.homepage-show-badge').show();
+			} else {
+				$subjectItem.find('.homepage-show-badge').hide();
+			}
+		}
+		defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage_show', homepageShowCallback);
+		defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage_show', homepageShowCallback);
+
+		// 设为金课与取消金课
+		var excellentCallback = function (subjectId, url) {
+			var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
+
+			if (url === '/excellent') {
+				$subjectItem.find('.excellent-badge').show();
+			} else {
+				$subjectItem.find('.excellent-badge').hide();
+			}
+		}
+		defineStatusChangeFunc('.excellent-action', '.cancel-excellent-action', '/excellent', excellentCallback);
+		defineStatusChangeFunc('.cancel-excellent-action', '.excellent-action', '/cancel_excellent', excellentCallback);
+	}
+});

app/assets/javascripts/common.js

@@ -66,9 +66,9 @@ function customConfirm(opts){
   return $.confirm($.extend({}, defaultOpts, opts))
 }
 
-function show_success_flash(){
+function show_success_flash(message) {
   $.notify({
-    message: '操作成功'
+		message: message || '操作成功'
   },{
     type: 'success'
   });

app/assets/stylesheets/admins/sidebar.scss

@@ -21,9 +21,12 @@
       flex-direction: column;
 
       &-logo {
-        padding-left: 5px;
         overflow: hidden;
         margin-bottom: 10px;
+
+        & > .logo-label {
+          display: none;
+        }
       }
     }
 
@@ -76,6 +79,23 @@
     display: flex;
     flex-direction: row;
     justify-content: space-between;
+
+    &-logo {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      & > img {
+        width: 40px;
+        height: auto;
+      }
+
+      & > .logo-label {
+        font-size: 18px;
+        color: darkgrey;
+        margin-left: 10px;
+      }
+    }
   }
 
   #sidebarCollapse {

app/controllers/admins/subjects_controller.rb

@@ -0,0 +1,71 @@
+class Admins::SubjectsController < Admins::BaseController
+  def index
+    default_sort('created_at', 'desc')
+
+    subjects = Admins::SubjectQuery.call(params)
+    @subjects = paginate subjects.includes(:repertoire, :subject_level_system, user: { user_extension: :school })
+  end
+
+  def edit
+    @subject = current_subject
+  end
+
+  def update
+    current_subject.update!(update_params)
+
+    flash[:success] = '保存成功'
+    redirect_to admins_subjects_path
+  end
+
+  def destroy
+    current_subject.destroy!
+
+    render_delete_success
+  end
+
+  # 隐藏
+  def hide
+    current_subject.update!(hidden: true)
+    render_ok
+  end
+
+  # 展示
+  def cancel_hide
+    current_subject.update!(hidden: false)
+    render_ok
+  end
+
+  # 设为主页展示
+  def homepage_show
+    current_subject.update!(homepage_show: true)
+    render_ok
+  end
+
+  # 取消主页展示
+  def cancel_homepage_show
+    current_subject.update!(homepage_show: false)
+    render_ok
+  end
+
+  # 设为金课
+  def excellent
+    current_subject.update!(excellent: true)
+    render_ok
+  end
+
+  # 取消金课
+  def cancel_excellent
+    current_subject.update!(excellent: false)
+    render_ok
+  end
+
+  private
+
+  def current_subject
+    @_current_subject ||= Subject.find(params[:id])
+  end
+
+  def update_params
+    params.require(:subject).permit(:repertoire_id, :subject_level_system_id, :student_count)
+  end
+end

app/controllers/competitions/competitions_controller.rb

@@ -145,7 +145,10 @@ class Competitions::CompetitionsController < Competitions::BaseController
   end
 
   def allow_visit
-    render_forbidden unless current_competition.published? || admin_or_business?
+    return if current_competition.published? || admin_or_business?
+    return if current_competition.nearly_published? && current_competition.manager?(current_user)
+
+    render_forbidden
   end
 
   def chart_visible

app/controllers/courses_controller.rb

@@ -28,7 +28,8 @@ class CoursesController < ApplicationController
                                      :switch_to_teacher, :switch_to_assistant, :switch_to_student, :exit_course,
                                      :informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
                                     :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs,
-                                    :delete_informs, :change_member_role, :course_groups, :join_course_group]
+                                    :delete_informs, :change_member_role, :course_groups, :join_course_group, :statistics,
+                                    :work_score, :act_score]
   before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
                                                 :search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
   before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
@@ -47,6 +48,7 @@ class CoursesController < ApplicationController
   before_action :validate_page_size, only: :mine
   before_action :course_tasks, only: [:tasks_list, :update_task_position]
   before_action :validate_inform_params, only: [:update_informs, :new_informs]
+  before_action :course_member_allowed, only: [:statistics, :work_score, :act_score]
 
   if RUBY_PLATFORM =~ /linux/
     require 'simple_xlsx_reader'
@@ -227,6 +229,40 @@ class CoursesController < ApplicationController
     end
   end
 
+  def statistics
+    max_exp = User.where(id: @course.students.pluck(:user_id)).pluck(:experience).max
+    limit = params[:limit] || 5
+    @top_scores = course_statistics(@course, max_exp, limit)
+  end
+
+  def work_score
+    sort = params[:sort] || "desc"
+    group_ids = params[:group_ids].is_a?(Array) ? params[:group_ids] : params[:group_ids].split(",") if params[:group_ids]
+    @course_members = course_work_scores @course, sort, group_ids
+    if @user_course_identity == Course::STUDENT
+      user_ids = @course_members.map(&:user_id)
+      @rank = user_ids.index(current_user.id).to_i + 1
+      @course_members = @course_members.select{|member| member.user_id == current_user.id}
+    else
+      @all_count = @course_members.size
+      @course_members = paginate @course_members
+    end
+  end
+
+  def act_score
+    group_ids = params[:group_ids].is_a?(Array) ? params[:group_ids] : params[:group_ids].split(",") if params[:group_ids]
+    all_members = course_act_scores @course, group_ids
+    @course_members = all_members[0 .. 9]
+    if @user_course_identity == Course::STUDENT
+      user_ids = all_members.map(&:user_id)
+      rank = user_ids.index(current_user.id).to_i + 1
+      if rank > 10
+        current_member = all_members.select{|member| member.user_id == current_user.id}
+        @course_members << current_member
+      end
+    end
+  end
+
   def join_excellent_course
     tip_exception("您已是课堂成员") if current_user.member_of_course?(@course)
     tip_exception("请通过邀请码加入课堂") unless @course.excellent
@@ -1379,6 +1415,10 @@ class CoursesController < ApplicationController
     end
   end
 
+  def course_member_allowed
+    tip_exception(403, "..") if @user_course_identity > Course::STUDENT
+  end
+
   def course_tasks
     case params[:container_type]
     when 'shixun_homework'
@@ -1466,319 +1506,93 @@ class CoursesController < ApplicationController
     act_scores
   end
 
-  def course_info_to_xlsx course
+  def course_statistics course, max_exp, limit
-    #课堂信息
+    max_rate = 20.0 / max_exp
-    @course_info = []
+
-    course_info_title = "课堂信息概要"
+    sql_select = %Q{ SELECT a.*, (message_num*0.2 + message_reply_num*0.1 + resource_num*0.5 + homework_journal_num*0.1 + graduation_num +
-    course_id = course.id
+                  homework_num + exercise_num + poll_num*0.7 + exercise_score * 0.7 + graduation_score * 0.7 + homework_score * 0.7 + exp*#{max_rate})
-    course_name = course.name
+                  AS score from
-    course_list_name = course.course_list.present? ? course.course_list.name : "--"
+                  (select cm.*, users.experience as exp,
-    course_assistants = course.teachers
+                  (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{course.id}
-    course_assistants_count = course_assistants&.size
+                          AND messages.author_id = cm.user_id and messages.parent_id is null) AS message_num,
-    course_assistants_name = course_assistants_count > 0 ? course_assistants.map{|m| m.user.real_name}.join('、') : "--"
+                  (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{course.id}
-    course_teacher_member = course.course_members.course_user_role(%i[CREATOR])
+                          AND messages.author_id = cm.user_id and messages.parent_id is not null) AS message_reply_num,
-    course_teacher = course_teacher_member.present? ? course_teacher_member.first.user.real_name : "--"
+                  (SELECT count(attachments.id) FROM attachments WHERE container_id = #{course.id} and container_type = "Course"
-    course_class_counts = course.course_groups_count
+                          AND attachments.author_id = cm.user_id) AS resource_num,
-    course_students_count = course.students.size
+                  (SELECT count(jfm.id) FROM journals_for_messages AS jfm, homework_commons hs WHERE jfm.jour_id = hs.id AND
-    course_1 = ["课堂编号",course_id]
+                          jfm.user_id = cm.user_id and jfm.jour_type = "HomeworkCommon" and hs.course_id = #{course.id}) AS homework_journal_num,
-    course_2 = ["课程名称",course_list_name]
+                  (SELECT COUNT(gw.id) FROM graduation_works AS gw, graduation_tasks AS gt WHERE gw.graduation_task_id = gt.id AND
-    course_3 = ["课堂名称",course_name]
+                          gt.course_id = #{course.id} AND gw.work_status != 0 AND gw.user_id = cm.user_id) AS graduation_num,
-    course_4 = ["教师团队(#{course_assistants_count})", course_assistants_name]
+                  (SELECT IFNULL(sum(gw.work_score),0) FROM graduation_works AS gw, graduation_tasks AS gt WHERE gw.graduation_task_id = gt.id AND
-    course_5 = ["主讲教师", course_teacher]
+                          gt.course_id = #{course.id} AND gw.work_status != 0 AND gw.user_id = cm.user_id) AS graduation_score,
-    course_6 = ["分班",course_class_counts]
+                  (SELECT COUNT(ss.id) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND
-    course_7 = ["学生", course_students_count]
+                          hc.course_id = #{course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id) AS homework_num,
-    course_main_info = [course_1,course_2,course_3,course_4,course_5,course_6,course_7]
+                  (SELECT IFNULL(sum(ss.work_score),0) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND
-    course_group_info_head = %w(序号 分班名称 邀请码 学生数量)
+                          hc.course_id = #{course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id) AS homework_score,
-    course_group_info_body = []
+                  (SELECT COUNT(eu.id) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{course.id}
-    none_group_counts = course.none_group_count
+                          AND eu.commit_status = 1 AND eu.user_id = cm.user_id) AS exercise_num,
-
+                  (SELECT IFNULL(sum(eu.score),0) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{course.id}
-    #当有未分班时，应该也做个统计
+                          AND eu.commit_status = 1 AND eu.user_id = cm.user_id) AS exercise_score,
-    if none_group_counts > 0
+                  (SELECT COUNT(pu.id) FROM poll_users AS pu, polls WHERE pu.poll_id = polls.id AND polls.course_id = #{course.id}
-      none_group_index = 2
+                          AND pu.commit_status = 1 AND pu.user_id = cm.user_id) AS poll_num
-      no_group_array = [1,"未分班",course.invite_code,none_group_counts]
+                  FROM course_members cm join users on cm.user_id = users.id
-      course_group_info_body.push(no_group_array)
+                              WHERE cm.role = 4 and cm.course_id = #{course.id}) a ORDER BY score desc limit #{limit};
-    else
+                  }
-      none_group_index = 1
+    CourseMember.find_by_sql(sql_select)
-    end
+  end
-
+
-    if course.course_groups.exists?
+  def course_work_scores course, sort, group_ids
-      course.course_groups.each_with_index do |group, index|
+    sql_select = %Q{ SELECT a.*,
-        group_index = (index+none_group_index)
+                  (exercise_score + graduation_score + common_score + practice_score + group_score) AS score from
-        group_name = group.name
+                  (select cm.*,
-        group_code = group.invite_code
+                  (SELECT IFNULL(sum(gw.work_score),0) FROM graduation_works AS gw, graduation_tasks AS gt WHERE gw.graduation_task_id = gt.id AND
-        group_count = group.course_members_count
+                  gt.course_id = #{course.id} AND gw.work_status != 0 AND gw.user_id = cm.user_id) AS graduation_score,
-        group_array = [group_index,group_name,group_code,group_count]
+                  (SELECT IFNULL(sum(ss.work_score),0) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND
-        course_group_info_body.push(group_array)
+                  hc.course_id = #{course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id and hc.homework_type=1) AS common_score,
-      end
+                  (SELECT IFNULL(sum(ss.work_score),0) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND
-
+                  hc.course_id = #{course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id and hc.homework_type=3) AS group_score,
-    end
+                  (SELECT IFNULL(sum(ss.work_score),0) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND
-    course_group_info = [course_group_info_head,course_group_info_body]
+                  hc.course_id = #{course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id and hc.homework_type=4) AS practice_score,
-    @course_info += [course_info_title,course_main_info,course_group_info]
+                  (SELECT IFNULL(sum(eu.score),0) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{course.id}
-  end
+                  AND eu.commit_status = 1 AND eu.user_id = cm.user_id) AS exercise_score
-
+                  FROM course_members cm join users on cm.user_id = users.id
-  def act_score_to_xlsx all_members
+                  WHERE cm.role = 4 and cm.course_id = #{course.id}
-    #课堂活跃度
+                  }
-    @user_activity_level = []
+
-    course_user_level = []
+    sql_select += %Q{ and cm.course_group_id in (#{group_ids.join(",")}) } if group_ids.present?
-    course_activity_title = "课堂活跃度统计"
+    sql_select += %Q{ ) a ORDER BY score #{sort}; }
-    user_cell_head = %w(排名 真实姓名 登录名 邮箱 学号 学校 分班 作业完成数(*10) 试卷完成数(*10) 问卷完成数(*7) 资源发布数(*5) 帖子发布数(*2) 帖子回复数(*1) 作业回复数(*1) 活跃度)
+    course_members = CourseMember.find_by_sql(sql_select)
-    all_members.each do |u|
+    course_members
-      #用户的基本信息
+  end
-      user = u.user
+
-      user_login = user.login
+  def course_act_scores course, group_ids
-      user_name = user.real_name
+    sql_select = %Q{ SELECT a.*,
-      user_mail = user.mail
+                  (message_num*2 + message_reply_num + resource_num*5 + homework_journal_num + graduation_num*10 + homework_num*10 + exercise_num*10 + poll_num*7) AS score from
-      user_stu_id = u.student_id.present? ? (u.student_id.to_s + "\t") : "--"
+                  (select cm.*,
-      user_school = user.school_name
+                  (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{course.id}
-      user_course_group = u.course_group_name
+                          AND messages.author_id = cm.user_id and messages.parent_id is null) AS message_num,
-
+                  (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{course.id}
-      #课堂活跃度统计
+                          AND messages.author_id = cm.user_id and messages.parent_id is not null) AS message_reply_num,
-      user_homeworks_num = u.homework_num.to_i  #完成的作业数
+                  (SELECT count(attachments.id) FROM attachments WHERE container_id = #{course.id} and container_type = "Course"
-      user_graduate_num = u.graduation_num.to_i  #毕业任务完成数
+                          AND attachments.author_id = cm.user_id) AS resource_num,
-      user_exercise_num = u.exercise_num.to_i  #根据试卷的id来查找
+                  (SELECT count(jfm.id) FROM journals_for_messages AS jfm, homework_commons hs WHERE jfm.jour_id = hs.id AND
-      user_poll_num = u.poll_num.to_i  #已完成问卷
+                          jfm.user_id = cm.user_id and jfm.jour_type = "HomeworkCommon" and hs.course_id = #{course.id}) AS homework_journal_num,
-      user_file_num = u.resource_num.to_i
+                  (SELECT COUNT(gw.id) FROM graduation_works AS gw, graduation_tasks AS gt WHERE gw.graduation_task_id = gt.id AND
-      user_messages_num = u.message_num.to_i  #帖子发布数
+                          gt.course_id = #{course.id} AND gw.work_status != 0 AND gw.user_id = cm.user_id) AS graduation_num,
-      user_reply_num = u.message_reply_num.to_i   #帖子回复数
+                  (SELECT COUNT(ss.id) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND
-      user_work_reply_num = u.homework_journal_num.to_i  #作业回复数的数量
+                          hc.course_id = #{course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id) AS homework_num,
-      c_works_num = (user_homeworks_num + user_graduate_num)*10
+                  (SELECT COUNT(eu.id) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{course.id}
-      c_exercise_num = user_exercise_num*10
+                          AND eu.commit_status = 1 AND eu.user_id = cm.user_id) AS exercise_num,
-      c_poll_num = user_poll_num*7
+                  (SELECT COUNT(pu.id) FROM poll_users AS pu, polls WHERE pu.poll_id = polls.id AND polls.course_id = #{course.id}
-      c_file_num = user_file_num*5
+                          AND pu.commit_status = 1 AND pu.user_id = cm.user_id) AS poll_num
-      c_message_num = user_messages_num*2
+                  FROM course_members cm join users on cm.user_id = users.id
-      c_reply_num = user_reply_num
+                  join user_extensions ue on ue.user_id = users.id
-      user_activity_levels = c_works_num + c_exercise_num + c_poll_num + c_file_num + c_message_num + c_reply_num + user_work_reply_num
+                  WHERE cm.role = 4 and cm.course_id = #{course.id}
-      user_ac_level = {
+                  }
-        u_1: user_name,
+
-        u_2: user_login,
+    sql_select += %Q{ and cm.course_group_id in (#{group_ids.join(",")}) } if group_ids.present?
-        u_2_1: user_mail,
+    sql_select += %Q{ ) a ORDER BY score desc; }
-        u_3: user_stu_id,
+    course_members = CourseMember.find_by_sql(sql_select)
-        u_4: user_school,
+    course_members
-        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)
-
-      #.课堂活跃度统计的集合
-      course_user_level = course_user_level.sort_by {|k| k[:u_13]}.reverse
-      @user_activity_level = [course_activity_title,user_cell_head,course_user_level]
-    end
-  end
-
-  def member_to_xlsx(course,all_members,homeworks,exercises,tasks)
-    #课堂的作业信息
-    shixun_homeworks = homeworks.search_homework_type(4)   #全部实训作业
-    shixun_titles = shixun_homeworks.pluck(:name) + ["总得分"]
-
-    # 更新实训作业成绩
-    unless course.is_end
-      shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
-        homework.update_homework_work_score
-      end
-    end
-
-    shixun_homeworks = shixun_homeworks&.includes(score_student_works: :user)
-
-    common_homeworks = homeworks.search_homework_type(1) #全部普通作业
-    common_titles = common_homeworks.pluck(:name)+ ["总得分"]
-    common_homeworks = common_homeworks&.includes(score_student_works: :user)
-
-    group_homeworks = homeworks.search_homework_type(3)  #全部分组作业
-    group_titles = group_homeworks.pluck(:name)+ ["总得分"]
-    group_homeworks = group_homeworks&.includes(score_student_works: :user)
-
-    task_titles = tasks.pluck(:name) + ["总得分"]
-    tasks = tasks&.includes(user: :user_extension, score_graduation_works: :user)
-
-    exercise_titles = exercises.pluck(:exercise_name) + ["总得分"]
-    exercises = exercises&.includes(user: :user_extension, score_exercise_users: :user)
-
-    total_user_score_array = []   #学生总成绩集合
-
-    all_members.each do |u|
-      #用户的基本信息
-      user = u.user
-      user_login = user.login
-      user_name = user.real_name
-      user_mail = user.mail
-      user_stu_id = user.student_id.present? ? (user.student_id.to_s + "\t") : "--"
-      user_school = user.school_name
-      user_course_group = u.course_group_name
-      user_info_array = [user_name,user_login,user_mail,user_stu_id,user_school,user_course_group]   #用户的信息集合
-      user_work_scores = []
-
-      #学生总成绩
-      shixun_score = 0.0 # 实训作业的总分
-      common_score = 0.0 #普通作业的总分
-      group_score = 0.0 #分组作业的总分
-      task_score = 0.0 # 毕业任务的总得分
-      exercise_score = 0.0 #试卷的总得分
-      shixun_score_array = []
-      common_score_array = []
-      group_score_array = []
-      task_score_array = []
-      exercise_score_array = []
-
-      #实训作业
-      if shixun_homeworks.size > 0
-        shixun_homeworks.each do |s|
-          user_student_work = s.score_student_works.select{|work| work.user_id == user.id}.first   #当前用户的对该作业的回答
-          if user_student_work.nil?
-            h_score = 0.0  #该作业的得分为0
-          else
-            h_score = user_student_work.work_score.nil? ? 0.0 : user_student_work.work_score  #用户对该作业的分数
-          end
-          shixun_score_array.push(h_score)
-        end
-      end
-      shixun_score += shixun_score_array.sum
-      shixun_score_array.push(shixun_score)   #shixun_score_array的最后一行为总分
-      user_work_scores += user_info_array + shixun_score_array   #单个用户的实训作业得分信息
-
-      #普通作业
-      if common_homeworks.size > 0
-        common_homeworks.each do |c|
-          user_student_work_1 = c.score_student_works.select{|work| work.user_id == user.id}.first  #当前用户的对该作业的回答
-          if user_student_work_1.nil?
-            h_score_1 = 0.0  #该作业的得分为0
-          else
-            h_score_1 = user_student_work_1.work_score.nil? ? 0.0 : user_student_work_1.work_score  #用户对该作业的分数
-          end
-          common_score_array.push(h_score_1)
-        end
-      end
-      common_score += common_score_array.sum
-      common_score_array.push(common_score)   #shixun_score_array的最后一行为总分
-      user_work_scores += common_score_array   #单个用户的普通作业得分信息
-
-      #分组作业
-      if group_homeworks.size > 0
-        group_homeworks.each do |g|
-          user_student_work_3 = g.score_student_works.select{|work| work.user_id == user.id}.first   #当前用户的对该作业的回答
-          if user_student_work_3.nil?
-            h_score_3 = 0.0  #该作业的得分为0
-          else
-            h_score_3 = user_student_work_3.work_score.nil? ? 0.0 : user_student_work_3.work_score  #用户对该作业的分数
-          end
-          group_score_array.push(h_score_3)
-        end
-      end
-      group_score += group_score_array.sum
-      group_score_array.push(group_score)   #shixun_score_array的最后一行为总分
-      user_work_scores += group_score_array   #单个用户的分组作业得分信息
-
-      #毕设作业
-      if tasks.size > 0
-        tasks.each do |task|
-          graduation_work = task.score_graduation_works.select{|work| work.user_id == user.id}.first
-          if graduation_work.nil?
-            t_score = 0.0
-          else
-            t_score = graduation_work.work_score.nil? ? 0.0 : graduation_work.work_score
-          end
-          task_score_array.push(t_score)
-        end
-      end
-      task_score += task_score_array.sum
-      task_score_array.push(task_score)
-      user_work_scores += task_score_array   #单个用户的分组作业得分信息
-
-      #试卷
-      if exercises.size > 0
-        exercises.each do |ex|
-          exercise_work = ex.score_exercise_users.select{|work| work.user_id == user.id}.first
-          if exercise_work.nil?
-            e_score = 0.0
-          else
-            e_score = exercise_work.score.nil? ? 0.0 : exercise_work.score
-          end
-          exercise_score_array.push(e_score)
-        end
-      end
-      exercise_score += exercise_score_array.sum
-      exercise_score_array.push(exercise_score)
-
-      user_work_scores += exercise_score_array   #单个用户的分组作业得分信息
-      total_user_scores = shixun_score + common_score + group_score + task_score + exercise_score
-      user_work_scores.push(total_user_scores)  #个人的行内容添加总成绩
-      total_user_score_array.push(user_work_scores)  # 全部成员的集合
-    end
-
-    #2.学生总成绩的集合
-    ## 作业标题的集合
-    course_user_score_title = "学生总成绩"
-    score_title_cells = shixun_titles + common_titles + group_titles + task_titles + exercise_titles
-    score_title_counts = [shixun_titles.count,common_titles.count,group_titles.count,task_titles.count,exercise_titles.count]
-    score_cell_head = %w(序号 真实姓名 登录名 邮箱 学号 学校 分班) + score_title_cells + ["个人总成绩"]
-    @course_user_scores = [course_user_score_title,score_cell_head,score_title_counts,total_user_score_array]
-
-    #作业的全部集合
-    @shixun_work_arrays = []
-    @group_work_arrays = []
-    @common_work_arrays = []
-    @task_work_arrays = []
-    @exercise_work_arrays = []
-    count_1 = shixun_homeworks.size
-    count_2 = common_homeworks.size
-    count_3 = group_homeworks.size
-    count_4 = tasks.size
-    #实训作业
-    shixun_homeworks.each_with_index do |s,index|
-      all_student_works = s.score_student_works   #该实训题的全部用户回答
-      title_no = index.to_i + 1
-      student_work_to_xlsx(all_student_works,s)
-      shixun_work_display_name = format_sheet_name (title_no.to_s + "." + s.name).strip.first(30)
-      shixun_work_content = [shixun_work_display_name,@work_head_cells,@work_cells_column]
-      @shixun_work_arrays.push(shixun_work_content)
-    end
-
-    #普通作业
-    common_homeworks.each_with_index do |c,index|
-      all_student_works = c.score_student_works   #当前用户的对该作业的回答
-      title_no = count_1 + index.to_i + 1
-      student_work_to_xlsx(all_student_works,c)
-
-      work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
-      work_content = [work_name,@work_head_cells,@work_cells_column]
-      @common_work_arrays.push(work_content)
-      title_no
-    end
-
-    #分组作业
-    group_homeworks.each_with_index do |c,index|
-      all_student_works = c.score_student_works   #当前用户的对该作业的回答
-      title_no = count_1 + count_2 + index.to_i + 1
-      student_work_to_xlsx(all_student_works,c)
-      work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
-      work_content = [work_name,@work_head_cells,@work_cells_column]
-      @group_work_arrays.push(work_content)
-    end
-
-    #毕设任务
-    tasks.each_with_index do |c,index|
-      all_student_works = c.score_graduation_works   #当前用户的对该作业的回答
-      title_no = count_1 + count_2 + count_3 + index.to_i + 1
-      graduation_work_to_xlsx(all_student_works,c,current_user)
-      work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
-      work_content = [work_name,@head_cells_column,@task_cells_column]
-      @task_work_arrays.push(work_content)
-    end
-
-    #试卷的导出
-    exercises.each_with_index do |c,index|
-      all_student_works = c.score_exercise_users   #当前用户的对该作业的回答
-      title_no = count_1 + count_2 + count_3 + count_4 + index.to_i + 1
-      get_export_users(c,course,all_student_works)
-      work_name = format_sheet_name (title_no.to_s + "." + c.exercise_name).strip.first(30)
-      work_content = [work_name,@table_columns,@user_columns]
-      @exercise_work_arrays.push(work_content)
-    end
   end
 end

app/helpers/admins/subjects_helper.rb

@@ -0,0 +1,11 @@
+module Admins::SubjectsHelper
+  def display_subject_status(subject)
+    style =
+      case subject.status
+      when 0 then 'text-secondary'
+      when 1 then 'text-warning'
+      when 2 then 'text-success'
+      end
+    raw content_tag(:span, t("subject.status.#{subject.status}"), class: style)
+  end
+end

app/helpers/exercises_helper.rb

@@ -414,7 +414,7 @@ module ExercisesHelper
     score2 = 0.0 #填空题
     score5 = 0.0  #实训题
     ques_stand = []  #问题是否正确
-    exercise_questions = exercise.exercise_questions.includes(:exercise_standard_answers,:exercise_shixun_challenges)
+    exercise_questions = exercise.exercise_questions.includes(:exercise_answers,:exercise_shixun_answers,:exercise_standard_answers,:exercise_shixun_challenges)
     exercise_questions&.each do |q|
       begin
         if q.question_type != 5

app/helpers/export_helper.rb

@@ -9,6 +9,319 @@ module ExportHelper
   OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
   MAX_PATH = 50
 
+  # 课堂成绩导出
+  def member_to_xlsx(course,all_members,homeworks,exercises,tasks)
+    #课堂的作业信息
+    shixun_homeworks = homeworks.search_homework_type(4)   #全部实训作业
+    shixun_titles = shixun_homeworks.pluck(:name) + ["总得分"]
+
+    # 更新实训作业成绩
+    unless course.is_end
+      shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
+        homework.update_homework_work_score
+      end
+    end
+
+    shixun_homeworks = shixun_homeworks&.includes(score_student_works: :user)
+
+    common_homeworks = homeworks.search_homework_type(1) #全部普通作业
+    common_titles = common_homeworks.pluck(:name)+ ["总得分"]
+    common_homeworks = common_homeworks&.includes(score_student_works: :user)
+
+    group_homeworks = homeworks.search_homework_type(3)  #全部分组作业
+    group_titles = group_homeworks.pluck(:name)+ ["总得分"]
+    group_homeworks = group_homeworks&.includes(score_student_works: :user)
+
+    task_titles = tasks.pluck(:name) + ["总得分"]
+    tasks = tasks&.includes(user: :user_extension, score_graduation_works: :user)
+
+    exercise_titles = exercises.pluck(:exercise_name) + ["总得分"]
+    exercises = exercises&.includes(user: :user_extension, score_exercise_users: :user)
+
+    total_user_score_array = []   #学生总成绩集合
+
+    all_members.each do |u|
+      #用户的基本信息
+      user = u.user
+      user_login = user.login
+      user_name = user.real_name
+      user_mail = user.mail
+      user_stu_id = user.student_id.present? ? (user.student_id.to_s + "\t") : "--"
+      user_school = user.school_name
+      user_course_group = u.course_group_name
+      user_info_array = [user_name,user_login,user_mail,user_stu_id,user_school,user_course_group]   #用户的信息集合
+      user_work_scores = []
+
+      #学生总成绩
+      shixun_score = 0.0 # 实训作业的总分
+      common_score = 0.0 #普通作业的总分
+      group_score = 0.0 #分组作业的总分
+      task_score = 0.0 # 毕业任务的总得分
+      exercise_score = 0.0 #试卷的总得分
+      shixun_score_array = []
+      common_score_array = []
+      group_score_array = []
+      task_score_array = []
+      exercise_score_array = []
+
+      #实训作业
+      if shixun_homeworks.size > 0
+        shixun_homeworks.each do |s|
+          user_student_work = s.score_student_works.select{|work| work.user_id == user.id}.first   #当前用户的对该作业的回答
+          if user_student_work.nil?
+            h_score = 0.0  #该作业的得分为0
+          else
+            h_score = user_student_work.work_score.nil? ? 0.0 : user_student_work.work_score  #用户对该作业的分数
+          end
+          shixun_score_array.push(h_score)
+        end
+      end
+      shixun_score += shixun_score_array.sum
+      shixun_score_array.push(shixun_score)   #shixun_score_array的最后一行为总分
+
+      #普通作业
+      if common_homeworks.size > 0
+        common_homeworks.each do |c|
+          user_student_work_1 = c.score_student_works.select{|work| work.user_id == user.id}.first  #当前用户的对该作业的回答
+          if user_student_work_1.nil?
+            h_score_1 = 0.0  #该作业的得分为0
+          else
+            h_score_1 = user_student_work_1.work_score.nil? ? 0.0 : user_student_work_1.work_score  #用户对该作业的分数
+          end
+          common_score_array.push(h_score_1)
+        end
+      end
+      common_score += common_score_array.sum
+      common_score_array.push(common_score)   #shixun_score_array的最后一行为总分
+
+      #分组作业
+      if group_homeworks.size > 0
+        group_homeworks.each do |g|
+          user_student_work_3 = g.score_student_works.select{|work| work.user_id == user.id}.first   #当前用户的对该作业的回答
+          if user_student_work_3.nil?
+            h_score_3 = 0.0  #该作业的得分为0
+          else
+            h_score_3 = user_student_work_3.work_score.nil? ? 0.0 : user_student_work_3.work_score  #用户对该作业的分数
+          end
+          group_score_array.push(h_score_3)
+        end
+      end
+      group_score += group_score_array.sum
+      group_score_array.push(group_score)   #shixun_score_array的最后一行为总分
+
+      #毕设作业
+      if tasks.size > 0
+        tasks.each do |task|
+          graduation_work = task.score_graduation_works.select{|work| work.user_id == user.id}.first
+          if graduation_work.nil?
+            t_score = 0.0
+          else
+            t_score = graduation_work.work_score.nil? ? 0.0 : graduation_work.work_score
+          end
+          task_score_array.push(t_score)
+        end
+      end
+      task_score += task_score_array.sum
+      task_score_array.push(task_score)
+
+      #试卷
+      if exercises.size > 0
+        exercises.each do |ex|
+          exercise_work = ex.score_exercise_users.select{|work| work.user_id == user.id}.first
+          if exercise_work.nil?
+            e_score = 0.0
+          else
+            e_score = exercise_work.score.nil? ? 0.0 : exercise_work.score
+          end
+          exercise_score_array.push(e_score)
+        end
+      end
+      exercise_score += exercise_score_array.sum
+      exercise_score_array.push(exercise_score)
+
+      total_user_scores = shixun_score + common_score + group_score + task_score + exercise_score
+      user_info_array.push(total_user_scores)  #个人的行内容添加总成绩
+      user_work_scores += user_info_array + shixun_score_array + common_score_array + group_score_array + task_score_array + exercise_score_array
+      total_user_score_array.push(user_work_scores)  # 全部成员的集合
+    end
+
+    #2.学生总成绩的集合
+    ## 作业标题的集合
+    course_user_score_title = "学生总成绩"
+    score_title_cells = shixun_titles + common_titles + group_titles + task_titles + exercise_titles
+    score_title_counts = [shixun_titles.count,common_titles.count,group_titles.count,task_titles.count,exercise_titles.count]
+    score_cell_head = %w(序号 真实姓名 登录名 邮箱 学号 学校 分班 个人总成绩) + score_title_cells
+    @course_user_scores = [course_user_score_title,score_cell_head,score_title_counts,total_user_score_array]
+
+    #作业的全部集合
+    @shixun_work_arrays = []
+    @group_work_arrays = []
+    @common_work_arrays = []
+    @task_work_arrays = []
+    @exercise_work_arrays = []
+    count_1 = shixun_homeworks.size
+    count_2 = common_homeworks.size
+    count_3 = group_homeworks.size
+    count_4 = tasks.size
+    #实训作业
+    shixun_homeworks.each_with_index do |s,index|
+      all_student_works = s.score_student_works   #该实训题的全部用户回答
+      title_no = index.to_i + 1
+      student_work_to_xlsx(all_student_works,s)
+      shixun_work_display_name = format_sheet_name (title_no.to_s + "." + s.name).strip.first(30)
+      shixun_work_content = [shixun_work_display_name,@work_head_cells,@work_cells_column]
+      @shixun_work_arrays.push(shixun_work_content)
+    end
+
+    #普通作业
+    common_homeworks.each_with_index do |c,index|
+      all_student_works = c.score_student_works   #当前用户的对该作业的回答
+      title_no = count_1 + index.to_i + 1
+      student_work_to_xlsx(all_student_works,c)
+
+      work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
+      work_content = [work_name,@work_head_cells,@work_cells_column]
+      @common_work_arrays.push(work_content)
+      title_no
+    end
+
+    #分组作业
+    group_homeworks.each_with_index do |c,index|
+      all_student_works = c.score_student_works   #当前用户的对该作业的回答
+      title_no = count_1 + count_2 + index.to_i + 1
+      student_work_to_xlsx(all_student_works,c)
+      work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
+      work_content = [work_name,@work_head_cells,@work_cells_column]
+      @group_work_arrays.push(work_content)
+    end
+
+    #毕设任务
+    tasks.each_with_index do |c,index|
+      all_student_works = c.score_graduation_works   #当前用户的对该作业的回答
+      title_no = count_1 + count_2 + count_3 + index.to_i + 1
+      graduation_work_to_xlsx(all_student_works,c,current_user)
+      work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
+      work_content = [work_name,@head_cells_column,@task_cells_column]
+      @task_work_arrays.push(work_content)
+    end
+
+    #试卷的导出
+    exercises.each_with_index do |c,index|
+      all_student_works = c.score_exercise_users   #当前用户的对该作业的回答
+      title_no = count_1 + count_2 + count_3 + count_4 + index.to_i + 1
+      get_export_users(c,course,all_student_works)
+      work_name = format_sheet_name (title_no.to_s + "." + c.exercise_name).strip.first(30)
+      work_content = [work_name,@table_columns,@user_columns]
+      @exercise_work_arrays.push(work_content)
+    end
+  end
+
+  #课堂活跃度
+  def act_score_to_xlsx all_members
+    @user_activity_level = []
+    course_user_level = []
+    course_activity_title = "课堂活跃度统计"
+    user_cell_head = %w(排名 真实姓名 登录名 邮箱 学号 学校 分班 作业完成数(*10) 试卷完成数(*10) 问卷完成数(*7) 资源发布数(*5) 帖子发布数(*2) 帖子回复数(*1) 作业回复数(*1) 活跃度)
+    all_members.each do |u|
+      #用户的基本信息
+      user = u.user
+      user_login = user.login
+      user_name = user.real_name
+      user_mail = user.mail
+      user_stu_id = u.student_id.present? ? (u.student_id.to_s + "\t") : "--"
+      user_school = user.school_name
+      user_course_group = u.course_group_name
+
+      #课堂活跃度统计
+      user_homeworks_num = u.homework_num.to_i  #完成的作业数
+      user_graduate_num = u.graduation_num.to_i  #毕业任务完成数
+      user_exercise_num = u.exercise_num.to_i  #根据试卷的id来查找
+      user_poll_num = u.poll_num.to_i  #已完成问卷
+      user_file_num = u.resource_num.to_i
+      user_messages_num = u.message_num.to_i  #帖子发布数
+      user_reply_num = u.message_reply_num.to_i   #帖子回复数
+      user_work_reply_num = u.homework_journal_num.to_i  #作业回复数的数量
+      c_works_num = (user_homeworks_num + user_graduate_num)*10
+      c_exercise_num = user_exercise_num*10
+      c_poll_num = user_poll_num*7
+      c_file_num = user_file_num*5
+      c_message_num = user_messages_num*2
+      c_reply_num = user_reply_num
+      user_activity_levels = c_works_num + c_exercise_num + c_poll_num + c_file_num + c_message_num + c_reply_num + user_work_reply_num
+      user_ac_level = {
+        u_1: user_name,
+        u_2: user_login,
+        u_2_1: user_mail,
+        u_3: user_stu_id,
+        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)
+
+      #.课堂活跃度统计的集合
+      course_user_level = course_user_level.sort_by {|k| k[:u_13]}.reverse
+      @user_activity_level = [course_activity_title,user_cell_head,course_user_level]
+    end
+  end
+
+  def course_info_to_xlsx course
+    #课堂信息
+    @course_info = []
+    course_info_title = "课堂信息概要"
+    course_id = course.id
+    course_name = course.name
+    course_list_name = course.course_list.present? ? course.course_list.name : "--"
+    course_assistants = course.teachers
+    course_assistants_count = course_assistants&.size
+    course_assistants_name = course_assistants_count > 0 ? course_assistants.map{|m| m.user.real_name}.join('、') : "--"
+    course_teacher_member = course.course_members.course_user_role(%i[CREATOR])
+    course_teacher = course_teacher_member.present? ? course_teacher_member.first.user.real_name : "--"
+    course_class_counts = course.course_groups_count
+    course_students_count = course.students.size
+    course_1 = ["课堂编号",course_id]
+    course_2 = ["课程名称",course_list_name]
+    course_3 = ["课堂名称",course_name]
+    course_4 = ["教师团队(#{course_assistants_count})", course_assistants_name]
+    course_5 = ["主讲教师", course_teacher]
+    course_6 = ["分班",course_class_counts]
+    course_7 = ["学生", course_students_count]
+    course_main_info = [course_1,course_2,course_3,course_4,course_5,course_6,course_7]
+    course_group_info_head = %w(序号 分班名称 邀请码 学生数量)
+    course_group_info_body = []
+    none_group_counts = course.none_group_count
+
+    #当有未分班时，应该也做个统计
+    if none_group_counts > 0
+      none_group_index = 2
+      no_group_array = [1,"未分班",course.invite_code,none_group_counts]
+      course_group_info_body.push(no_group_array)
+    else
+      none_group_index = 1
+    end
+
+    if course.course_groups.exists?
+      course.course_groups.each_with_index do |group, index|
+        group_index = (index+none_group_index)
+        group_name = group.name
+        group_code = group.invite_code
+        group_count = group.course_members_count
+        group_array = [group_index,group_name,group_code,group_count]
+        course_group_info_body.push(group_array)
+      end
+
+    end
+    course_group_info = [course_group_info_head,course_group_info_body]
+    @course_info += [course_info_title,course_main_info,course_group_info]
+  end
+
   # 作业导出为xlsx，homework_type 1：普通作业  2：编程作业（弃用） 3：分组作业  4：实训作业
   def student_work_to_xlsx(works,homework)
     @work_head_cells = []

app/helpers/student_works_helper.rb

@@ -126,7 +126,7 @@ module StudentWorksHelper
       if game.status == 2
         "评测通过"
       else
-        "共有#{game.challenge.challenge_chooses.count}组测试集，其中有#{game.challenge.challenge_chooses.count-game.choose_correct_num}组测试结果不匹配"
+        "共有#{game.challenge.challenge_chooses.count}组测试集，其中有#{game.challenge.challenge_chooses.count-game.choose_correct_num(output.query_index)}组测试结果不匹配"
       end
     end
   end

app/jobs/sync_trustie_job.rb

@@ -6,24 +6,21 @@ class SyncTrustieJob < ApplicationJob
 
   def perform(type, count)
     Rails.logger.info("#######_________response__sync__start__#########")
-    configs_content = Rails.application.config_for(:configuration)
 
-    token = configs_content["sync_token"]
+    token = EduSetting.get('trustie_api_token')
-    token_url = configs_content["sync_url"]
+    api_host = EduSetting.get('trustie_api_url')
-    url = "#{token_url}/api/v1/homes/sync_count"
+
+    url = "#{api_host}/api/v1/homes/sync_count"
     sync_json = {
       "token": token,
       "type": type,
       "number": count
     }
     uri = URI.parse(url)
-    http = Net::HTTP.new(uri.hostname, uri.port)
+    if api_host
-    if token_url.include?("https://")
+      http = Net::HTTP.new(uri.hostname, uri.port)
-      http.use_ssl = true
+      http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+      Rails.logger.info("#######_________response__sync__end_____#########")
     end
-
-
-    response = http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
-    Rails.logger.info("#######_________response__sync__end_____#########{response.body}")
   end
 end

app/libs/custom_sortable.rb

@@ -14,7 +14,13 @@ module CustomSortable
     return relations unless self.class.check_sort_parameter_validate(sort_by.to_s, sort_direction.to_s)
 
     order_method = self.class.sort_options[:reorder] ? :reorder : :order
-    relations.send(order_method, "#{sort_by} #{sort_direction}")
+
+    default_table = self.class.sort_options[:default_table]
+    if default_table.present?
+      relations.send(order_method, "#{default_table}.#{sort_by} #{sort_direction}")
+    else
+      relations.send(order_method, "#{sort_by} #{sort_direction}")
+    end
   end
 
   module ClassMethods
@@ -23,6 +29,7 @@ module CustomSortable
       @_sort_options[:default_by]        = opts[:default_by].to_s
       @_sort_options[:default_direction] = opts[:default_direction].to_s
       @_sort_options[:reorder]           = opts[:reorder]
+      @_sort_options[:default_table]     = opts[:default_table]
 
       @_sort_columns = columns.map(&:to_s)
     end

app/models/application_record.rb

@@ -12,4 +12,8 @@ class ApplicationRecord < ActiveRecord::Base
   def display_extra_data(key)
     _extra_data&.[](key)
   end
+
+  def allow_sync_to_trustie?
+    Rails.env.production? && EduSetting.get('host_name') == 'https://www.educoder.net'
+  end
 end

app/models/project.rb

@@ -8,7 +8,9 @@ class Project < ApplicationRecord
   has_many :issues
   has_many :user_grades, dependent: :destroy
 
-  after_create :sync_project_trustie  #同步到trustie
+  after_create do
+    SyncTrustieJob.perform_later("project", 1) if allow_sync_to_trustie?
+  end #同步到trustie
 
   # 创建者
   def creator
@@ -23,7 +25,4 @@ class Project < ApplicationRecord
     members.exists?(user_id: user.id)
   end
 
-  def sync_project_trustie
-    SyncTrustieJob.perform_later("project", 1)
-  end
 end

app/models/school.rb

@@ -19,7 +19,9 @@ class School < ApplicationRecord
   has_many :apply_add_departments, dependent: :destroy
   has_many :user_extensions, dependent: :nullify
 
-  after_create :sync_school_trustie  #同步到trustie
+  after_create do
+    SyncTrustieJob.perform_later("school", 1) if allow_sync_to_trustie? #同步到trustie
+  end
 
   # 学校管理员
   def manager?(user)
@@ -41,8 +43,4 @@ class School < ApplicationRecord
   def manage_permission?(user)
     manager?(user) || major_manager?(user) || course_manager?(user)
   end
-
-  def sync_school_trustie
-    SyncTrustieJob.perform_later("school", 1)
-  end
 end

app/models/searchable/course.rb

@@ -25,6 +25,7 @@ module Searchable::Course
       author_school_name: teacher&.school_name,
       visits_count: visits,
       members_count: course_members_count,
+      tasks_count: homework_commons_count + exercises_count + polls_count,
       is_public: is_public == 1,
       first_category_url: ApplicationController.helpers.module_url(none_hidden_course_modules.first, self)
     }

app/models/shixun.rb

@@ -75,7 +75,11 @@ class Shixun < ApplicationRecord
   scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) }
   scope :find_by_ids,lambda{|k| where(id:k)}
 
-  after_create :send_tiding, :sync_shixun_trustie  #同步到trustie
+  after_create :send_tiding
+  #同步到trustie
+  after_create do
+    SyncTrustieJob.perform_later("practical_training_project", 1) if allow_sync_to_trustie?
+  end
 
   # REDO: 
   def propaedeutics
@@ -290,10 +294,6 @@ class Shixun < ApplicationRecord
     subjects.where(hidden: 0).uniq
   end
 
-  def sync_shixun_trustie
-    SyncTrustieJob.perform_later("practical_training_project", 1)
-  end
-
   private
 
   def send_tiding

app/models/subject.rb

@@ -5,8 +5,9 @@ class Subject < ApplicationRecord
   include Searchable::Subject
 
   #status :0 编辑中  1 审核中  2 发布
-  belongs_to :repertoire
+  belongs_to :repertoire, optional: true
   belongs_to :user
+  belongs_to :subject_level_system, optional: true
 
   has_many :stages, -> { order("stages.position ASC") }, dependent: :destroy
 

app/models/subject_level_system.rb

@@ -0,0 +1,5 @@
+class SubjectLevelSystem < ApplicationRecord
+  default_scope { order(level: :asc) }
+
+  has_many :subjects, dependent: :nullify
+end

app/models/user.rb

@@ -156,7 +156,9 @@ class User < ApplicationRecord
   delegate :gender, :department_id, :school_id, :location, :location_city, :technical_title, to: :user_extension, allow_nil: true
 
   before_save :update_hashed_password
-  after_create :sync_user_trustie   #同步到trustie
+  after_create do
+    SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie?
+  end
 
   #
   # validations
@@ -314,10 +316,6 @@ class User < ApplicationRecord
     shixun.shixun_members.exists?(role: 2, user_id: id)
   end
 
-  def sync_user_trustie
-    SyncTrustieJob.perform_later("user", 1)
-  end
-
   # TPI的创建者
   def creator_of_game?(game)
     id == game.user_id

app/queries/admins/subject_query.rb

@@ -0,0 +1,45 @@
+class Admins::SubjectQuery < ApplicationQuery
+  include CustomSortable
+
+  attr_reader :params
+
+  sort_columns :created_at, default_by: :created_at, default_direction: :desc, default_table: 'subjects'
+
+  def initialize(params)
+    @params = params
+  end
+
+  def call
+    subjects = Subject.all
+
+    # 状态过滤
+    status =
+      case params[:status].to_s.strip
+      when 'pending'   then 0
+      when 'applying'  then 1
+      when 'published' then 2
+      end
+    subjects = subjects.where(status: status) if status
+
+    # 创建者单位
+    if params[:school_id].present?
+      subjects = subjects.joins(user: :user_extension).where(user_extensions: { school_id: params[:school_id] })
+    end
+
+    # 首页展示、金课
+    %i[homepage_show excellent].each do |column|
+      if params[column].present? && params[column].to_s == 'true'
+        subjects = subjects.where(column => true)
+      end
+    end
+
+    # 关键字
+    keyword = params[:keyword].to_s.strip
+    if keyword
+      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR subjects.name LIKE :keyword'
+      subjects = subjects.joins(:user).where(sql, keyword: "%#{keyword}%")
+    end
+
+    custom_sort(subjects, params[:sort_by], params[:sort_direction])
+  end
+end

app/tasks/exercise_publish_task.rb

@@ -74,7 +74,7 @@ class ExercisePublishTask
                 :subjective_score => subjective_score,
                 :commit_method => exercise_user&.commit_method.to_i > 0 ? exercise_user&.commit_method.to_i : 3
             }
-            exercise_user.update_attributes!(commit_option)
+            exercise_user.update_attributes(commit_option)
           end
         rescue Exception => e
           Rails.logger.info("rescue errors ___________________________#{e}")

app/views/admins/laboratories/shared/_laboratory_item.html.erb

@@ -36,12 +36,14 @@
     <%= javascript_void_link '添加管理员', class: 'action', data: { laboratory_id: laboratory.id, toggle: 'modal', target: '.admin-add-laboratory-user-modal' } %>
   <% end %>
 
-  <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
+  <div class="d-inline">
-  <div class="dropdown-menu more-action-dropdown">
+    <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
-    <%= link_to '轮播图', admins_laboratory_carousels_path(laboratory), class: 'dropdown-item' %>
+    <div class="dropdown-menu more-action-dropdown">
+      <%= link_to '轮播图', admins_laboratory_carousels_path(laboratory), class: 'dropdown-item' %>
 
-    <% if school.present? && laboratory.id != 1 %>
+      <% if school.present? && laboratory.id != 1 %>
-      <%= delete_link '删除', admins_laboratory_path(laboratory, element: ".laboratory-item-#{laboratory.id}"), class: 'dropdown-item delete-laboratory-action' %>
+        <%= delete_link '删除', admins_laboratory_path(laboratory, element: ".laboratory-item-#{laboratory.id}"), class: 'dropdown-item delete-laboratory-action' %>
-    <% end %>
+      <% end %>
+    </div>
   </div>
 </td>

app/views/admins/shared/_sidebar.html.erb

@@ -1,9 +1,10 @@
 <% sidebar_collapse = request.cookies['admin_sidebar_collapse'].to_s == 'true' %>
 <nav id="sidebar" class="<%= sidebar_collapse ? 'active' : '' %>" data-current-controller="<%= admin_sidebar_controller %>">
   <div class="sidebar-header">
-    <a href="/" class="sidebar-header-logo" data-toggle="tooltip" title="返回主站">
+    <div class="sidebar-header-logo">
-      <%= image_tag('logo.png') %>
+      <img class="rounded-circle" src="/images/<%= url_to_avatar(current_user) %>" />
-    </a>
+      <span class="logo-label">后台管理</span>
+    </div>
     <div id="sidebarCollapse" class="navbar-btn <%= sidebar_collapse ? 'active' : '' %>">
       <i class="fa fa-chevron-left fold" data-toggle="tooltip" data-placement="right" data-boundary="window" title="收起"></i>
       <i class="fa fa-bars unfold" data-toggle="tooltip" data-placement="right" data-boundary="window" title="展开"></i>
@@ -29,6 +30,12 @@
       <% end %>
     </li>
 
+    <li>
+      <%= sidebar_item_group('#subject-submenu', '实践课程', icon: 'th-list') do %>
+        <li><%= sidebar_item(admins_subjects_path, '课程列表', icon: 'cog', controller: 'admins-subjects') %></li>
+      <% end %>
+    </li>
+
     <li>
       <%= sidebar_item_group('#schools-submenu', '单位管理', icon: 'building') do %>
         <li><%= sidebar_item(admins_schools_path, '单位列表', icon: 'university', controller: 'admins-schools') %></li>

app/views/admins/shared/modal/_upload_file_modal.html.erb

@@ -17,7 +17,7 @@
               <span class="input-group-text">文件</span>
             </div>
             <div class="custom-file">
-              <input type="file" name="file" class="upload-file-input" id="upload-file-input">
+              <input type="file" name="file" class="upload-file-input" accept="<%= accept ||= '*' %>" id="upload-file-input">
               <label class="custom-file-label file-names" for="upload-file-input">选择文件</label>
             </div>
           </div>

app/views/admins/subjects/edit.js.erb

@@ -0,0 +1,2 @@
+$('.admin-modal-container').html("<%= j( render partial: 'admins/subjects/shared/edit_subject_modal', locals: { subject: @subject } ) %>");
+$('.modal.admin-edit-subject-modal').modal('show');

app/views/admins/subjects/index.html.erb

@@ -0,0 +1,39 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('课程配置') %>
+<% end %>
+
+<div class="box search-form-container subject-list-form">
+  <%= form_tag(admins_subjects_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+    <div class="form-group mr-1">
+      <label for="status">状态：</label>
+      <% status_options = [['全部', ''], ['编辑中', 'pending'], ['审核中', 'applying'], ['已发布', 'published']] %>
+      <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
+    </div>
+
+    <div class="form-group col-12 col-md-3">
+      <label for="school_name">单位：</label>
+      <%= select_tag :school_id, options_for_select([''], params[:school_id]), class: 'form-control school-select flex-1' %>
+    </div>
+
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-12 col-md-2 mr-3', placeholder: '创建者/课程名称检索') %>
+
+    <div class="form-check mr-2">
+      <%= hidden_field_tag(:homepage_show, false, id:'') %>
+      <%= check_box_tag(:homepage_show, true, params[:homepage_show].to_s == 'true', class: 'form-check-input') %>
+      <label class="form-check-label" for="homepage_show">只看首页展示</label>
+    </div>
+
+    <div class="form-check mr-2">
+      <%= hidden_field_tag(:excellent, false, id:'') %>
+      <%= check_box_tag(:excellent, true, params[:excellent].to_s == 'true', class: 'form-check-input') %>
+      <label class="form-check-label" for="excellent">只看金课</label>
+    </div>
+
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+    <input type="reset" class="btn btn-secondary clear-btn" value="清空"/>
+  <% end %>
+</div>
+
+<div class="box subject-list-container">
+  <%= render partial: 'admins/subjects/shared/list', locals: { subjects: @subjects } %>
+</div>

app/views/admins/subjects/index.js.erb

@@ -0,0 +1 @@
+$('.subject-list-container').html("<%= j( render partial: 'admins/subjects/shared/list', locals: { subjects: @subjects } ) %>");

app/views/admins/subjects/shared/_edit_subject_modal.html.erb

@@ -0,0 +1,33 @@
+<div class="modal fade admin-edit-subject-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">编辑课程信息</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <%= simple_form_for([:admins, subject], html: { class: 'admin-edit-subject-form' }, defaults: { wrapper_html: { class: 'offset-md-1 col-md-10' } }) do |f| %>
+          <%= f.input :repertoire_id, label: '技术体系：' do %>
+            <% repertoire_options = Repertoire.order('CONVERT(name USING gbk) COLLATE gbk_chinese_ci ASC').map{|r| [r.name, r.id]} %>
+            <%= f.select :repertoire_id, [['请选择', '']] + repertoire_options, {}, class: 'form-control' %>
+          <% end %>
+
+          <%= f.input :subject_level_system_id, label: '等级体系：' do %>
+            <% level_options = SubjectLevelSystem.all.map{|r| [r.name, r.id]} %>
+            <%= f.select :subject_level_system_id, [['请选择', '']] + level_options, {}, class: 'form-control' %>
+          <% end %>
+
+          <%= f.input :student_count, as: :integer, label: '开课人数：' %>
+
+          <div class="error text-danger"></div>
+        <% end %>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+        <button type="button" class="btn btn-primary submit-btn">确认</button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,73 @@
+<table class="table table-hover text-center subject-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="14%" class="text-left">名称</th>
+    <th width="6%">阶段数</th>
+    <th width="6%">实训数</th>
+    <th width="8%">技术体系</th>
+    <th width="8%">等级体系</th>
+    <th width="8%">封面</th>
+    <th width="7%">创建者</th>
+    <th width="10%">单位</th>
+    <th width="8%">开课人数</th>
+    <th width="10%"><%= sort_tag('创建时间', name: 'created_at', path: admins_subjects_path) %></th>
+    <th width="7%">状态</th>
+    <th width="15%">操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if subjects.present? %>
+    <% subjects.each do |subject| %>
+      <tr class="subject-item-<%= subject.id %>">
+        <td class="text-left">
+          <%= link_to(subject.name, "/paths/#{subject.id}", target: '_blank') %>
+          <span class="badge badge-pill badge-success homepage-show-badge" style="<%= subject.homepage_show? ? '' : 'display:none' %>">首页</span>
+          <span class="badge badge-pill badge-info excellent-badge" style="<%= subject.excellent? ? '' : 'display:none' %>">金课</span>
+        </td>
+        <td><%= subject.stages_count %></td>
+        <td><%= subject.shixuns_count %></td>
+        <td><%= display_text subject.repertoire&.name %></td>
+        <td><%= display_text subject.subject_level_system&.name %></td>
+        <td>
+          <% image_exists = Util::FileManage.exists?(subject) %>
+          <%= image_tag(image_exists ? Util::FileManage.source_disk_file_url(subject) : '', height: 40, class: "w-100 preview-image subject-image-#{subject.id}", style: image_exists ? '' : 'display:none') %>
+          <%= javascript_void_link image_exists ? '重新上传' : '上传图片', class: 'action upload-image-action', data: { source_id: subject.id, source_type: 'Subject', toggle: 'modal', target: '.admin-upload-file-modal' } %>
+        </td>
+        <td><%= subject.user.real_name %></td>
+        <td><%= subject.user.school_name %></td>
+        <td><%= subject.student_count %></td>
+        <td><%= subject.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
+        <td>
+          <%= display_subject_status(subject) %>
+        </td>
+        <td class="action-container">
+          <%= link_to('编辑', edit_admins_subject_path(subject), remote: true, class: 'edit-action') %>
+
+          <%= javascript_void_link('隐藏', class: 'hide-action', data: { id: subject.id }, style: subject.hidden? ? 'display:none' : '') %>
+          <%= javascript_void_link('取消隐藏', class: 'active-action', data: { id: subject.id }, style: subject.hidden? ? '' : 'display:none') %>
+
+          <div class="d-inline">
+            <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
+            <div class="dropdown-menu more-action-dropdown">
+              <% if subject.published? %>
+                <%= javascript_void_link('首页展示', class: 'dropdown-item homepage-show-action', data: { id: subject.id }, style: subject.homepage_show? ? 'display:none' : '') %>
+                <%= javascript_void_link('取消首页展示', class: 'dropdown-item homepage-hide-action', data: { id: subject.id }, style: subject.homepage_show? ? '' : 'display:none') %>
+
+                <%= javascript_void_link('选为金课', class: 'dropdown-item excellent-action', data: { id: subject.id }, style: subject.excellent? ? 'display:none' : '') %>
+                <%= javascript_void_link('取消金课', class: 'dropdown-item cancel-excellent-action', data: { id: subject.id }, style: subject.excellent? ? '' : 'display:none') %>
+              <% end %>
+
+              <%= delete_link '删除', admins_subject_path(subject, element: ".subject-item-#{subject.id}"), class: 'dropdown-item delete-subject-action' %>
+            </div>
+          </div>
+        </td>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: subjects } %>
+<%= render partial: 'admins/shared/modal/upload_file_modal', locals: { title: '上传图片', accept: 'image/*' } %>

app/views/admins/users/shared/_user_list.html.erb

@@ -43,13 +43,15 @@
               <%= javascript_void_link '加锁', class: 'action lock-action', data: { id: user.id }, style: user.locked? || user.registered? ? 'display: none;' : '' %>
             <% end %>
 
-            <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
+            <div class="d-inline">
-            <div class="dropdown-menu more-action-dropdown">
+              <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
-              <%= javascript_void_link('奖励', class: 'dropdown-item reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>
+              <div class="dropdown-menu more-action-dropdown">
+                <%= javascript_void_link('奖励', class: 'dropdown-item reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>
 
-              <%= javascript_void_link '恢复禁密账号', class: 'dropdown-item reset-login-times-action', data: { id: user.id } %>
+                <%= javascript_void_link '恢复禁密账号', class: 'dropdown-item reset-login-times-action', data: { id: user.id } %>
 
-              <%= delete_link '删除', admins_user_path(user, element: ".user-item-#{user.id}"), class: 'dropdown-item delete-user-action' %>
+                <%= delete_link '删除', admins_user_path(user, element: ".user-item-#{user.id}"), class: 'dropdown-item delete-user-action' %>
+              </div>
             </div>
           </td>
         </tr>

app/views/competitions/competitions/index.json.jbuilder

@@ -27,5 +27,9 @@ json.competitions do
     #     json.end_time section.display_end_time
     #   end
     # end
+
+    json.permission do
+      json.editable current_user.admin_or_business? || (competition.nearly_published? && competition.manager?(current_user))
+    end
   end
 end

app/views/courses/act_score.json.jbuilder

@@ -0,0 +1,7 @@
+json.course_members @course_members.each do |member|
+  user = member.user
+  json.user_login user.login
+  json.user_name user.real_name
+  # json.course_group member.course_group_name
+  json.total_score member.score
+end

app/views/courses/export_member_scores_excel.xlsx.axlsx

@@ -22,18 +22,19 @@ wb.styles do |s|
     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.merge_cells("H1:H2")
+    # 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  #第二行
     work_head_title = %w(实训作业 普通作业 分组作业 毕设任务 试卷)
     (0..(sheet_length-1)).each do |i|
-      if i <= 6 || i == sheet_length-1
+      if i <= 7
         sheet_first.cells[i].value = sheet_title[i]
       else
         sheet_second.cells[i].value = sheet_title[i]
       end
     end
-    st_col = 7
+    st_col = 8
     sheet_title_counts.each_with_index do |c,index|
       end_col = (st_col + c - 1)
       sheet.merge_cells sheet_first.cells[(st_col..end_col)]

app/views/courses/statistics.json.jbuilder

@@ -0,0 +1,6 @@
+json.top_scores @top_scores.each do |cm_score|
+  user = cm_score.user
+  json.user_name user.real_name
+  json.user_login user.login
+  json.avatar_url url_to_avatar(user)
+end

app/views/courses/work_score.json.jbuilder

@@ -0,0 +1,14 @@
+json.course_members @course_members.each do |member|
+  user = member.user
+  json.user_login user.login
+  json.user_name user.real_name
+  json.course_group member.course_group_name
+  json.common_score member.common_score
+  json.group_score member.group_score
+  json.practice_score member.practice_score
+  json.exercise_score member.exercise_score
+  json.graduation_score member.graduation_score
+  json.total_score member.score
+  json.rank @rank if @user_course_identity == Course::STUDENT
+end
+json.all_count @all_count

app/views/weapps/searchs/index.json.jbuilder

@@ -5,5 +5,10 @@ json.results do
     json.type obj.class.name.downcase
 
     json.title highlights.delete(:name)&.join('...') || obj.searchable_title
+    json.cover url_to_avatar(obj)
+
+    if obj.is_a?(Course)
+      json.author_avatar_url url_to_avatar(obj.teacher)
+    end
   end
 end

config/locales/subjects/zh-CN.yml

@@ -0,0 +1,6 @@
+'zh-CN':
+  subject:
+    status:
+      '0': 编辑中
+      '1': 审核中
+      '2': 已发布

config/routes.rb

@@ -375,6 +375,9 @@ Rails.application.routes.draw do
         post 'update_task_position'
         get 'course_groups'
         post 'join_course_group'
+        get 'work_score'
+        get 'act_score'
+        get 'statistics'
       end
 
       collection do
@@ -1048,6 +1051,17 @@ Rails.application.routes.draw do
     resources :weapp_adverts, only: [:index, :create, :update, :destroy] do
       post :drag, on: :collection
     end
+
+    resources :subjects, only: [:index, :edit, :update, :destroy] do
+      member do
+        post :hide
+        post :cancel_hide
+        post :homepage_show
+        post :cancel_homepage_show
+        post :excellent
+        post :cancel_excellent
+      end
+    end
   end
 
   namespace :cooperative do

db/migrate/20191029065244_init_trustie_config.rb

@@ -0,0 +1,8 @@
+class InitTrustieConfig < ActiveRecord::Migration[5.2]
+  def change
+    hash = {"trustie_api_token" => "", "trustie_api_url" => ""}
+      hash.each { |key, value|
+        EduSetting.find_or_create_by(name: key, value: value)
+      }
+  end
+end

public/assets/admin-6a76c25b6691b4f436608be28606d90c907ba8f033f5f47c6c20d7bf11251cb6.css

@@ -26136,12 +26136,16 @@ input.form-control {
 
 /* line 23, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active .sidebar-header-logo {
-  padding-left: 5px;
   overflow: hidden;
   margin-bottom: 10px;
 }
 
-/* line 30, app/assets/stylesheets/admins/sidebar.scss */
+/* line 27, app/assets/stylesheets/admins/sidebar.scss */
+#sidebar.active .sidebar-header-logo > .logo-label {
+    display: none;
+}
+
+/* line 33, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active ul li a {
   padding: 10px;
   text-align: center;
@@ -26152,12 +26156,12 @@ input.form-control {
           justify-content: center;
 }
 
-/* line 37, app/assets/stylesheets/admins/sidebar.scss */
+/* line 40, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active ul li a span {
   display: none;
 }
 
-/* line 39, app/assets/stylesheets/admins/sidebar.scss */
+/* line 42, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active ul li a i {
   margin-right: 0;
   display: block;
@@ -26167,7 +26171,7 @@ input.form-control {
   height: 20px;
 }
 
-/* line 49, app/assets/stylesheets/admins/sidebar.scss */
+/* line 52, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active .dropdown-toggle::after {
   top: auto;
   bottom: 10px;
@@ -26176,17 +26180,17 @@ input.form-control {
   transform: translateX(50%);
 }
 
-/* line 58, app/assets/stylesheets/admins/sidebar.scss */
+/* line 61, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active ul ul a {
   padding: 10px !important;
 }
 
-/* line 61, app/assets/stylesheets/admins/sidebar.scss */
+/* line 64, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active ul ul a span {
   display: none;
 }
 
-/* line 63, app/assets/stylesheets/admins/sidebar.scss */
+/* line 66, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar.active ul ul a i {
   margin-left: 0px;
   display: block;
@@ -26195,7 +26199,7 @@ input.form-control {
   height: 10px;
 }
 
-/* line 73, app/assets/stylesheets/admins/sidebar.scss */
+/* line 76, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar .sidebar-header {
   padding: 20px;
   background: #272822;
@@ -26208,7 +26212,30 @@ input.form-control {
           justify-content: space-between;
 }
 
-/* line 81, app/assets/stylesheets/admins/sidebar.scss */
+/* line 83, app/assets/stylesheets/admins/sidebar.scss */
+#sidebar .sidebar-header-logo {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+}
+
+/* line 88, app/assets/stylesheets/admins/sidebar.scss */
+#sidebar .sidebar-header-logo > img {
+    width: 40px;
+    height: auto;
+}
+
+/* line 93, app/assets/stylesheets/admins/sidebar.scss */
+#sidebar .sidebar-header-logo > .logo-label {
+    font-size: 18px;
+    color: darkgrey;
+    margin-left: 10px;
+}
+
+/* line 101, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar #sidebarCollapse {
   display: -webkit-box;
   display: flex;
@@ -26220,7 +26247,7 @@ input.form-control {
   text-align: right;
 }
 
-/* line 88, app/assets/stylesheets/admins/sidebar.scss */
+/* line 108, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar #sidebarCollapse.active {
   width: 40px;
   height: 30px;
@@ -26229,27 +26256,27 @@ input.form-control {
   border-radius: 3px;
 }
 
-/* line 95, app/assets/stylesheets/admins/sidebar.scss */
+/* line 115, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar #sidebarCollapse.active i.fold {
   display: none;
 }
 
-/* line 96, app/assets/stylesheets/admins/sidebar.scss */
+/* line 116, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar #sidebarCollapse.active i.unfold {
   display: block;
 }
 
-/* line 99, app/assets/stylesheets/admins/sidebar.scss */
+/* line 119, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar #sidebarCollapse i.fold {
   display: block;
 }
 
-/* line 102, app/assets/stylesheets/admins/sidebar.scss */
+/* line 122, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar #sidebarCollapse i.unfold {
   display: none;
 }
 
-/* line 105, app/assets/stylesheets/admins/sidebar.scss */
+/* line 125, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar a, #sidebar a:hover, #sidebar a:focus {
   color: inherit;
   text-decoration: none;
@@ -26257,25 +26284,25 @@ input.form-control {
   transition: all 0.3s;
 }
 
-/* line 111, app/assets/stylesheets/admins/sidebar.scss */
+/* line 131, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar > ul > li > a > i {
   width: 14px;
   height: 14px;
 }
 
-/* line 117, app/assets/stylesheets/admins/sidebar.scss */
+/* line 137, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar ul.components {
   padding: 20px 0;
   border-bottom: 1px solid #3f3f3f;
 }
 
-/* line 122, app/assets/stylesheets/admins/sidebar.scss */
+/* line 142, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar ul p {
   color: #fff;
   padding: 10px;
 }
 
-/* line 127, app/assets/stylesheets/admins/sidebar.scss */
+/* line 147, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar ul li > a {
   padding: 10px;
   font-size: 1em;
@@ -26283,25 +26310,25 @@ input.form-control {
   text-align: left;
 }
 
-/* line 133, app/assets/stylesheets/admins/sidebar.scss */
+/* line 153, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar ul li > a i {
   margin-right: 10px;
   font-size: 1em;
   margin-bottom: 5px;
 }
 
-/* line 141, app/assets/stylesheets/admins/sidebar.scss */
+/* line 161, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar ul li a:hover, #sidebar ul li a.active {
   color: #fff;
   background: #276891;
 }
 
-/* line 147, app/assets/stylesheets/admins/sidebar.scss */
+/* line 167, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar ul li.active > a, #sidebar ul a[aria-expanded="true"] {
   color: #fff;
 }
 
-/* line 152, app/assets/stylesheets/admins/sidebar.scss */
+/* line 172, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar ul ul a {
   font-size: 0.9em !important;
   padding-left: 30px !important;
@@ -26309,7 +26336,7 @@ input.form-control {
 }
 
 @media (max-width: 768px) {
-  /* line 162, app/assets/stylesheets/admins/sidebar.scss */
+    /* line 182, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active {
     padding: 10px 5px;
     min-width: 40px;
@@ -26319,39 +26346,47 @@ input.form-control {
     -webkit-transform: none;
             transform: none;
   }
-  /* line 170, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 190, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active .sidebar-header {
     padding: 0px;
   }
-  /* line 173, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 193, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active .sidebar-header .sidebar-header-logo {
     display: none;
   }
-  /* line 177, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 197, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active .sidebar-header #sidebarCollapse {
     width: 30px;
     height: 20px;
   }
-  /* line 183, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 203, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active ul li a {
     padding: 10px;
     font-size: 0.85em;
   }
-  /* line 187, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 207, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active ul li a i {
     margin-right: 0;
     display: block;
     margin-bottom: 5px;
   }
-  /* line 194, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 214, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active > ul > li > a > i {
     font-size: 1.8em;
   }
-  /* line 198, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 218, app/assets/stylesheets/admins/sidebar.scss */
   #sidebar.active ul ul a {
     padding: 10px !important;
   }
-  /* line 207, app/assets/stylesheets/admins/sidebar.scss */
+
+    /* line 227, app/assets/stylesheets/admins/sidebar.scss */
   .dropdown-toggle::after {
     top: auto;
     bottom: 10px;

public/assets/admin-e975e2039206e9ae2b6a072fee083cf39b8e04f2318f67bfbf1923fe208456b3.js

@@ -29898,9 +29898,9 @@ function customConfirm(opts){
   return $.confirm($.extend({}, defaultOpts, opts))
 }
 
-function show_success_flash(){
+function show_success_flash(message) {
   $.notify({
-    message: '操作成功'
+		message: message || '操作成功'
   },{
     type: 'success'
   });
@@ -136202,7 +136202,7 @@ $(document).on('turbolinks:load', function(){
           },
           templateResult: function (item) {
             if(!item.id || item.id === '') return item.text;
-            return $("<span>" + item.real_name + " <span class='font-12'>" + item.school_name + ' ' + item.hidden_phone + "</span></span>");
+						return $("<div class='row px-0'><span class='col-3'>" + item.real_name + "</span><span class='col-5 font-12'>" + item.school_name + "</span><span class='col-4 font-12'>" + item.hidden_phone + "</span></div>");
           },
           templateSelection: function(item){
             if (item.id) {
@@ -137786,8 +137786,26 @@ $(document).on('turbolinks:load', function() {
           data: $form.serialize()
         });
       }
-    });
+		});
-  })
+	})
+});
+$(document).on('turbolinks:load', function () {
+	$('.admin-modal-container').on('show.bs.modal', '.modal.admin-edit-subject-modal', function () {
+		var $modal = $('.modal.admin-edit-subject-modal');
+		var $form = $modal.find('form.admin-edit-subject-form');
+
+		$modal.on('click', '.submit-btn', function () {
+			$form.find('.error').html('');
+			var url = $form.attr('action');
+
+			$.ajax({
+				method: 'PATCH',
+				dataType: 'script',
+				url: url,
+				data: $form.serialize()
+			});
+		});
+	})
 });
 $(document).on('turbolinks:load', function() {
   var $modal = $('.modal.admin-import-course-member-modal');
@@ -138478,6 +138496,113 @@ $(document).on('turbolinks:load', function() {
   }
 })
 ;
+$(document).on('turbolinks:load', function () {
+	if ($('body.admins-subjects-index-page').length > 0) {
+		var $form = $('.subject-list-form');
+
+		// ************** 学校选择 *************
+		$form.find('.school-select').select2({
+			theme: 'bootstrap4',
+			placeholder: '请选择创建者单位',
+			minimumInputLength: 1,
+			ajax: {
+				delay: 500,
+				url: '/api/schools/for_option.json',
+				dataType: 'json',
+				data: function (params) {
+					return {keyword: params.term};
+				},
+				processResults: function (data) {
+					return {results: data.schools}
+				}
+			},
+			templateResult: function (item) {
+				if (!item.id || item.id === '') return item.text;
+				return item.name;
+			},
+			templateSelection: function (item) {
+				if (item.id) {
+				}
+				return item.name || item.text;
+			}
+		});
+
+		// 清空
+		$form.on('click', '.clear-btn', function () {
+			$form.find('select[name="status"]').val('');
+			$form.find('.school-select').val('').trigger('change');
+			$form.find('input[name="keyword"]').val('');
+			$form.find('#homepage_show').attr('checked', false);
+			$form.find('#excellent').attr('checked', false);
+			$form.find('input[type="submit"]').trigger('click');
+		})
+
+		// 上传图片
+		$('.modal.admin-upload-file-modal').on('upload:success', function (e, data) {
+			var $imageElement = $('.subject-image-' + data.source_id);
+			$imageElement.attr('src', data.url);
+			$imageElement.show();
+			$imageElement.next().html('重新上传');
+		})
+
+		// 定义状态切换监听事件
+		var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
+			$('.subject-list-container').on('click', doElement, function () {
+				var $doAction = $(this);
+				var $undoAction = $doAction.siblings(undoElement);
+
+				var subjectId = $doAction.data('id');
+				customConfirm({
+					content: '确认进行该操作吗？',
+					ok: function () {
+						$.ajax({
+							url: '/admins/subjects/' + subjectId + url,
+							method: 'POST',
+							dataType: 'json',
+							success: function () {
+								show_success_flash();
+								$doAction.hide();
+								$undoAction.show();
+								if (callback && typeof callback === "function") {
+									callback(subjectId, url);
+								}
+							}
+						});
+					}
+				});
+			});
+		}
+		// 隐藏与取消隐藏
+		defineStatusChangeFunc('.hide-action', '.active-action', '/hide');
+		defineStatusChangeFunc('.active-action', '.hide-action', '/cancel_hide');
+
+		// 首页展示与取消首页展示
+		var homepageShowCallback = function (subjectId, url) {
+			var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
+
+			if (url === '/homepage_show') {
+				$subjectItem.find('.homepage-show-badge').show();
+			} else {
+				$subjectItem.find('.homepage-show-badge').hide();
+			}
+		}
+		defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage_show', homepageShowCallback);
+		defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage_show', homepageShowCallback);
+
+		// 设为金课与取消金课
+		var excellentCallback = function (subjectId, url) {
+			var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
+
+			if (url === '/excellent') {
+				$subjectItem.find('.excellent-badge').show();
+			} else {
+				$subjectItem.find('.excellent-badge').hide();
+			}
+		}
+		defineStatusChangeFunc('.excellent-action', '.cancel-excellent-action', '/excellent', excellentCallback);
+		defineStatusChangeFunc('.cancel-excellent-action', '.excellent-action', '/cancel_excellent', excellentCallback);
+	}
+});
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-user-statistics-index-page').length > 0) {
     var $form = $('.user-statistic-list-form');

public/react/src/modules/competition/Registration.js

@@ -70,6 +70,8 @@ class Registration extends React.Component {
 			members_count: 0,
 			mode: 0,
 			region_schools: [],
+			admin: false,
+			typeysl: 0,
 
 		}
 	}
@@ -85,6 +87,9 @@ class Registration extends React.Component {
 			const {keyword, page, per_page} = this.state;
 			this.Getdata(keyword, page, per_page, this.props.user.admin);// 获取列表数据
 			this.GetenrollmentAPI();//获取我的报名配置
+			this.setState({
+				admin: this.props.user.admin
+			})
 		} catch (e) {
 			// 	const {keyword, page, per_page} = this.state;
 			// 	this.Getdata(keyword, page, per_page, this.props.isAdmin());
@@ -107,6 +112,9 @@ class Registration extends React.Component {
 			this.GetenrollmentAPI();
 			//取模式
 			this.Getdataheader();
+			this.setState({
+				admin: this.props.user.admin
+			})
 		}
 
 	}
@@ -281,17 +289,90 @@ class Registration extends React.Component {
 
 						}
 					} else {
-						this.setState({
+						if (this.props.user.admin === true) {
-							type: 6,
+							try {
-							data: result.data.my_teams,
-							count: result.data.count,
-							competition_teams: result.data.competition_teams,
-							personal: result.data.personal,
-							competition_name: result.data.competition_name,
-							members_count: result.data.members_count
 
+								if (result.data.competition_teams.length === 0) {
+									this.setState({
+										type: 6,
+										typeysl: 1,
+										data: result.data.competition_teams,
+										count: result.data.count,
+										competition_teams: result.data.competition_teams,
+										personal: result.data.personal,
+										competition_name: result.data.competition_name,
+										members_count: result.data.members_count,
+
+									})
+								} else {
+									this.setState({
+										type: 6,
+										typeysl: 0,
+										data: result.data.competition_teams,
+										count: result.data.count,
+										competition_teams: result.data.competition_teams,
+										personal: result.data.personal,
+										competition_name: result.data.competition_name,
+										members_count: result.data.members_count,
+
+									})
+								}
+							} catch (e) {
+								this.setState({
+									type: 6,
+									typeysl: 1,
+									data: result.data.competition_teams,
+									count: result.data.count,
+									competition_teams: result.data.competition_teams,
+									personal: result.data.personal,
+									competition_name: result.data.competition_name,
+									members_count: result.data.members_count,
+
+								})
+							}
+						} else {
+							try {
+
+								if (result.data.my_teams.length === 0) {
+									this.setState({
+										type: 6,
+										typeysl: 1,
+										data: result.data.my_teams,
+										count: result.data.count,
+										competition_teams: result.data.competition_teams,
+										personal: result.data.personal,
+										competition_name: result.data.competition_name,
+										members_count: result.data.members_count,
+
+									})
+								} else {
+									this.setState({
+										type: 6,
+										typeysl: 0,
+										data: result.data.my_teams,
+										count: result.data.count,
+										competition_teams: result.data.competition_teams,
+										personal: result.data.personal,
+										competition_name: result.data.competition_name,
+										members_count: result.data.members_count,
+
+									})
+								}
+							} catch (e) {
+								this.setState({
+									type: 6,
+									typeysl: 1,
+									data: result.data.my_teams,
+									count: result.data.count,
+									competition_teams: result.data.competition_teams,
+									personal: result.data.personal,
+									competition_name: result.data.competition_name,
+									members_count: result.data.members_count,
+
+								})
+							}
+						}
 
-						})
 
 					}
 				}
@@ -824,7 +905,7 @@ class Registration extends React.Component {
 
 
 	render() {
-		const {page, mode, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited, teamutiple_limited, members_count} = this.state;
+		const {page, admin, typeysl, mode, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited, teamutiple_limited, members_count} = this.state;
 
 		return (
 			<div className="newMain clearfix  newMainybot">
@@ -894,15 +975,15 @@ class Registration extends React.Component {
 					></CompetitionMaxImg>
 					{/*大图结尾*/}
 					{/*没数据*/}
-					{
+					{admin === true ?
-						pint === 1 || pint === 3 ?
+						(pint === 1 || pint === 3 ?
 							<div style={{
 								marginTop: "22px"
 							}}>
 								<p>参赛总人数：<span style={{color: "#459BE5"}}>{members_count}</span><span
 									style={{marginLeft: "5px"}}>人</span>
 								</p>
-							</div>
+							</div> : "")
 							: ""}
 					{/*列表*/}
 					{
@@ -926,7 +1007,7 @@ class Registration extends React.Component {
 							</div>
 							: ""}
 					{
-						type === 1 ?
+						type === 1 || typeysl === 1 ?
 							<RegisNodata  {...this.props} {...this.state} ></RegisNodata>
 							:
 							""

public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js

@@ -53,14 +53,6 @@ class CompetitionsIndex extends Component{
 		this.getdata(e.key,page)
 	};
 
-	setcompetitonurl=(url)=>{
-
-		if(url!=null){
-			// this.props.history.push(url);
-			window.location.href=url;
-		}
-	}
-
 	PaginationCourse=(pageNumber)=>{
 		let {category}=this.state;
 		this.setState({
@@ -68,6 +60,7 @@ class CompetitionsIndex extends Component{
 		})
 		this.getdata(category,pageNumber);
 	}
+
 	render() {
 		let {datas,page,count}=this.state;
 
@@ -124,14 +117,16 @@ 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"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
+										<a target="_blank"
-											className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
+											 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}
-												this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}
+											 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"?
-													this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===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>*/}
 												{/*{*/}
@@ -180,9 +175,9 @@ class CompetitionsIndex extends Component{
 											>
 												<List.Item.Meta
 													title={<a className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
-														this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}>
+														item.permission.editable == true ? "competitionstitlesshou" : "endedfont" : "competitionstitlesshou"}>
-														<a target="_blank"  className={"competitionstitles"}
+														<a target="_blank" className={"competitionstitles"}
-																					href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
+															 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.name}{item.sub_title===null?"":`——${item.sub_title}`}</a>
 														{/*<span>{item.sub_title===null?"":*/}
 															{/*<Tag className="competitionsrelative" color="#87d068">{item.sub_title}</Tag>}*/}

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js

@@ -268,7 +268,8 @@ class CompetitionCommon extends Component{
 
 						<Row className={"CompetitionCommonbanner"}>
 							{data.competition_status==="nearly_published"?
-								this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
+								data && data.permission.editable === true ? "" :
+									<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div> : ""}
 							<img className={"Commonimg"}
 									 src={data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} />
 							<Col span={15} className={"Commonimgbox"}>
@@ -334,7 +335,7 @@ class CompetitionCommon extends Component{
 										 <Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
 										   已结束
 									  </Button>:data.enroll_end===true?<Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
-													报名截止
+													{data.competition_status === "nearly_published" ? "未发布" : "报名截止"}
 												</Button>:
 											data.competition_status==="progressing"?<Button type="primary" block className={"Competitionfontsize22"}>
 												{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}

public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js

@@ -19,13 +19,14 @@ class CompetitionContents extends Component{
 	}
 
 	render() {
-    let{mdContentdata}=this.props;
+		let {mdContentdata, data} = this.props;
 		//mdhash滚动
 		this.props.MdifHasAnchorJustScorll();
 		return (
 
 				<div className={"fr"}>
-					{this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?this.props.Competitionedittype===false?this.props.has_url===false?<Button className={"fr"} type="primary" ghost onClick={()=>this.props.Competitionedit()}>
+					{data && data.permission.editable === true ? this.props.Competitionedittype === false ? this.props.has_url === false ?
+						<Button className={"fr"} type="primary" ghost onClick={() => this.props.Competitionedit()}>
 						编辑
 					</Button>:"":"":""}
 					<div className={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?"mt50 mb100 ":"mb100 "}>

public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js

@@ -115,8 +115,8 @@ class CompetitionContents extends Component{
 			},
 		];
 
-		const data = [];
+		const datas = [];
-		let {chart_rules,chartdata}=this.props;
+		let {chart_rules, chartdata, data} = this.props;
 		let {personal}=this.state;
 		 chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<3?"":chartdata.teams.map((item,key)=>{
 
@@ -130,7 +130,7 @@ class CompetitionContents extends Component{
 					score:item.score,
 					user_login:item.user_login
 				}
-				data.push(list)
+				datas.push(list)
 			}
 		 })
 
@@ -139,7 +139,9 @@ class CompetitionContents extends Component{
     //console.log(chartdata&&chartdata.teams)
     return (
 			<div>
-				{chart_rules===undefined?"":<Tabs  onChange={(e)=>this.props.Competitioncallback(e)} activeKey={this.props.tabkey} tabBarExtraContent={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?this.props.Competitionedittype===false?this.props.has_url===false?operations:"":"":""}>
+				{chart_rules === undefined ? "" :
+					<Tabs onChange={(e) => this.props.Competitioncallback(e)} activeKey={this.props.tabkey}
+								tabBarExtraContent={data && data.permission.editable === true ? this.props.Competitionedittype === false ? this.props.has_url === false ? operations : "" : "" : ""}>
 					{chart_rules.stages.map((item,key)=>{
 						return(
 							<TabPane tab={item.name} key={item.id===null?0:item.id}>
@@ -343,7 +345,9 @@ class CompetitionContents extends Component{
 							`
 						}
 					</style>
-					{chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<4?"":<Table className="Competitiontransparent" columns={columns} dataSource={data} showHeader={false} pagination={false}/>}
+					{chartdata === undefined ? "" : chartdata.teams.length === 0 || chartdata.teams.length < 4 ? "" :
+						<Table className="Competitiontransparent" columns={columns} dataSource={datas} showHeader={false}
+									 pagination={false}/>}
 				</Row>
 
 

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
 import {Link} from 'react-router-dom';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { WordsBtn, ConditionToolTip, queryString,getImageUrl, on, off, NoneData} from 'educoder';
+import {WordsBtn, ConditionToolTip, queryString, getImageUrl, on, off, NoneData, sortDirections} from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import CoursesListType from '../coursesPublic/CoursesListType';
@@ -97,7 +97,7 @@ function buildColumns(that, student_works, studentData) {
 					 }} title={text && text.length > 5 ? text : ''}>
 				{/* <Tooltip placement="bottom" title={text}>
 				</Tooltip> */}
-          {record.is_leader ? 
+				{record.is_leader ?
           <div style={{ display: 'flex', 'flex-direction': 'column', 'align-items': 'center'}}>
             <div >{text}</div>
             <LeaderIcon></LeaderIcon>
@@ -113,11 +113,18 @@ function buildColumns(that, student_works, studentData) {
       dataIndex: 'student_id',
       key: 'student_id',
 			sorter: true,
+			sortDirections: sortDirections,
       render: (text, record) => (
         <span>
           <a href="javascript:;"
-            title={text && text.length > 12 ? text : ''}
+						 title={text && text.length > 12 ? text : ''}
-            style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '98px', display: 'block', overflow: 'hidden'
+						 style={{
+							 color: '#9A9A9A',
+							 'text-overflow': 'ellipsis',
+							 'white-space': 'nowrap',
+							 'width': '98px',
+							 display: 'block',
+							 overflow: 'hidden'
                 , margin: '0 auto', cursor: 'default'}}
           >{record.student_id}</a>
       </span>
@@ -161,9 +168,15 @@ function buildColumns(that, student_works, studentData) {
 
       render: (project_info, record) => (
         <span>
-          {project_info && project_info.name && <a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`} 
+          {project_info && project_info.name &&
-              target={ project_info.id == -1 ? '' : "_blank" }
+					<a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`}
-              className="overflowHidden1" style={{color:'#4CACFF', width: that.state.anonymous_comment ? '80px' : '130px', margin: '0 auto', display: 'block'}} title={project_info.name}
+						 target={project_info.id == -1 ? '' : "_blank"}
+						 className="overflowHidden1" style={{
+						color: '#4CACFF',
+						width: that.state.anonymous_comment ? '80px' : '130px',
+						margin: '0 auto',
+						display: 'block'
+					}} title={project_info.name}
           >{project_info.name}</a>}
         </span>
       ),
@@ -201,12 +214,14 @@ function buildColumns(that, student_works, studentData) {
     dataIndex: 'update_time',
     key: 'update_time',
 		sorter: true,
+		defaultSortOrder: 'descend',
+		sortDirections: sortDirections,
     render: (update_time, record) => (
       <span>
         <a href="javascript:;"  style={{color:'#989898', cursor: 'default'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
     </span>
     ),
-  }]) 
+	}])
   if (!niPingAndIsStudent) {
     columns.push({
       width: 70,
@@ -232,7 +247,7 @@ function buildColumns(that, student_works, studentData) {
       /**
       * 2名助教进行了评分
       平均分：85.0分
-      * 
+			 *
       */
       render: (teaching_asistant_score, record) => (
         <span>
@@ -252,10 +267,9 @@ function buildColumns(that, student_works, studentData) {
   }
 
 
-  
+	if (that.state.anonymous_comment) {
-  if (that.state.anonymous_comment) {
+		/**
-    /** 
+		 开启了匿评的才显示此列，悬浮TIP示例：
-   开启了匿评的才显示此列，悬浮TIP示例： 
     3名学生进行了匿评
     有效平均分：80.0分
   */
@@ -281,7 +295,7 @@ function buildColumns(that, student_works, studentData) {
       </span>
       ),
     })
-  }  
+	}
 
   if (that.state.anonymous_appeal) {
     columns.push({
@@ -292,7 +306,7 @@ function buildColumns(that, student_works, studentData) {
 
       render: (appeal_all_count, record) => (
         <span>
-          { !!appeal_all_count && 
+          {!!appeal_all_count &&
             <Tooltip placement="bottom" title={`共有${appeal_all_count}条匿评申诉，${record.appeal_deal_count}条待处理`}>
               <span style={{ minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
                 {`${record.appeal_deal_count}/${appeal_all_count}`}
@@ -310,6 +324,7 @@ function buildColumns(that, student_works, studentData) {
       key: 'work_score',
       dataIndex: 'work_score',
 			sorter: true,
+			sortDirections: sortDirections,
       render: (work_score, record) => {
         return (
         <span>
@@ -317,8 +332,8 @@ function buildColumns(that, student_works, studentData) {
             getScoreTip(work_score,
             <div>
               <div>{`${record.user_name}（${record.user_login}）`}</div>
-              { record.ultimate_score ? 
+							{record.ultimate_score ?
-              <div>最终调整成绩：{record.work_score}分</div> :      
+								<div>最终调整成绩：{record.work_score}分</div> :
               <div>
                 { record.final_score && <div>作业评分：{record.final_score}分</div> }
                 { record.late_penalty >= 0 && <div>迟交扣分：{record.late_penalty}分</div>}
@@ -326,7 +341,7 @@ function buildColumns(that, student_works, studentData) {
                 { record.appeal_penalty >= 0 && <div>违规匿评扣分：{record.appeal_penalty}分</div>}
                 <div>最终成绩：{record.work_score}分</div>
               </div> }
-            </div>) 
+						</div>)
           }>
             { renderScore(work_score) }
           </Tooltip>
@@ -388,7 +403,7 @@ class CommonWorkList extends Component{
       task_status: [],
       teacher_comment: [],
       course_group_info: [],
-      arg_work_status: [], 
+			arg_work_status: [],
       arg_teacher_comment: [],
       arg_course_group: [],
       order: 'update_time',
@@ -425,13 +440,13 @@ class CommonWorkList extends Component{
 
   }
   componentWillUnmount() {
-    off('commonwork_fetch_all', this.fetchAllListener)  
+		off('commonwork_fetch_all', this.fetchAllListener)
   }
   fetchAllListener = () => {
     this.fetchList()
   }
 
-  _getRequestParams() {
+	_getRequestParams() {
 		const {search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work, b_order} = this.state
     return {
       page,
@@ -474,7 +489,6 @@ class CommonWorkList extends Component{
      })
 
 
-  
   }
   teacherCommentOptionChange = (values, isAllChecked) => {
     this.setState({arg_teacher_comment: isAllChecked ? [] : values, page: 1}, () => {
@@ -623,10 +637,10 @@ class CommonWorkList extends Component{
       modulationModalVisible, work_statuses,
 
       id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
-      ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count, 
+			ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
       late_penalty, absence_penalty, appeal_penalty
 
-      ,end_immediately ,publish_immediately 
+			, end_immediately, publish_immediately
       , homework_id, visible, work_group, project_info, is_leader
     } =this.state;
 
@@ -707,7 +721,7 @@ class CommonWorkList extends Component{
 
     const hasData = this.state.homework_status && this.state.homework_status.indexOf("未发布") == -1 // student_works && !!student_works.length && page == 1 &&
 
-    // console.log(StudentData)
+		// console.log(StudentData)
 		// console.log(student_works)
     return(
       <React.Fragment>
@@ -716,7 +730,7 @@ class CommonWorkList extends Component{
           {...this.props}
         ></CheckCodeModal>
 
-        <AccessoryModal
+				<AccessoryModal
             {...this.props}
             modalname={"补交附件"}
             visible={visible}
@@ -739,7 +753,7 @@ class CommonWorkList extends Component{
 					/>
 
 
-          {/* 内容区 */}
+				{/* 内容区 */}
           <style>{`
             .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
               text-align: center;
@@ -793,58 +807,12 @@ class CommonWorkList extends Component{
                   }
                 </span>}
 
-                {/* { isAdminOrStudent && student_works && !!student_works.length && <div className="fr color-grey-6 edu-menu-panel">
-                  <p style={{color: '#989898'}} className="color-grey-6"><a data-remote="true" className="font-12">
-                    {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}</a><i
-                    className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
-                  <ul className="edu-menu-list" style={{ textAlign: 'center'}}>
-                    <li onClick={(e)=>this.funorder("update_time")} ><a data-remote="true" className={order==="update_time"?"color-blue":""}>更新时间</a>
-                    </li>
-                    <li onClick={(e)=>this.funorder("work_score" )} ><a data-remote="true" className={order==="work_score"?"color-blue":""}>最终成绩</a>
-                    </li>
-                    <li  onClick={(e)=>this.funorder("student_id" )} ><a data-remote="true" className={order==="student_id"?"color-blue":""}>学生学号</a>
-                    </li>
-                  </ul>
-                </div> } */}
-								{/*{*/}
-								{/*  isAdminOrStudent && student_works && !!student_works.length &&*/}
-								{/*  <div className="fr">*/}
-								{/*    <li className="drop_down">*/}
-								{/*      <span className="color-grey-9 font-12">*/}
-								{/*        {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}*/}
-								{/*      </span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>*/}
-								{/*      <ul className="drop_down_normal">*/}
-								{/*        <li className={''} onClick={()=>this.funorder("update_time")}>更新时间</li>*/}
-								{/*        <li className={''} onClick={()=>this.funorder("work_score")}>最终成绩</li>*/}
-								{/*        <li className={''} onClick={()=>this.funorder("student_id")}>学生学号</li>*/}
-								{/*      </ul>*/}
-								{/*    </li>*/}
-								{/*  </div>*/}
-								{/*}*/}
 
-              </div>
+							</div>
             </div> }
 
 
-
+						<style>{`
-            {/* 
-              "commit_count": 10, //已交数（学生身份）
-              "uncommit_count": 12, //未交数（学生身份）
-              "left_time": {   //学生身份剩余的时间和状态
-                  "status": "剩余补交时间",
-                  "time": "24 天 24分 23秒"
-              },
-            */}
-            {/* { isStudent && <div id="graduation_work_list" style={{padding:'10px 30px 10px 40px'}}>
-              <div className="clearfix">
-                <span className="fl color-grey-6 font-12">
-                  <span className="color-orange-tip">{commit_count}</span>已交  {uncommit_count}未交  剩余提交时间：
-                  <span className="color-orange-tip">{left_time.time}</span>
-                </span>
-              </div>
-            </div> } */}
-            
-            <style>{`
               .workListContent .ant-table-thead > tr > th {
                 border-bottom: none;
               }
@@ -883,21 +851,14 @@ class CommonWorkList extends Component{
 									<div id="forum_list" className="forum_table">
 										<div className="mh650 edu-back-white">
 
-                      <NoneData></NoneData>
+											<NoneData></NoneData>
 										</div>
 									</div>
 								</Spin>
 								:
               <React.Fragment>
-              {/* pagination={work_count > PAGE_SIZE ? {  //分页
+
-                  total: work_count, //数据总数量
+								<Table
-                  pageSize: PAGE_SIZE,  //显示几条一页
-                  current: page,
-                } : false} 
-                
-                onChange={this.onTablePagination}
-                */}
-              <Table
 								className="stageTable"
 								dataSource={student_works}
 								columns={columns}
@@ -912,7 +873,7 @@ class CommonWorkList extends Component{
             </div>
           </div>
 
-          {work_count > PAGE_SIZE && <Pagination 
+				{work_count > PAGE_SIZE && <Pagination
               style={{ textAlign: 'center', marginBottom: '20px' }}
               showQuickJumper pageSize={PAGE_SIZE} onChange={this.onTablePagination} current={page} total={work_count} />}
 

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -1017,40 +1017,41 @@ class Coursesleftnav extends Component{
                     return(
                         <div key={key} 	>
                             <a>
-                            <li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)}   className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}   onMouseLeave={(e)=>this.hidesandian(e,key)}  onMouseEnter={(e)=>this.showsandian(e,key)}>
+															{item.type != "statistics" ?
-                                <a onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)}  className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
+																<li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}>
-                                  {
+																	<a onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
-                                    item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
+																		{
-                                    item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
+																			item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
-                                    item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
+																				item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
-                                    item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
+																					item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
-                                    item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
+																						item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
-                                    item.type==="graduation"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-biyezhuanhuan mr10 fl":"iconfont icon-biyezhuanhuan mr10 fl"}></i>:
+																							item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
-                                    item.type==="exercise"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-shijuan mr10 fl":"iconfont icon-shijuan mr10 fl"}></i>:
+																								item.type==="graduation"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-biyezhuanhuan mr10 fl":"iconfont icon-biyezhuanhuan mr10 fl"}></i>:
-                                    item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
+																									item.type==="exercise"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-shijuan mr10 fl":"iconfont icon-shijuan mr10 fl"}></i>:
-                                    item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
+																										item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
-                                    item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
+																											item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
-                                    item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:
+																												item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
-																		item.type==="statistics"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-tongji mr10 fl":"iconfont icon-tongji mr10 fl"}  ></i>:""
+																													item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:
-                                  }
+																														item.type==="statistics"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-tongji mr10 fl":"iconfont icon-tongji mr10 fl"}  ></i>:""
-
+																		}
-                                    {/*||this.props.location.pathname===this.state.url&&key===this.state.indexs*/}
+
-
+																		{/*||this.props.location.pathname===this.state.url&&key===this.state.indexs*/}
-																			<span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"}
+
-																						onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}
+																		<span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"}
-																			>{item.name}</span>
+																					onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}
-
+																		>{item.name}</span>
-                                    {/*className={sandiantype===undefined?item.task_count===0?"fr mr10 colortransparent":"fr mr10 color999 font-14":sandiantype===key?"none":item.task_count===0?"none":"fr mr10 color999 font-14"}*/}
+
-                                    <span className={this.state.sandiantypes===key?"none":this.props.location.pathname===item.category_url?"color-blue fr mr25 font-14":"fr mr25 color999 font-14"} >{item.task_count===0?"":item.task_count}</span>
+																		{/*className={sandiantype===undefined?item.task_count===0?"fr mr10 colortransparent":"fr mr10 color999 font-14":sandiantype===key?"none":item.task_count===0?"none":"fr mr10 color999 font-14"}*/}
-                                     {/*<i className={this.state.sandiantypes===key?"iconfont icon-sandian mr5 fr color999":"none"} onMouseEnter={(e)=>this.sandianshow(e,key)}></i>  */}
+																		<span className={this.state.sandiantypes===key?"none":this.props.location.pathname===item.category_url?"color-blue fr mr25 font-14":"fr mr25 color999 font-14"} >{item.task_count===0?"":item.task_count}</span>
-
+																		{/*<i className={this.state.sandiantypes===key?"iconfont icon-sandian mr5 fr color999":"none"} onMouseEnter={(e)=>this.sandianshow(e,key)}></i>  */}
-                                  {this.state.sandiantypes===key?<Popover placement="right" content={this.maincontent(item,key)} trigger="hover" key={key}>
+
-
+																		{this.state.sandiantypes===key?<Popover placement="right" content={this.maincontent(item,key)} trigger="hover" key={key}>
-                                    <i className={"iconfont icon-sandian mr20 fr color999"}></i>
+
-
+																			<i className={"iconfont icon-sandian mr20 fr color999"}></i>
-                                  </Popover>:""}
+
-                                </a>
+																		</Popover>:""}
-                            </li>
+																	</a>
+																</li> : ""}
 
                             {/*下拉列表*/}
 
@@ -1154,30 +1155,31 @@ class Coursesleftnav extends Component{
                  <div key={key}>
                    {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}
                    <a >
-                   <li className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}
+										 {item.type != "statistics" ?
-                       onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)}  onMouseEnter={(e)=>this.showsandian(e,key)}
+											 <li className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}
-											 title={item.name.length<7?"":item.name}
+													 onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)} onMouseEnter={(e)=>this.showsandian(e,key)}
-                   >
+													 title={item.name.length<7?"":item.name}
-                       <a className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
+											 >
-                       {
+												 <a className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
-                         item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
+													 {
-                         item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
+														 item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
-                         item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
+															 item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
-                           item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
+																 item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
-                             item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
+																	 item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
-                               item.type==="graduation"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-biyezhuanhuan mr10 fl":"iconfont icon-biyezhuanhuan mr10 fl"}></i>:
+																		 item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
-                                 item.type==="exercise"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-shijuan mr10 fl":"iconfont icon-shijuan mr10 fl"}></i>:
+																			 item.type==="graduation"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-biyezhuanhuan mr10 fl":"iconfont icon-biyezhuanhuan mr10 fl"}></i>:
-                                   item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
+																				 item.type==="exercise"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-shijuan mr10 fl":"iconfont icon-shijuan mr10 fl"}></i>:
-                                     item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
+																					 item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
-                                       item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
+																						 item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
-                                         item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:""
+																							 item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
-                       }
+																								 item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:""
-
+													 }
-                       <span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"} onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}>{item.name}</span>
+
-                       <span className={this.props.location.pathname===item.category_url?"color-blue fr mr20 font-14":"fr mr20 color999 font-14"}>{item.task_count===0?"":item.task_count}</span>
+													 <span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"} onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}>{item.name}</span>
-
+													 <span className={this.props.location.pathname===item.category_url?"color-blue fr mr20 font-14":"fr mr20 color999 font-14"}>{item.task_count===0?"":item.task_count}</span>
-                       </a>
+
-                   </li>
+												 </a>
+											 </li> : ""}
                    </a>
 
                    <ul style={{display:key===this.props.indexs?"":"none"}} class="droppableul">

public/react/src/modules/courses/exercise/Exercisestatisticalresult.js

@@ -184,7 +184,8 @@ class Exercisestatisticalresult extends Component {
 					</style>
 
 					<div className="stud-class-set fafafa">
-						<li className="drop_down fr mt10 mr33 cursor" onClick={() => this.onSortTypeChange()}>
+						<li className="fl mt10 cursor zexercisetitle">统计详情</li>
+						<li className="drop_down fr mt10 cursor zexercisetitle" onClick={() => this.onSortTypeChange()}>
 							{/*{sort==="percent"?"正确率":sort==="type"?"题型":sort==="position"?"题序":""}*/}
 							{/*<i className="iconfont icon-xiajiantou font-12 ml2"></i>*/}
 							{/*<ul className="drop_down_normal">*/}
@@ -208,6 +209,9 @@ class Exercisestatisticalresult extends Component {
 					 .CACFF{
 						 color:#4CACFF;
 					 }
+					 .C3333{
+					   color:#333;
+					 }
 					 .bor-greyE{
 						border: 1px solid #EEEEEE!important;
 					 }
@@ -281,7 +285,8 @@ class Exercisestatisticalresult extends Component {
 								<div className="stud-class-set mb20 exerciseTable" key={key}>
 									<div className="clearfix edu-back-white poll_list"  style={{padding: '20px'}}>
 										<div className="font-16 shixunreporttitle fl" style={{width:"1050px"}}>
-										<span className="CACFF">{item.ques_position+"."}{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}题</span>
+											<span
+												className="C3333">{item.ques_position + "."}{item.ques_type === 0 ? "单选" : item.ques_type === 1 ? "多选" : item.ques_type === 2 ? "判断" : item.ques_type === 3 ? "填空" : item.ques_type === 4 ? "主观" : item.ques_type === 5 ? "实训" : ""}题</span>
 										<div>
 											{/*Q{item.ques_position}：*/}
 											{/* <div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML1(item.ques_title).replace(/▁/g,"▁▁▁")}}></div> */}

public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js

@@ -74,7 +74,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '不及格(0-60)',
+			title: '不及格（得分 低于60%）',
 			key: 'fail_counts',
 			dataIndex: 'fail_counts',
 			render: (text, record) => (
@@ -83,7 +83,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '及格(60-70)',
+			title: '及格（得分 60%~70%）',
 			key: 'pass_counts',
 			dataIndex: 'pass_counts',
 
@@ -93,7 +93,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '良好(70-90)',
+			title: '良好（得分 70%~90%）',
 			key: 'good_counts',
 			dataIndex: 'good_counts',
 
@@ -103,7 +103,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '优秀(90-100)',
+			title: '优秀（得分 90%~100%）',
 			key: 'best_counts',
 			dataIndex: 'best_counts',
 
@@ -167,6 +167,12 @@ class OfficialAcademicTranscript extends Component {
 					.exerctabel .ant-table-tbody > tr >td{
 					  border:1px solid transparent;
 					}
+					.exerctabel .ant-table-thead > tr > th {
+							 background: #fff !important;
+							 border-top: 1px solid #F4F4F4;
+               border-bottom: 1px solid #F4F4F4 !important;
+
+					}
 
 			`}
 				</style>

public/react/src/modules/courses/exercise/Exercisetablesmubu.js

@@ -109,7 +109,22 @@ class Exercisetablesmubus extends Component {
 
 		return (
 			<div>
-
+				<style>{`
+					.Exermubu .ant-table-thead > tr > th {
+							 background: #fff !important;
+               border-bottom: 1px solid #F4F4F4 !important;
+					}
+
+					.Exermubu .ant-table-thead .ant-table-column-title{
+								color:#999999;
+					}
+
+					.Exermubu .ant-table-tbody> tr > td{
+         			border-bottom: transparent;
+					}
+
+			`}
+				</style>
 				
 				{datas===undefined?"":<Table
 					className={"Exermubu"}

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -20,7 +20,7 @@ import '../poll/pollStyle.css'
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import './yslexercisetable.css';
-import {getImageUrl, toPath} from 'educoder';
+import {getImageUrl, toPath, sortDirections} from 'educoder';
 import CheckBoxGroup from "../../page/component/CheckBoxGroup";
 import NoneData from '../../../modules/courses/coursesPublic/NoneData'
 const Search = Input.Search;
@@ -111,6 +111,7 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14 maxnamewidth175",
 					width:'175px',
 					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span className="maxnamewidth175" style={{
 							width:'175px',
@@ -202,6 +203,8 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					width:'175px',
 					sorter: true,
+					defaultSortOrder: 'descend',
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{
 							width:'175px',
@@ -297,6 +300,7 @@ class Studentshavecompletedthelist extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14",
 					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
 							{record.efficiencyscore === "--" ?
@@ -881,6 +885,7 @@ class Studentshavecompletedthelist extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14",
 					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
 						{record.stduynumber === "--" ?
@@ -935,6 +940,8 @@ class Studentshavecompletedthelist extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14",
 					sorter: true,
+					defaultSortOrder: 'descend',
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
 							{record.updatetime==="--"?
@@ -984,6 +991,7 @@ class Studentshavecompletedthelist extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14",
 					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
 															{record.efficiencyscore === "--" ?
@@ -1058,6 +1066,7 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center font-14",
+
 					render: (text, record) => (
 						<span>
 							{record.name==="--"?
@@ -1074,6 +1083,8 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
 						{record.stduynumber === "--" ?
@@ -1127,6 +1138,9 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					sorter: true,
+					defaultSortOrder: 'descend',
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
 							{record.updatetime==="--"?
@@ -1175,6 +1189,8 @@ class Studentshavecompletedthelist extends Component {
 					key: 'efficiencyscore',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
 															{record.efficiencyscore === "--" ?
@@ -1225,7 +1241,7 @@ class Studentshavecompletedthelist extends Component {
                     </span>
 					)
 				},
-			],
+			],//columnsystwo 也会被columnsys当作参数接收
 			exercise_status:0,
 			order_type: "desc",
 		}
@@ -2721,7 +2737,7 @@ class Studentshavecompletedthelist extends Component {
 						                 .ysltableows2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
-															mysjysltable1 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+															.mysjysltable1 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
 						              `}</style>
@@ -2832,7 +2848,7 @@ class Studentshavecompletedthelist extends Component {
 						                 .ysltableows2  .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
-															mysjysltable2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+															.mysjysltable2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
 						              `}</style>
@@ -2888,7 +2904,7 @@ class Studentshavecompletedthelist extends Component {
 													 .ysltableows  .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
-														mysjysltable3  .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+														.mysjysltable3  .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
 												`
@@ -2964,7 +2980,7 @@ class Studentshavecompletedthelist extends Component {
 														 .ysltableowss .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
-															mysjysltable4 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+															.mysjysltable4 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
 													 padding: 9px;
 															}
 						              `}</style>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -1,7 +1,7 @@
 import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Pagination, Table, Divider, Tag,Tooltip} from "antd";
 import {Link} from 'react-router-dom';
-import { getImageUrl , NoneData } from 'educoder';
+import {getImageUrl, NoneData, sortDirections} from 'educoder';
 import axios from 'axios';
 import moment from 'moment';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
@@ -66,7 +66,7 @@ class GraduationTaskssettinglist extends Component{
       this.props.triggerRef(this)
     }catch(e){
 
-    }
+		}
 	}
 
 	goback=()=>{
@@ -771,6 +771,7 @@ class GraduationTaskssettinglist extends Component{
 			key: 'stduynumber',
 			className:'edu-txt-center',
 				sorter: true,
+				sortDirections: sortDirections,
 			render: (text, record) => (
 				<span>
              <div style={{color:'#9A9A9A'}} className={"studentnumber"} title={record.stduynumber}>{record.stduynumber}</div>
@@ -823,6 +824,8 @@ class GraduationTaskssettinglist extends Component{
 			key: 'turnovertime',
 			className:'edu-txt-center',
 				sorter: true,
+				defaultSortOrder: 'descend',
+				sortDirections: sortDirections,
 			render: (text, record) => (
 				<span>
              <a style={{color:'#989898'}}>
@@ -865,6 +868,7 @@ class GraduationTaskssettinglist extends Component{
 			dataIndex: 'finalscore',
 			className:'edu-txt-center',
 				sorter: true,
+				sortDirections: sortDirections,
 			render: (text, record) => (
 				<span>
 			 <Tooltip placement="right" title={record.finalscore.work_score==="--"?"未评阅":	<pre>

public/react/src/modules/courses/poll/PollDetailTabFirst.js

@@ -1,7 +1,7 @@
 import React,{ Component } from "react";
 import {Checkbox,Input,Table, Pagination} from "antd";
 
-import { WordsBtn } from 'educoder'
+import {WordsBtn, sortDirections} from 'educoder'
 import moment from 'moment';
 import CheckAllGroup from '../common/button/CheckAllGroup'
 import NoneData from "../coursesPublic/NoneData"
@@ -259,6 +259,7 @@ class PollDetailTabFirst extends Component{
       key: 'StudentNo',
       className:"edu-txt-center",
 			sorter: true,
+			sortDirections: sortDirections,
       render:(StudentNo,item,index)=>{
         return(
           item.StudentNo ? <span>{item.StudentNo}</span> : "--"
@@ -289,10 +290,12 @@ class PollDetailTabFirst extends Component{
     }, {
       title: '提交时间',
       dataIndex: 'time',
-      key: 'time',      
+			key: 'time',
       className:"edu-txt-center",
       width:160,
 			sorter: true,
+			defaultSortOrder: 'descend',
+			sortDirections: sortDirections,
       render:(time,item,index)=>{
         return(
           item.time == null ? <span className="color-grey-9">--</span> : moment(item.time).format('YYYY-MM-DD HH:mm')
@@ -352,7 +355,7 @@ class PollDetailTabFirst extends Component{
                 </div>
               </div>
               {
-                course_groups && course_groups.length > 1 ? 
+								course_groups && course_groups.length > 1 ?
                 <div className="mt15">
                   <CheckAllGroup options={options_Class} label={'分班情况：'} onChange={this.classOptionsChange}></CheckAllGroup>
                 </div>
@@ -367,17 +370,17 @@ class PollDetailTabFirst extends Component{
               isAdmin ? <span className="fl color-grey-3 font-12"><span className="color-orange-tip">{poll_types && poll_types.total_users}</span>个检索结果（{poll_types && poll_types.poll_users_count} 学生）</span> :""
             }
             {
-              isStudent ? 
+							isStudent ?
               <span className="fl color-grey-3 font-12">
 								{poll_types && poll_types.answer_users===undefined?"":<span className="mr15"><span className="color-orange-tip">{poll_types && poll_types.answer_users}</span> 已交</span>}
 								{poll_types && poll_types.unanswer_users===undefined?"":<span className="mr15">{poll_types && poll_types.unanswer_users} 未交</span>}
                 {
                   poll_end_at != "0" ?
                     <span className="color-grey-9"> 剩余提交时间：<span className="color-orange-tip">{poll_end_at}</span></span>
-                  :"" 
+										: ""
                 }
               </span>
-              :"" 
+								: ""
             }
 							{/*{*/}
 							{/*  isAdmin && */}
@@ -399,7 +402,7 @@ class PollDetailTabFirst extends Component{
             }
           </div>
           {
-            poll_types && poll_types.total_users && poll_types.total_users > limit ? 
+						poll_types && poll_types.total_users && poll_types.total_users > limit ?
             <div className="edu-txt-center mt30 mb50">
               <Pagination showQuickJumper current={page} onChange={this.changePage} pageSize={limit} total={poll_types.total_users}></Pagination>
             </div>:""

public/react/src/modules/courses/poll/pollStyle.css

@@ -372,3 +372,9 @@ textarea:read-only{
 .myyslwidth {
   min-width:1200px
 }
+
+.zexercisetitle {
+    font-size: 16px;
+    color: rgba(51, 51, 51, 1);
+    min-width: 95px;
+}

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import CoursesListType from '../coursesPublic/CoursesListType';
-import {WordsBtn, ActionBtn} from 'educoder';
+import {WordsBtn, ActionBtn, sortDirections} from 'educoder';
 import {
 	Form,
 	Select,
@@ -874,6 +874,7 @@ class Listofworksstudentone extends Component {
 					align: "center",
 					className: 'font-14 maxnamewidth110',
 					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span className="maxnamewidth110">
 							{record.stduynumber === undefined ?
@@ -1094,6 +1095,8 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className: 'font-14',
 					sorter: true,
+					sortDirections: sortDirections,
+					defaultSortOrder: 'descend',
 					render: (text, record) => (
 						<span>
 									{
@@ -1208,6 +1211,7 @@ class Listofworksstudentone extends Component {
 					align: "center",
 					className: 'font-14 maxnamewidth110',
 					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span className="maxnamewidth110">
 							{record.stduynumber === undefined ?
@@ -1421,6 +1425,8 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className: 'font-14',
 					sorter: true,
+					sortDirections: sortDirections,
+					defaultSortOrder: 'descend',
 					render: (text, record) => (
 						<span>
 									{

public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js

@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import CoursesListType from '../coursesPublic/CoursesListType';
-import {WordsBtn,ActionBtn} from 'educoder';
+import {WordsBtn, ActionBtn, sortDirections} from 'educoder';
 import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal";
@@ -725,6 +725,7 @@ class ShixunStudentWork extends Component {
 				dataIndex: 'stduynumber',
 				key: 'stduynumber',
 				sorter: true,
+				sortDirections: sortDirections,
 				render: (text, record) => (
 					<span>
              <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
@@ -736,6 +737,8 @@ class ShixunStudentWork extends Component {
 				key: 'classroom',
 				dataIndex: 'classroom',
 				sorter: true,
+				defaultSortOrder: 'descend',
+				sortDirections: sortDirections,
 				render: (text, record) => (
 					<span>
              <a style={{"color": record.classroom>=90?'#FF6800':"#747A7F", "text-align": "center"}}>{isNaN(record.classroom)?"--":record.classroom}%</a>

public/react/src/modules/courses/statistics/Statistics.js

@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import {Table, Pagination,Tooltip,Spin, Row, Col ,Tabs} from "antd";
-import { WordsBtn,on, off, trigger } from 'educoder';
+import {WordsBtn, on, off, trigger, getImageUrl} from 'educoder';
 import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
 import axios from'axios';
 import './Statistics.css';
@@ -11,125 +11,315 @@ class Statistics extends Component{
 		this.state={
 			nd1:60,
 			nd2:40,
-			nd3:20
+			nd3: 20,
+			data: undefined,
+			bomdata: undefined,
+			topisSpin: true,
+			bomisSpin: true,
+			sort: 'desc',
+			course_groups: [],
+			page: 1
 		}
 	}
 
 	componentDidMount() {
-		this.setState({
+		let {page, group_ids, sort} = this.state;
-			isSpin:true,
+		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
+				})
+			}
+		}).catch((error) => {
+			console.log(error);
+			this.setState({
+				topisSpin: false,
+			})
+		})
+
+
+		let courseurl = `/courses/${courseId}/all_course_groups.json`;
+		axios.get(courseurl).then((result) => {
+			if (result) {
+				this.setState({
+					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);
+				}
+			}
+		}).catch((error) => {
+			console.log(error);
 
 		})
+	}
 
+	getwork_scoredata = (page, group_ids, sort) => {
+		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:
+			data
+		}).then((result) => {
+			if (result) {
+				this.setState({
+					bomdata: result.data.course_members,
+					bomisSpin: false
+				})
+			}
+		}).catch((error) => {
+			console.log(error);
+			this.setState({
+				bomisSpin: false,
+			})
+		})
 	}
 
+
 	 callback=(key)=>{
 		console.log(key);
 	 }
 
 	render(){
-		let {nd1,nd2,nd3}=this.state;
+		let {nd1, nd2, nd3, data, bomdata, course_groups} = this.state;
+		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
+					}
+				})
+			}
+		}
+
+		// const columns = [
+		// 	{
+		// 		title: 'Name',
+		// 		dataIndex: 'name',
+		// 		sorter: true,
+		// 		render: name => `${name.first} ${name.last}`,
+		// 		width: '20%',
+		// 	},
+		// 	{
+		// 		title: 'Gender',
+		// 		dataIndex: 'gender',
+		// 		filters: course_groups,
+		// 		width: '20%',
+		// 	},
+		// 	{
+		// 		title: 'Email',
+		// 		dataIndex: 'email',
+		// 	},
+		// ];
+
+
+		// console.log(bomdata)
+
+
+		//common_score: 0
+		// course_group: "威风威风急急急"
+		// exercise_score: "0.0"
+		// graduation_score: 0
+		// group_score: 0
+		// practice_score: 3232
+		// total_score: 3232
+		// user_login: "p40793521"
+		// user_name: "李明霞"
+
 
 		return(
 			<React.Fragment  >
 				<div>
-					<div className="edu-back-white">
-						<p className="clearfix padding30">
-							<Row gutter={24}>
-								<Col>
-									明星学员
-								</Col>
-							</Row>
-
-							<Row type="flex" justify="center" align="bottom">
-								<Col span={3}>
-									<li className="pr rankingss">
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g"/>
-										</a>
-									</li>
-								</Col>
-
-								<Col  span={5}>
-									<li className="pr rankingss">
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g" className={"mb10"}/>
-										</a>
-									</li>
-									<Col className={`height-${nd2}`}>
 
+					<div className="edu-back-white">
+						<Spin size="large" spinning={this.state.topisSpin}>
+							<p className="clearfix padding30">
+								<Row gutter={24}>
+									<Col>
+										明星学员
 									</Col>
-								</Col>
+								</Row>
 
-								<Col  span={5} className={"relatives"}>
+								<Row type="flex" justify="center" align="bottom">
-									<li className="pr rankingss">
+									{data && data.map((item, key) => {
-										<img src="https://test-newweb.educoder.net/images/educoder/huangguan.png" className="huangguans mb5" />
+										if (key === 3) {
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
+											return (
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g" className={"mb10"}/>
+												<Col span={3}>
-										</a>
+													<li className="pr rankingss">
-									</li>
+														<a href={`/users/${item.user_login}`} className="color-dark">
-									<Col className={`height-${nd1}`}>
+															<img src={getImageUrl(`images/${item.avatar_url}`)}/>
+														</a>
+													</li>
+												</Col>
+											)
+										}
 
-									</Col>
+									})}
-								</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 span={5}>
+													</Col>
-									<li className="pr rankingss">
+												</Col>
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
+											)
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g" className={"mb10"}/>
+										}
-										</a>
-									</li>
-									<Col className={`height-${nd3}`}>
 
-									</Col>
+									})}
-								</Col>
+
-
+									{data && data.map((item, key) => {
-								<Col span={3}>
+										if (key === 0) {
-									<li className="pr rankingss">
+											return (
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
+												<Col span={5} className={"relatives"}>
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g"/>
+													<li className="pr rankingss">
-										</a>
+														<img src="https://test-newweb.educoder.net/images/educoder/huangguan.png"
-									</li>
+																 className="huangguans mb5"/>
-								</Col>
+														<a href={`/users/${item.user_login}`} className="color-dark">
-
+															<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10 mt5"}/>
-							</Row>
+														</a>
-
+													</li>
-
+													<Col className={`height-${nd1}`}>
-							<Row className="mt10" type="flex" justify="center" align="bottom">
+
-								<Col span={3} className={"Statisticscenter"}>
+													</Col>
-									<Col>威震江湖</Col>
+												</Col>
-									<Col>4th</Col>
+											)
-								</Col>
+										}
-								<Col span={5} className={"Statisticscenter"}>
+
-									<Col>神魔遮天</Col>
+									})}
-									<Col>2th</Col>
+
-								</Col>
+									{data && data.map((item, key) => {
-								<Col span={5} className={"Statisticscenter"}>
+										if (key === 2) {
-									<Col>雄霸天下</Col>
+											return (
-									<Col>1th</Col>
+												<Col span={5}>
-								</Col>
+													<li className="pr rankingss">
-								<Col span={5} className={"Statisticscenter"}>
+														<a href={`/users/${item.user_login}`} className="color-dark">
-									<Col>不灭战神</Col>
+															<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10"}/>
-									<Col>3th</Col>
+														</a>
-								</Col>
+													</li>
-								<Col span={3} className={"Statisticscenter"}>
+													<Col className={`height-${nd3}`}>
-									<Col>霸气初现</Col>
+
-									<Col>5th</Col>
+													</Col>
-								</Col>
+												</Col>
-							</Row>
+											)
-						</p>
+										}
+
+									})}
+
+
+									{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>
+
+
+								<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>
+							</p>
+						</Spin>
 					</div>
 
 					<div className="mt20 edu-back-white">
-						<Tabs  className="statisticsTabs" defaultActiveKey="1" onChange={this.callback}>
+						<Spin size="large" spinning={this.state.bomisSpin}>
-							<TabPane tab="学习成绩" key="1" className={"statisticsTabs1"}>
+							<Tabs className="statisticsTabs" defaultActiveKey="1" onChange={this.callback}>
-								Content of Tab Pane 1
+								<TabPane tab="学习成绩" key="1" className={"statisticsTabs1"}>
-							</TabPane>
+									{/*<Table*/}
-							<TabPane tab="课堂活跃度" key="2">
+									{/*columns={columns}*/}
-								Content of Tab Pane 2
+									{/*dataSource={bomdata}*/}
-							</TabPane>
+									{/*onChange={this.handleTableChange}*/}
-						</Tabs>
+									{/*/>*/}
+								</TabPane>
+								<TabPane tab="课堂活跃度" key="2">
+									Content of Tab Pane 2
+								</TabPane>
+							</Tabs>
+						</Spin>
 					</div>
+
 				</div>
 			</React.Fragment>
 		)