diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 1812e7cff..1b27c06d8 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -176,11 +176,8 @@ class HomeworkCommonController < ApplicationController
       end
       anonymous = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 1
       if anonymous != @homework.anonymous_comment
-        if anonymous == 1
-          homework_detail_manual.ta_proportion = @homework.homework_type == 2 ? 0.4 : 1.0
-        else
-          homework_detail_manual.ta_proportion = @homework.homework_type == 2 ? 0.3 : 0.6
-        end
+        homework_detail_manual.te_proportion = 1.0
+        homework_detail_manual.ta_proportion = 0
       end
 
       @homework.save_attachments(params[:attachments])
@@ -192,11 +189,7 @@ class HomeworkCommonController < ApplicationController
           @homework_detail_programing = @homework.homework_detail_programing
           @homework_detail_programing.language = params[:language_type].to_i if params[:language_type]
           if anonymous != @homework.anonymous_comment
-            if anonymous == 1
-              @homework_detail_programing.ta_proportion = 0.6
-            else
-              @homework_detail_programing.ta_proportion = 0.5
-            end
+            @homework_detail_programing.ta_proportion = 0
           end
 
           @homework.homework_samples.delete_all if params[:sample]
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 88bddfeb8..a6f0cdd12 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1225,15 +1225,13 @@ class StudentWorkController < ApplicationController
       end
     end
 
-    teacher_priority = params[:teacher_priority].to_i
-    if homework_detail_manual.ta_proportion.to_s != params[:ta_proportion].to_s || @homework.teacher_priority.to_s != teacher_priority.to_s || (homework_detail_programing && homework_detail_programing.ta_proportion.to_s != params[:sy_proportion].to_s)
+    if (params[:te_proportion] && params[:te_proportion].to_s != homework_detail_manual.te_proportion.to_s) || (params[:ta_proportion] && params[:ta_proportion].to_s != homework_detail_manual.ta_proportion.to_s) || (homework_detail_programing && homework_detail_programing.ta_proportion.to_s != params[:sy_proportion].to_s)
+      homework_detail_manual.te_proportion = params[:te_proportion]
       homework_detail_manual.ta_proportion = params[:ta_proportion]
       homework_detail_programing.ta_proportion = params[:sy_proportion] if homework_detail_programing
-      @homework.update_column('teacher_priority', teacher_priority)
 
       homework_detail_manual.save if homework_detail_manual
       homework_detail_programing.save if homework_detail_programing
-
       @homework.save
       @homework = HomeworkCommon.find @homework.id
       @homework.student_works.each do |student_work|
@@ -1820,95 +1818,88 @@ class StudentWorkController < ApplicationController
   #成绩计算
   def set_final_score homework,student_work
     if homework && homework.homework_detail_manual
+      tea_ass_proportion = homework.homework_detail_manual.ta_proportion
+      tea_proportion = homework.homework_detail_manual.te_proportion
       if homework.homework_type != 2 #非编程作业
-        if homework.teacher_priority == 1 #教师优先
-          if student_work.teacher_score
-            student_work.final_score = student_work.teacher_score
-            student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty
-          else
-            if student_work.teaching_asistant_score.nil?
-              student_work.final_score = student_work.student_score
-            elsif student_work.student_score.nil?
-              student_work.final_score = student_work.teaching_asistant_score
+        if student_work.teacher_score
+          if student_work.teaching_asistant_score.nil?
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.teacher_score
             else
-              ta_proportion = homework.homework_detail_manual.ta_proportion
-              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
-              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-              final_score = final_ta_score + final_s_score
+              te_proportion = tea_proportion + tea_ass_proportion / 2
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{te_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{te_proportion}"))
+              final_score = final_te_score + final_s_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
-            if student_work.final_score
-              score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-              student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+          else
+            if student_work.student_score.nil?
+              te_proportion = tea_proportion + (1.0 - tea_proportion - tea_ass_proportion) / 2
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{te_proportion}")
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{te_proportion}"))
+              final_score = final_te_score + final_ta_score
+              student_work.final_score = format("%.2f",final_score.to_f)
             else
-              student_work.work_score = nil
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion}")
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{tea_ass_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{tea_proportion}") - BigDecimal.new("#{tea_ass_proportion}"))
+              final_score = final_te_score + final_ta_score + final_s_score
+              student_work.final_score = format("%.2f",final_score.to_f)
             end
           end
-        else  #不考虑教师评分
+        else
           if student_work.teaching_asistant_score.nil?
             student_work.final_score = student_work.student_score
           elsif student_work.student_score.nil?
             student_work.final_score = student_work.teaching_asistant_score
           else
-            ta_proportion = homework.homework_detail_manual.ta_proportion
+            ta_proportion = tea_ass_proportion + tea_proportion / 2
             final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
             final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
             final_score = final_ta_score + final_s_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
-          if student_work.final_score
-            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-          else
-            student_work.work_score = nil
-          end
         end
       elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
-        if homework.teacher_priority == 1 #教师优先
-          if student_work.teacher_score
-            student_work.final_score = student_work.teacher_score
-            student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-          else
-            if student_work.teaching_asistant_score.nil? #教辅未评分
-              if student_work.student_score.nil?
-                student_work.final_score = student_work.system_score
-              else
-                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
-                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-                final_score = final_sy_score + final_st_score
-                student_work.final_score = format("%.2f",final_score.to_f)
-              end
-            elsif student_work.student_score.nil? #学生未评分
-              if student_work.teaching_asistant_score.nil?
-                student_work.final_score = student_work.system_score
-              else
-                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
-                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-                final_score = final_sy_score + final_ts_score
-                student_work.final_score = format("%.2f",final_score.to_f)
-              end
+        #if homework.teacher_priority == 1 #教师优先
+        sy_proportion = homework.homework_detail_programing.ta_proportion
+        if student_work.teacher_score
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              ta_proportion = tea_proportion + (1 - tea_proportion - sy_proportion) / 2
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{ta_proportion}")
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_te_score
+              student_work.final_score = format("%.2f",final_score.to_f)
             else
-              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
-              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
-              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
-              final_score = final_sy_score + final_ts_score + final_st_score
+              rest_proportion = tea_ass_proportion / 3
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion + rest_proportion}")
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion + rest_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{sy_proportion + rest_proportion}") - BigDecimal.new("#{tea_proportion + rest_proportion}"))
+              final_score = final_sy_score + final_te_score + final_st_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
-            if student_work.final_score
-              score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-              student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-            else
-              student_work.work_score = nil
-            end
+          elsif student_work.student_score.nil? #学生未评分
+            rest_proportion = (1 - tea_proportion - sy_proportion - tea_ass_proportion) / 3
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion + rest_proportion}")
+            final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion + rest_proportion}")
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{sy_proportion + rest_proportion}") - BigDecimal.new("#{tea_proportion + rest_proportion}"))
+            final_score = final_sy_score + final_te_score + final_ta_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion}")
+            final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion}")
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{tea_ass_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0') - BigDecimal.new("#{sy_proportion}") - BigDecimal.new("#{tea_proportion}") - BigDecimal.new("#{tea_ass_proportion}"))
+            final_score = final_sy_score + final_ta_score + final_te_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
           end
-        else  #不考虑教师评分
+        else
           if student_work.teaching_asistant_score.nil? #教辅未评分
             if student_work.student_score.nil?
               student_work.final_score = student_work.system_score
             else
-              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              ta_proportion = sy_proportion + (tea_ass_proportion + tea_proportion) / 2
               final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
               final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
               final_score = final_sy_score + final_st_score
@@ -1918,27 +1909,29 @@ class StudentWorkController < ApplicationController
             if student_work.teaching_asistant_score.nil?
               student_work.final_score = student_work.system_score
             else
-              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              ta_proportion = sy_proportion + (1.0 - tea_ass_proportion - sy_proportion) / 2
               final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
               final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
               final_score = final_sy_score + final_ts_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
           else
-            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
-            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
-            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            rest_proportion = tea_proportion / 3
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion + rest_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{tea_ass_proportion + rest_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{sy_proportion + rest_proportion}") - BigDecimal.new("#{tea_ass_proportion + rest_proportion}"))
             final_score = final_sy_score + final_ts_score + final_st_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
-          if student_work.final_score
-            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-          else
-            student_work.work_score = nil
-          end
         end
       end
+
+      if student_work.final_score
+        score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
+        student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+      else
+        student_work.work_score = nil
+      end
     end
   end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ddff55733..c1fb7da58 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1408,11 +1408,9 @@ class UsersController < ApplicationController
         render_attachment_warning_if_needed(homework)
 
         homework_detail_manual = HomeworkDetailManual.new
-        if homework.anonymous_comment == 1
-          homework_detail_manual.ta_proportion = homework.homework_type == 2 ? 0.4 : 1.0
-        else
-          homework_detail_manual.ta_proportion = homework.homework_type == 2 ? 0.3 : 0.6
-        end
+        homework_detail_manual.te_proportion = 1.0
+        homework_detail_manual.ta_proportion = 0
+
         if params[:homework_common][:end_time] == ""
           homework_detail_manual.comment_status = 0
         else
@@ -1446,11 +1444,7 @@ class UsersController < ApplicationController
         if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
-          if homework.anonymous_comment == 1
-            homework_detail_programing.ta_proportion = 0.6
-          else
-            homework_detail_programing.ta_proportion = 0.5
-          end
+          homework_detail_programing.ta_proportion = 0
           homework_detail_programing.language = params[:language_type].to_i
 
           sample_inputs = params[:sample][:input]
diff --git a/app/models/homework_detail_manual.rb b/app/models/homework_detail_manual.rb
index 6faa84d40..41c44cc40 100644
--- a/app/models/homework_detail_manual.rb
+++ b/app/models/homework_detail_manual.rb
@@ -1,7 +1,7 @@
 #手动评分作业表
 #comment_status: 1:未开启匿评，2：开启匿评，3：匿评结束
 class HomeworkDetailManual < ActiveRecord::Base
-   attr_accessible :ta_proportion, :comment_status, :evaluation_start, :evaluation_end, :evaluation_num, :absence_penalty, :homework_common_id, :no_anon_penalty
+   attr_accessible :te_proportion, :ta_proportion, :comment_status, :evaluation_start, :evaluation_end, :evaluation_num, :absence_penalty, :homework_common_id, :no_anon_penalty
 
   belongs_to :homework_common
 end
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 9ea0e75eb..082a164d6 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -50,97 +50,88 @@ class StudentWork < ActiveRecord::Base
   #成绩计算
   def set_final_score homework,student_work
     if homework && homework.homework_detail_manual
+      tea_ass_proportion = homework.homework_detail_manual.ta_proportion
+      tea_proportion = homework.homework_detail_manual.te_proportion
       if homework.homework_type != 2 #非编程作业
-        if homework.teacher_priority == 1 #教师优先
-          if student_work.teacher_score
-            student_work.final_score = student_work.teacher_score
-            student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-          else
-            if student_work.teaching_asistant_score.nil?
-              student_work.final_score = student_work.student_score
-            elsif student_work.student_score.nil?
-              student_work.final_score = student_work.teaching_asistant_score
+        if student_work.teacher_score
+          if student_work.teaching_asistant_score.nil?
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.teacher_score
             else
-              ta_proportion = homework.homework_detail_manual.ta_proportion
-              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
-              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-              final_score = final_ta_score + final_s_score
+              te_proportion = tea_proportion + tea_ass_proportion / 2
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{te_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{te_proportion}"))
+              final_score = final_te_score + final_s_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
-            if student_work.final_score
-              score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-              student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+          else
+            if student_work.student_score.nil?
+              te_proportion = tea_proportion + (1.0 - tea_proportion - tea_ass_proportion) / 2
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{te_proportion}")
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{te_proportion}"))
+              final_score = final_te_score + final_ta_score
+              student_work.final_score = format("%.2f",final_score.to_f)
             else
-              student_work.work_score = nil
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion}")
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{tea_ass_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{tea_proportion}") - BigDecimal.new("#{tea_ass_proportion}"))
+              final_score = final_te_score + final_ta_score + final_s_score
+              student_work.final_score = format("%.2f",final_score.to_f)
             end
           end
-        else  #不考虑教师评分
-          if student_work.student_score.nil? && student_work.teaching_asistant_score.nil?
-            student_work.final_score = student_work.teacher_score
-          elsif student_work.teaching_asistant_score.nil?
+        else
+          if student_work.teaching_asistant_score.nil?
             student_work.final_score = student_work.student_score
           elsif student_work.student_score.nil?
             student_work.final_score = student_work.teaching_asistant_score
           else
-            ta_proportion = homework.homework_detail_manual.ta_proportion
+            ta_proportion = tea_ass_proportion + tea_proportion / 2
             final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
             final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
             final_score = final_ta_score + final_s_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
-          if student_work.final_score
-            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-          else
-            student_work.work_score = nil
-          end
         end
       elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
-        if homework.teacher_priority == 1 #教师优先
-          if student_work.teacher_score
-            student_work.final_score = student_work.teacher_score
-            student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-          else
-            if student_work.teaching_asistant_score.nil? #教辅未评分
-              if student_work.student_score.nil?
-                student_work.final_score = student_work.system_score
-              else
-                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
-                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-                final_score = final_sy_score + final_st_score
-                student_work.final_score = format("%.2f",final_score.to_f)
-              end
-            elsif student_work.student_score.nil? #学生未评分
-              if student_work.teaching_asistant_score.nil?
-                student_work.final_score = student_work.system_score
-              else
-                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
-                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-                final_score = final_sy_score + final_ts_score
-                student_work.final_score = format("%.2f",final_score.to_f)
-              end
+        #if homework.teacher_priority == 1 #教师优先
+        sy_proportion = homework.homework_detail_programing.ta_proportion
+        if student_work.teacher_score
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              ta_proportion = tea_proportion + (1 - tea_proportion - sy_proportion) / 2
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{ta_proportion}")
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_te_score
+              student_work.final_score = format("%.2f",final_score.to_f)
             else
-              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
-              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
-              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
-              final_score = final_sy_score + final_ts_score + final_st_score
+              rest_proportion = tea_ass_proportion / 3
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion + rest_proportion}")
+              final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion + rest_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{sy_proportion + rest_proportion}") - BigDecimal.new("#{tea_proportion + rest_proportion}"))
+              final_score = final_sy_score + final_te_score + final_st_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
-            if student_work.final_score
-              score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-              student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-            else
-              student_work.work_score = nil
-            end
+          elsif student_work.student_score.nil? #学生未评分
+            rest_proportion = (1 - tea_proportion - sy_proportion - tea_ass_proportion) / 3
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion + rest_proportion}")
+            final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion + rest_proportion}")
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{sy_proportion + rest_proportion}") - BigDecimal.new("#{tea_proportion + rest_proportion}"))
+            final_score = final_sy_score + final_te_score + final_ta_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion}")
+            final_te_score = BigDecimal.new("#{student_work.teacher_score}") * BigDecimal.new("#{tea_proportion}")
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{tea_ass_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0') - BigDecimal.new("#{sy_proportion}") - BigDecimal.new("#{tea_proportion}") - BigDecimal.new("#{tea_ass_proportion}"))
+            final_score = final_sy_score + final_ta_score + final_te_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
           end
-        else  #不考虑教师评分
+        else
           if student_work.teaching_asistant_score.nil? #教辅未评分
             if student_work.student_score.nil?
               student_work.final_score = student_work.system_score
             else
-              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              ta_proportion = sy_proportion + (tea_ass_proportion + tea_proportion) / 2
               final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
               final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
               final_score = final_sy_score + final_st_score
@@ -150,27 +141,29 @@ class StudentWork < ActiveRecord::Base
             if student_work.teaching_asistant_score.nil?
               student_work.final_score = student_work.system_score
             else
-              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              ta_proportion = sy_proportion + (1.0 - tea_ass_proportion - sy_proportion) / 2
               final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
               final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
               final_score = final_sy_score + final_ts_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
           else
-            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
-            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
-            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            rest_proportion = tea_proportion / 3
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{sy_proportion + rest_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{tea_ass_proportion + rest_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{sy_proportion + rest_proportion}") - BigDecimal.new("#{tea_ass_proportion + rest_proportion}"))
             final_score = final_sy_score + final_ts_score + final_st_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
-          if student_work.final_score
-            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-          else
-            student_work.work_score = nil
-          end
         end
       end
+
+      if student_work.final_score
+        score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
+        student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+      else
+        student_work.work_score = nil
+      end
     end
   end
 
diff --git a/app/views/homework_common/_set_score_rule_non_pro.html.erb b/app/views/homework_common/_set_score_rule_non_pro.html.erb
index cdcee01f1..8f30629f4 100644
--- a/app/views/homework_common/_set_score_rule_non_pro.html.erb
+++ b/app/views/homework_common/_set_score_rule_non_pro.html.erb
@@ -103,37 +103,29 @@
 
             <li class="mb10 mt10 fl">
               <label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
-              <input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/><label for="teacher_score" class=" fl ml5">教师评分</label>
-            </li>
-            <div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230" style="margin-left: 141px;">
-              <em></em>
-              <span></span>
-              <p>教师评分-迟交扣分-缺评扣分-违规匿评扣分</p>
-            </div>
-            <li class="mb10 fl">
-              <label class="pop_box_label fl">&nbsp;&nbsp;</label>
-              <ul class="fl">
+              <ul class="fl ml5">
                 <li class="clear">
-                  <input type="radio" class="fl" id="other_score" value="0" name="teacher_priority"/>
-                  <label for="other_score" class="fl ml5">助教评分+学生匿评</label>
+                  <span class="fl">教师评分</span>
+                  <%= select_tag :te_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.te_proportion), {:class => "w61 fl ml15"} %>
                 </li>
-                <li class="clear">
-                  <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100),homework.homework_detail_manual.ta_proportion), {:class => "w61 fl ml15"}  %>
-                  <span class="fl ml5">助教评分</span>
+                <li class="clear mt5">
+                  <span class="fl">助教评分</span>
+                  <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_manual.te_proportion * 100).to_i),homework.homework_detail_manual.ta_proportion), {:class => "w61 fl ml15"}  %>
                 </li>
-                <li class="clear">
-                  <input type="text" style="width: 49px; padding-left: 10px;" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i%>%" class="fl ml15" readonly>
-                  <span class="fl ml5">学生匿评</span>
+                <li class="clear mt5">
+                  <span class="fl">学生匿评</span>
+                  <input type="text" style="width: 49px; padding-left: 10px;" id="student_proportion" value="<%= 100 - (homework.homework_detail_manual.te_proportion * 100).to_i - (homework.homework_detail_manual.ta_proportion * 100).to_i%>%" class="fl ml15" readonly>
                 </li>
               </ul>
-              <div class="fl clear popup_tip_box fontGrey2 w230" style="margin-left: 78px;">
-                <em></em>
-                <span></span>
-                <p >助教评分*其百分比+ <br/>
-                  学生匿评平均分*其百分比- <br/>
-                  ( 迟交扣分+缺评扣分+违规匿评扣分 )</p>
-              </div>
             </li>
+            <div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230" style="margin-left: 78px;">
+              <em></em>
+              <span></span>
+              <p>教师评分 * 其百分比+ <br/>
+                助教评分 * 其百分比+  <br/>
+                学生匿评平均分 * 其百分比 - <br/>
+                ( 迟交扣分+缺评扣分+违规匿评扣分 )</p>
+            </div>
           </ul>
           <div class="cl"></div>
           <a href="javascript:void(0);" class="fr sy_btn_blue mr50" onclick="set_score_rule_submit();">确定</a>
@@ -145,9 +137,16 @@
 
 <script>
     $(function(){
-        $("#ta_proportion").change(function(){
-            var ta_proportion = parseFloat($("#ta_proportion").val());
-            $("#student_proportion").val((100 - parseFloat(parseInt(ta_proportion * 100))) + "%");
+        $("#te_proportion").die();
+        $("#ta_proportion").die();
+        $("#te_proportion").live('change', function(){
+            var ta_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100);
+            $("#ta_proportion").replaceWith(build_selector(ta_proportion));
+            $("#student_proportion").val("0%");
+        });
+        $("#ta_proportion").live('change', function(){
+            var ta_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100) - parseInt(parseFloat($("#ta_proportion").val()) * 100);
+            $("#student_proportion").val(ta_proportion + "%");
         });
         <% if homework.teacher_priority == 1 %>
         $("#teacher_score").attr("checked", "checked");
diff --git a/app/views/homework_common/_set_score_rule_none_pro_anon.html.erb b/app/views/homework_common/_set_score_rule_none_pro_anon.html.erb
index abc15d445..30986ebf6 100644
--- a/app/views/homework_common/_set_score_rule_none_pro_anon.html.erb
+++ b/app/views/homework_common/_set_score_rule_none_pro_anon.html.erb
@@ -41,25 +41,25 @@
             </div>
             <div class="cl"></div>
             <span class="separator_short"></span>
-            <li class="mb10">
+            <li class="mb10 fl">
               <label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
-              <input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/>
-              <label for="teacher_score" class=" fl ml5">教师评分</label>
+              <!--<input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/>-->
+              <ul class="fl ml5">
+                <li class="clear">
+                  <span class="fl">教师评分</span>
+                  <%= select_tag :te_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.te_proportion), {:class => "w61 fl ml15"} %>
+                </li>
+                <li class="clear mt5">
+                  <span class="fl">助教评分</span>
+                  <input type="hidden" name="ta_proportion" value="<%= homework.homework_detail_manual.ta_proportion %>">
+                  <input type="text" style="width: 49px; padding-left: 10px;" id="ta_proportion" value="<%= (homework.homework_detail_manual.ta_proportion * 100).to_i %>%" class="fl ml15" readonly>
+                </li>
+              </ul>
             </li>
-            <div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
+            <div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 29px;">
               <em></em>
               <span></span>
-              <p >教师评分 - 迟交扣分 </p>
-            </div>
-            <li class="mb10">
-              <label class="pop_box_label fl">&nbsp;&nbsp;</label>
-              <input type="radio" class="fl" id="other_score" value="0" name="teacher_priority"/>
-              <label for="other_score" class="fl ml5">助教评分</label>
-            </li>
-            <div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
-              <em></em>
-              <span></span>
-              <p >助教评分 - 迟交扣分 </p>
+              <p >教师评分 * 其百分比 + <br/>助教评分 * 其百分比 - <br/> 迟交扣分 </p>
             </div>
           </ul>
           <div class="cl"></div>
@@ -72,6 +72,14 @@
 
 <script>
     $(function(){
+        $("#te_proportion").die();
+
+        $("#te_proportion").live('change', function(){
+            var ta_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100);
+            $("#ta_proportion").val(ta_proportion + "%");
+            $("input[name='ta_proportion']").val(ta_proportion/100);
+        });
+
         <% if homework.teacher_priority == 1 %>
         $("#teacher_score").attr("checked", "checked");
         <% else %>
diff --git a/app/views/homework_common/_set_score_rule_pro.html.erb b/app/views/homework_common/_set_score_rule_pro.html.erb
index 725eca62e..380489e7f 100644
--- a/app/views/homework_common/_set_score_rule_pro.html.erb
+++ b/app/views/homework_common/_set_score_rule_pro.html.erb
@@ -103,42 +103,34 @@
 
             <li class="mb10 mt10 fl">
               <label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
-              <input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/><label for="teacher_score" class=" fl ml5">教师评分</label>
-            </li>
-            <div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230" style="margin-left: 141px;">
-              <em></em>
-              <span></span>
-              <p>教师评分-迟交扣分-缺评扣分-违规匿评扣分</p>
-            </div>
-            <li class="mb10 fl">
-              <label class="pop_box_label fl">&nbsp;&nbsp;</label>
-              <ul class="fl">
+              <ul class="fl ml5">
                 <li class="clear">
-                  <input type="radio" class="fl" id="other_score" value="0" name="teacher_priority"/>
-                  <label for="other_score" class="fl ml5">系统评分+助教评分+学生匿评</label>
+                  <span class="fl">教师评分</span>
+                  <%= select_tag :te_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.te_proportion), {:class => "w61 fl ml15"} %>
                 </li>
-                <li class="clear">
-                  <%= select_tag :sy_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "w61 fl ml15"} %>
-                  <span class="fl ml5">系统评分</span>
+                <li class="clear mt5">
+                  <span class="fl">助教评分</span>
+                  <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_manual.te_proportion * 100).to_i),homework.homework_detail_manual.ta_proportion), {:class => "w61 fl ml15"}  %>
                 </li>
-                <li class="clear">
-                  <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing.ta_proportion * 100).to_i),homework.homework_detail_manual.ta_proportion), {:class => "w61 fl ml15"}  %>
-                  <span class="fl ml5">助教评分</span>
+                <li class="clear mt5">
+                  <span class="fl">系统评分</span>
+                  <%= select_tag :sy_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_manual.te_proportion * 100).to_i-(homework.homework_detail_manual.ta_proportion * 100).to_i),homework.homework_detail_programing.ta_proportion), {:class => "w61 fl ml15"} %>
                 </li>
-                <li class="clear">
-                  <input type="text" style="width: 49px; padding-left: 10px;" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing.ta_proportion * 100).to_i%>" class="fl ml15" readonly>
-                  <span class="fl ml5">学生匿评</span>
+                <li class="clear mt5">
+                  <span class="fl">学生匿评</span>
+                  <input type="text" style="width: 49px; padding-left: 10px;" id="student_proportion" value="<%= 100 - (homework.homework_detail_manual.te_proportion * 100).to_i - (homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing.ta_proportion * 100).to_i%>%" class="fl ml15" readonly>
                 </li>
               </ul>
-              <div class="fl clear popup_tip_box fontGrey2 w230" style="margin-left: 27px;">
-                <em></em>
-                <span></span>
-                <p>系统评分*其百分比+ <br/>
-                  助教评 *其百分比+  <br/>
-                  学生匿评平均分*其百分比 - <br/>
-                  ( 迟交扣分+缺评扣分+违规匿评扣分 )</p>
-              </div>
             </li>
+            <div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230" style="margin-left: 73px;">
+              <em></em>
+              <span></span>
+              <p>教师评分 * 其百分比 + <br/>
+                助教评分 * 其百分比 +  <br/>
+                系统评分 * 其百分比 + <br/>
+                学生匿评平均分 * 其百分比 - <br/>
+                ( 迟交扣分+缺评扣分+违规匿评扣分 )</p>
+            </div>
           </ul>
           <div class="cl"></div>
           <a href="javascript:void(0);" class="fr sy_btn_blue mr50" onclick="set_score_rule_submit();">确定</a>
@@ -150,14 +142,24 @@
 </div>
 <script>
     $(function(){
-        $("#sy_proportion").live('change', function(){
-            var ta_proportion = 100 - parseInt(parseFloat($("#sy_proportion").val()) * 100);
+        $("#te_proportion").die();
+        $("#ta_proportion").die();
+        $("#sy_proportion").die();
+
+        $("#te_proportion").live('change', function(){
+            var ta_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100);
             $("#ta_proportion").replaceWith(build_selector(ta_proportion));
+            $("#sy_proportion").replaceWith(build_selector_sy(0));
             $("#student_proportion").val("0%");
         });
         $("#ta_proportion").live("change",function(){
-            var ta_proportion = 100 - parseInt(parseFloat($("#sy_proportion").val()) * 100) - parseInt(parseFloat($("#ta_proportion").val()) * 100);
-            $("#student_proportion").val(ta_proportion  + "%");
+            var sy_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100) - parseInt(parseFloat($("#ta_proportion").val()) * 100);
+            $("#sy_proportion").replaceWith(build_selector_sy(sy_proportion));
+            $("#student_proportion").val("0%");
+        });
+        $("#sy_proportion").live("change",function(){
+            var sy_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100) - parseInt(parseFloat($("#ta_proportion").val()) * 100) - parseInt(parseFloat($("#sy_proportion").val()) * 100);
+            $("#student_proportion").val(sy_proportion + "%");
         });
         <% if homework.teacher_priority == 1 %>
         $("#teacher_score").attr("checked", "checked");
diff --git a/app/views/homework_common/_set_score_rule_pro_anon.html.erb b/app/views/homework_common/_set_score_rule_pro_anon.html.erb
index 9c92f5b5e..7c3fb093f 100644
--- a/app/views/homework_common/_set_score_rule_pro_anon.html.erb
+++ b/app/views/homework_common/_set_score_rule_pro_anon.html.erb
@@ -43,37 +43,28 @@
             <span class="separator_short"></span>
             <li class="mb10 fl">
               <label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
-              <input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/>
-              <label for="teacher_score" class=" fl ml5">教师评分</label>
-            </li>
-            <div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
-              <em></em>
-              <span></span>
-              <p >教师评分 - 迟交扣分 </p>
-            </div>
-            <li class="mb10 fl">
-              <label class="pop_box_label fl">&nbsp;&nbsp;</label>
-              <ul class="fl">
+              <!--<input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/>-->
+              <ul class="fl ml5">
                 <li class="clear">
-                  <input type="radio" class="fl" id="other_score" value="0" name="teacher_priority"/><label for="other_score" class="fl ml5">系统评分+助教评分</label>
+                  <span class="fl">教师评分</span>
+                  <%= select_tag :te_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.te_proportion), {:class => "w61 fl ml15"} %>
                 </li>
-                <li class="clear">
-                  <%= select_tag :sy_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "w61 fl ml15"} %>
-                  <span class="fl ml5">系统评分</span>
+                <li class="clear mt5">
+                  <span class="fl">助教评分</span>
+                  <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_manual.te_proportion * 100).to_i),homework.homework_detail_manual.ta_proportion), {:class => "w61 fl ml15"}  %>
                 </li>
-                <li class="clear">
-                  <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing.ta_proportion * 100).to_i),homework.homework_detail_manual.ta_proportion), {:class => "w61 fl ml15"}  %>
-                  <span class="fl ml5">助教评分</span>
+                <li class="clear mt5">
+                  <span class="fl">系统评分</span>
+                  <input name="sy_proportion" type="hidden" value="<%= homework.homework_detail_programing.ta_proportion %>">
+                  <input type="text" style="width: 49px; padding-left: 10px;" id="sy_proportion" value="<%= (homework.homework_detail_programing.ta_proportion * 100).to_i %>%" class="fl ml15" readonly>
                 </li>
               </ul>
-              <div class="fl clear popup_tip_box fontGrey2 mb10 w190 ml30">
-                <em></em>
-                <span></span>
-                <p >系统评分 * 其百分比 + <br/>
-                  助教评分 * 其百分比 - <br/>
-                  迟交扣分  </p>
-              </div>
             </li>
+            <div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 29px;">
+              <em></em>
+              <span></span>
+              <p >教师评分 * 其百分比 + <br/>助教评分 * 其百分比 + <br/>系统评分 * 其百分比 - <br/> 迟交扣分 </p>
+            </div>
           </ul>
           <div class="cl"></div>
           <a href="javascript:void(0);" class="fr sy_btn_blue mr40" onclick="set_score_rule_submit();">确定</a>
@@ -86,13 +77,19 @@
 
 <script>
     $(function(){
-        $("#sy_proportion").live('change', function(){
-            var ta_proportion = 100 - parseInt(parseFloat($("#sy_proportion").val()) * 100);
+        $("#te_proportion").die();
+        $("#ta_proportion").die();
+
+        $("#te_proportion").live('change', function(){
+            var ta_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100);
             $("#ta_proportion").replaceWith(build_selector(ta_proportion));
+            $("#sy_proportion").val("0%");
+            $("input[name='sy_proportion']").val(0);
         });
         $("#ta_proportion").live('change', function(){
-            var sy_proportion = 100 - parseInt(parseFloat($("#ta_proportion").val()) * 100);
-            $("#sy_proportion").replaceWith(build_selector_sy(sy_proportion));
+            var ta_proportion = 100 - parseInt(parseFloat($("#te_proportion").val()) * 100) - parseInt(parseFloat($("#ta_proportion").val()) * 100);
+            $("#sy_proportion").val(ta_proportion  + "%");
+            $("input[name='sy_proportion']").val(ta_proportion/100);
         });
         <% if homework.teacher_priority == 1 %>
         $("#teacher_score").attr("checked", "checked");
diff --git a/db/migrate/20170327084330_add_te_proportion_to_homework.rb b/db/migrate/20170327084330_add_te_proportion_to_homework.rb
new file mode 100644
index 000000000..a20902906
--- /dev/null
+++ b/db/migrate/20170327084330_add_te_proportion_to_homework.rb
@@ -0,0 +1,27 @@
+class AddTeProportionToHomework < ActiveRecord::Migration
+  def change
+    add_column :homework_detail_manuals, :te_proportion, :float, :default => 1.0
+
+    count  = HomeworkDetailManual.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        HomeworkDetailManual.page(i).per(30).each do |homework|
+          if homework.homework_common
+            homework_common = homework.homework_common
+            homework_detail_programing = homework_common.homework_detail_programing
+            if homework_common.teacher_priority == 1
+              if homework_detail_programing
+                homework_detail_programing.update_column("ta_proportion", 0.0)
+              end
+              homework.update_column("ta_proportion", 0.0)
+            else
+              homework.update_column("te_proportion", 0.0)
+            end
+          else
+            homework.destroy
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 547a82a56..22a5f1494 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -658,7 +658,7 @@ function build_selector(max_num){
 }
 function build_selector_sy(max_num){
     var html = "<select class='w61 fl ml15' id='sy_proportion' name='sy_proportion'>";
-    for(var i = 0; i <= 100; i += 10){
+    for(var i = 0; i <= max_num; i += 10){
         if( i == max_num){
             html += "<option value='" + parseFloat(i)/100 + "' selected='selected'>" + i + "%</option>";
         }else{