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

app/controllers/ec_years_controller.rb

@@ -17,18 +17,11 @@ class EcYearsController < ApplicationController
   # 添加年份
   def create
     @major_school = EcMajorSchool.find(params[:ec_major_school_id])
-    ec_years = @major_school.ec_years.pluck(:year)
-    exist_year = ec_years.include?(params[:year].to_i)
-    if exist_year
+    if @major_school.ec_years.exists?(year: params[:year].to_i)
       @status = -1
     else
-      prev_year = "#{params[:year].to_i - 1}"
-      prev_ec_year = @major_school.ec_years.where(:year => prev_year).first
-      if prev_ec_year.blank?
-        EcYear.create!(:year => params[:year], :ec_major_school_id => @major_school.id)
-      else
-        copy_year(prev_ec_year, params[:year])
-      end
+      service = CopyEcYearService.new(@major_school, params[:year].to_i)
+      service.call
       @status = 1
     end
     @major_manager = true
@@ -246,7 +239,7 @@ class EcYearsController < ApplicationController
     template_file = EcTemplate.find_by_name "课程列表导入模板"
     if template_file.present?
       file = template_file.attachments.first
-      @file_url = "/attachments/download/#{file.id}/#{file.filename}"
+      @file_url = '' #"/attachments/download/#{file.id}/#{file.filename}"
     else
       @file_url = "javascript:void(0);"
     end
@@ -357,236 +350,6 @@ class EcYearsController < ApplicationController
     @year = EcYear.find(params[:id])
   end
 
-  # 复制最新一届下的所有数据. previous_ec_year: 本专业最新一届, new_year: 新建的届别
-  def copy_year previous_ec_year, new_year
-    ActiveRecord::Base.transaction do
-      begin
-        # 如果是第一次创建届别，则直接创建
-        if previous_ec_year.blank?
-          raise("没有界别可以复制")
-        else
-          logger.info("############previous_ec_year: #{previous_ec_year.id}")
-          # 多个中间表需要替换的id
-          egs_record = [] # 记录ec_graduation_subitems的新旧值 例如: [[prev_egs, new_egs], [...]]
-          egr_record = [] # 记录ec_graduation_requirements的新旧值, 例如:  [[prev_egr, new_egr], [...]]
-          ec_record  = [] # 记录ec_courses
-          ece_record = [] # 记录ec_course_evaluations
-          eces_record= [] # 记录ec_course_evaluation_subitems
-          ect_record = [] # 记录ec_course_targets
-
-          # 复制 "届别"
-          ec_year = EcYear.create!(:year => new_year,
-                                   :ec_major_school_id => previous_ec_year.ec_major_school_id,
-                                   :calculation_value => previous_ec_year.calculation_value)
-
-          # 复制 "毕业要求"
-          previous_ec_year.ec_graduation_requirements.try(:each) do |pre_egr|
-            new_egr = EcGraduationRequirement.new
-            new_egr.attributes = pre_egr.attributes.dup.except("id", "ec_year_id")
-            new_egr.ec_year_id = ec_year.id
-            new_egr.save!
-            egr_record << [pre_egr.id, new_egr.id]
-            # 复制 "毕业要求子标点"
-            pre_egr.ec_graduation_subitems.try(:each) do |pre_egs|
-              new_egs = EcGraduationSubitem.new
-              new_egs.attributes = pre_egs.attributes.dup.except("id", "ec_graduation_requirement_id")
-              new_egs.ec_graduation_requirement_id = new_egr.id
-              new_egs.save!
-              # 记录新旧对应关系,为之后的中间表做记录
-              egs_record << [pre_egs.id, new_egs.id]
-              prev_ersvss = EcRequireSubVsStandard.where(:ec_graduation_subitem_id => pre_egs.id)
-              prev_ersvss.each do |prev_ersvs|
-                new_ersvss = EcRequireSubVsStandard.new
-                new_ersvss.attributes = prev_ersvs.attributes.dup.except("id", "ec_graduation_subitem_id")
-                new_ersvss.ec_graduation_subitem_id = new_egs.id
-                new_ersvss.save!
-              end
-
-            end
-          end
-
-          # 复制 "培养目标"
-          pre_eto = previous_ec_year.ec_training_objective
-          if pre_eto.present?
-            new_eto = EcTrainingObjective.new
-            new_eto.attributes = pre_eto.attributes.dup.except("id", "ec_year_id")
-            new_eto.ec_year_id = ec_year.id
-            new_eto.save!
-
-            # 复制 "培养目标分项"
-            pre_eto.ec_training_subitems.try(:each) do |pre_ets|
-              new_ets = EcTrainingSubitem.new
-              new_ets.attributes = pre_ets.attributes.dup.except("id", "ec_training_objective_id")
-              new_ets.ec_training_objective_id = new_eto.id
-              new_ets.save!
-
-              # 复制 "毕业要去 vs 培养目标"
-              pre_ervsos =  EcRequirementVsObjective.where(:ec_training_objective_id => pre_ets.id)
-              pre_ervsos.each do |ervso|
-                new_ervso = EcRequirementVsObjective.new
-                new_ervso.attributes = ervso.attributes.dup.except("id", "ec_training_objective_id", "ec_graduation_requirement_id")
-                new_ervso.ec_training_objective_id = new_ets.id
-                new_egr_id = -1
-                egr_record.each do |egr_id|
-                  if egr_id[0] == ervso.ec_graduation_requirement_id
-                    new_egr_id = egr_id[1]
-                  end
-                end
-                raise("找不对应的毕业要求") if new_egr_id == -1
-                new_ervso.ec_graduation_requirement_id = new_egr_id
-                new_ervso.save!
-              end
-            end
-          end
-
-          # 复制 "课程体系"
-          previous_ec_year.ec_courses.try(:each) do |pre_ec|
-            new_ec = EcCourse.create!(name: pre_ec.name, ec_year_id: ec_year.id)
-            ec_record << [pre_ec.id, new_ec.id]
-            # 复制 "课程考核标准"
-            pre_ec.ec_course_evaluations.try(:each) do |pre_ece|
-              new_ece = EcCourseEvaluation.create!(name: pre_ece.name,
-                                                   evluation_count: pre_ece.evluation_count,
-                                                   ec_course_id: new_ec.id,
-                                                   is_course_type: pre_ece.is_course_type)
-              ece_record << [pre_ece.id, new_ece.id]
-              # 复制 "考核分项"
-              pre_ece.ec_course_evaluation_subitems.try(:each) do |pre_eces|
-                new_eces =  EcCourseEvaluationSubitem.create!(name: pre_eces.name, ec_course_evaluation_id: new_ece.id)
-                # 记录新旧对应关系,为之后的中间表做记录
-                eces_record << [pre_eces.id, new_eces.id]
-              end
-            end
-
-            # 复制 "课程目标"
-            pre_ec.ec_course_targets.try(:each) do |pre_ect|
-              new_ect = EcCourseTarget.new
-              new_ect.attributes = pre_ect.attributes.dup.except("id", "ec_course_id")
-              new_ect.ec_course_id = new_ec.id
-              new_ect.save!
-              # 记录新旧对应关系,为之后的中间表做记录
-              ect_record << [pre_ect.id, new_ect.id]
-              # 复制 "课程目标和毕业要求指标点"
-              pre_ect.ec_graduation_subitem_course_targets.try(:each) do |pre_egsct|
-                new_egsct = EcGraduationSubitemCourseTarget.new
-                new_egsct.attributes = pre_egsct.attributes.dup.except("id", "ec_graduation_subitem_id", "ec_course_target_id")
-                # 寻找对应的new_egs_id
-                logger.info("############egs_record:#{egs_record}")
-                logger.info("############ec_graduation_subitem_id: #{pre_egsct.ec_graduation_subitem_id}")
-                new_egs_id = -1
-                egs_record.each do |id|
-                  if id[0] ==  pre_egsct.ec_graduation_subitem_id
-                    new_egs_id = id[1]
-                  end
-                end
-                raise("课程目标和毕业要求指标点找不到对应关系.") if new_egs_id == -1
-                new_egsct.ec_graduation_subitem_id = new_egs_id
-                new_egsct.ec_course_target_id = new_ect.id
-                new_egsct.save!
-              end
-
-              # 复制 "课程达成方法"
-              pre_ect.ec_course_achievement_methods.each do |pre_ecam|
-                # 寻找对应的 ec_course_id
-                new_ec_id = -1
-                new_ece_id = -1
-                new_eces_id = -1
-                ec_record.each do |ec_id|
-                  if ec_id[0] == pre_ecam.ec_course_id
-                    new_ec_id = ec_id[1]
-                  end
-                end
-                # 寻找对应的ec_course_evaluation_id
-                ece_record.each do |ece_id|
-                  if ece_id[0] ==  pre_ecam.ec_course_evaluation_id
-                    new_ece_id = ece_id[1]
-                  end
-                end
-                # 寻找对应的ec_course_evaluation_subitem_id
-                eces_record.each do |eces_id|
-                  if eces_id[0] == pre_ecam.ec_course_evaluation_subitem_id
-                    new_eces_id = eces_id[1]
-                  end
-                end
-
-                new_ecam = EcCourseAchievementMethod.new
-                new_ecam.attributes = pre_ecam.attributes.dup.except("id", "ec_course_id", "ec_course_evaluation_id",
-                                                                     "ec_course_evaluation_subitem_id", "ec_course_target_id")
-                new_ecam.ec_course_id                    = new_ec_id if new_ec_id != -1
-                new_ecam.ec_course_evaluation_id         = new_ece_id if new_ece_id != -1
-                new_ecam.ec_course_evaluation_subitem_id = new_eces_id if new_eces_id != -1
-                new_ecam.ec_course_target_id             = new_ect.id
-                new_ecam.save!
-
-                # 复制 "课程评价达成关系"
-                pre_ecam.ec_achievement_evaluation_relates.each do |pre_eaer|
-                  new_eaer = EcAchievementEvaluationRelate.new
-                  new_eaer.attributes = pre_eaer.attributes.dup.except("id", "ec_course_achievement_method_id",
-                                                                       "ec_course_evaluation_subitem_id", "ec_course_target_id")
-                  new_eaer.ec_course_achievement_method_id = new_ecam.id
-                  # 寻找对应的 ec_course_evaluation_subitem_id
-                  new_eces_id = -1
-                  eces_record.each do |eces_id|
-                    if eces_id[0] == pre_eaer.ec_course_evaluation_subitem_id
-                      new_eces_id = eces_id[1]
-                    end
-                  end
-                  new_eaer.ec_course_evaluation_subitem_id = new_eces_id if new_eces_id != -1
-                  # 寻找对应的 ec_course_target_id
-                  new_ect_id = -1
-                  ect_record.each do |ect_id|
-                    if ect_id[0] == pre_eaer.ec_course_target_id
-                      new_ect_id = ect_id[1]
-                    end
-                  end
-                  new_eaer.ec_course_target_id = new_ect_id if new_ect_id != -1
-                  new_eaer.save!
-                end
-              end
-            end
-
-            # 复制 "课程支撑"
-            pre_ec.ec_course_supports.try(:each) do |pre_ecs|
-              new_ecs = EcCourseSupport.new
-              new_ecs.attributes = pre_ecs.attributes.dup.except("id", "ec_course_id")
-              new_ecs.ec_course_id = new_ec.id
-              new_ecs.save!
-              # 复制 "课程vs毕业要求"
-              pre_ecs.ec_graduation_subitem_courses.try(:each) do |pre_egsc|
-                new_egs_id = -1
-                egs_record.each do |egs_id|
-                  if egs_id[0] == pre_egsc.ec_graduation_subitem_id
-                    new_egs_id = egs_id[1]
-                  end
-                end
-                new_egsc = EcGraduationSubitemCourse.new
-                new_egsc.attributes = pre_egsc.attributes.dup.except("id", "ec_graduation_subitem_id", "ec_course_support_id")
-                raise("找不到课程vs毕业要求的关联关系!") if new_egs_id == -1
-                new_egsc.ec_graduation_subitem_id = new_egs_id
-                new_egsc.ec_course_support_id = new_ecs.id
-                new_egsc.save!
-              end
-
-            end
-
-            # 复制 "成绩等级设置"
-            pre_ec.ec_score_levels.try(:each) do |pre_esl|
-              new_esl = EcScoreLevel.new
-              new_esl.attributes = pre_esl.attributes.dup.except("id", "ec_course_id")
-              new_esl.ec_course_id = new_ec.id
-              new_esl.save!
-            end
-
-          end
-        end
-      rescue Exception => e
-        logger.error("###########error_message: #{e.message}")
-        raise ActiveRecord::Rollback
-      end
-
-    end
-  end
-
   # 导出培养目标excel
   def export_training_objectives objects
     xls_report = StringIO.new

app/models/ec_graduation_subitem.rb

@@ -9,4 +9,7 @@ class EcGraduationSubitem < ActiveRecord::Base
   # 课程目标配置
   has_many :ec_course_targets, :through => :ec_graduation_subitem_course_targets
   has_many :ec_graduation_subitem_course_targets, :dependent => :destroy
+
+  has_many :ec_require_sub_vs_standards
+  has_many :ec_graduation_standards, through: :ec_require_sub_vs_standards
 end

app/models/ec_require_sub_vs_standard.rb

@@ -1,3 +1,6 @@
 class EcRequireSubVsStandard < ActiveRecord::Base
   attr_accessible :ec_graduation_standard_id, :ec_graduation_subitem_id, :status
+
+  belongs_to :ec_graduation_standard
+  belongs_to :ec_graduation_subitem
 end

app/models/ec_requirement_vs_objective.rb

@@ -1,3 +1,5 @@
 class EcRequirementVsObjective < ActiveRecord::Base
   attr_accessible :ec_graduation_requirement_id, :ec_training_objective_id, :status
+  belongs_to :ec_graduation_requirement
+  belongs_to :ec_training_subitem
 end

app/models/ec_training_subitem.rb

@@ -1,4 +1,5 @@
 class EcTrainingSubitem < ActiveRecord::Base
   belongs_to :ec_training_objective
 
+  has_many :ec_requirement_vs_objectives, foreign_key: :ec_training_objective_id
 end

app/models/ec_year.rb

@@ -16,4 +16,8 @@ class EcYear < ActiveRecord::Base
   # 课堂配置
   has_many :ec_courses, :dependent => :destroy
   acts_as_attachable
+
+  def prev_year
+    ec_major_school.ec_years.find_by_year(year - 1)
+  end
 end

app/models/school.rb

@@ -16,6 +16,7 @@ class School < ActiveRecord::Base
 
   has_many :ec_majors, :through => :ec_major_schools
   has_many :ec_major_schools, :dependent => :destroy
+  has_one :ec_template_major, conditions: 'template_major = 1', class_name: 'EcMajorSchool'
 
   has_many :partners, :dependent => :destroy
   has_many :customers, :dependent => :destroy

app/services/copy_ec_year_service.rb

@@ -0,0 +1,306 @@
+ class CopyEcYearService
+   attr_reader :major_school, :to_year
+
+   def initialize(major_school, year)
+     @major_school = major_school
+     @to_year      = major_school.ec_years.new(year: year)
+   end
+
+   def call
+    if from_year.blank?
+      to_year.save!
+      return to_year
+    end
+
+    # 专业第一次创建届别时，复制示例专业2017届
+    ActiveRecord::Base.transaction do
+      copy_ec_year!
+
+      copy_graduation_requirement!
+
+      copy_training_objective!
+
+      new_major_school? ? copy_template_ec_course! : copy_ec_courses!
+    end
+
+    to_year
+   end
+
+   private
+
+   def new_major_school?
+     @_new_major ||= major_school.ec_years.count.zero?
+   end
+
+   def from_year
+     @_from_year ||= new_major_school? ? template_major_year : to_year.prev_year
+   end
+
+   def template_major_year
+     EcYear.joins(:ec_major_school).where(ec_major_schools: { template_major: true }).find_by_year('2017')
+   end
+
+   def copy_ec_year!
+     to_year.calculation_value = from_year.calculation_value
+     to_year.save!
+   end
+
+   def copy_graduation_requirement!
+     requirements = from_year.ec_graduation_requirements.includes(ec_graduation_subitems: :ec_require_sub_vs_standards)
+
+     requirements.each do |requirement|
+       to_requirement = to_year.ec_graduation_requirements.new
+       to_requirement.attributes = requirement.attributes.except('id', 'ec_year_id', 'created_at', 'updated_at')
+       to_requirement.save!
+
+       # 记录对应关系，创建支撑时使用
+       graduation_requirement_map[requirement.id] = to_requirement.id
+
+       copy_graduation_subitems(requirement, to_requirement)
+     end
+   end
+
+   def copy_graduation_subitems(requirement, to_requirement)
+     requirement.ec_graduation_subitems.each do |item|
+       to_item = to_requirement.ec_graduation_subitems.new
+       to_item.attributes = item.attributes.except('id', 'ec_graduation_requirement_id', 'created_at', 'updated_at')
+       to_item.save!
+
+       # 记录对应关系，创建支撑时使用
+       graduation_subitem_map[item.id] = to_item.id
+
+       copy_requirement_standard_supports!(item, to_item)
+     end
+   end
+
+   def copy_requirement_standard_supports!(graduation_subitem, to_graduation_subitem)
+     graduation_subitem.ec_require_sub_vs_standards.each do |support|
+       to_support = to_graduation_subitem.ec_require_sub_vs_standards.new
+       to_support.attributes = support.attributes.except('id', 'ec_graduation_subitem_id', 'created_at', 'updated_at')
+       to_support.save!
+     end
+   end
+
+   def copy_training_objective!
+     training_objective = from_year.ec_training_objective
+     return if training_objective.blank?
+
+     attributes = training_objective.attributes.except('id', 'ec_year_id', 'created_at', 'updated_at')
+     to_training_objective = to_year.create_ec_training_objective!(attributes)
+
+     copy_training_subitems!(training_objective, to_training_objective)
+   end
+
+   def copy_training_subitems!(training_objective, to_training_objective)
+     training_subitems = training_objective.ec_training_subitems.includes(:ec_requirement_vs_objectives)
+
+     training_subitems.each do |item|
+       to_item = to_training_objective.ec_training_subitems.new
+       to_item.attributes = item.attributes.except('id', 'ec_training_objective_id', 'created_at', 'updated_at')
+       to_item.save!
+
+       copy_requirement_vs_objectives!(item, to_item)
+     end
+   end
+
+   def copy_requirement_vs_objectives!(training_item, to_training_item)
+     training_item.ec_requirement_vs_objectives.each do |support|
+       to_support = to_training_item.ec_requirement_vs_objectives.new(status: support.status)
+       to_support.ec_graduation_requirement_id = graduation_requirement_map[support.ec_graduation_requirement_id]
+       to_support.save!
+     end
+   end
+
+   def copy_template_ec_course!
+     course = from_year.ec_courses.includes(
+       :ec_score_levels,
+       ec_course_evaluations: :ec_course_evaluation_subitems,
+       ec_course_targets: :ec_graduation_subitem_course_targets,
+       ec_course_achievement_methods: :ec_achievement_evaluation_relates,
+       ec_course_supports: :ec_graduation_subitem_courses
+     ).find_by_name('数据库原理')
+
+     to_course = to_year.ec_courses.new
+     to_course.attributes = course.attributes.except('id', 'ec_year_id', 'created_at', 'updated_at')
+     to_course.save!
+
+     course_map[course.id] = to_course.id
+
+     copy_course_evaluations!(course, to_course)
+     copy_course_targets!(course, to_course)
+     copy_course_achievement_methods!(course, to_course)
+     copy_ec_course_supports!(course, to_course)
+     copy_score_levels!(course, to_course)
+
+     # 复制示例时需要复制学生和成绩数据
+     copy_year_students!
+   end
+
+   def copy_ec_courses!
+     courses = from_year.ec_courses.includes(
+       :ec_score_levels,
+       ec_course_evaluations: :ec_course_evaluation_subitems,
+       ec_course_targets: :ec_graduation_subitem_course_targets,
+       ec_course_achievement_methods: :ec_achievement_evaluation_relates,
+       ec_course_supports: :ec_graduation_subitem_courses
+     )
+
+     courses.each do |course|
+       to_course = to_year.ec_courses.new
+       to_course.attributes = course.attributes.except('id', 'ec_year_id', 'created_at', 'updated_at')
+       to_course.save!
+
+       course_map[course.id] = to_course.id
+
+       copy_course_evaluations!(course, to_course)
+       copy_course_targets!(course, to_course)
+       copy_course_achievement_methods!(course, to_course)
+       copy_ec_course_supports!(course, to_course)
+       copy_score_levels!(course, to_course)
+     end
+   end
+
+   def copy_course_evaluations!(course, to_course)
+     course.ec_course_evaluations.each do |evaluation|
+       to_evaluation = to_course.ec_course_evaluations.new
+       to_evaluation.attributes = evaluation.attributes.except('id', 'ec_course_id', 'created_at', 'updated_at')
+       to_evaluation.save!
+
+       course_evaluation_map[evaluation.id] = to_evaluation.id
+
+       copy_course_evaluation_subitems!(evaluation, to_evaluation)
+     end
+   end
+
+   def copy_course_evaluation_subitems!(evaluation, to_evaluation)
+     evaluation.ec_course_evaluation_subitems.each do |item|
+       to_item = to_evaluation.ec_course_evaluation_subitems.new
+       to_item.attributes = item.attributes.except('id', 'ec_course_evaluation_id', 'created_at', 'updated_at')
+       to_item.save!
+
+       course_evaluation_subitem_map[item.id] = to_item.id
+     end
+   end
+
+   def copy_course_targets!(course, to_course)
+     course.ec_course_targets.each do |target|
+       to_target = to_course.ec_course_targets.new
+       to_target.attributes = target.attributes.except('id', 'ec_course_id', 'created_at', 'updated_at')
+       to_target.save!
+
+       course_target_map[target.id] = to_target.id
+
+       copy_graduation_subitem_course_targets!(target, to_target)
+     end
+   end
+
+   def copy_graduation_subitem_course_targets!(target, to_target)
+     target.ec_graduation_subitem_course_targets.each do |support|
+       to_support = to_target.ec_graduation_subitem_course_targets.new
+       to_support.attributes = support.attributes.except('id', 'ec_graduation_subitem_id', 'created_at', 'updated_at')
+       to_support.ec_graduation_subitem_id = graduation_subitem_map[support.ec_graduation_subitem_id]
+       to_support.save!
+     end
+   end
+
+   def copy_course_achievement_methods!(course, to_course)
+     course.ec_course_achievement_methods.each do |from|
+       to            = to_course.ec_course_achievement_methods.new
+       to.attributes = from.attributes.except('id', 'ec_course_id', 'ec_course_target_id', 'ec_course_evaluation_id',
+                                              'ec_course_evaluation_subitem_id', 'created_at', 'updated_at')
+
+       to.ec_course_target_id             = course_target_map[from.ec_course_target_id]
+       to.ec_course_evaluation_id         = course_evaluation_map[from.ec_course_evaluation_id]
+       to.ec_course_evaluation_subitem_id = course_evaluation_subitem_map[from.ec_course_evaluation_subitem_id]
+       to.save!
+
+       copy_achievement_evaluation_relates!(from, to)
+     end
+   end
+
+   def copy_achievement_evaluation_relates!(method, to_method)
+     method.ec_achievement_evaluation_relates.each do |relate|
+       to_relate = to_method.ec_achievement_evaluation_relates.new
+       to_relate.attributes = relate.attributes.except('id', 'ec_course_achievement_method_id', 'ec_course_target_id',
+                                                       'ec_course_evaluation_subitem_id', 'created_at', 'updated_at')
+       to_relate.ec_course_target_id             = course_target_map[relate.ec_course_target_id]
+       to_relate.ec_course_evaluation_subitem_id = course_target_map[relate.ec_course_evaluation_subitem_id]
+       to_relate.save!
+     end
+   end
+
+   def copy_ec_course_supports!(course, to_course)
+     course.ec_course_supports.each do |support|
+       to_support = to_course.ec_course_supports.new
+       to_support.attributes = support.attributes.except('id', 'ec_course_id', 'created_at', 'updated_at')
+       to_support.save!
+
+       copy_graduation_subitem_courses!(support, to_support)
+     end
+   end
+
+   def copy_graduation_subitem_courses!(course_support, to_course_support)
+     course_support.ec_graduation_subitem_courses.each do |item|
+       to_item = to_course_support.ec_graduation_subitem_courses.new
+       to_item.attributes = item.attributes.except('id', 'ec_course_support_id', 'ec_graduation_subitem_id',
+                                                   'created_at', 'updated_at')
+       to_item.ec_graduation_subitem_id = graduation_subitem_map[item.ec_graduation_subitem_id]
+       to_item.save!
+     end
+   end
+
+   def copy_score_levels!(course, to_course)
+     course.ec_score_levels.each do |level|
+       to_level = to_course.ec_score_levels.new
+       to_level.attributes = level.attributes.except('id', 'ec_course_id', 'created_at', 'updated_at')
+       to_level.save!
+     end
+   end
+
+   def copy_year_students!
+     students = from_year.ec_year_students.includes(:ec_student_achievements)
+
+     students.each do |student|
+       to_student = to_year.ec_year_students.new
+       to_student.attributes = student.attributes.except('id', 'ec_year_id', 'created_at', 'updated')
+       to_student.save!
+
+       copy_student_achievements!(student, to_student)
+     end
+   end
+
+   def copy_student_achievements!(student, to_student)
+     student.ec_student_achievements.each do |achievement|
+       to_achievement = to_student.ec_student_achievements.new
+       to_achievement.attributes = achievement.attributes.except('id', 'ec_year_student_id', 'ec_course_evaluation_id',
+                                                                 'ec_course_evaluation_subitem_id', 'created_at', 'updated_at')
+       to_achievement.ec_course_evaluation_id = course_evaluation_map[achievement.ec_course_evaluation_id]
+       to_achievement.ec_course_evaluation_subitem_id = course_evaluation_subitem_map[achievement.ec_course_evaluation_subitem_id]
+       to_achievement.save!
+     end
+   end
+
+   def graduation_requirement_map
+     @_graduation_requirement_map ||= {}
+   end
+
+   def graduation_subitem_map
+     @_graduation_subitem_map ||= {}
+   end
+
+   def course_map
+     @_course_map ||= {}
+   end
+
+   def course_evaluation_map
+     @_course_evaluation_map ||= {}
+   end
+
+   def course_evaluation_subitem_map
+     @_course_evaluation_subitem_map ||= {}
+   end
+
+   def course_target_map
+     @_course_target_map ||= {}
+   end
+ end

app/views/common/index.html.erb

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.80b6ec5e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.66470372.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c233538b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.3a7bf64a.js"></script></body></html>

app/views/ec_major_schools/_year_list.html.erb

@@ -15,12 +15,12 @@
             <%= graduation_requirements > 0 ? graduation_requirements : @btn_text %>
           </a>
         </span>
-        <span class="column-5 fl">
-          <% students = year.ec_year_students.count %>
-          <a href="<%= student_lists_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>" class="<%= students > 0 ? '' : 'color-blue' %>">
-            <%= students > 0 ? students : @btn_text %>
-          </a>
-        </span>
+        <!--<span class="column-5 fl">-->
+          <!--<%# students = year.ec_year_students.count %>-->
+          <!--<a href="<%#= student_lists_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>" class="<%#= students > 0 ? '' : 'color-blue' %>">-->
+            <!--<%#= students > 0 ? students : @btn_text %>-->
+          <!--</a>-->
+        <!--</span>-->
         <span class="column-5 fl">
           <% courses = year.ec_courses.count %>
           <a href="<%= ec_course_setting_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>" class="<%= courses > 0 ? '' : 'color-blue' %>">

app/views/ec_major_schools/show.html.erb

@@ -4,21 +4,26 @@
   </p>
   <div>
     <div  style="position: relative">
-    <p class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
-      <span class="fl font-18"><%= @major.name %></span>
+    <ul class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
+      <li class="fl">
+        <p class="font-18 clearfix">
+            <span class="fl"><%= @major.name %></span>
+            <% if @major.schools && User.current.admin? %>
+                <i class="iconfont icon-youjiantou font-14 newxiajiantou fl ml20" ></i>
+                <ul class="edu-menu-list" id="ecmajorschools">
+                  <% @major.schools.each do |school| %>
+                      <% ec_major_school =  school.ec_major_schools.where(:ec_major_id => @major.id).first %>
+                      <li><a href="<%= ec_major_school_path(ec_major_school) %>"  target="_blank" ><%= school.name %></a></li>
+                  <% end %>
+                </ul>
+            <% end %>
+        </p>
+        <p><span class="color-grey-9 mr10">请选择添加参与认证的学生界别，多个界别分次添加</span><a href="javascript:void(0)" onclick="elasticLayer(3528);" class="color-blue">查看详情</a></p>
+      </li>
       <% if @major_manager %>
-        <a href="javascript:void(0)" class="fr white-btn edu-blueback-btn mt4" onclick="addAcademicYear();">添加届别</a>
+        <a href="javascript:void(0)" class="fr white-btn edu-blueback-btn mt25" onclick="addAcademicYear();">添加届别</a>
       <% end %>
-      <% if @major.schools && User.current.admin? %>
-        <i class="iconfont icon-youjiantou font-14 newxiajiantou" ></i>
-        <ul class="edu-menu-list" id="ecmajorschools">
-          <% @major.schools.each do |school| %>
-            <% ec_major_school =  school.ec_major_schools.where(:ec_major_id => @major.id).first %>
-            <li><a href="<%= ec_major_school_path(ec_major_school) %>"  target="_blank" ><%= school.name %></a></li>
-          <% end %>
-        </ul>
-      <% end %>
-    </p>
+    </ul>
     </div>
     <div class="clearfix padding20-30 edu-back-white">
       <div class="fr" id="pollingPanel">
@@ -31,7 +36,7 @@
         <span class="column-1">届别</span>
         <span class="column-5 fl">培养目标</span>
         <span class="column-5 fl">毕业要求</span>
-        <span class="column-5 fl">学生</span>
+        <!--<span class="column-5 fl">学生</span>-->
         <span class="column-5 fl">课程体系</span>
         <span class="column-6 fl lineh-20">课程目标<br/>（达成情况）</span>
         <span class="column-5 fl edu-txt-center lineh-20">毕业要求指标点<br/>（达成情况）</span>

app/views/ec_years/ec_course_setting.html.erb

@@ -1,9 +1,10 @@
 <!-------------------------------------课程列表begin---------------------------------->
 <div class="educontent mb50">
   <%= render :partial => "ecs/ec_top_navigation" %>
-  <p class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
-    <span class="fl font-18">课程体系（<%= @ec_courses.count %>）</span>
-  </p>
+  <ul class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
+    <li class="font-18">课程体系（<%= @ec_courses.count %>）</li>
+    <p><span class="color-grey-9 mr10">提供模板支持课程信息导入，亦可直接新增课程；并继续完成每门课程的评估机制配置</span><a href="javascript:void(0)" onclick="elasticLayer(3533);" class="color-blue">查看详情</a></p>
+  </ul>
   <p class="padding20-30 edu-back-white clearfix">
     <span class="mr30">温馨提醒：请下载课程模板（<a href="<%= @file_url %>" class="color-green"><i class="iconfont icon-fujian mr5 color-green font-16"></i>点击下载</a>），将本届所有参与认证的课程名称导入系统，以便录入教学活动相关数据</span>
     <%= file_field_tag 'attachments[dummy][file]',

app/views/ec_years/graduation_requirement.html.erb

@@ -10,12 +10,15 @@
 <div class="educontent mb50">
   <%= render :partial => "ecs/ec_top_navigation" %>
   <div class="edu-back-white minH-560 mb50 pb20">
-      <p class="clearfix padding20-30 bor-bottom-greyE">
-        <span class="fl font-18">毕业要求(及其指标点)</span>
+      <ul class="clearfix padding20-30 bor-bottom-greyE">
+        <li class="fl">
+          <p class="font-18">毕业要求(及其指标点)</p>
+          <p><span class="color-grey-9 mr10">请结合本专业特色修改毕业要求文字描述及指标点，需完全覆盖12项通用标准</span><a href="javascript:void(0)" onclick="elasticLayer(3530);" class="color-blue">查看详情</a></p>
+        </li>
         <% if @template_major || @ec_major_school.template_major %>
-            <%=link_to "导出毕业要求", graduation_requirement_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn" %>
+            <%=link_to "导出毕业要求", graduation_requirement_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn mt25" %>
         <% end %>
-      </p>
+      </ul>
       <div class="ListTableLine">
         <p class="clearfix">
           <span class="column-second">指标点</span>

app/views/ec_years/requirement_vs_objective.html.erb

@@ -1,12 +1,15 @@
 <div class="educontent mb50">
   <%= render :partial => "ecs/ec_top_navigation" %>
   <div class="minH-560 edu-back-white mb50">
-      <p class="clearfix padding20-30 bor-bottom-greyE">
-        <span class="fl font-18">毕业要求对培养目标的支撑</span>
+      <ul class="clearfix padding20-30 bor-bottom-greyE">
+        <li class="fl">
+          <p class="font-18">毕业要求对培养目标的支撑</p>
+          <p><span class="color-grey-9 mr10">用矩阵图的形式说明本专业毕业要求对培养目标的支撑关系，鼠标左键单击单元格即可</span><a href="javascript:void(0)" onclick="elasticLayer(3531);" class="color-blue">查看详情</a></p>
+        </li>
         <% if @template_major || @ec_major_school.template_major %>
-            <%=link_to "导出矩阵", requirement_vs_objective_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn" %>
+            <%=link_to "导出矩阵", requirement_vs_objective_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn mt25" %>
         <% end %>
-      </p>
+      </ul>
       <div class="padding30">
     <p class="clearfix mb20">
       <span class="fl mr30"><i class="iconfont icon-gouxuan color-green font-16 mr5"></i>表示支撑</span>

app/views/ec_years/requirement_vs_standard.html.erb

@@ -1,12 +1,15 @@
 <div class="educontent mb50">
   <%= render :partial => "ecs/ec_top_navigation" %>
   <div class="minH-560 edu-back-white mb50">
-  <p class="clearfix padding20-30 bor-bottom-greyE">
-    <span class="fl font-18">毕业要求对通用标准的支撑</span>
+  <ul class="clearfix padding20-30 bor-bottom-greyE">
+    <li class="fl">
+      <p class="font-18">毕业要求对通用标准的支撑</p>
+      <p><span class="color-grey-9 mr10">用矩阵图的形式说明本专业毕业要求对12项通用标准的覆盖关系，鼠标左键单击单元格即可</span><a href="javascript:void(0)" onclick="elasticLayer(3532);" class="color-blue">查看详情</a></p>
+    </li>
     <% if @template_major || @ec_major_school.template_major %>
-        <%=link_to "导出矩阵", requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn" %>
+        <%=link_to "导出矩阵", requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn mt25" %>
     <% end %>
-  </p>
+  </ul>
   <div class="padding30">
     <p class="clearfix mb20">
       <span class="fl mr30"><i class="iconfont icon-gouxuan color-green font-16 mr5"></i>表示支撑</span>

app/views/ec_years/training_objectives.html.erb

@@ -2,12 +2,15 @@
   <%= render :partial => "ecs/ec_top_navigation" %>
 
   <div class="mb50 mb50">
-    <p class="edu-back-white clearfix padding20-30 bor-bottom-greyE">
-      <span class="fl font-18">培养目标</span>
+    <ul class="edu-back-white clearfix padding20-30 bor-bottom-greyE">
+      <li class="fl">
+        <p class=" font-18">培养目标</p>
+        <p><span class="color-grey-9 mr10">请结合本专业特色修改培养目标文字描述及目标分解</span><a href="javascript:void(0)" onclick="elasticLayer(3529);" class="color-blue">查看详情</a></p>
+      </li>
       <% if @template_major || @ec_major_school.template_major %>
-          <a href="<%= training_objectives_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => "xls") %>" class="fr white-btn edu-blueback-btn mt4">导出培养目标</a>
+          <a href="<%= training_objectives_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => "xls") %>" class="fr white-btn edu-blueback-btn mt25">导出培养目标</a>
       <% end %>
-    </p>
+    </ul>
     <div class="edu-back-white padding20-30" id="training_objective_contents">
       <%= render :partial => "training_objective_contents" %>
     </div>

app/views/ecs/_ec_top_navigation.html.erb

@@ -45,12 +45,16 @@
     <a class="<%= ['requirement_vs_standard'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml22":"ecTitle" %>">4</a>
     <a class="<%= ['requirement_vs_standard'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">毕业要求 vs 通用标准</a>
   </li>
+  <li class="<%= ['student_lists'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>">
+    <a class="<%= ['student_lists'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml22":"ecTitle" %>">5</a>
+    <a class="<%= ['student_lists'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= student_lists_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">学生</a>
+  </li>
   <li class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>">
-    <a class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">5</a>
+    <a class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">6</a>
     <a class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= ec_course_setting_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系</a>
   </li>
   <li class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>">
-    <a class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">6</a>
+    <a class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">7</a>
     <a class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= requirement_vs_courses_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系 vs 毕业要求</a>
   </li>
   <li class="ecimgs">

app/views/ecs/department.html.erb

@@ -19,12 +19,15 @@
   <% end %>
 
   <div class="educontent mb30">
-    <p class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
-      <span class="fl font-18">专业列表</span>
+    <ul class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
+      <li class="fl">
+        <p class="font-18">专业列表</p>
+        <p><span class="color-grey-9 mr10">请添加参与认证的专业名称</span><a href="javascript:void(0)" onclick="elasticLayer(3527);" class="color-blue">查看详情</a></p>
+      </li>
       <% if @is_school_manager %>
-        <a href="javascript:void(0)" class="fr white-btn edu-blueback-btn" onclick="addNewMajorPanel();">添加专业</a>
+        <a href="javascript:void(0)" class="fr white-btn edu-blueback-btn mt25" onclick="addNewMajorPanel();">添加专业</a>
       <% end %>
-    </p>
+    </ul>
     <div class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
         <span class="fl font-12 mt5">
           <span class="color-orange-tip mr3" id="search_major_count"><%= @obj_count %></span>

public/javascripts/educoder/edu_application.js

@@ -1229,3 +1229,19 @@ $(document).bind('ajaxError', function(event, xhr, settings) {
     }
 });
 /** tpm实训开启按钮，不允许多次点击  END                  */
+
+
+//工程认证各个页面的查看详情弹层
+function elasticLayer(forumId){
+    var html='<div class="layerContent"><div class="educontent">' +
+        '<p class="clearfix pt25 pb25 color-grey-3 bor-bottom-greyE"><span class="fl font-24">工程教育专业认证【培养目标】</span>' +
+        '<a href="javascript:void(0)" onclick="removeElasticLayer();" class="fr font-16 mt5">返回</a></p>' +
+        '</div></div>'
+    $(".newMain").after(html).hide();
+    document.body.addEventListener('touchmove',bodyScroll,false);
+    $('body').css({'position':'fixed',"width":"100%"});
+}
+function removeElasticLayer(){
+    $(".layerContent").remove();
+    $(".newMain").show();
+}

public/react/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-
-}

public/react/src/App.js

@@ -125,12 +125,13 @@ const NewContentCareerPathIndex =Loadable({
 loader: () => import('./modules/careerPath/managementsCareerPath/New_Content_Career_Path_Index'),
 loading: Loading,
 })
-
+{/*课程体系对毕业要求的支撑*/}
 const ecCourseSupports=Loadable({
     loader: () => import('./modules/ec/ecCourseSupports/ecCourseSupports'),
     loading: Loading,
 })
 
+//课程体系
 const ecCourseEvaluations=Loadable({
     loader: () => import('./modules/ec/ecCourseEvaluations/ecCourseEvaluations'),
     loading: Loading,
@@ -141,11 +142,12 @@ const ecGradeEvaluations=Loadable({
     loading: Loading,
 })
 
+{/*课程目标评价方法*/}
 const EvaluationMethods=Loadable({
     loader: () => import('./modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom'),
     loading: Loading,
 })
-
+{/*达成评价详情*/}
 const EcCompletionCalculation=Loadable({
     loader: () => import('./modules/ec/ecCompletion_calculation/ecCompletion_calculation'),
     loading: Loading,
@@ -190,18 +192,21 @@ class App extends Component {
             <Route path="/ec_major_schools/:major_school_id/academic_years/:ec_year_id/reach_calculation_info"
                    component={GraduatesRequirement}>
             </Route>
-
+            {/*课程体系对毕业要求的支撑*/}
             <Route path="/ec_major_schools/:major_school_id/academic_years/:ec_year_id/requirement_vs_courses" component={ecCourseSupports}>
             </Route>
 
+            {/*课程体系*/}
             <Route path="/ec_courses/:ec_course_id/ec_course_reach_setting" component={ecCourseEvaluations} {...this.state} {...this.props}>
             </Route>
-
+            {/*达成评价详情*/}
             <Route path="/ec_courses/:ec_course_id/competition_calculation_info" component={EcCompletionCalculation}>
             </Route>
 
+            {/*课程目标评价方法*/}
             <Route path="/ec_courses/:ec_course_id/evaluation_methods" component={EvaluationMethods}>
             </Route>
+
             <Route path="/tasks/:stageId" component={IndexWrapperComponent}/>
 
 
@@ -262,7 +267,7 @@ class App extends Component {
           <Route path="/ec_courses/:ec_course_id/ec_course_support_setting" component={EcCourseSupportSetting}>
           </Route>
 
-
+          {/*达成评价详情*/}
           <Route path="/ec_courses/:ec_course_id/competition_calculation_info" component={EcCompletionCalculation}>
           </Route>
 

public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js

@@ -432,6 +432,7 @@ class EcCompletionCalculation extends Component {
                 <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecComponentState={'ecCompletion'}
                         ecpath={"show"}
@@ -443,6 +444,8 @@ class EcCompletionCalculation extends Component {
                             <a href={schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> >
                             <a className="TrainingTheory major_name"> {schooldata.ec_course_name} 达成评价详情</a>
                             {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
+                            <div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>
+
                         </div>
 
                      <div className="padding20-30" id="training_objective_contents"

public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js

@@ -267,7 +267,6 @@ class ecCourseEvaluations extends Component {
                     this.setState({
                         Modallist: "删除失败",
                         Modallisttype:true,
-                        Modallist:'',
                         Modallists:'',
                         deleteassociatedclasstype:false,
                         assclassvalue:''
@@ -860,6 +859,7 @@ class ecCourseEvaluations extends Component {
                 <div className="educontent mb40">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecComponentState={ecComponentState}
                         ecpath={"show"}
@@ -870,6 +870,7 @@ class ecCourseEvaluations extends Component {
                         <p className="clearfix padding20-30 bor-bottom-greyE" id="SystemParametersP">
                             <a href={schooldata.course_setting_url} className="TrainingLecturer color-grey-9">课程体系 </a> >
                             <a className="TrainingTheory major_name"> {schooldata.ec_course_name}</a>
+                            <div className="color-grey-9 mr10">请结合本课程的教学情况，修改考核方式、并导入学生的对应考核成绩  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>
                             {/*课程考核方式与数据来源*/}
                             {/* <span className="fl font-18 courseSystem"></span> */}
                             {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}

public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js

@@ -703,6 +703,7 @@ class EcCourseEvaluationsbottom extends Component {
 
               {/*</div>*/}
               <EcTitleCourseEvaluations
+                  {...this.props}
                   schooldata={schooldata}
                   ecpath={"show"}
               />
@@ -712,7 +713,9 @@ class EcCourseEvaluationsbottom extends Component {
                     <p className="clearfix padding20-30 bor-bottom-greyE" id="SystemParametersP">
                         <a href={schooldata.course_setting_url} className="TrainingLecturer color-grey-9">课程体系 </a> >
                         <a className="TrainingTheory major_name"> {schooldata.ec_course_name} </a>
-                        {/*课程考核方式与数据来源*/}
+                        <div className="color-grey-9 mr10">请结合本课程的教学情况，修改说明每个课程目标的评价环节和评估方式  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>
+
+                      {/*课程考核方式与数据来源*/}
                         {/* <span className="fl font-18 courseSystem"></span> */}
                         {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
                         <span className="Importclassroomdata" style={{top: '22px'}}>

public/react/src/modules/ec/ecCourseSupportSetting/index.js

@@ -245,6 +245,7 @@ class EcCourseSupportSetting extends Component {
       <div className="newMain clearfix courseSupport">
         <div className="educontent mb50">
             <EcTitleCourseEvaluations
+                {...this.props}
                 schooldata={schooldata}
                 ecComponentState={'ecCompletion'}
                 ecpath={"ec_course_support_setting"}

public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js

@@ -473,6 +473,7 @@ class ecCourseSupports extends Component {
                 <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecComponentState={ecComponentState}
                         ecpath={"requirement_vs_courses"}
@@ -481,11 +482,13 @@ class ecCourseSupports extends Component {
                     <div className="edu-back-white eacourse">
 
                         <div className="clearfix padding20-30 bor-bottom-greyE" style={{position:'relative'}}>
-                            <span className="fl font-18 courseSystem">课程体系对毕业要求的支撑</span>
+                            <span className="font-18 courseSystem">课程体系对毕业要求的支撑</span>
                             {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
                             <span className={data.is_manager===false?"none":"Importclassroomdata"} style={{top: '29px'}}>
                                 <a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={'/ec_major_schools/'+major_school_id+'/academic_years/'+ec_year_id+'/export_course_requirements?format=xls'}>导出课程体系支撑矩阵</a>
                             </span>
+                            <div className="color-grey-9 mr10">用矩阵图的形式说明本专业课程体系对毕业要求的支撑关系  <a className={"color-blue"} onClick={() => window.elasticLayer(3534)} >查看详情</a></div>
+
                         </div>
                         <div className="padding20-30" id="training_objective_contents">
                             <span className="fl SystemParameters" >毕业要求指标点（<a href={data.subitems_url}><span className="Systemnum">{data.subitems_count}</span></a>）</span>

public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js

@@ -262,6 +262,7 @@ class ecGradeEvaluations extends Component {
                 <div className="educontent mb40">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecpath={"show"}
                     />
@@ -271,6 +272,7 @@ class ecGradeEvaluations extends Component {
                         <p className="clearfix padding20-30 bor-bottom-greyE" id="SystemParametersP">
                             <a href={schooldata.course_setting_url} className="TrainingLecturer color-grey-9">课程体系 </a> >
                             <a className="TrainingTheory major_name"> {schooldata.ec_course_name}</a>
+
                             {/*课程考核方式与数据来源*/}
                             {/* <span className="fl font-18 courseSystem"></span> */}
                             {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}

public/react/src/modules/ec/ecStudentList/ecStudentList.js

@@ -23,6 +23,7 @@ class ecStudentList extends Component {
             schooldata:{},
             majorschoollist:undefined,
             titlemessage:"提示",
+            ecComponentState:"ecStudentList",
             visible:false,
             Modallist:'',
             Modallisttypes:0,
@@ -318,8 +319,9 @@ class ecStudentList extends Component {
                 <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
-                        ecpath={"none"}
+                        ecpath={this.state.ecComponentState}
                     />
                    <div className="clearfix padding20-30 bor-bottom-greyE mb10 mt10 edu-back-white">
                         <span className="fl font-18 courseSystem ">学生列表</span>
@@ -329,9 +331,11 @@ class ecStudentList extends Component {
                     <div className="edu-back-white eacourse">
 
                         <div className="clearfix padding20-30 bor-bottom-greyE"><span
-                            className="fl font-18 courseSystem">学生列表（
+                            className=" font-18 courseSystem">学生列表（
                             {majorschoollist===undefined?"":majorschoollist.total_student}
-                            ）</span></div>
+                            ）</span>
+                            <div className="color-grey-9 mr10">提供模板支持导入学生信息(请先下载模板)  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>
+                        </div>
 
                         <div className="padding20-30 padbottom" id="training_objective_contents">
                         {ismanager===false?"":

public/react/src/modules/ec/ecTitle/ecTitle.css

@@ -21,7 +21,7 @@
     margin-right: 10px;
 }
 #traningNav>li>.ecTitles {
-    line-height: 18px !important;
+    line-height: 16px !important;
 }
 
 #traningNav>li>.ecTitlefont:hover{

public/react/src/modules/ec/ecTitle/ecTitle.js

@@ -21,6 +21,7 @@ class EcTitleCourseEvaluations extends Component {
 
     render() {
         let{schooldata,ecComponentState,ecpaths}=this.state;
+
         return (
             <div>
                 <div className="mb10 mt10 eaSystemp">
@@ -49,16 +50,20 @@ class EcTitleCourseEvaluations extends Component {
                         <a className={"ecTitle ecTitles"} >4</a>
                         <a className={"ecTitlefont"} href={schooldata.requirement_vs_standard}>毕业要求 vs 通用标准</a>
                     </li>
+                    <li className={ecpaths==="ecStudentList"||ecpaths==="show"?"ecimgs11":"ecimgs"} style={{width: ecpaths==="ecStudentList"?'126px':'83px'}}>
+                        <a className={ ecpaths==="ecStudentList"||ecpaths==="show"?"ml18 ecTitleFFF ecTitles":"ecTitle"} >5</a>
+                        <a  className={ ecpaths==="ecStudentList"||ecpaths==="show"?"ecTitlefontFFF":"ecTitlefont"} href={"/ec_major_schools/"+this.props.match.params.major_school_id+"/academic_years/"+this.props.match.params.ec_year_id+"/student_lists"}>学生</a>
+                    </li>
                     <li className={ecpaths==="ec_course_support_setting"||ecpaths==="show"?"ecimgs11":"ecimgs"}>
-                        <a className={ ecpaths==="ec_course_support_setting"||ecpaths==="show"?"ml18 ecTitleFFF ecTitles":"ecTitle ecTitles"} >5</a>
+                        <a className={ ecpaths==="ec_course_support_setting"||ecpaths==="show"?"ml18 ecTitleFFF ecTitles":"ecTitle ecTitles"} >6</a>
                         <a  className={ ecpaths==="ec_course_support_setting"||ecpaths==="show"?"ecTitlefontFFF":"ecTitlefont"} href={schooldata.course_setting_url}>课程体系</a>
                     </li>
                     <li className={ecpaths==="requirement_vs_courses"?"ecimgs3":"ecimgs"}>
-                        <a className={ ecpaths==="requirement_vs_courses"?"ecmarginleft ecTitleFFF ecTitles":"ecTitle ecTitles"} >6</a>
+                        <a className={ ecpaths==="requirement_vs_courses"?"ecmarginleft ecTitleFFF ecTitles":"ecTitle ecTitles"} >7</a>
                         <a className={ ecpaths==="requirement_vs_courses"?"ecTitlefontFFF":"ecTitlefont"} href={schooldata.requirement_vs_courses}>课程体系 vs 毕业要求</a>
                     </li>
                     <li className={ecpaths==="reach_calculation_info"?"ecimgs2 info2":"ecimgs"}>
-                        <a className={ ecpaths==="reach_calculation_info"?"ecTitleFFF ml18 ecTitles":"ecTitle ecTitles"} >7</a>
+                        <a className={ ecpaths==="reach_calculation_info"?"ecTitleFFF ml18 ecTitles":"ecTitle ecTitles"} >8</a>
                         <a className={ ecpaths==="reach_calculation_info"?"ecTitlefontFFF":"ecTitlefont"} href={schooldata.reach_calculation_info_url}>达成度评价结果</a>
                     </li>
                     {/*<li className={ecComponentState==="ecCourseSupports"?"active edu-menu-panel":"edu-menu-panel"}>*/}

public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js

@@ -599,16 +599,24 @@ class GraduatesRequirement extends Component {
         <div className="newMain clearfix">
           <div className="educontent mb290">
             <EcTitleCourseEvaluations
+                {...this.props}
               schooldata={schooldata}
               ecComponentState={'ecCompletion'}
               ecpath={"reach_calculation_info"}
             ></EcTitleCourseEvaluations>
             <div className="contentWrap graduatesRequirement">
 
-              <p className="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
+              <ul className="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
                 style={{ 'marginBottom': '0px' }} >
-                <a className="fl font-18 courseSystem"> 毕业要求指标点达成计算 </a>
-              </p>
+                <li className="fl">
+                  <p className="font-18 courseSystem"> 毕业要求指标点达成计算 </p>
+                  <p>
+                    <span class="color-grey-9 mr10">系统根据课程体系与毕业要求的支持关系，以课程的考核与成绩判定方式，一键计算毕业要求的达成度情况</span>
+                    <a href="javascript:void(0)" onClick={() => window.elasticLayer(3530)} class="color-blue">查看详情</a>
+                  </p>
+
+                </li>
+              </ul>
 
               <p class="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
                 style={{ 'paddingBottom': '12px' }}>

public/react/src/modules/page/MainContentContainer.js

@@ -639,7 +639,7 @@ class MainContentContainer extends Component {
 	    		let requestTimes = 0;
 
 	    		var gameStatusIntervalId = setInterval(()=>{
-	    			let game_status_url = `${locationPath}/game_status?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}`
+	    			let game_status_url = `${locationPath}/game_status?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}&sec_key=${sec_key}`
 
 		    		axios.get(game_status_url, {
 		    			withCredentials: true,

public/stylesheets/educoder/edu-all.css

@@ -3089,17 +3089,17 @@ a.singlepublishtwo{
 .MajorName > i:hover{color: #4CACFF}
 /*培养目标*/
 #traningNav{margin-bottom: 0px!important;}
-#traningNav>li{float: left;padding:0px 30px 30px 30px;font-size: 16px;}
+#traningNav>li{float: left;padding:0px 30px 30px 30px;font-size: 15px;}
 #traningNav>li>a,#traningNav li>i{color: #666!important;position: relative}
 #traningNav>li.active > a,#traningNav li.active > i{color: #05101A!important;}
 #traningNav>li.active > a:after{content: '';position: absolute;width: 64px;left: 50%;margin-left: -32px;height: 2px;background-color: #05101A;bottom: -35px;}
 
-#traningNav>li>.ecTitle {width: 20px;height: 20px;border: 1px solid rgba(65, 140, 205, 1);border-radius: 50%;text-align: center;
-line-height: 20px;display: inline-block;color: rgba(65, 140, 205, 1) !important;margin-right: 8px;}
+#traningNav>li>.ecTitle {width: 16px;height: 16px;border: 1px solid rgba(65, 140, 205, 1);border-radius: 50%;text-align: center;
+line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;margin-right: 8px;font-size: 12px}
 #traningNav>li>.ecTitlefont:hover{color: rgba(65, 140, 205, 1)  !important;}
 .ecimgs{height: 90px;line-height: 90px;box-sizing: border-box;}
 #traningNav>li>.ecTitlefontFFF{color:#fff!important;}
-#traningNav>li>.ecTitleFFF {width: 20px;height: 20px;border: 1px solid #fff;border-radius: 50%;text-align: center;line-height: 20px;
+#traningNav>li>.ecTitleFFF {width: 16px;height: 16px;border: 1px solid #fff;border-radius: 50%;text-align: center;line-height: 16px;font-size: 12px;
     display: inline-block;color: #fff !important;margin-right: 8px;}
 .traningNavs>li {padding: 0px 10px 30px 12px !important;}
 .ecimgs1{background: url("/images/educoder/auth/1.png");background-repeat: no-repeat;background-size: 100% 100%;-moz-background-size: 100% 100%;

public/stylesheets/educoder/edu-main.css

@@ -903,4 +903,13 @@ html>body #ajax-indicator { position: fixed; }
     margin-left: 20px;
     text-indent: 25px;
     min-height: 100px;
+}
+
+
+/*工程认证 各页面公用弹层*/
+.layerContent{
+    margin: 0 auto;
+    padding-bottom: 235px;
+    min-width: 1200px;
+    padding-top: 60px;
 }