diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb
index d95fd848..85a09d0b 100644
--- a/app/controllers/colleges_controller.rb
+++ b/app/controllers/colleges_controller.rb
@@ -1,7 +1,9 @@
 # encoding: utf-8
 class CollegesController < ApplicationController
 
-  before_filter :find_department, :only => [:statistics, :course_statistics, :student_shixun, :engineering_capability, :student_eval]
+  before_filter :find_department, :only => [:statistics, :course_statistics, :student_shixun, :engineering_capability,
+                                            :student_eval, :shixun_time, :shixun_report_count, :teachers, :shixun_chart_data,
+                                            :student_hot_evaluations]
   before_filter :manager_auth, :except => [:home, :get_home_data]
 
   include ApplicationHelper
@@ -42,143 +44,128 @@ class CollegesController < ApplicationController
   end
 
   def statistics
-    logger.info("#########################{params}")
-    @teachers_count = User.find_by_sql("SELECT COUNT(users.`id`) AS teacher_count FROM users LEFT JOIN user_extensions ON users.id=user_extensions.user_id WHERE
-                                        user_extensions.`school_id` = #{@school.id} AND user_extensions.`identity` = 0").first.try(:teacher_count)
-    @students_count = User.find_by_sql("SELECT COUNT(users.`id`) AS student_count FROM users LEFT JOIN user_extensions ON users.id=user_extensions.user_id WHERE
-                                        user_extensions.`school_id` = #{@school.id} AND user_extensions.`identity` = 1").first.try(:student_count)
-    # Redo：这样做内存会卡死的
-    # user_ids = User.find_by_sql("SELECT users.id FROM users LEFT JOIN user_extensions ON users.id=user_extensions.user_id WHERE user_extensions.`school_id` = #{@school.id}").map(&:id)
-    # Redo：是否直接使用count会更好
-    all_course_ids = Course.where("id != 1309 and is_delete = 0 and school_id = #{@school.id}")
-    @courses_count = all_course_ids.size
-
-    # Redo：对于量比较大的尽量不使用笛卡尔积
-    # @shixuns_count = Shixun.where(:status => [2, 3], :user_id => user_ids).size
-    @shixuns_count = Shixun.find_by_sql("select count(s.id) as shixun_count from users u right join shixuns s on u.id=s.user_id and s.status in (2, 3) inner join user_extensions ue on
-                                         u.id=ue.user_id and ue.school_id=#{@school.id}").first.try(:shixun_count)
-    # @shixun_time_sum = (Game.where(:user_id => user_ids).pluck(:cost_time).sum / (24*60*60.0)).ceil
-    @shixun_time_sum = (Game.find_by_sql("select sum(g.cost_time) cost_time from users u RIGHT join games g on u.id=g.user_id inner join user_extensions ue on
-                                          u.id=ue.user_id and ue.school_id=#{@school.id}").first.try(:cost_time).to_i / (24 * 60 * 60.0)).ceil
-
-    # select count(sw.id) from users u left join student_works sw on u.id=sw.user_id and sw.myshixun_id is not null and sw.work_status !=0 inner join user_extensions ue on u.id=ue.user_id and ue.school_id=117 ;
-    # @shixun_report_count = StudentWork.where("work_status != 0 and user_id in (#{user_ids.join(',').strip == "" ? -1 : user_ids.join(',')}) and myshixun_id is not null").count
-    @shixun_report_count = StudentWork.find_by_sql("SELECT count(*) as sw_count FROM `student_works` where user_id in (SELECT users.id FROM users RIGHT JOIN user_extensions ON users.id=user_extensions.user_id WHERE
-                                                    user_extensions.`school_id`=#{@school.id}) and work_status between 1 and 2 and myshixun_id !=0").first.try(:sw_count)
+    # 教师、学生总数
+    count_statistic = UserExtensions.where(school_id: @school.id).select('SUM(IF(identity=0, 1, 0)) AS teachers_count, SUM(IF(identity=1, 1, 0)) AS students_count').first
+    @teachers_count = count_statistic['teachers_count']
+    @students_count = count_statistic['students_count']
 
+    # 课堂总数
+    @courses_count = Course.where(school_id: @school.id, is_delete: 0).where('id != 1309').count
+    # 实训总数
+    @shixuns_count = Shixun.visible.joins('left join user_extensions on user_extensions.user_id = shixuns.user_id').where(user_extensions: { school_id: @school.id }).count
+
+    respond_to do |format|
+      format.html {render :layout => "base_edu"}
+    end
+  end
+
+  def shixun_time
+    time_sum = Game.joins('left join user_extensions on user_extensions.user_id = games.user_id').where(user_extensions: { school_id: @school.id }).sum(:cost_time)
+    shixun_time_sum = (time_sum / (24 * 60 * 60.0)).ceil
+
+    render json: { shixun_time: shixun_time_sum }
+  end
+
+  def shixun_report_count
+    shixun_report_count = StudentWork.where(work_status: [1, 2]).where('myshixun_id != 0')
+                             .joins('left join user_extensions on user_extensions.user_id = student_works.user_id')
+                             .where(user_extensions: { school_id: @school.id }).count
+    render json: { shixun_report_count: shixun_report_count }
+  end
+
+  def teachers
     @teachers = User.find_by_sql("SELECT users.id, users.login, users.lastname, users.firstname, users.nickname, IFNULL((SELECT count(shixuns.id) FROM shixuns where shixuns.user_id =users.id group by shixuns.user_id), 0) AS publish_shixun_count,
                                 (SELECT count(c.id) FROM courses c, course_members m WHERE c.id != 1309 and m.course_id = c.id AND m.role in (1,2,3) and c.school_id = #{@school.id} AND m.user_id=users.id AND c.is_delete = 0) as course_count
                                 FROM `users`, user_extensions ue where users.id=ue.user_id and ue.identity=0 and ue.school_id=#{@school.id} ORDER BY publish_shixun_count desc, course_count desc, id desc LIMIT 10")
     # ).order("publish_shixun_count desc, experience desc").limit(10)
     @teachers =
-        @teachers.map do |teacher|
-          course_ids = Course.find_by_sql("SELECT c.id FROM courses c, course_members m WHERE c.id != 1309 and m.course_id = c.id AND m.role in (1,2,3) AND m.user_id=#{teacher.id} AND c.is_delete = 0 and c.school_id = #{@school.id}")
-          course_count = course_ids.size
-          homeworks = HomeworkCommon.where(:homework_type => 4, :course_id => course_ids.map(&:id))
-          un_shixun_work_count = homeworks.where("publish_time > '#{Time.now}' or publish_time is null").count
-          shixun_work_count = homeworks.size - un_shixun_work_count
-          student_count = StudentsForCourse.where(:course_id => course_ids.map(&:id)).count
-          myshixun_ids = StudentWork.select("myshixun_id").where("homework_common_id in (#{homeworks.map(&:id).join(',').strip == "" ? -1 : homeworks.map(&:id).join(',')}) and myshixun_id is not null")
-          complete_myshixun = Myshixun.select("id").where(:status => 1, :id => myshixun_ids.map(&:myshixun_id)).size
-          all_myshixun = Myshixun.select("id").where(:id => myshixun_ids.map(&:myshixun_id)).size
-          complete_rate = all_myshixun == 0 ? 0 : ((complete_myshixun * 100) / all_myshixun).try(:round, 2).to_f
-          real_name = teacher.show_real_name
-          teacher = teacher.attributes.dup.merge({
-                                                     real_name: real_name,
-                                                     course_count: course_count,
-                                                     shixun_work_count: shixun_work_count,
-                                                     un_shixun_work_count: un_shixun_work_count,
-                                                     student_count: student_count,
-                                                     complete_rate: complete_rate
-                                                 }).to_json
-          JSON.parse(teacher)
-        end
-
-    shixun_ids = HomeworkCommonsShixuns.find_by_sql("SELECT hcs.shixun_id FROM homework_commons_shixuns hcs, homework_commons hc
-                 WHERE hc.course_id in (#{all_course_ids.map(&:id).join(',').strip == "" ? -1 : all_course_ids.map(&:id).join(',')})
-                 AND hcs.homework_common_id = hc.id").map(&:shixun_id)
-    shixun_tags = TagRepertoire.find_by_sql("SELECT tr.`name`, COUNT(str.shixun_id) as shixun_count FROM tag_repertoires tr,
-                                             shixun_tag_repertoires str WHERE tr.id = str.tag_repertoire_id AND str.shixun_id
-                                             IN (#{shixun_ids.join(',').strip == "" ? -1 : shixun_ids.join(',')}) GROUP BY tr.id
-                                             order by shixun_count desc")
-    all_shixun_count = shixun_tags.map(&:shixun_count).sum
-    other_count = all_shixun_count.to_i - shixun_tags[0..8].map(&:shixun_count).sum.to_i
-    @shixun_tags_name = []
-    @shixun_tags_data = []
-    shixun_tags[0..8].each do |tag|
-      @shixun_tags_name << tag.name
-      @shixun_tags_data << {value: tag.shixun_count, name: tag.name}
-    end
-    if shixun_tags.size > 9
-      @shixun_tags_name << 'Others'
-      @shixun_tags_data << {value: other_count, name: 'Others'}
+      @teachers.map do |teacher|
+        course_ids = Course.find_by_sql("SELECT c.id FROM courses c, course_members m WHERE c.id != 1309 and m.course_id = c.id AND m.role in (1,2,3) AND m.user_id=#{teacher.id} AND c.is_delete = 0 and c.school_id = #{@school.id}")
+        course_count = course_ids.size
+        homeworks = HomeworkCommon.where(:homework_type => 4, :course_id => course_ids.map(&:id))
+        un_shixun_work_count = homeworks.where("publish_time > '#{Time.now}' or publish_time is null").count
+        shixun_work_count = homeworks.size - un_shixun_work_count
+        student_count = StudentsForCourse.where(:course_id => course_ids.map(&:id)).count
+        myshixun_ids = StudentWork.select("myshixun_id").where("homework_common_id in (#{homeworks.map(&:id).join(',').strip == "" ? -1 : homeworks.map(&:id).join(',')}) and myshixun_id is not null")
+        complete_myshixun = Myshixun.select("id").where(:status => 1, :id => myshixun_ids.map(&:myshixun_id)).size
+        all_myshixun = Myshixun.select("id").where(:id => myshixun_ids.map(&:myshixun_id)).size
+        complete_rate = all_myshixun == 0 ? 0 : ((complete_myshixun * 100) / all_myshixun).try(:round, 2).to_f
+        real_name = teacher.show_real_name
+        teacher = teacher.attributes.dup.merge({
+                                                 real_name: real_name,
+                                                 course_count: course_count,
+                                                 shixun_work_count: shixun_work_count,
+                                                 un_shixun_work_count: un_shixun_work_count,
+                                                 student_count: student_count,
+                                                 complete_rate: complete_rate
+                                               }).to_json
+        JSON.parse(teacher)
+      end
+  end
+
+  def shixun_chart_data
+    shixun_ids = HomeworkCommonsShixuns.joins(homework_common: :course).where(courses: {school_id: @school.id, is_delete: 0}).where('courses.id != 1309').pluck('distinct shixun_id')
+    shixun_count_map = ShixunTagRepertoire.joins(:tag_repertoire).where(shixun_id: shixun_ids).group('tag_repertoires.name').order('count_shixun_id desc').count(:shixun_id)
+
+    names = []
+    data = []
+    shixun_count_map.each do |name, count|
+      break if names.size == 9
+
+      names << name
+      data << { value: count, name: name }
     end
 
-    respond_to do |format|
-      format.html {render :layout => "base_edu"}
+    if shixun_count_map.keys.size > 9
+      other_count = shixun_count_map.values[9..-1].reduce(:+)
+      names << 'Others'
+      data << { name: 'Others', value: other_count }
     end
+
+    render json: { names: names, data: data }
   end
 
   # 在线课堂
   def course_statistics
-    @courses = Course.find_by_sql("SELECT c.id, (select concat(lastname,firstname) from users u where u.id=c.tea_id) as username,
-               (select count(sfc.id) from students_for_courses sfc where c.id=sfc.course_id group by c.id) as student_count,
-               (select count(hc.id) from homework_commons hc where c.id=hc.course_id and hc.homework_type=4 group by c.id) as hcm_count,
-               (select count(hc.id) from homework_commons hc where c.id=hc.course_id and hc.homework_type in (1,3) group by c.id) as hcm_nonshixun_count,
-               (select count(e.id) from exercises e where c.id=e.course_id group by c.id) as exercises_count,
-               (select count(p.id) from polls p where c.id=p.course_id group by c.id) as polls_count,
-               (select count(a.id) from attachments a where c.id=a.container_id and a.container_type='Course' group by c.id) as attachments_count,
-               (select count(m.id) from messages m inner join boards b on  b.id=m.board_id and b.parent_id=0 where b.course_id=c.id group by c.id) as messages_count,
-               c.tea_id, c.name, c.is_end,
-               (SELECT MAX(created_at) FROM `course_activities` ca WHERE ca.course_id = c.id) AS update_time
-               FROM `courses` c WHERE c.school_id = #{@school.id} and c.is_delete = 0")
-
-    @courses.each do |course|
-      course[:evaluating_count] = Output.find_by_sql("select sum(g.evaluate_count) as evaluating_count from games g inner join
-                                  (select myshixun_id from student_works sw inner join homework_commons hc on sw.homework_common_id=hc.id and
-                                  sw.myshixun_id !=0 and hc.course_id=#{course.id} and homework_type=4) aa on g.myshixun_id=aa.myshixun_id").first.try(:evaluating_count).to_i
-      course[:task_count] = course.hcm_count.to_i + course.attachments_count.to_i + course.messages_count.to_i + course.hcm_nonshixun_count.to_i + course.exercises_count.to_i + course.polls_count.to_i
-    end
-    @courses = @courses.sort{|x,y| [y[:evaluating_count], y[:task_count]] <=> [x[:evaluating_count], x[:task_count]] }
-    @courses = @courses.sort_by { |course| course.is_end ? 1 : 0 }
-
-    # SELECT c.id, (select concat(firstname,lastname) from users u where u.id=c.tea_id) as username,
-    #                                                                                      (select count(sfc.id) from students_for_courses sfc where c.id=sfc.course_id group by c.id) as student_count,
-    #                                                                                                                                                                                     (select count(hc.id) from homework_commons hc where c.id=hc.course_id and hc.homework_type=4 group by c.id) as hcm_count,
-    #                                                                                                                                                                                                                                                                                                    c.tea_id, c.name, c.is_end,
-    #                                                                                                                                                                                                                                                                                                    (SELECT MAX(created_at) FROM `course_activities` ca WHERE ca.course_id = c.id) AS update_time
-    # FROM `courses` c WHERE (c.school_id = 117 and c.is_delete = 0) ORDER BY update_time desc LIMIT 8 OFFSET 0
-
-    # @courses = Course.where("courses.school_id = #{@department.school_id} and courses.is_delete = 0").select("courses.id, courses.tea_id, courses.name, courses.is_end,
-    #   (SELECT MAX(created_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS update_time").order("update_time desc")
-    @courses = paginateHelper @courses, 8
-    # @courses = @courses.includes(:student, :boards, :exercises, :polls, :attachments, :homework_commons, :teacher => [:user_extensions])
+    courses = Course.where(school_id: @school.id, is_delete: 0)
+
+    @obj_count = courses.count
+
+    courses = courses.joins(shixun_homework_commons: :student_works)
+                .joins('join games on games.myshixun_id = student_works.myshixun_id')
+                .select('courses.id, courses.name, courses.is_end, sum(games.evaluate_count) evaluating_count')
+                .group('courses.id').order('is_end asc, evaluating_count desc')
+
+    @obj_pages = Paginator.new @obj_count, 8, params['page']
+    @courses = courses.limit(@obj_pages.per_page).offset(@obj_pages.offset)
+
+    course_ids = @courses.map(&:id)
+    @student_count     = StudentsForCourse.where(course_id: course_ids).group(:course_id).count
+    @shixun_work_count = HomeworkCommon.where(homework_type: 4, course_id: course_ids).group(:course_id).count
+    @attachment_count  = Attachment.where(container_id: course_ids, container_type: 'Course').group(:container_id).count
+    @message_count     = Message.joins(:board).where(boards: { parent_id: 0, course_id: course_ids }).group('boards.course_id').count
+    @active_time       = CourseActivity.where(course_id: course_ids).group(:course_id).maximum(:created_at)
+    @exercise_count    = Exercise.where(course_id: course_ids).group(:course_id).count
+    @poll_count        = Poll.where(course_id: course_ids).group(:course_id).count
+    @other_work_count  = HomeworkCommon.where(homework_type: [1,3], course_id: course_ids).group(:course_id).count
   end
 
   # 学生实训
   def student_shixun
-    user_ids = User.find_by_sql("SELECT users.id FROM users, user_extensions WHERE users.id=user_extensions.user_id AND user_extensions.`school_id` = #{@school.id}").map(&:id)
-    @students = User.find_by_sql("SELECT users.id, users.login, users.lastname, users.firstname, users.nickname, users.grade,
-                users.experience, ue.student_id, (SELECT COUNT(myshixuns.id) FROM `myshixuns` WHERE myshixuns.user_id
-                = users.id AND myshixuns.status = 1 GROUP BY users.id) AS myshixun_count FROM users join user_extensions ue on
-                users.id = ue.user_id where ue.school_id = #{@school.id} AND ue.identity = 1 AND `users`.`type` IN ('User', 'AnonymousUser') ORDER BY experience DESC, myshixun_count DESC LIMIT 10")
-
-    ## outputs基数过大，用inner join有奇效
-    @shixun_tags = TagRepertoire.find_by_sql(%Q{
-      select name,  COUNT(outputs.id) AS test_count from outputs inner join (
-        SELECT tr.id as trid, tr.`name` as name,  games.id as id
-        FROM tag_repertoires tr, shixun_tag_repertoires str,  games, myshixuns
-        WHERE tr.id = str.tag_repertoire_id
-          AND str.shixun_id = myshixuns.`shixun_id`
-          AND myshixuns.id = games.`myshixun_id`
-          AND myshixuns.`user_id` IN (
-            SELECT users.id FROM users, user_extensions WHERE users.id=user_extensions.user_id AND user_extensions.`school_id` = #{@school.id}
-          )
-        ) a on a.id = outputs.game_id and outputs.`test_set_position` = 1 group by trid
-        ORDER BY test_count DESC
-        LIMIT 10
-    })
+    @students = User.joins(:user_extensions).where(user_extensions: { school_id: @school.id, identity: 1 }).includes(:user_extensions).order('experience desc').limit(10)
+
+    student_ids = @students.map(&:id)
+    @shixun_count       = Myshixun.where(user_id: student_ids).group(:user_id).count
+    @study_shixun_count = Myshixun.where(user_id: student_ids, status: 0).group(:user_id).count
+  end
+
+  def student_hot_evaluations
+    games = Game.joins(:myshixun).joins('join shixun_tag_repertoires str on str.shixun_id = myshixuns.shixun_id')
+    games = games.joins('join tag_repertoires tr on tr.id = str.tag_repertoire_id')
+    games = games.joins("join user_extensions ue on ue.user_id = myshixuns.user_id and ue.school_id = #{@school.id}")
+    evaluate_count_map = games.group('tr.name').reorder('sum_games_evaluate_count desc').limit(10).sum('games.evaluate_count')
 
+    render json: { names: evaluate_count_map.keys, values: evaluate_count_map.values }
   end
 
   # 工程能力
diff --git a/app/controllers/competitions_controller.rb b/app/controllers/competitions_controller.rb
index 57ff871c..cd3a9ef6 100644
--- a/app/controllers/competitions_controller.rb
+++ b/app/controllers/competitions_controller.rb
@@ -327,9 +327,9 @@ class CompetitionsController < ApplicationController
           elsif @type == "决赛"
             # '92b7vt8x','a7fxenvc','wt2xfzny','xa4m9cng','tng6heyf','am5o73er','9fla2zry','fzp3iu4w','qlsy6xb4'
             # 预赛的实训id  第一阶段：1289，1373，1256  第二阶段：1488, 1453, 1487  第三阶段：1470, 1473, 1408
-            shixun1_id = Shixun.where(:identifier => ['92b7vt8x','a7fxenvc','wt2xfzny']).pluck(:id)
-            shixun2_id = Shixun.where(:identifier => ['xa4m9cng','tng6heyf','am5o73er']).pluck(:id)
-            shixun3_id = Shixun.where(:identifier => ['9fla2zry','fzp3iu4w','qlsy6xb4']).pluck(:id)
+            shixun1_id = Shixun.where(:identifier => ['ftlc4x38']).pluck(:id)
+            shixun2_id = Shixun.where(:identifier => ['y9npgih2','ucqt7fw3','2p7ouzwk']).pluck(:id)
+            shixun3_id = Shixun.where(:identifier => ['fj49r7xv','gf2cvxfh','cmoxhtbs']).pluck(:id)
           end
 
           if @competition.competition_scores.where(:competition_stage_id => @stage.id).count == 0
@@ -385,7 +385,7 @@ class CompetitionsController < ApplicationController
             f_score = team.competition_scores.where(:competition_stage_id => final_stage.try(:id)).first
             # 预赛记录
             p_score = team.competition_scores.where(:competition_stage_id => pre_stage.try(:id)).first
-            team[:s_score] = (f_score.try(:score).to_f * 0.85 + p_score.try(:score).to_f * 0.15).try(:round, 2)
+            team[:s_score] = (f_score.try(:score).to_f * 0.80 + p_score.try(:score).to_f * 0.20).try(:round, 2)
             team[:s_spend_time] = f_score.try(:cost_time).to_i + p_score.try(:cost_time).to_i
           end
         end
diff --git a/app/controllers/ec_graduation_requirements_controller.rb b/app/controllers/ec_graduation_requirements_controller.rb
index 091588cd..79c678de 100644
--- a/app/controllers/ec_graduation_requirements_controller.rb
+++ b/app/controllers/ec_graduation_requirements_controller.rb
@@ -50,9 +50,14 @@ class EcGraduationRequirementsController < ApplicationController
     @year = requirement.ec_year
     @template_major = admin_or_business? || @year.ec_major_school.school.ec_school_users.pluck(:user_id).include?(User.current.id)
     requirement.update_attribute(:content, params[:requirement])
-    requirement.ec_graduation_subitems.destroy_all
+    # requirement.ec_graduation_subitems.destroy_all
     params[:subitems].try(:each_with_index) do |sub, index|
-      EcGraduationSubitem.create(:content => sub, :position => index+1, :ec_graduation_requirement_id => requirement.id)
+      subitem = requirement.ec_graduation_subitems.where(position: index+1).first
+      if subitem.present?
+        subitem.update_attributes(:content => sub)
+      else
+        EcGraduationSubitem.create(:content => sub, :position => index+1, :ec_graduation_requirement_id => requirement.id)
+      end
     end
 
     @ec_graduation_requirements = requirement.ec_year.ec_graduation_requirements
diff --git a/app/controllers/ec_graduation_subitems_controller.rb b/app/controllers/ec_graduation_subitems_controller.rb
index b281e3f3..1248f450 100644
--- a/app/controllers/ec_graduation_subitems_controller.rb
+++ b/app/controllers/ec_graduation_subitems_controller.rb
@@ -82,9 +82,13 @@ class EcGraduationSubitemsController < ApplicationController
   # DELETE /ec_graduation_subitems/1.json
   def destroy
     @ec_graduation_subitem = EcGraduationSubitem.find(params[:id])
+    @ec_graduation_requirement = @ec_graduation_subitem.ec_graduation_requirement
+    @ec_graduation_requirement.ec_graduation_subitems.where("position > #{@ec_graduation_subitem.position}").update_all("position = position - 1")
+    @ec_graduation_requirements = @ec_graduation_requirement.ec_year.ec_graduation_requirements
     @ec_graduation_subitem.destroy
 
     respond_to do |format|
+      format.js
       format.html { redirect_to ec_graduation_subitems_url }
       format.json { head :no_content }
     end
diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb
index 3e02c579..ac303ce3 100644
--- a/app/controllers/ecloud_controller.rb
+++ b/app/controllers/ecloud_controller.rb
@@ -18,7 +18,7 @@ class EcloudController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
   before_filter :save_para
-  before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
+  # before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
 
   before_filter :user_setup
   # before_filter :require_login, only: [:authorize]
diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index d07c7de1..b018e38d 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -179,6 +179,8 @@ class ManagementsController < ApplicationController
     if params[:search]
       if params[:search].to_i.to_s == params[:search].to_s
         myshixun_id = Game.where(:myshixun_id => params[:search].to_i).pluck(:myshixun_id)
+        game_myshixun_id = Game.where(:id => params[:search].to_i).pluck(:myshixun_id)
+        myshixun_id = myshixun_id + game_myshixun_id
       else
         myshixun_id = Game.where(:identifier => params[:search]).pluck(:myshixun_id)
       end
diff --git a/app/models/tag_repertoire.rb b/app/models/tag_repertoire.rb
index c33faa5c..7b7891e7 100644
--- a/app/models/tag_repertoire.rb
+++ b/app/models/tag_repertoire.rb
@@ -1,8 +1,8 @@
 class TagRepertoire < ActiveRecord::Base
   # attr_accessible :title, :body
   belongs_to :sub_repertoire
-  has_many :shixuns, :through => :shixun_tag_repertoires
   has_many :shixun_tag_repertoires, :dependent => :destroy
+  has_many :shixuns, :through => :shixun_tag_repertoires
 
   has_many :memos, :through => :memo_tag_repertoires
   has_many :memo_tag_repertoires, :dependent => :destroy
diff --git a/app/views/colleges/_course_statistics.html.erb b/app/views/colleges/_course_statistics.html.erb
index 67e989f3..b8608dc0 100644
--- a/app/views/colleges/_course_statistics.html.erb
+++ b/app/views/colleges/_course_statistics.html.erb
@@ -20,13 +20,13 @@
         <%= course_managers course.teachers %>
       </td>
       <td class="edu-txt-center"><%= course.evaluating_count %></td>
-      <td class="edu-txt-center"><%= course.student_count.to_i %></td>
-      <td class="edu-txt-center"><%= course.hcm_count.to_i %></td>
-      <td class="edu-txt-center"><%= course.attachments_count.to_i %></td>
-      <td class="edu-txt-center"><%= course.messages_count.to_i %></td>
-      <td class="edu-txt-center"><%= course.hcm_nonshixun_count.to_i + course.exercises_count.to_i + course.polls_count.to_i %></td>
+      <td class="edu-txt-center"><%= @student_count.fetch(course.id, 0) %></td>
+      <td class="edu-txt-center"><%= @shixun_work_count.fetch(course.id, 0) %></td>
+      <td class="edu-txt-center"><%= @attachment_count.fetch(course.id, 0) %></td>
+      <td class="edu-txt-center"><%= @message_count.fetch(course.id, 0) %></td>
+      <td class="edu-txt-center"><%= @exercise_count.fetch(course.id, 0) + @poll_count.fetch(course.id, 0) + @other_work_count.fetch(course.id, 0) %></td>
       <td class="edu-txt-center <%= course.is_end ? "color-grey-98" : "color-orange" %>"><%= course.is_end ? "已结束" : "正在进行" %></td>
-      <td class="edu-txt-center color-grey-9"><%= format_time course.update_time %></td>
+      <td class="edu-txt-center color-grey-9"><%= format_time @active_time[course.id] %></td>
     </tr>
   <% end %>
   </tbody>
diff --git a/app/views/colleges/_student_shixun.html.erb b/app/views/colleges/_student_shixun.html.erb
index f0999075..5fd310d1 100644
--- a/app/views/colleges/_student_shixun.html.erb
+++ b/app/views/colleges/_student_shixun.html.erb
@@ -21,8 +21,8 @@
         <a href="<%= user_path(student) %>" target="_blank" class="task-hide" style="max-width: 84px;"><%= student.show_real_name %></a>
       </td>
       <td><%= student.student_id %></td>
-      <td><%= student.myshixun_count %></td>
-      <td><%= student.myshixuns.where(:status => 0).count %></td>
+      <td><%= @shixun_count.fetch(student.id, 0) %></td>
+      <td><%= @study_shixun_count.fetch(student.id, 0) %></td>
       <td><%= student.grade %></td>
       <td class="color-blue"><%= student.experience %></td>
       </tr>
@@ -32,14 +32,15 @@
 <script>
     $(function(){
         //初始化最热评测柱状图
-        InitHotEvaluating();
+      $.get('<%= student_hot_evaluations_college_path(@school) %>', function(data){
+        InitHotEvaluating(data.names.reverse(), data.values.reverse());
+      })
     });
 
-    function InitHotEvaluating(){
+    function InitHotEvaluating(names, values){
         var Color = ['#962e66', '#623363', '#CCCCCC', '#9A9A9A', '#FF8080', '#FF80C2', '#B980FF', '#80B9FF', '#6FE9FF', '#4DE8B4', '#F8EF63', '#FFB967'];
         var xData = function() {
-            var data = <%= raw @shixun_tags.map(&:name).reverse %>;
-            return data;
+            return names;
         }();
 
         option = {
@@ -112,7 +113,7 @@
                         fontSize: '12'
                     }
                 },
-                data: xData
+                data: names
             },
             series: [{
                 name: '',
@@ -130,7 +131,7 @@
                 },
                 barGap: '0%',
                 barCategoryGap: '50%',
-                data: <%= raw @shixun_tags.map(&:test_count).reverse %>
+                data: values
             }
 
             ]
diff --git a/app/views/colleges/_teacher_ranking.html.erb b/app/views/colleges/_teacher_ranking.html.erb
new file mode 100644
index 00000000..f3559955
--- /dev/null
+++ b/app/views/colleges/_teacher_ranking.html.erb
@@ -0,0 +1,17 @@
+<% @teachers.each_with_index do |teacher, index| %>
+  <tr>
+    <td class="pl20 pr20">
+    <% if index < 3 %>
+      <img src="/images/educoder/competition/<%= index + 1 %>.png" width="18px" height="22px" class="mt8"/></td>
+    <% else %>
+      <%= index + 1 %>
+    <% end %>
+    <td class="color-dark"><a href="<%= user_path(teacher['login']) %>" target="_blank" class="task-hide" style="max-width: 84px;"><%= teacher['real_name'] %></a></td>
+    <td><%= teacher['course_count'] %></td>
+    <td><%= teacher['shixun_work_count'] %></td>
+    <td><%= teacher['un_shixun_work_count'] %></td>
+    <td><%= teacher['student_count'] %></td>
+    <td><%= teacher['complete_rate'] %>%</td>
+    <td class="color-blue"><%= teacher['publish_shixun_count'].to_i %></td>
+  </tr>
+<% end %>
\ No newline at end of file
diff --git a/app/views/colleges/statistics.html.erb b/app/views/colleges/statistics.html.erb
index 3c842539..8df81fcb 100644
--- a/app/views/colleges/statistics.html.erb
+++ b/app/views/colleges/statistics.html.erb
@@ -42,8 +42,8 @@
       <li><span><%= @students_count %></span>人</li>
       <li><span><%= @courses_count %></span>个</li>
       <li><span><%= @shixuns_count %></span>个</li>
-      <li><span><%= @shixun_report_count %></span>个</li>
-      <li><span data-tip-down="所有学员的实训耗时之和"><span><%= @shixun_time_sum %></span>天</span></li>
+      <li class="shixun-report-count">加载中</li>
+      <li class="shixun-time">加载中</li>
 <!--      <li><span><%#= @department.present? ? @department.host_count.to_i : @school.departments.first.try(:host_count).to_i %></span>台</li>-->
     </div>
   </div>
@@ -52,7 +52,7 @@
     <li class="active" index="1"><a href="javascript:void(0);">课堂</a></li>
     <li index="2"><a href="<%= student_shixun_college_path(@school) %>" data-remote="true">学生实训</a></li>
     <!--<li><a href="<%#= engineering_capability_college_path(@department) %>" data-remote="true">工程能力</a></li>-->
-    <li index="4"><a href="<%= student_eval_college_path(@school) %>" data-remote="true">学生测评</a></li>
+<!--    <li index="4"><a href="<%#= student_eval_college_path(@school) %>" data-remote="true">学生测评</a></li>-->
   </div>
 
   <div class="panelContent panelContent-1">
@@ -76,23 +76,7 @@
             <th>发布实训</th>
             </thead>
             <tbody>
-            <% @teachers.each_with_index do |teacher, index| %>
-                <tr>
-                  <td class="pl20 pr20">
-                    <% if index < 3 %>
-                        <img src="/images/educoder/competition/<%= index + 1 %>.png" width="18px" height="22px" class="mt8"/></td>
-                    <% else %>
-                        <%= index + 1 %>
-                    <% end %>
-                  <td class="color-dark"><a href="<%= user_path(teacher['login']) %>" target="_blank" class="task-hide" style="max-width: 84px;"><%= teacher['real_name'] %></a></td>
-                  <td><%= teacher['course_count'] %></td>
-                  <td><%= teacher['shixun_work_count'] %></td>
-                  <td><%= teacher['un_shixun_work_count'] %></td>
-                  <td><%= teacher['student_count'] %></td>
-                  <td><%= teacher['complete_rate'] %>%</td>
-                  <td class="color-blue"><%= teacher['publish_shixun_count'].to_i %></td>
-                </tr>
-              <% end %>
+              <tr><td colspan="100" style="height:400px">加载中...</td></tr>
               </tbody>
             </table>
         </div>
@@ -100,12 +84,9 @@
       <div class="fl width40">
         <div class="online_status static_shadow">
           <p class="font-24 padding30-20">在线实训情况</p>
-          <% if @shixun_tags_name.size == 0 %>
-            <%= render :partial => 'welcome/no_data' %>
-            <div id="pieChart"></div>
-          <% else %>
-            <div id="pieChart" style="height: 440px;width: 480px;"></div>
-          <% end %>
+          <div class="pie-chart-loading" style="width: 440px;height: 480px; text-align: center; padding: 150px 0; box-sizing: border-box;">加载中...</div>
+          <%= render :partial => 'welcome/no_data', locals: { style: 'display: none' } %>
+          <div id="pieChart"></div>
         </div>
       </div>
     </div>
@@ -158,7 +139,15 @@
             })
         });
 
-        $.get('<%= course_statistics_college_path(@school) %>');
+        $.get('<%= shixun_time_college_path(@school) %>', function(data){
+          $('.shixun-time').html("<span data-tip-down=\"所有学员的实训耗时之和\">" + data.shixun_time + "</span>天");
+        });
+        $.get('<%= shixun_report_count_college_path(@school) %>', function(data){
+          $('.shixun-report-count').html("<span>" + data.shixun_report_count + "</span>个");
+        });
+
+        // 教师排名
+        $.ajax({ url: '<%= teachers_college_path(@school) %>', method: 'GET', dataType: 'script' })
 
         $(".count_student_test a").click(function(){
             $(".count_student_test a").removeClass("active");
@@ -166,9 +155,20 @@
         });
 
         //初始化饼状图
-        InitPieChart();
+        $.get('<%= shixun_chart_data_college_path(@school) %>', function(data){
+          $('.pie-chart-loading').hide();
+          if (data.names.length > 0) {
+            $('.online_status .edu-tab-con-box').hide();
+            $('#pieChart').css('height', '440px').css('width', '480px')
+            InitPieChart(data.names, data.data);
+          } else {
+            $('.online_status .edu-tab-con-box').show();
+          }
+        });
+
+        $.get('<%= course_statistics_college_path(@school) %>');
     });
-    function InitPieChart(){
+    function InitPieChart(names, data){
         var Color = ['#49A9EE', '#FFD86E', '#98D87D', '#8996E6', '#F3857B', '#B97BF3','#4DE8B4','#F37BDB','#566EFF','#FF961A'];
 
         option = {
@@ -185,7 +185,7 @@
                 bottom: 20,
                 left: 20,
                 right:20,
-                data: <%= raw @shixun_tags_name %>
+                data: names
             },
             series : [
                 {
@@ -193,7 +193,7 @@
                     radius : '50%',
                     center: ['50%', '35%'],
                     selectedMode: 'single',
-                    data:<%= raw @shixun_tags_data.to_json %>,
+                    data: data,
                     itemStyle: {
                         emphasis: {
                             shadowBlur: 10,
diff --git a/app/views/colleges/teachers.js.erb b/app/views/colleges/teachers.js.erb
new file mode 100644
index 00000000..be51842c
--- /dev/null
+++ b/app/views/colleges/teachers.js.erb
@@ -0,0 +1 @@
+$('.teacher_ranking table tbody').html("<%= j(render :partial => 'colleges/teacher_ranking') %>")
\ No newline at end of file
diff --git a/app/views/competitions/_gq_second_code_competition.html.erb b/app/views/competitions/_gq_second_code_competition.html.erb
index 4e6ecdd5..7cba08a8 100644
--- a/app/views/competitions/_gq_second_code_competition.html.erb
+++ b/app/views/competitions/_gq_second_code_competition.html.erb
@@ -76,13 +76,13 @@
   extra_data = [
     {
       name: 'C++项目',
-      description: "本项目的paddle/fluid/operators/optimizers目录中包含了常见的优化器（如，Momentum，Adam等等）的c++实现。",
+      description: "飞桨（PaddlePaddle）由百度公司开发，是目前国内唯一功能完备的端到端开源深度学习平台，集深度学习训练和预测框架、模型库、工具组件、服务平台为一体，其兼具灵活和效率的开发机制、工业级应用效果的模型、超大规模并行深度学习能力、推理引擎一体化设计以及系统化的服务支持，致力于让深度学习技术的创新与应用更简单。<br/>本项目的paddle/fluid/operators/optimizers目录中包含了常见的优化器（如，Momentum，Adam等等）的c++实现。",
       task: '标注../fluid/operators/optimizers/目录下的所有代码文件',
       link_name: '官方，优化器',
       link_url: 'https://www.paddlepaddle.org.cn/documentation/docs/zh/1.5/api_guides/low_level/optimizer.html'
     },{
       name: 'Python项目',
-      description: "本项目的python/paddle/fluid/layers/nn.py中包含了神经网络中大量常见层和操作符的python实现，如fc、conv、gru等等。",
+      description: "飞桨（PaddlePaddle）由百度公司开发，是目前国内唯一功能完备的端到端开源深度学习平台，集深度学习训练和预测框架、模型库、工具组件、服务平台为一体，其兼具灵活和效率的开发机制、工业级应用效果的模型、超大规模并行深度学习能力、推理引擎一体化设计以及系统化的服务支持，致力于让深度学习技术的创新与应用更简单。<br/>本项目的python/paddle/fluid/layers/nn.py中包含了神经网络中大量常见层和操作符的python实现，如fc、conv、gru等等。",
       task: '标注../paddle/fluid/layers/nn.py代码文件',
       link_name: '官方，nn',
       link_url: 'https://www.paddlepaddle.org.cn/documentation/docs/zh/1.5/api_cn/layers_cn/nn_cn.html'
@@ -152,10 +152,6 @@
       </ul>
 
       <% if index == 4 %>
-        <p class="break_word font-18 challenge_describe" style="margin-top: 20px;">
-          飞桨（PaddlePaddle）由百度公司开发，是目前国内唯一功能完备的端到端开源深度学习平台，集深度学习训练和预测框架、模型库、工具组件、服务平台为一体，其兼具灵活和效率的开发机制、工业级应用效果的模型、超大规模并行深度学习能力、推理引擎一体化设计以及系统化的服务支持，致力于让深度学习技术的创新与应用更简单。
-        </p>
-
         <ul class="mt30 clearfix">
           <% first_section.competition_entries.offset(3).each_with_index do |entry, j| %>
             <% row_data = extra_data[j] %>
@@ -174,7 +170,7 @@
 
               <% if row_data.present? %>
                 <p class="challenge_b_d">项目简介</p>
-                <p class="break-word challenge_b_des" style="min-height: 80px;"><%= raw row_data[:description] %></p>
+                <p class="break-word challenge_b_des" style="min-height: 260px;"><%= raw row_data[:description] %></p>
                 <p class="challenge_b_d">标注任务</p>
                 <% if index ==2 %>
                   <p class="break-word challenge_b_des" style="color: #FC2F78;min-height: 60px"><%= row_data[:task] %></p>
diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index 1f66e525..d41ba5e4 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
-  <a href="/" style="margin: 10px 0; display: inline-block;">
+  <a href="/" style="margin: 10px 0; display: inline-block; margin-left: 25px;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:6px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:3px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">
diff --git a/app/views/ec_graduation_requirements/_requirement_item.html.erb b/app/views/ec_graduation_requirements/_requirement_item.html.erb
new file mode 100644
index 00000000..95aed9a9
--- /dev/null
+++ b/app/views/ec_graduation_requirements/_requirement_item.html.erb
@@ -0,0 +1,25 @@
+<li class="clearfix" id="require_<%= requirement.id %>">
+  <p class="clearfix df">
+    <span class="fl column-second"><%= requirement.position %></span>
+    <span class="fl flex1 font-bd lineh-20 pt3"><%= requirement.content %></span>
+    <span class="lineh-20 pt5">
+      <% if template_major %>
+        <% if requirement.position == @ec_graduation_requirements.count %>
+          <a href="javascript:void(0)" class="newAddSubentry" onclick="ShowPanel();" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green ml15"></i></a>
+        <% end %>
+      <a href="javascript:void(0)" onclick="delete_confirm_box_2('<%= ec_graduation_requirement_path(requirement) %>','是否确认删除？')" data-remote="true" data-method="DELETE" class="mr15 fl" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>
+        <a href="<%= edit_ec_graduation_requirement_path(requirement) %>" class="fl" data-tip-down="编辑" data-remote="true"><i class="iconfont icon-bianjidaibeijing color-green "></i></a>
+      <% end %>
+    </span>
+  </p>
+  <% if requirement.ec_graduation_subitems.present? %>
+    <div class="mt10">
+      <% requirement.ec_graduation_subitems.each do |sub| %>
+        <p class="clearfix df pr48 mb5 lineh-20">
+          <span class="fl column-second"><%= "#{requirement.position}-#{sub.position}" %></span>
+          <span class="fl flex1"><%= sub.content %></span>
+        </p>
+      <% end %>
+    </div>
+  <% end %>
+</li>
diff --git a/app/views/ec_graduation_requirements/_requirement_lists.html.erb b/app/views/ec_graduation_requirements/_requirement_lists.html.erb
index 623e910a..f0ca8110 100644
--- a/app/views/ec_graduation_requirements/_requirement_lists.html.erb
+++ b/app/views/ec_graduation_requirements/_requirement_lists.html.erb
@@ -1,37 +1,13 @@
 <% if @ec_graduation_requirements.present? && @ec_graduation_requirements.count>0 %>
-<% @ec_graduation_requirements.each_with_index do |requirement, index| %>
-    <li class="clearfix" id="require_<%= requirement.id %>">
-    <p class="clearfix df">
-      <span class="fl column-second"><%= requirement.position %></span>
-      <span class="fl flex1 font-bd lineh-20 pt3"><%= requirement.content %></span>
-      <span class="lineh-20 pt5">
-        <% if @template_major %>
-          <% if index+1 == @ec_graduation_requirements.count %>
-            <a href="javascript:void(0)" class="newAddSubentry" onclick="ShowPanel();" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green ml15"></i></a>
-          <% end %>
-          <a href="javascript:void(0)" onclick="delete_confirm_box_2('<%= ec_graduation_requirement_path(requirement) %>','是否确认删除？')" data-remote="true" data-method="DELETE" class="mr15 fl" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>
-          <a href="<%= edit_ec_graduation_requirement_path(requirement) %>" class="fl" data-tip-down="编辑" data-remote="true"><i class="iconfont icon-bianjidaibeijing color-green "></i></a>
-        <% end %>
-      </span>
-    </p>
-    <% if requirement.ec_graduation_subitems.present? %>
-      <div class="mt10">
-        <% requirement.ec_graduation_subitems.each_with_index do |sub, index| %>
-            <p class="clearfix df pr48 mb5 lineh-20">
-              <span class="fl column-second"><%= "#{requirement.position}-#{sub.position}" %></span>
-              <span class="fl flex1"><%= sub.content %></span>
-            </p>
-        <% end %>
-      </div>
-    <% end %>
-  </li>
-<% end %>
+  <% @ec_graduation_requirements.each_with_index do |requirement| %>
+      <%= render :partial => "ec_graduation_requirements/requirement_item", :locals => {:requirement => requirement, :template_major => @template_major} %>
+  <% end %>
 <% elsif @template_major %>
     <form id="form_data_for_requirements">
       <div class="clearfix ml30 mr30 pt20 pb20 bor-top-greyE" id="requirementNew">
         <p class="df mb20"><input type="hidden" name="year_id" value="<%= @year.id %>">
           <span class="column-second lineh-40" id="sequenceNum">1</span>
-          <input type="text" class="input-flex-40 mr20" name="requirement">
+          <textarea type="text" class="input-flex-40 mr20" name="requirement"></textarea>
           <span class="lineh-40">
             <a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i>
             </a>
@@ -40,14 +16,14 @@
         <p class="df mb10">
           <span class="column-second lineh-40">
             <span class="color-red">* </span><span class="sequence">1-1</span></span>
-          <input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40">
+          <textarea type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"></textarea>
           <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i>
           </a>
         </span>
         </p>
         <p class="df mb10">
           <span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">1-2</span></span>
-          <input type="text" class="input-flex-40 mr20" name="subitems[]">
+          <textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea>
           <span class="lineh-40">
             <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i>
             </a>
@@ -56,7 +32,7 @@
         <p class="df mb10">
           <span class="column-second lineh-40">
             <span class="color-red">* </span><span class="sequence">1-3</span></span>
-          <input type="text" class="input-flex-40 mr20" name="subitems[]">
+          <textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea>
           <span class="lineh-40">
             <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i>
             </a>
diff --git a/app/views/ec_graduation_requirements/edit.js.erb b/app/views/ec_graduation_requirements/edit.js.erb
index fab4ee00..e4fd4a34 100644
--- a/app/views/ec_graduation_requirements/edit.js.erb
+++ b/app/views/ec_graduation_requirements/edit.js.erb
@@ -1,22 +1,22 @@
 if($("#form_data_for_requirements").length==0){
-var html_begin = "<form id=\"form_data_for_requirements\"><div class=\"clearfix mt20\" id=\"requirementNew\">"
+var html_begin = "<form id=\"form_data_for_requirements\"><li class=\"clearfix\"><div class=\"clearfix mt20\" id=\"requirementNew\">"
 
 var html_requirement = '<p class="df mb20">' +
     '<span class="column-second lineh-40" id="sequenceNum"><%= @ec_graduation_requirement.position %></span>' +
-    '<input type="text" class="input-flex-40 mr20" name="requirement" value="<%= @ec_graduation_requirement.content %>">' +
+    '<textarea type="text" class="input-flex-40 mr20" name="requirement"><%= @ec_graduation_requirement.content %></textarea>' +
     '<span class="lineh-40">' +
     '<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>' +
     '</span></p>'
 
 var html_subitems = "";
 <% @ec_graduation_requirement.ec_graduation_subitems.each do |sub| %>
-  html_subitems += '<p class="df mb10">' +
+  html_subitems += '<p id="edit_subitem_<%= sub.id %>" class="df mb10">' +
       '<span class="column-second lineh-40">' +
       '<span class="color-red">* </span><span class="sequence"><%= "#{@ec_graduation_requirement.position}-#{sub.position}" %></span>' +
       '</span>' +
-      '<input type="text" class="input-flex-40 mr20" name="subitems[]" value="<%= sub.content %>">' +
+      '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"><%= sub.content %></textarea>' +
       '<span class="lineh-40">' +
-      '<a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>' +
+      '<a href="javascript:void(0)" class="fl" data-tip-down="删除" onclick="delete_confirm_box_2('+"'<%= ec_graduation_subitem_path(sub) %>'"+', \'确定要删除吗\')"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>' +
       '</span>' +
       '</p>';
 <% end %>
@@ -26,16 +26,22 @@ var html_submit = "<p class=\"edu-txt-right clearfix pr35\" id=\"AddPanelOperati
     "<a href=\"javascript:void(0)\" class=\"defalutCancelbtn fr mr20\" onclick=\"removePanel('require_<%= @ec_graduation_requirement.id %>');\">取消</a>" +
     "</p>"
 
-var html_end = "</div></form>"
+var html_end = "</div></li></form>"
 
 var html = html_begin + html_requirement + html_subitems + html_submit + html_end
 
 console.log("require_<%= @ec_graduation_requirement.id %>");
-$("body").append('<div style="display: none" id="editFormContent">'+$("#require_<%= @ec_graduation_requirement.id %>").html()+'</div>');
-$("#require_<%= @ec_graduation_requirement.id %>").empty().append(html);
+//$("body").append('<div style="display: none" id="editFormContent">'+$("#require_<%= @ec_graduation_requirement.id %>").html()+'</div>');
+$("#require_<%= @ec_graduation_requirement.id %>").hide();
+$(html).insertAfter($("#require_<%= @ec_graduation_requirement.id %>"));
 $("#requirementNew").find("input[name='requirement']").focus();
 }else{
     $("#edit_add_notice").removeClass("none").html("请先保存!");
 }
+var subInputs=document.getElementsByName("subitems[]");
+for (var i = 0; i < subInputs.length; i++) {
+    autoTextarea(subInputs[i], 0, 140); 
+}
+autoTextarea(document.getElementsByName("requirement")[0], 0, 140); 
 
 
diff --git a/app/views/ec_graduation_subitems/destroy.js.erb b/app/views/ec_graduation_subitems/destroy.js.erb
new file mode 100644
index 00000000..b5662344
--- /dev/null
+++ b/app/views/ec_graduation_subitems/destroy.js.erb
@@ -0,0 +1,9 @@
+$("#edit_subitem_<%= @ec_graduation_subitem.id %>").remove();
+var num=$("#sequenceNum").html();
+var sub=$(".sequence");
+for(var i=0;i<parseInt(sub.length);i++){
+    $(sub).eq(i).html(num+"-"+(i+1));
+}
+LeaveTitle($("[data-tip-down]"),$(".data-tip-down"));
+$("#require_<%= @ec_graduation_requirement.id %>").replaceWith("<%= j(render :partial => "ec_graduation_requirements/requirement_item",
+:locals => {:requirement => @ec_graduation_requirement, :template_major => true}) %>");
\ No newline at end of file
diff --git a/app/views/ec_years/graduation_requirement.html.erb b/app/views/ec_years/graduation_requirement.html.erb
index 76833188..990f0c77 100644
--- a/app/views/ec_years/graduation_requirement.html.erb
+++ b/app/views/ec_years/graduation_requirement.html.erb
@@ -1,9 +1,9 @@
 <script id="t:add-Require-Item" type="text/html">
   <p class="df mb10">
     <span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">1-1</span></span>
-    <input type="text" class="input-flex-40 mr20" name="subitems[]"/>
+    <textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea>
     <span class="lineh-40">
-        <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>
+      <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>
     </span>
   </p>
 </script>
@@ -55,7 +55,13 @@
         for(var i=0;i<sub.length;i++){
             $(sub).eq(i).html(num+"-"+(i+1));
         }
-    })
+
+        var subInputs=document.getElementsByName("subitems[]");
+        for (var i = 0; i < subInputs.length; i++) {
+            autoTextarea(subInputs[i], 0, 140);
+        }
+        autoTextarea(document.getElementsByName("requirement")[0], 0, 140);
+    });
       //删除子项
     $(".subDel").live('click', function () {
         del_item=$(this);
@@ -69,7 +75,7 @@
                     '<a href="javascript:void(0)" class="task-btn task-btn-orange fr" onclick="deleteSubItem(del_item);hideModal();">确定</a></div></div>'
             pop_box_new(html, 500, 205);
         }
-    })
+    });
 
       $("input[name='subitems[]'],input[name='requirement']").live("input",function(){
           $(this).removeClass("bor-red");
@@ -101,18 +107,18 @@
                   '<p class="df mb20">' +
                   '<input type="hidden" name="year_id" value="<%= @year.id %>">' +
                   '<span class="column-second lineh-40" id="sequenceNum">'+liNum+'</span>'+
-                  '<input type="text" class="input-flex-40 mr20" name="requirement"/>'+
+                  '<textarea type="text" class="input-flex-40 mr20" name="requirement"></textarea>'+
                   '<span class="lineh-40">'+
                   '<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>'+
                   '</span></p>'+
                   '<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-1</span></span>'+
-                  '<input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
+                  '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
                   '<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+
                   '<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-2</span></span>'+
-                  '<input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
+                  '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
                   '<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+
                   '<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-3</span></span>'+
-                  '<input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
+                  '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
                   '<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+
                   '<p class="edu-txt-right clearfix pr35" id="AddPanelOperation"><span class="color-red mt3 fl ml60 none" id="option_Item_notice">内容不能为空</span>'+
                   '<a href="javascript:void(0)" class="defalutSubmitbtn fr" id="submit_sure" onclick="submit_data_for_requirement(\'post\', \'<%= ec_graduation_requirements_path %>\')">保存</a>'+
@@ -121,6 +127,11 @@
                   '</form>';
           $(".ListTableLine").append(html);
           $("#requirementNew").find("input[name='requirement']").focus();
+          var subInputs=document.getElementsByName("subitems[]");
+          for (var i = 0; i < subInputs.length; i++) {
+            autoTextarea(subInputs[i], 0, 140); 
+          }
+          autoTextarea(document.getElementsByName("requirement")[0], 0, 140); 
           flagAdd=false;
       }
 
@@ -128,8 +139,8 @@
   //取消添加
   function removePanel(value){
       if(value!=undefined){
-        $("#"+value).html($("#editFormContent").html());
-        $("#editFormContent").remove();
+        $("#"+value).show();
+        // $("#editFormContent").remove();
       }
       $("#form_data_for_requirements").remove();
       flagAdd=true;
@@ -141,9 +152,9 @@
       console.log("#########type:"+ type)
       console.log("#########url:"+ url)
 
-      var requirement = $("input[name='requirement']").val();
+      var requirement = $("textarea[name='requirement']").val();
       if(requirement.trim() == ""){
-          $("input[name='requirement']").addClass("bor-red");
+          $("textarea[name='requirement']").addClass("bor-red");
           $("#option_Item_notice").removeClass("none").html("内容不能为空");
           return;
       }
@@ -170,7 +181,7 @@
               }
           })
           console.log(in_vain);
-          $("input[name='requirement']").removeClass("bor-red");
+          $("textarea[name='requirement']").removeClass("bor-red");
           $("input[name='subitems[]']").removeClass("bor-red");
           $("#option_Item_notice").addClass("none");
       }
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 66fc345d..d29a3893 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,9 +1,9 @@
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl ml25 mr60"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr30 ml25 mt10"), home_path %>
 <div class="educontents fl">
 
   <div class="head-nav pr">
     <ul id="header-nav">
-      <li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
+<!--      <li class="<%#= params[:controller] == "welcome" ? 'active' : '' %>"><%#= link_to "首页", home_path %></li>-->
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
       <!-- 精选实训 -->
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 2e12a992..bf00c8bc 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,11 +1,11 @@
 
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl ml25 mr60 "), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr30 ml25 mt10"), home_path %>
 
 <div class="educontents fl">
 
   <div class="head-nav pr">
     <ul id="header-nav">
-      <li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
+<!--      <li class="<%#= params[:controller] == "welcome" ? 'active' : '' %>"><%#= link_to "首页", home_path %></li>-->
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
 
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 7baa3d3b..e0834667 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -23,7 +23,7 @@
         <div class="newHeader" id="nHeader">
           <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
         <div class="cl"></div>
-        <div class="con_top pt60">
+        <div class="con_top">
             <div id="content" class="sy_contanier">
                 <%= render :partial => 'layouts/base_project_top' %>
             </div>
diff --git a/app/views/managements/_myshixun_list.html.erb b/app/views/managements/_myshixun_list.html.erb
index bfcf3dc1..3d68f26f 100644
--- a/app/views/managements/_myshixun_list.html.erb
+++ b/app/views/managements/_myshixun_list.html.erb
@@ -13,7 +13,7 @@
   <tbody>
   <% @myshixuns.each do |myshixun| %>
       <% edu_giturl = "...." %>
-      <% gitlab_giturl = @g.project(myshixun.gpid).try(:http_url_to_repo) %>
+      <% gitlab_giturl = "https://git.educoder.net/#{myshixun.repo_name}.git" %>
       <tr>
         <td><%= myshixun.id %></td>
         <td class="edu-txt-left"><span><%= link_to myshixun.shixun.try(:name), myshixun_path(myshixun), :target => "_blank", :title => myshixun.shixun.try(:name) %></span></td>
diff --git a/app/views/managements/video_applies/_video_apply_list.html.erb b/app/views/managements/video_applies/_video_apply_list.html.erb
index d3cfc50d..b79cabc4 100644
--- a/app/views/managements/video_applies/_video_apply_list.html.erb
+++ b/app/views/managements/video_applies/_video_apply_list.html.erb
@@ -22,6 +22,7 @@
               </li>
               <li class="clearfix mb10">
                 <span><%= video.title %></span>
+                <span style="margin-left: 20px;color: grey"><%= number_to_human_size(video.filesize) %></span>
               </li>
 
               <% if apply.pending? %>
@@ -58,20 +59,22 @@
 
 <script type="text/javascript">
     function video_authorization_gree(id){
+      if(window.confirm("确认同意该视频发布吗？")){
         $.ajax({
-            url: '/managements/video_applies/' + id + '/agree',
-            type: 'post',
-            success: function(data){
-              if (data && data.status != -1) {
-                $('#authentication_list .admin-con-box.apply-' + id).remove();
+          url: '/managements/video_applies/' + id + '/agree',
+          type: 'post',
+          success: function(data){
+            if (data && data.status != -1) {
+              $('#authentication_list .admin-con-box.apply-' + id).remove();
 
-                if($('#authentication_list .admin-con-box').length == 0){
-                  location.reload();
-                }
-              } else {
-                alert(data.message);
+              if($('#authentication_list .admin-con-box').length == 0){
+                location.reload();
               }
+            } else {
+              alert(data.message);
             }
+          }
         })
+      }
     }
 </script>
\ No newline at end of file
diff --git a/app/views/welcome/_no_data.html.erb b/app/views/welcome/_no_data.html.erb
index e3576008..a37aa535 100644
--- a/app/views/welcome/_no_data.html.erb
+++ b/app/views/welcome/_no_data.html.erb
@@ -1,4 +1,5 @@
-<div class="edu-tab-con-box clearfix edu-txt-center">
+<% style ||= '' %>
+<div class="edu-tab-con-box clearfix edu-txt-center" style="<%= style %>">
   <img class="edu-nodata-img mb20" src="/images/educoder/nodata.png"/>
   <p class="edu-nodata-p mb20">暂无数据哦~</p>
 </div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 22ea0bc4..b245e85c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1008,6 +1008,11 @@ RedmineApp::Application.routes.draw do ## oauth相关
       get 'student_eval'
       get 'home'
       get 'get_home_data'
+      get 'shixun_time'
+      get 'shixun_report_count'
+      get 'teachers'
+      get 'shixun_chart_data'
+      get 'student_hot_evaluations'
     end
 
     collection do
diff --git a/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb b/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb
deleted file mode 100644
index 0b054e3c..00000000
--- a/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddExecTimeToEvaluateRecords < ActiveRecord::Migration
-  def change
-    add_column :evaluate_records, :exec_time, :integer
-  end
-end
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index bfa0678c..c1a9da91 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -86,10 +86,11 @@ task :add_test_users => :environment do
 
 
 
-  (1..1000).each do |i|
+  (1..2000).each do |i|
+    puts i
 
     no = sprintf("%04d", i)
-    phone = "5160731#{no}"
+    phone = "6160731#{no}"
 
     us = UsersService.new
     user = us.register phone: phone, password: 'edu12345678'
@@ -100,7 +101,7 @@ task :add_test_users => :environment do
         平夏,凌旋,孤丝,怜寒,向萍,凡松,青丝,翠安,如天,凌雪,绮菱,代云,南莲,寻南,春文,香薇,冬灵,凌珍,采绿,天春,沛文,
         紫槐,幻柏,采文,春梅,雪旋,盼海,映梦,安雁,映容,凝阳,访风,天亦,平绿,盼香,觅风,小霜,雪萍,半雪,山柳,谷雪,靖易,
         白薇,梦菡,飞绿,如波,又晴,友易,香菱,冬亦,问雁,妙春,海冬,半安,平春,幼柏,秋灵,凝芙,念烟,白山,从灵,尔芙,迎蓉,
-        念寒,翠绿,翠芙,靖儿,妙柏,千凝,小珍,天巧。妙旋,雪枫,夏菡,元绿,痴灵,绮琴,雨双,听枫,觅荷,凡之,晓凡,雅彤,香薇,
+        念寒,翠绿,翠芙,靖儿,妙柏,千凝,小珍,天巧,妙旋,雪枫,夏菡,元绿,痴灵,绮琴,雨双,听枫,觅荷,凡之,晓凡,雅彤,香薇,
         孤风,从安,绮彤,之玉,雨珍,幻丝,代梅,香波,青亦,元菱,海瑶,飞槐,听露,梦岚,幻竹,新冬,盼翠,谷云".split(",")
 
     lastname = l[rand(l.length)] + f[rand(f.length)]
@@ -109,7 +110,7 @@ task :add_test_users => :environment do
         lastname: lastname,
         nickname: '',
         sex: 0,
-        mail: "00educoder#{no}@qq.com",
+        mail: "stueducoder#{no}@qq.com",
         identity: 1,
         te_technical_title: 0,
         pro_technical_title: 0,
diff --git a/public/images/educoder/headNavLogo.png b/public/images/educoder/headNavLogo.png
index 436d2349..8df93d54 100644
Binary files a/public/images/educoder/headNavLogo.png and b/public/images/educoder/headNavLogo.png differ
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 0275558c..ba201074 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -502,8 +502,11 @@ function imageAddInputFiles(inputEl){
     addInputFiles(inputEl)
 }
 
-function addInputFiles(inputEl,btnId) {
+function addInputFiles(inputEl,btnId) { 
     // var clearedFileInput = $(inputEl).clone().val('');
+    if($("#ajax-indicator").length>0){
+        $("#ajax-indicator").show();
+    }
     if (inputEl.files) {
 //        if(inputEl.files.length >= 5){
 //            alert('一次选择的文件不能超过5个')
@@ -527,6 +530,9 @@ function addInputFiles(inputEl,btnId) {
             if (count <= 0) count = 1;
             $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
         }
+        if($("#ajax-indicator").length>0){
+            $("#ajax-indicator").hide();
+        }
     }
 
     //clearedFileInput.insertAfter('#attachments_fields');
@@ -605,6 +611,9 @@ function uploadAndAttachFiles(files, inputEl,btnId) {
             addFile(inputEl, this, true,btnId);
         });
     }
+    if($("#ajax-indicator").length>0){
+        $("#ajax-indicator").hide();
+    }
 }
 
 function uploadAndAttachFiles_board(files, inputEl, id,btnId) {
diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index 76c02b44..2442031d 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -45,21 +45,21 @@ function nh_check_field(params){
         if(params.content.isEmpty()){
             result=false;
         }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-            params.textarea.html(params.content.html());
-            params.content.sync();
-            if(params.content.isEmpty()){
-                params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-                params.submit_btn.one('click', function(){
-                    params.form.submit();
-                });
-            }else{
-                params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
-            }
-            params.contentmsg.show();
-        }
+        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        //     params.textarea.html(params.content.html());
+        //     params.content.sync();
+        //     if(params.content.isEmpty()){
+        //         params.contentmsg.html('内容不能为空');
+        //         params.contentmsg.css({color:'#ff0000'});
+        //         params.submit_btn.one('click', function(){
+        //             params.form.submit();
+        //         });
+        //     }else{
+        //         params.contentmsg.html('填写正确');
+        //         params.contentmsg.css({color:'#008000'});
+        //     }
+        //     params.contentmsg.show();
+        // }
     }
     return result;
 }
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 4c63d169..3e44c5f0 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -80,18 +80,18 @@ function nh_check_field(params){
         if(params.content.isEmpty()){
             result=false;
         }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-            params.textarea.html(params.content.html());
-            params.content.sync();
-            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
-                params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-            }else{
-                params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
-            }
-            params.contentmsg.show();
-        }
+        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        //     params.textarea.html(params.content.html());
+        //     params.content.sync();
+        //     if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+        //         params.contentmsg.html('内容不能为空');
+        //         params.contentmsg.css({color:'#ff0000'});
+        //     }else{
+        //         params.contentmsg.html('填写正确');
+        //         params.contentmsg.css({color:'#008000'});
+        //     }
+        //     params.contentmsg.show();
+        // }
     }
     return result;
 }
diff --git a/public/react/src/index.js b/public/react/src/index.js
index 73bc2829..98130846 100644
--- a/public/react/src/index.js
+++ b/public/react/src/index.js
@@ -41,7 +41,7 @@ var proxy = "http://localhost:3000"
 //  proxy = "http://testbdweb.trustie.net"
 //    proxy = "http://testbdweb.educoder.net"
    // proxy ="http://192.168.2.63:3000"
-    proxy='http://localhost:3000'
+    proxy='http://47.96.87.25:48080'
 const requestMap={};
 // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
 // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/modules/ShCommunity/CommunityHome.js b/public/react/src/modules/ShCommunity/CommunityHome.js
index d1f51fad..dc86f23a 100644
--- a/public/react/src/modules/ShCommunity/CommunityHome.js
+++ b/public/react/src/modules/ShCommunity/CommunityHome.js
@@ -66,7 +66,12 @@ class CommunityHome extends Component {
         }
         let xhslist=["路由交换","H3CNA","H3CNE","H3CSE-Routing&Switching","H3CTE","","","H3CNE-SDN","","H3CIE-Routing&SWitching"]
 	    return (
-            <div className="edu-con-bg01" style={{paddingTop: '50px',paddingBottom: '231px'}}>
+            <div className="edu-con-bg01 communityHome" style={{paddingTop: '60px',paddingBottom: '231px'}}>
+                <style>{`
+                    .communityHome .ant-carousel .slick-slide {
+                        height: 500px;
+                    }
+                `}</style>
                 <div className="Community_Home_Top" style={{width:BrowserType===true?'100%':'100.9%'}}>
 
                        { BannersUrl===""?"":
diff --git a/public/react/src/modules/ec/css/ecCourseEvaluations.css b/public/react/src/modules/ec/css/ecCourseEvaluations.css
index 11ee74bb..5931e9f8 100644
--- a/public/react/src/modules/ec/css/ecCourseEvaluations.css
+++ b/public/react/src/modules/ec/css/ecCourseEvaluations.css
@@ -233,7 +233,7 @@ input{
 
 .newSystem .newtarget_scoreclass{
   padding: 10px 0px !important;
-  margin: 0px 30px !important;
+  margin: 0px 20px !important;
 }
 
 .newSystem .newtarget_target{
@@ -558,4 +558,8 @@ a.TrainingLecturer:hover{
 
 .mt60{
   margin-top:60px;
+}
+
+.SystemParameters{
+    height:auto;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
index f76e065d..002bb0ab 100644
--- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
+++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
@@ -556,7 +556,7 @@ class EcCompletionCalculation extends Component {
 
                    { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
 
-                   {
+                    {
                         graduation_list.length===0&&Spintype===false?
                         <li className={'clearfix newtarget_scoreclass marlr19'}  style={{minWidth:'1137px'}}>
                         {/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
@@ -575,7 +575,7 @@ class EcCompletionCalculation extends Component {
 
                             if(key===0){
                                 return(
-                                    <p key={key} className="clearfix lipadding20im" style={{minWidth: 228*ec_course_targets_count>1300?168.6*(ec_course_targets_count+3):1200+"px"}}>
+                                    <p key={key} className="clearfix lipadding20im" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
                                         <span className="column-1 color-666 mr16">毕业要求</span>
                                         <span className="nowrap329">{item.ec_subitem_content}</span>
                                         <span className="column-1 operationright color-666">达成结果</span>
@@ -595,7 +595,7 @@ class EcCompletionCalculation extends Component {
                             Spintype===false?graduation_list.map((item,key)=>{
 
                                 return(
-                                    <li className={key+1===target_list.length?"clearfix newtarget_target marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: 227.4*ec_course_targets_count>1300?162*(ec_course_targets_count+3):1137+"px"}}>
+                                    <li className={key+1===target_list.length?"clearfix newtarget_target marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}>
                                         {/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
                                         <span className="column-1 color-05101A ec_graduation_name">{key+1}</span>
                                         <span className="column-500 color-05101A" data-tip-down={item.content}>{item.ec_subitem_content}</span>
@@ -621,7 +621,7 @@ class EcCompletionCalculation extends Component {
 
                     <div className="ListTableLine newSystem mb20" id="school_major_list">
 
-                        <p  className="clearfix padding10im" style={{width: 113*(total_rate_data+4)>1200?(113*(total_rate_data+4.5))+63:1200+"px"}}>
+                        <p  className="clearfix padding10im" style={{width: total_rate_data > 5 ? (180 * total_rate_data+226+16) : 1200+"px"}}>
                             {/*<span className="column-1 color-666 mr16 width86">序号</span>*/}
                             <span className="column-1 color-666 mr16 width86">课程目标</span>
                             {/*<span className="column-1 color-666 mr16">姓名</span>*/}
@@ -651,7 +651,7 @@ class EcCompletionCalculation extends Component {
                         }
                           { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
                        {
-                            Spintype===false? <li className={"clearfix newtarget_scoreclass lipadding10im margin64px"} style={{width: 113*(total_rate_data+4)>1200?(113*(total_rate_data+4.5))+63:1200+"px"}}>
+                            Spintype===false? <li className={"clearfix newtarget_scoreclass lipadding10im margin64px"} style={{width: total_rate_data > 5 ? (180 * total_rate_data+226+16) : 1200 + "px"}}>
                             <span className="column-1 color-05101A mr16 width86">占比</span>
                             {/*colorTransparent*/}
                             {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}
diff --git a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
index 5a32d363..8f091f7b 100644
--- a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
+++ b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
@@ -54,7 +54,9 @@ class ecCourseEvaluations extends Component {
             checkevalue:undefined,
             isreload:false,
             newModallist:false,
-            isreloads:false
+            isreloads:false,
+            isSpin:false,
+            listSpin:false
         }
     }
     componentWillMount(){
@@ -90,7 +92,8 @@ class ecCourseEvaluations extends Component {
         let newec_course_id=this.props.match.params.ec_course_id;
 
         this.setState({
-            ec_course_id:newec_course_id
+            ec_course_id:newec_course_id,
+            listSpin:true
         })
         const url = `/ec_course_evaluations?ec_course_id=`+newec_course_id;
         axios.get(url, {
@@ -110,7 +113,8 @@ class ecCourseEvaluations extends Component {
                         course_url:response.data.course_url,
                         ec_course_id:response.data.ec_course_id,
                         ec_year_id:response.data.ec_year_id,
-                        ecmanager: response.data.is_manager
+                        ecmanager: response.data.is_manager,
+                        listSpin:false
                     })
                 }
             }).catch(function (error) {
@@ -564,6 +568,7 @@ class ecCourseEvaluations extends Component {
 
     }
     sync_course_data=()=>{
+        this.setState({listSpin:true})
         let ec_course_id=this.props.match.params.ec_course_id;
         let Url ='/ec_course_achievement_methods/sync_course_data';
         axios.post(Url, {
@@ -577,14 +582,16 @@ class ecCourseEvaluations extends Component {
                 this.setState({
                     // titlemessage: response.data.message+"(支撑关系变更)",
                     Modallist: response.data.message,
-                    Modallisttype:true
+                    Modallisttype:true,
+                    listSpin:false
                 })
                 this.UpdateEvaluations();
             }else if(response.data.status===-1){
                 this.setState({
                     // titlemessage: response.data.message+"(支撑关系变更)",
                     Modallist: response.data.message,
-                    Modallisttype:true
+                    Modallisttype:true,
+                    listSpin:false
                 })
 
             }
@@ -595,6 +602,7 @@ class ecCourseEvaluations extends Component {
     }
 
     uploadfile=(file)=>{
+        this.setState({listSpin:true})
         let Url =`/ec_course_evaluations/`+file.data+`/import_score`;
         const form = new FormData();
         form.append('file', file.file);
@@ -607,7 +615,8 @@ class ecCourseEvaluations extends Component {
                     Modallist: '已成功导入'+response.data.count+"条数据",
                     Modallisttype:true,
                     isreload:true,
-                    isreloads:true
+                    isreloads:true,
+                    listSpin:false
                 })
             }else if(response.data.status===0){
                 // message.warning(response.data.message);
@@ -616,7 +625,8 @@ class ecCourseEvaluations extends Component {
                     Modallist:response.data.message,
                     Modallisttype:true,
                     isreload:false,
-                    isreloads:false
+                    isreloads:false,
+                    listSpin:false
                 })
             }
         }).catch((error) => {
@@ -656,6 +666,7 @@ class ecCourseEvaluations extends Component {
     saveassclasslist=()=>{
         // 列表清空
         //搜索框清空
+        this.setState({isSpin:true});
         let{checkevalue}=this.state;
 
         let ec_course_id=this.props.match.params.ec_course_id;
@@ -672,7 +683,8 @@ class ecCourseEvaluations extends Component {
                 this.setState({
                     Modallist: "关联失败",
                     Modallisttype:true,
-                    isreload:false
+                    isreload:false,
+                    isSpin:false
                 })
             }else if(response.data.status===0)[
                 this.setState({
@@ -682,7 +694,8 @@ class ecCourseEvaluations extends Component {
                     assclassvalue:"",
                     Modallist: "关联成功",
                     Modallisttype:true,
-                    isreload:true
+                    isreload:true,
+                    isSpin:false
                 })
             ]
  
@@ -766,6 +779,7 @@ class ecCourseEvaluations extends Component {
 
         return (
             <div className="newMain clearfix">
+                <Spin delay={500} indicator={<Icon type="loading" style={{ fontSize: 30 }}></Icon>}  spinning={this.state.isSpin}>
                 <Modal
                     title={titlemessage}
                     // visible={modeldelet===true&&listid===list.id?true:false}
@@ -896,7 +910,7 @@ class ecCourseEvaluations extends Component {
 
                         </p>
 
-                        <div style={{padding: '20px 21px 0px 21px',height:'40px'}} id="SystemParameters" className={"SystemParameters"}>
+                        <div style={{padding: '20px 21px 0px 21px'}} id="SystemParameters" className={"SystemParameters"}>
                             {/*<span className="fl SystemParameters">课程考核标准</span>*/}
                             {/*<span className="fl SystemParameters" style={{display:course_name===null||course_name===undefined?"block":"none"}}>（请在完成配置后，使用各项成绩
                         模板，将本学年所有参与的学生成绩数据导入系统）</span>*/}
@@ -930,308 +944,305 @@ class ecCourseEvaluations extends Component {
                         </div>
 
                     </div>
+                    
+                        <div className="ListTableLine newSystem" id="school_major_list" >
+                            <p className="clearfix Coursetitle" style={{width:"1200px"}}>
+                                <span className="column-1 color-666" style={{width: "70px"}}>项</span>
+                                <span className="column-1 color-666" style={{width: "72px"}}>名称</span>
+                                <span className="column-1 ml15 color-666" style={{width: "90px"}}>考核次数</span>
+                                <span className="column-1 ml15 color-666" style={{width: "90px"}}>支撑关系</span>
+                                <span className="column-1 ml30 color-666" style={{width: "90px"}}>考核分项名称</span>
+                                <span className="column-1 operationright color-666"
+                                style={{width: '34px'}}
+                                >
+                                {/* 操作 */}
+                                {ecmanager===false?"":
+                                <a className="mr20 newAddSubentry" data-tip-down="添加">
+                                    <i className="iconfont icon-tianjiafangda color-green"
+                                    //  style={{display:savetype==='add'||savetype==='edit'?'none':'inline-block'}}
+                                    onClick={this.AddCourseEvaluations}></i>
+                                </a>}
+                            </span>
+
+                        <span className="column-2 operationright color-666"  style={{width: "126px"}}>
+                                成绩导入状态
+                            </span>
+                            <span className="column-1 operationright color-666" style={{textAlign: 'center',width: "119px"}}>
+                                成绩来源
+                            </span>
+                            <span className="column-2 operationright color-666" style={{width: "127px"}}>
+                            平均成绩导入模板
+                            </span>
+                            <span className="column-2 operationright color-666" style={{width: "152px"}}>
+                            明细成绩导入模板
+                            </span>
+                            </p>
+                            <Spin delay={500} className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} />} spinning={this.state.listSpin}>
+                            <div style={{minHeight:'560px'}}>
+                            {
+                                ec_course_evaluation_lists && ec_course_evaluation_lists.map((list,m)=>{
+
+                                    return(
+                                        <li className={m===ec_course_evaluation_lists.length-1?savetype==='add'?"bordereaeaeas clearfix":'bordereaeaea clearfix':"clearfix"} key={m}
+                                        style={{width:"1140px",position:'relative'}}
+                                        >
+                                            <span className="column-1" style={{marginLeft: '6px',display:parseInt(idkey)===m?'none ':'block',width: "70px"}}>{m+1}</span>
+                                            <span className="column-1" style={{marginLeft: '-4px',display:parseInt(idkey)===m?'none ':'block',width: "72px"}}>
+                                                <div>{list.name}</div>
+                                            </span>
+                                            <span className="column-1" style={{marginLeft: '37px',display:parseInt(idkey)===m?'none ':'block',width: "90px"}}>
+                                                <div>{list.evluation_count}</div>
+                                            </span>
+                                            <span className="column-1" style={{marginLeft: '-8px',display:parseInt(idkey)===m?'none ':'block',width: "90px"}}>
+                                                <div>{list.status===1?"总成绩支撑":list.status===2?"分项成绩支撑":list.status}</div>
+                                            </span>
+
+                                            <span className="column-1 color99" 
+                                            style={{marginLeft: '31px',display:parseInt(idkey)===m?'none ':'block',width: " 207px"}} >
+                                            {
+                                                list.subitems.map((listchild,mk)=>{
+                                                    return (
+                                                        <Tooltip placement="bottomLeft" title={
+                                                            listchild.name
+                                                            }>
+                                                                <div key={mk} className='listchildboxs'>{listchild.name}
+                                                            </div>
+                                                        </Tooltip>
+                                                    )
+                                                })
 
-                    <div className="ListTableLine newSystem" id="school_major_list" >
-
-                        <p className="clearfix Coursetitle" style={{width:"1200px"}}>
-                            <span className="column-1 color-666" style={{width: "70px"}}>项</span>
-                            <span className="column-1 color-666" style={{width: "72px"}}>名称</span>
-                            <span className="column-1 ml15 color-666" style={{width: "90px"}}>考核次数</span>
-                            <span className="column-1 ml15 color-666" style={{width: "90px"}}>支撑关系</span>
-                            <span className="column-1 ml30 color-666" style={{width: "90px"}}>考核分项名称</span>
-                            <span className="column-1 operationright color-666"
-                             style={{width: '34px'}}
-                            >
-                            {/* 操作 */}
-                            {ecmanager===false?"":
-                            <a className="mr20 newAddSubentry" data-tip-down="添加">
-                                <i className="iconfont icon-tianjiafangda color-green"
-                                //  style={{display:savetype==='add'||savetype==='edit'?'none':'inline-block'}}
-                                onClick={this.AddCourseEvaluations}></i>
-                            </a>}
-                        </span>
-
-                       <span className="column-2 operationright color-666"  style={{width: "126px"}}>
-                            成绩导入状态
-                        </span>
-                        <span className="column-1 operationright color-666" style={{textAlign: 'center',width: "119px"}}>
-                            成绩来源
-                        </span>
-                         <span className="column-2 operationright color-666" style={{width: "127px"}}>
-                          平均成绩导入模板
-                        </span>
-                        <span className="column-2 operationright color-666" style={{width: "152px"}}>
-                          明细成绩导入模板
-                        </span>
-                        </p>
-                        <div style={{minHeight:'560px'}}>
-                        {
-                            ec_course_evaluation_lists===undefined? <Spin delay={500} className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:ec_course_evaluation_lists.map((list,m)=>{
+                                            }
+                                            </span>
+            
+
+                                            {/*style={{display:list.is_course_type===false?'inline-block':'none'}}*/}
+                                            {/* editSubentry  编辑的 */}
+                                            <span className="column-1 operationright"  style={{display:parseInt(idkey)===m?'none ':'block',width: '61px'}}>
+                                                <div className="operationColumn" >
+                                                    <div className="left operationalter" style={{display:ecmanager===false?'none ':'block'}}>
+                                                        <Tooltip placement="bottom" title="删除">
+                                                            <a className="mr10 delSubentry fl" id={list.id} onClick={this.modeldeleteCourseEvaluations.bind(this,list.id)} style={{display:list.is_course_type===true?'none':'block'}} ><i className="iconfont icon-shanchu color-grey-c font-18"></i></a>
+                                                        </Tooltip>
+                                                        <Modal
+                                                            title="提示"
+                                                            visible={modeldelet===true&&listid===list.id?true:false}
+                                                            className={"ecmodeldelet"}
+                                                            closable={false}
+                                                            footer={null}
+                                                        >
+                                                            <div className="task-popup-content">
+                                                                <div className="task-popup-text-center font-14">您确定要删除吗?</div>
+                                                            </div>
+                                                            <div className="task-popup-submit clearfix">
+                                                                <a onClick={this.hidemodeldelete} className="task-btn fl">取消</a>
+                                                                <a  className="task-btn task-btn-orange fr"
+                                                                    onClick={this.deleteCourseEvaluations.bind(this,list.id)}
+                                                                >确定</a>
+                                                            </div>
+                                                        </Modal>
+                                                    <a className="mr10 delSubentry  fl" data-tip-down="编辑"
+                                                        style={{display:list.is_course_type===true?'none':'inline-block'}}
+                                                    >
+                                                    <i className="iconfont icon-bianjidaibeijing color-green" 
+                                                    style={{
+                                                        diaplay:savetype==='add'&&savetype==='edit'?'none':'inline-block'
+                                                    }}
+                                                    idkey={m} onClick={this.editEvaluations.bind(this)}></i>
+                                                    </a>
+                                                    </div>
+                                                </div>
+                                            </span>
 
-                                return(
-                                    <li className={m===ec_course_evaluation_lists.length-1?savetype==='add'?"bordereaeaeas clearfix":'bordereaeaea clearfix':"clearfix"} key={m}
-                                     style={{width:"1140px",position:'relative'}}
-                                      >
-                                        <span className="column-1" style={{marginLeft: '6px',display:parseInt(idkey)===m?'none ':'block',width: "70px"}}>{m+1}</span>
-                                        <span className="column-1" style={{marginLeft: '-4px',display:parseInt(idkey)===m?'none ':'block',width: "72px"}}>
-                                            <div>{list.name}</div>
-                                        </span>
-                                        <span className="column-1" style={{marginLeft: '37px',display:parseInt(idkey)===m?'none ':'block',width: "90px"}}>
-                                            <div>{list.evluation_count}</div>
-                                        </span>
-                                        <span className="column-1" style={{marginLeft: '-8px',display:parseInt(idkey)===m?'none ':'block',width: "90px"}}>
-                                            <div>{list.status===1?"总成绩支撑":list.status===2?"分项成绩支撑":list.status}</div>
-                                        </span>
-
-                                        <span className="column-1 color99" 
-                                        style={{marginLeft: '31px',display:parseInt(idkey)===m?'none ':'block',width: " 207px"}} >
-                                           {
-                                               list.subitems.map((listchild,mk)=>{
-                                                   return (
-                                                    <Tooltip placement="bottomLeft" title={
-                                                        listchild.name
-                                                        }>
-                                                            <div key={mk} className='listchildboxs'>{listchild.name}
-                                                        </div>
-                                                       </Tooltip>
-                                                   )
-                                               })
-
-                                           }
-                                        </span>
-          
-
-                                        {/*style={{display:list.is_course_type===false?'inline-block':'none'}}*/}
-                                        {/* editSubentry  编辑的 */}
-                                        <span className="column-1 operationright"  style={{display:parseInt(idkey)===m?'none ':'block',width: '61px'}}>
-                                            <div className="operationColumn" >
-                                                <div className="left operationalter" style={{display:ecmanager===false?'none ':'block'}}>
-                                                      <Tooltip placement="bottom" title="删除">
-                                                          <a className="mr10 delSubentry fl" id={list.id} onClick={this.modeldeleteCourseEvaluations.bind(this,list.id)} style={{display:list.is_course_type===true?'none':'block'}} ><i className="iconfont icon-shanchu color-grey-c font-18"></i></a>
-                                                      </Tooltip>
-                                                     <Modal
-                                                         title="提示"
-                                                         visible={modeldelet===true&&listid===list.id?true:false}
-                                                         className={"ecmodeldelet"}
-                                                         closable={false}
-                                                         footer={null}
-                                                     >
-                                                        <div className="task-popup-content">
-                                                            <div className="task-popup-text-center font-14">您确定要删除吗?</div>
-                                                        </div>
-                                                        <div className="task-popup-submit clearfix">
-                                                            <a onClick={this.hidemodeldelete} className="task-btn fl">取消</a>
-                                                            <a  className="task-btn task-btn-orange fr"
-                                                                onClick={this.deleteCourseEvaluations.bind(this,list.id)}
-                                                            >确定</a>
-                                                        </div>
-                                                    </Modal>
-                                                  <a className="mr10 delSubentry  fl" data-tip-down="编辑"
-                                                     style={{display:list.is_course_type===true?'none':'inline-block'}}
-                                                  >
-                                                   <i className="iconfont icon-bianjidaibeijing color-green" 
-                                                   style={{
-                                                    diaplay:savetype==='add'&&savetype==='edit'?'none':'inline-block'
-                                                   }}
-                                                   idkey={m} onClick={this.editEvaluations.bind(this)}></i>
-                                                  </a>
+                                            <span className="column-1 detaillist mr20" style={{width:'156px',display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
+                                                <a href={ecmanager===false?"":list.export_url+'?type=1'}  style={{display:list.is_course_type===false?"block":"none"}}>
+                                                <div className={ecmanager===false?"color-white":"color-green"}>
+                                                <i className={ecmanager===false?"color-white":"iconfont icon-fujian mr5 color-green font-16"}></i>模板下载
                                                 </div>
-                                            </div>
-                                        </span>
-
-                                        <span className="column-1 detaillist mr20" style={{width:'156px',display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
-                                            <a href={ecmanager===false?"":list.export_url+'?type=1'}  style={{display:list.is_course_type===false?"block":"none"}}>
-                                            <div className={ecmanager===false?"color-white":"color-green"}>
-                                             <i className={ecmanager===false?"color-white":"iconfont icon-fujian mr5 color-green font-16"}></i>模板下载
-                                             </div>
-                                            
-
-                                            </a>
-                                        </span>
-
-                                        <span className="column-1" style={{paddingLeft: '13px',width:"127px",display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
-                                            <a href={ecmanager===false?"":list.export_url+'?type=2'}  style={{display:list.is_course_type===false?"block":"none"}}>                          
-                                                <div  className={ecmanager===false?"color-white":"color-green"}
-                                                ><i className={ecmanager===false?"color-white":"iconfont icon-fujian mr5 color-green font-16"}></i>模板下载</div>
-                                            </a>
-                                        </span>
-
-                                        <span className="column-1" style={{width: "121px",marginRight:'-5px',paddingLeft: '24px',display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
-                                                <div className="operationColumn">
-                                                    <div className="left operationalter" style={{display:list.is_course_type===false?'block':'none'}}>
-                                                 
-                                                       <Upload
-                                                        {...uploadProps}
-                                                        data={list.id}
-                                                        showUploadList={false}
-                                                        >
-                                                        {ecmanager===false?<span className="color-white" idkey={m}>成绩导入</span>:<span className="delSubentry" idkey={m}>成绩导入</span>}
-                                                        </Upload>
+                                                
+
+                                                </a>
+                                            </span>
+
+                                            <span className="column-1" style={{paddingLeft: '13px',width:"127px",display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
+                                                <a href={ecmanager===false?"":list.export_url+'?type=2'}  style={{display:list.is_course_type===false?"block":"none"}}>                          
+                                                    <div  className={ecmanager===false?"color-white":"color-green"}
+                                                    ><i className={ecmanager===false?"color-white":"iconfont icon-fujian mr5 color-green font-16"}></i>模板下载</div>
+                                                </a>
+                                            </span>
+
+                                            <span className="column-1" style={{width: "121px",marginRight:'-5px',paddingLeft: '24px',display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
+                                                    <div className="operationColumn">
+                                                        <div className="left operationalter" style={{display:list.is_course_type===false?'block':'none'}}>
                                                     
+                                                        <Upload
+                                                            {...uploadProps}
+                                                            data={list.id}
+                                                            showUploadList={false}
+                                                            >
+                                                            {ecmanager===false?<span className="color-white" idkey={m}>成绩导入</span>:<span className="delSubentry" idkey={m}>成绩导入</span>}
+                                                            </Upload>
+                                                        
+                                                        </div>
                                                     </div>
-                                                </div>
-                                        </span>
+                                            </span>
 
 
-                                       {ecmanager===false?""
-                                       : <span className="column-2" style={{marginLeft: '-8px',width:'96px',display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
-                                            <div style={{display:list.is_course_type===false?"block":"none"}}
-                                            >{list.import_status===true||list.is_course_type?"已导入":"未导入"}</div>
-                                         </span>}
+                                        {ecmanager===false?""
+                                        : <span className="column-2" style={{marginLeft: '-8px',width:'96px',display:savetype==='edit'&&parseInt(idkey)===m?'none':'inline-block'}}>
+                                                <div style={{display:list.is_course_type===false?"block":"none"}}
+                                                >{list.import_status===true||list.is_course_type?"已导入":"未导入"}</div>
+                                            </span>}
 
 
-                                        <div className="ListTableLine newSystem" style={{display:parseInt(idkey)===m?'block':'none'}}>
+                                            <div className="ListTableLine newSystem" style={{display:parseInt(idkey)===m?'block':'none'}}>
 
-                                            {
+                                                {
 
-                                                params===" " ? " " : params.map((item,key)=>{
+                                                    params===" " ? " " : params.map((item,key)=>{
+
+                                                        return (
+                                                            <div key={key}>
+                                                                <div className="clearfix editorModify pt20">
+
+                                                                    <div className="">
+                                                                        <span className="column-1 ml75 mr16">名称</span>
+                                                                        <Input  style={{ width: '27%' }} size="large" className={item.name===undefined===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" }   placeholder="请输入考核方式的名称，如平时作业、考试、论文等" index="name" value={item.name} onInput={this.EstablishCurriculumStandards.bind(this)}/>
+
+                                                                        <span className="column-1 ml20 mr16">考核次数</span>
+                                                                        <Input  style={{ width: '20%' }} size="large" className={item.evluation_count===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" }  placeholder="请输入考核次数" value={item.evluation_count} index="evluation_count" onInput={this.EstablishCurriculumStandards.bind(this)}/>
+
+                                                                        <span className="RadioGroupbox">
+                                                                        <RadioGroup className="RadioGroupboxab" onChange={this.RadioGroupEvaluations} value={item.status}>
+                                                                        <Radio value={1}>由单次考核总成绩支撑课程目标</Radio>
+                                                                        <br />
+                                                                        <Radio value={2}>由单次考核的某分项成绩支撑课程目标</Radio>
+                                                                        </RadioGroup>
+                                                                </span>
+                                                                    </div>
+
+                                                                    <br />
+                                                                    {
+                                                                        item.subitems.map((i,k)=>{
+                                                                            return(
+                                                                                <div className="mb20" key={k}>
+                                                                                    <span className="column-1 ml20 mr16 ">考核分项名称</span>
+                                                                                    <Input  style={{ width: '27%' }} size="large" className={i.name===""&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" } placeholder="请输入考核分项名称，如选择题、填空题、报告等" value={i.name} index="subitems" newid={k} onInput={this.EstablishCurriculumStandards.bind(this)}/>
+
+                                                                                    <span className="buttoninline SetTheAssociated">
+                                                                                <div className="left operatebutton">
+                                                                                    <a className="mr15 delSubentry" style={{display:k===0?"none":"inline-block"}}>
+                                                                                        <Tooltip placement="bottom" title="删除">
+                                                                                        <i className="iconfont icon-shanchu color-grey-c  font-17" id={k} onClick={this.deleteInspectionItems.bind(this)}></i>
+                                                                                        </Tooltip>
+                                                                                    </a>
+
+                                                                                    <a className="newAddSubentry" data-tip-down="添加"
+                                                                                    style={{display:k===item.subitems.length-1?'inline-block':'none'}}
+                                                                                    ><i className="iconfont icon-tianjiafangda color-green mt10" onClick={this.addInspectionItems}></i></a>
+                                                                                </div>
+                                                                            </span>
+                                                                                </div>
+                                                                            )
+                                                                        })
+                                                                    }
 
-                                                    return (
-                                                        <div key={key}>
-                                                            <div className="clearfix editorModify pt20">
-
-                                                                <div className="">
-                                                                    <span className="column-1 ml75 mr16">名称</span>
-                                                                    <Input  style={{ width: '27%' }} size="large" className={item.name===undefined===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" }   placeholder="请输入考核方式的名称，如平时作业、考试、论文等" index="name" value={item.name} onInput={this.EstablishCurriculumStandards.bind(this)}/>
-
-                                                                    <span className="column-1 ml20 mr16">考核次数</span>
-                                                                    <Input  style={{ width: '20%' }} size="large" className={item.evluation_count===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" }  placeholder="请输入考核次数" value={item.evluation_count} index="evluation_count" onInput={this.EstablishCurriculumStandards.bind(this)}/>
-
-                                                                    <span className="RadioGroupbox">
-                                                                    <RadioGroup className="RadioGroupboxab" onChange={this.RadioGroupEvaluations} value={item.status}>
-                                                                      <Radio value={1}>由单次考核总成绩支撑课程目标</Radio>
-                                                                      <br />
-                                                                      <Radio value={2}>由单次考核的某分项成绩支撑课程目标</Radio>
-                                                                    </RadioGroup>
-                                                               </span>
                                                                 </div>
 
-                                                                <br />
-                                                                {
-                                                                    item.subitems.map((i,k)=>{
-                                                                        return(
-                                                                            <div className="mb20" key={k}>
-                                                                                <span className="column-1 ml20 mr16 ">考核分项名称</span>
-                                                                                <Input  style={{ width: '27%' }} size="large" className={i.name===""&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" } placeholder="请输入考核分项名称，如选择题、填空题、报告等" value={i.name} index="subitems" newid={k} onInput={this.EstablishCurriculumStandards.bind(this)}/>
-
-                                                                                <span className="buttoninline SetTheAssociated">
-                                                                            <div className="left operatebutton">
-                                                                                <a className="mr15 delSubentry" style={{display:k===0?"none":"inline-block"}}>
-                                                                                    <Tooltip placement="bottom" title="删除">
-                                                                                      <i className="iconfont icon-shanchu color-grey-c  font-17" id={k} onClick={this.deleteInspectionItems.bind(this)}></i>
-                                                                                    </Tooltip>
-                                                                                </a>
-
-                                                                                <a className="newAddSubentry" data-tip-down="添加"
-                                                                                style={{display:k===item.subitems.length-1?'inline-block':'none'}}
-                                                                                ><i className="iconfont icon-tianjiafangda color-green mt10" onClick={this.addInspectionItems}></i></a>
-                                                                            </div>
-                                                                        </span>
-                                                                            </div>
-                                                                        )
-                                                                    })
-                                                                }
-
+                                                                <div className="right editglybuttonbox mt20 mb20">
+                                                                    <div className="defalutSubmitbtn fr" onClick={this.SaveecCourseEvaluationstop}>保存</div>
+                                                                    <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationstop}>取消</div>
+                                                                </div>
+                                                                <span className="c_red none ml30" id="error_tip" style={{display:newModallist===true?"inline":'none'}}>{Modallist}</span>
                                                             </div>
+                                                        )
+                                                    })
+                                                }
 
-                                                            <div className="right editglybuttonbox mt20 mb20">
-                                                                <div className="defalutSubmitbtn fr" onClick={this.SaveecCourseEvaluationstop}>保存</div>
-                                                                <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationstop}>取消</div>
-                                                            </div>
-                                                            <span className="c_red none ml30" id="error_tip" style={{display:newModallist===true?"inline":'none'}}>{Modallist}</span>
-                                                        </div>
-                                                    )
-                                                })
-                                            }
+                                            </div>
 
-                                        </div>
 
 
+                                        </li>
+                                    )
+                                })
+                            }
 
-                                    </li>
-                                )
-                            })
-                        }
+                            {ecmanager===false?"": <div className="ListTableLine newSystem" id="EvaluationsList" style={{display:'none'}}>
 
-                           {ecmanager===false?"": <div className="ListTableLine newSystem" id="EvaluationsList" style={{display:'none'}}>
+                                {
 
-                            {
+                                    params===" " ? " " : params.map((item,key)=>{
 
-                                params===" " ? " " : params.map((item,key)=>{
+                                        return (
+                                            <div key={key}>
+                                                <div className="clearfix editorModify pt20">
 
-                                    return (
-                                        <div key={key}>
-                                            <div className="clearfix editorModify pt20">
+                                                    <div className="">
+                                                        <span className="column-1 ml75 mr16">名称</span>
+                                                        <Input  style={{ width: '27%' }} size="large" className={item.name===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" } placeholder="请输入考核方式的名称，如平时作业、考试、论文等" index="name" value={item.name} onInput={this.EstablishCurriculumStandards.bind(this)}/>
 
-                                                <div className="">
-                                                    <span className="column-1 ml75 mr16">名称</span>
-                                                    <Input  style={{ width: '27%' }} size="large" className={item.name===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" } placeholder="请输入考核方式的名称，如平时作业、考试、论文等" index="name" value={item.name} onInput={this.EstablishCurriculumStandards.bind(this)}/>
+                                                        <span className="column-1 ml20 mr16">考核次数</span>
+                                                        <Input  style={{ width: '20%' }} size="large" className={item.evluation_count===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" }  placeholder="请输入考核次数" value={item.evluation_count} index="evluation_count" onInput={this.EstablishCurriculumStandards.bind(this)}/>
 
-                                                    <span className="column-1 ml20 mr16">考核次数</span>
-                                                    <Input  style={{ width: '20%' }} size="large" className={item.evluation_count===undefined&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" }  placeholder="请输入考核次数" value={item.evluation_count} index="evluation_count" onInput={this.EstablishCurriculumStandards.bind(this)}/>
+                                                        <span className="RadioGroupbox">
+                                                        <RadioGroup className="RadioGroupboxab" onChange={this.RadioGroupEvaluations} value={item.status}>
+                                                        <Radio value={1}>由单次考核总成绩支撑课程目标</Radio>
+                                                        <br />
+                                                        <Radio value={2}>由单次考核的某分项成绩支撑课程目标</Radio>
+                                                        </RadioGroup>
+                                                        </span>
+                                                    </div>
 
-                                                    <span className="RadioGroupbox">
-                                                    <RadioGroup className="RadioGroupboxab" onChange={this.RadioGroupEvaluations} value={item.status}>
-                                                    <Radio value={1}>由单次考核总成绩支撑课程目标</Radio>
                                                     <br />
-                                                    <Radio value={2}>由单次考核的某分项成绩支撑课程目标</Radio>
-                                                    </RadioGroup>
-                                                    </span>
+                                                    {
+                                                        item.subitems.map((i,k)=>{
+                                                            return(
+                                                                <div className="mb20" key={k}>
+                                                                    <span className="column-1 ml20 mr16 ">考核分项名称</span>
+                                                                    <Input  style={{ width: '27%' }} size="large" className={i.name===""&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" } placeholder="请输入考核分项名称，如选择题、填空题、报告等" value={i.name} index="subitems" newid={k} onInput={this.EstablishCurriculumStandards.bind(this)}/>
+
+                                                                    <span className="buttoninline SetTheAssociated">
+                                                <div className="left operatebutton">
+                                                    <a className="mr15 delSubentry" style={{display:k===0?"none":"inline-block"}}>
+                                                        <Tooltip placement="bottom" title="删除">
+                                                        <i className="iconfont icon-shanchu color-grey-c  font-17" id={k} onClick={this.deleteInspectionItems.bind(this)}></i>
+                                                        </Tooltip>
+                                                    </a>
+
+                                                    <a className="newAddSubentry" data-tip-down="添加"
+                                                    style={{display:k===item.subitems.length-1?'inline-block':'none'}}
+                                                    ><i className="iconfont icon-tianjiafangda color-green" onClick={this.addInspectionItems}></i></a>
                                                 </div>
-
-                                                <br />
-                                                {
-                                                    item.subitems.map((i,k)=>{
-                                                        return(
-                                                            <div className="mb20" key={k}>
-                                                                <span className="column-1 ml20 mr16 ">考核分项名称</span>
-                                                                <Input  style={{ width: '27%' }} size="large" className={i.name===""&&savetypes===true?"inputWeight placeholder bor-red":"inputWeight placeholder" } placeholder="请输入考核分项名称，如选择题、填空题、报告等" value={i.name} index="subitems" newid={k} onInput={this.EstablishCurriculumStandards.bind(this)}/>
-
-                                                                <span className="buttoninline SetTheAssociated">
-                                            <div className="left operatebutton">
-                                                <a className="mr15 delSubentry" style={{display:k===0?"none":"inline-block"}}>
-                                                    <Tooltip placement="bottom" title="删除">
-                                                    <i className="iconfont icon-shanchu color-grey-c  font-17" id={k} onClick={this.deleteInspectionItems.bind(this)}></i>
-                                                    </Tooltip>
-                                                </a>
-
-                                                <a className="newAddSubentry" data-tip-down="添加"
-                                                style={{display:k===item.subitems.length-1?'inline-block':'none'}}
-                                                ><i className="iconfont icon-tianjiafangda color-green" onClick={this.addInspectionItems}></i></a>
-                                            </div>
-                                        </span>
-                                                            </div>
-                                                        )
-                                                    })
-                                                }
-                                                <div className="right editglybuttonbox mt20 mb20 mr20">
-                                                {/* 新建 */}
-                                                    <div className="defalutSubmitbtn fr" onClick={this.SaveecCourseEvaluationstop}>保存</div>
-                                                    <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationstop}>取消</div>
+                                            </span>
+                                                                </div>
+                                                            )
+                                                        })
+                                                    }
+                                                    <div className="right editglybuttonbox mt20 mb20 mr20">
+                                                    {/* 新建 */}
+                                                        <div className="defalutSubmitbtn fr" onClick={this.SaveecCourseEvaluationstop}>保存</div>
+                                                        <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationstop}>取消</div>
+                                                    </div>
+                                                    <span className="c_red none ml30" id="error_tip" style={{display:newModallist===true?"inline":'none'}}>{Modallist}</span>
                                                 </div>
-                                                <span className="c_red none ml30" id="error_tip" style={{display:newModallist===true?"inline":'none'}}>{Modallist}</span>
-                                            </div>
 
 
 
-                                        </div>
-                                    )
-                                })
-                            }
-                            </div>
-                            }
-                            </div>
+                                            </div>
+                                        )
+                                    })
+                                }
+                                </div>
+                                }
+                                </div>
+                            </Spin>    
                         </div>
-
-
-                    </div>
-
+                </div>
                 {/*<EcCourseEvaluationsbottom*/}
                 {/*// ec_course_id={ec_course_id}*/}
                 {/*// schooldata={schooldata}*/}
                 {/*/>*/}
-
-
+                </Spin>
             </div>
         );
     }
diff --git a/public/react/src/modules/ec/ecCourseSupportSetting/style.css b/public/react/src/modules/ec/ecCourseSupportSetting/style.css
index f961452a..85646a47 100644
--- a/public/react/src/modules/ec/ecCourseSupportSetting/style.css
+++ b/public/react/src/modules/ec/ecCourseSupportSetting/style.css
@@ -28,7 +28,7 @@
 }
 
 .SystemParameters {
-    height: 60px;
+    min-height: 60px;
 }
 
 p {
diff --git a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js
index 26f9a167..ef0d4625 100644
--- a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js
+++ b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js
@@ -470,7 +470,7 @@ class ecCourseSupports extends Component {
                 </Modal>
 
 
-                <div className="educontent mb290 mt60">
+                <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
                         {...this.props}
diff --git a/public/react/src/modules/ec/ecStudentList/ecStudentList.js b/public/react/src/modules/ec/ecStudentList/ecStudentList.js
index b60ab2ee..50d93de9 100644
--- a/public/react/src/modules/ec/ecStudentList/ecStudentList.js
+++ b/public/react/src/modules/ec/ecStudentList/ecStudentList.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 
 import axios from 'axios';
+import { Spin } from 'antd';
 
 import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
 
@@ -30,7 +31,8 @@ class ecStudentList extends Component {
             studentall:false,
             student_id:undefined,
             Modallisttypess:0,
-            ismanager:false
+            ismanager:false,
+            isSpin:false
         }
     }
     componentDidMount(){
@@ -120,6 +122,7 @@ class ecStudentList extends Component {
 
 
     uploadfile=(file)=>{
+        this.setState({isSpin:true})
         let {majorschoollist}=this.state;
         let Url =majorschoollist.import_url;
         const form = new FormData();
@@ -132,7 +135,8 @@ class ecStudentList extends Component {
                     // titlemessage: response.data.message+"(支撑关系变更)",
                     Modallist: '已成功导入'+response.data.count+"条数据！",
                     Modallisttype:true,
-                    Modallisttypes:1
+                    Modallisttypes:1,
+                    isSpin:false
                 })
             }else if(response.data.status===0){
                 // message.warning(response.data.message);
@@ -140,7 +144,8 @@ class ecStudentList extends Component {
                     // titlemessage: response.data.message+"(支撑关系变更)",
                     Modallist:response.data.message,
                     Modallisttype:true,
-                    Modallisttypes:0
+                    Modallisttypes:0,
+                    isSpin:false
                 })
             }
         }).catch((error) => {
@@ -357,8 +362,8 @@ class ecStudentList extends Component {
                                 删除
                             </div>}
                         </div>
-
-                        <div className="ListTableLine minH-560 edu-back-white mb80" id="listContent">
+                        <Spin spinning={this.state.isSpin}>
+                            <div className="ListTableLine minH-560 edu-back-white mb80" id="listContent">
                             <p className="clearfix">
                                 <span className="column-No column-2 relative">
                                 <Checkbox 
@@ -411,6 +416,7 @@ class ecStudentList extends Component {
                             }     
                             </div>
                         </div>
+                        </Spin>    
                     </div>
                 </div>
 
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index 0b1636c9..c93b8c1e 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -306,7 +306,7 @@ a.postReplyIcon:hover {background:url(../images/post_image_list.png) -40px -29px
 .postThemeWrap {width:655px; float:left;position: relative}
 .postLikeIcon {background:url(../images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-top:3px; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .postLikeIcon:hover {background:url(../images/post_image_list.png) 0px -64px no-repeat ; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
-a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
+a.AnnexBtn{  line-height: 20px;  background: url(../images/homepage_icon2.png) 0px -343px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .postEdit {background:url(../images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;}
 .postDelete {background:url(../images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;}
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index e768d86d..d88c31c8 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -4,9 +4,9 @@
     /*position: fixed;*/
     top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
 .newHeader .logoimg{
-    margin-top: 16px;
+    margin-top: 13px;
     float: left;
-    width: 97px;
+    width: 40px;
 }
 .head-nav{float: left;width: 800px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
 .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
@@ -612,13 +612,13 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 #competition-content img,#competition-db-content img,#ccfPage img{vertical-align: bottom;}
 #hnpage1{background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;min-height: 820px;}
 
-#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;
+#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 25px;box-sizing: border-box;
     /*position: fixed;*/
     top: 0px;left: 0px;width: 100%;z-index: 1000;}
 #competition-header .logoimg{
     margin-top: 5px;
     float: left;
-    width: 97px;}
+    width: 40px;}
 
 .nav-game{position: relative;}
 .nav-game li{position: relative;float: left;width: 110px;height: 60px;line-height: 60px;text-align: center;box-sizing: border-box}
@@ -673,7 +673,7 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;
 .second_code_2{min-height: 436px;}
 .second_code_3{min-height: 1460px;padding-top: 190px;box-sizing: border-box;position: relative}
 .second_code_4{min-height: 1459px;padding-top: 190px;box-sizing: border-box;position: relative}
-.second_code_5{min-height: 2314px;padding-top: 190px;box-sizing: border-box;position: relative}
+.second_code_5{min-height: 2384px;padding-top: 190px;box-sizing: border-box;position: relative}
 .second_code_6{min-height: 1060px;}
 .second_code_7{min-height: 1116px;}
 .second_code_8{min-height: 711px;}
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index aee805f4..5aa367ad 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -122,7 +122,7 @@ a.decoration{text-decoration: underline}
 .mr3{margin-right: 3px}.mr4{margin-right: 4px}.mr5{ margin-right: 5px;}.mr8{ margin-right: 8px;}.mr10{ margin-right: 10px;}.mr12{ margin-right:12px!important;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr24{ margin-right: 24px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr35{margin-right:35px;}.mr40{margin-right:40px;}.mr45{margin-right:45px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}.mr70{ margin-right: 70px;}.mr75{ margin-right: 75px;}.mr80{ margin-right:80px;}.mr90{ margin-right:90px;}.mr100{ margin-right: 100px;}.mr110{ margin-right:110px;}.mr350{ margin-right:350px;}
 
 .pt1{ padding-top:1px;}.pt3{ padding-top:3px!important;}.pt5{ padding-top:5px!important;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt17{ padding-top:17px;}.pt20{ padding-top:20px!important;}.pt25{ padding-top:25px;}.pt30{ padding-top:30px;}.pt35{ padding-top:35px;}.pt37{ padding-top:37px;}.pt40{ padding-top:40px;}.pt47{ padding-top:47px;}.pt49{ padding-top:49px;}.pt50{ padding-top:50px;}.pt60{ padding-top:60px;}.pt70{ padding-top:70px;}.pt80{ padding-top:80px;}.pt90{ padding-top:90px;}.pt100{padding-top:100px;}.pt110{ padding-top:110px;}.pt120{ padding-top:120px;}.pt130{padding-top:130px;}.pt200{padding-top:200px;}
-.pb3{ padding-bottom:3px!important;}.pb5{ padding-bottom:5px!important;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb25{ padding-bottom:20px;}.pb25{ padding-bottom:20px;}.pb30{ padding-bottom:30px;}.pb35{ padding-bottom:35px;}.pb40{ padding-bottom:40px;}.pb47{ padding-bottom:47px;}.pb50{ padding-bottom:50px;}.pb60{ padding-bottom:60px;}.pb70{ padding-bottom:70px;}.pb80{ padding-bottom:80px;}.pb90{ padding-bottom:90px;}.pb100{ padding-bottom:100px;}.pb110{ padding-bottom:110px;}.pb155{ padding-bottom:155px;}
+.pb3{ padding-bottom:3px!important;}.pb5{ padding-bottom:5px!important;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb25{ padding-bottom:25px;}.pb30{ padding-bottom:30px;}.pb35{ padding-bottom:35px;}.pb40{ padding-bottom:40px;}.pb47{ padding-bottom:47px;}.pb50{ padding-bottom:50px;}.pb60{ padding-bottom:60px;}.pb70{ padding-bottom:70px;}.pb80{ padding-bottom:80px;}.pb90{ padding-bottom:90px;}.pb100{ padding-bottom:100px;}.pb110{ padding-bottom:110px;}.pb155{ padding-bottom:155px;}
 .pr2{ paddding-right:2px;}.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px!important;}.pr30{ padding-right:30px!important;}.pr35{ padding-right:35px!important;}.pr42{ padding-right:42px;}.pr45{ padding-right:45px;}.pr48{ padding-right:48px;}.pr57{ padding-right:57px;}.pr60{ padding-right:60px;}.pr70{ padding-right:70px;}.pr72{ padding-right:72px;}.pr75{ padding-right:75px;}.pr88{ padding-right:88px;}
 
 .pl0{ padding-left:0px!important;}.pl2{ padding-left:2px;}.pl5{ padding-left:5px;}.pl7{ padding-left:7px;}.pl8{ padding-left:8px;}.pl10{ padding-left:10px;}.pl12{ padding-left:12px!important;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}.pl22{ padding-left:22px;}.pl25{ padding-left:25px;}.pl28{ padding-left:28px;}.pl30{ padding-left:30px;}.pl33{padding-left: 33px}.pl35{ padding-left:35px;}.pl40{ padding-left:40px;}.pl42{ padding-left:42px;}.pl45{ padding-left:45px;}.pl50{ padding-left:50px;}.pl60{ padding-left:60px;}.pl70{padding-left:70px;}.pl75{padding-left:75px;}.pl80{padding-left:80px;}.pl88{ padding-left:88px;}.pl92{padding-left:92px;}.pl100{ padding-left:100px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index f7a5b439..06564e50 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1096,7 +1096,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 select.InputBox, input.InputBox, textarea.InputBox {border: 1px solid #D9D9D9;color: #888;height: 28px;line-height: 28px;padding-left: 5px;font-size: 14px;}
 .w713 {width: 713px;}
 a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a.AnnexBtn{ line-height: 20px; background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
@@ -1128,7 +1128,7 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no
 .postThemeWrap {width:655px; float:left;position: relative}
 .postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-top:3px;}
 .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;}
-a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a.AnnexBtn{  line-height: 20px;  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}
 .postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;}
 .postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;}