diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 3c0469e9b..d11259f15 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1060,7 +1060,7 @@ class StudentWorkController < ApplicationController
   end
 
   def forbidden_anonymous_comment
-    @homework.update_column('anonymous_comment', 1)
+    @homework.update_column('anonymous_comment', @homework.anonymous_comment == 0 ? 1 : 0)
     homework_detail_manual = @homework.homework_detail_manual
     homework_detail_programing = @homework.homework_detail_programing
     if homework_detail_programing
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 75a0eb3f1..2b1f3fbb9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3710,7 +3710,9 @@ def get_hw_status homework_common
       end
       if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
         str += '<span class="green_homework_btn_cir ml5">作品提交中</span>'
-      elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
+      elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && homework_common.anonymous_comment == 1 && User.current.allowed_to?(:as_teacher, homework_common.course)
+        str += '<span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>'
+      else
         str += '<span class="red_homework_btn_cir ml5">作品补交中</span>'
       end
     elsif homework_common.homework_detail_manual.comment_status == 2
diff --git a/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
index 354f217e2..a19815ca3 100644
--- a/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
+++ b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
@@ -1,6 +1,2 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>');
-showModal('ajax-modal', '500px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
\ No newline at end of file
+var htmlvalue = "<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
+pop_box_new(htmlvalue, 400, 178);
\ No newline at end of file
diff --git a/app/views/student_work/_alert_forbidden_anonymous.html.erb b/app/views/student_work/_alert_forbidden_anonymous.html.erb
index d1cdd8d57..328386a04 100644
--- a/app/views/student_work/_alert_forbidden_anonymous.html.erb
+++ b/app/views/student_work/_alert_forbidden_anonymous.html.erb
@@ -1,16 +1,19 @@
-<div id="popbox02">
-  <div class="ni_con">
-    <h2>禁用匿评</h2>
-    <p>
-      禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？
-    </p>
-    <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :hw_status => hw_status)%>');" style="margin-bottom: 20px;" >
-        确&nbsp;&nbsp;定
-      </a>
-      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
-        取&nbsp;&nbsp;消
-      </a>
-    </div>
+<div id="muban_popup_box" style="width:400px;">
+  <div class="muban_popup_top">
+    <h3 class="fl">
+      提示
+    </h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
   </div>
-</div>
\ No newline at end of file
+  <div class="muban_popup_con ml30 mr30 mt20 mb10 clear" >
+    <p class="mb10 f14 text_c">评分比例将恢复默认值，您可以在评分设置中进行修改</p>
+    <% if @homework.anonymous_comment == 0%>
+        <p class="mb10 f14 text_c">是否确定禁用匿评</p>
+    <% else %>
+        <p class="mb10 f14 text_c">是否确定启用匿评</p>
+    <% end %>
+    <a href="javascript:void(0);" class="fl sy_btn_blue" style="margin-left: 114px;" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :hw_status => hw_status)%>');">确定</a>
+    <a href="javascript:void(0);" class="fl sy_btn_grey ml5" onclick="hideModal();">取消</a>
+  </div>
+</div>
diff --git a/app/views/student_work/forbidden_anonymous_comment.js.erb b/app/views/student_work/forbidden_anonymous_comment.js.erb
index 2dd4a88a4..729776685 100644
--- a/app/views/student_work/forbidden_anonymous_comment.js.erb
+++ b/app/views/student_work/forbidden_anonymous_comment.js.erb
@@ -3,4 +3,12 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(r
 sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
 <% else %>
 sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
+<% end %>
+<% if @homework.anonymous_comment == 0 %>
+    var htmlvalue = '<div id="muban_popup_box" style="width:400px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+        '<div class="muban_popup_con ml30 mr30 mt20 mb10 clear"><p class="mb10 f14 text_c">将于7天后自动启动该作业的匿评</p><p class="mb10 f14 text_c">您可以在匿评设置中进行修改</p>' +
+        '<a href="javascript:void(0);" class="btn btn-blue mt10" style="margin-left: 142px;" onclick="hideModal();">知道啦</a></div></div>';
+    pop_box_new(htmlvalue, 400, 178);
+<% else %>
+    hideModal();
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_homework_base_info.html.erb b/app/views/users/_homework_base_info.html.erb
index 40381e686..53f968328 100644
--- a/app/views/users/_homework_base_info.html.erb
+++ b/app/views/users/_homework_base_info.html.erb
@@ -111,6 +111,11 @@
                   <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
                               :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
                 </li>
+            <% elsif activity.anonymous_comment == 1 %>
+                <li>
+                  <%= link_to("启用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
+                              :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
+                </li>
             <% end %>
             <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
                 <li>
diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake
index dac3c11af..c18d529e1 100644
--- a/lib/tasks/homework_publishtime.rake
+++ b/lib/tasks/homework_publishtime.rake
@@ -41,19 +41,19 @@ namespace :homework_publishtime do
     puts "--------------------------------homework_publish end"
   end
 
-  task :end => :environment do
-    puts "--------------------------------homework_publish_end start"
-    Rails.logger.info("log--------------------------------homework_publish_end start")
-    homework_commons = HomeworkCommon.where("end_time = '#{Date.today}'")
-    homework_commons.each do |homework|
-      if homework.anonymous_comment == 1
-        homework_detail_manual = homework.homework_detail_manual
-        if homework_detail_manual.comment_status == 1
-          homework_detail_manual.update_column('comment_status', 3)
-        end
-      end
-    end
-    Rails.logger.info("log--------------------------------homework_publish_end end")
-    puts "--------------------------------homework_publish_end end"
-  end
+  # task :end => :environment do
+  #   puts "--------------------------------homework_publish_end start"
+  #   Rails.logger.info("log--------------------------------homework_publish_end start")
+  #   homework_commons = HomeworkCommon.where("end_time = '#{Date.today}'")
+  #   homework_commons.each do |homework|
+  #     if homework.anonymous_comment == 1
+  #       homework_detail_manual = homework.homework_detail_manual
+  #       if homework_detail_manual.comment_status == 1
+  #         homework_detail_manual.update_column('comment_status', 3)
+  #       end
+  #     end
+  #   end
+  #   Rails.logger.info("log--------------------------------homework_publish_end end")
+  #   puts "--------------------------------homework_publish_end end"
+  # end
 end
\ No newline at end of file