diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index cf61f7d12..a3f02cbb9 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -72,12 +72,29 @@ class StudentWorkController < ApplicationController
         query.update_attributes(:viewed => true)
       end
     end
-
     ##################################################################################################################
-    @stundet_works = @homework.student_works
+    @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @homework_commons = @course.homework_commons.order("created_at desc")
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @is_evaluation = @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
+    if @is_teacher   #老师 || 超级管理员 显示所有列表
+      @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+    elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+    elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+      my_work = @homework.student_works.where(:user_id => User.current.id)
+      @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+    elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前只看到自己的，提交了作品看到所有的
+      my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+      if my_work.empty?
+        @stundet_works = []
+      else
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+      end
+    else
+      @stundet_works = []
+    end
+    @score = @b_sort == "desc" ? "asc" : "desc"
 
     respond_to do |format|
       format.html
@@ -415,10 +432,14 @@ class StudentWorkController < ApplicationController
 
   #根据条件过滤作业结果
   def search_homework_member homeworks,name
-    name = name.downcase
-    select_homework = homeworks.select{ |homework|
-      homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
-    }
+    if name == ""
+      select_homework = homeworks
+    else
+      name = name.downcase
+      select_homework = homeworks.select{ |homework|
+        homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
+      }
+    end
     select_homework
   end
 
@@ -582,9 +603,7 @@ class StudentWorkController < ApplicationController
   end
 
   #成绩计算
-  def set_final_score
-    homework = HomeworkCommon.first
-    student_work = StudentWork.first
+  def set_final_score homework,student_work
     if homework && homework.homework_detail_manual
       if homework.homework_type == 1 #匿评作业
         if homework.teacher_priority == 1 #教师优先
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 409c064c8..4979c5c95 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -38,19 +38,22 @@
         <!---menu_r end--->
       </div>
       <!--div class="hworkInfor"><a href="javascript:void(0);" class="linkBlue">作业信息</a></div-->
-      <div class="fr mt5">
-        <ul class="resourcesSelect">
-          <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-            <ul class="hworkMenu">
-              <li><a href="javascript:void(0);" class="hworkExport resourcesGrey">导出作业成绩</a></li>
-              <li><a href="javascript:void(0);" class="hworkExport postTypeGrey">导出作业附件</a></li>
-              <li><a href="javascript:void(0);" class="hworkExport postTypeGrey">导出缺评情况</a></li>
-              <li><a href="javascript:void(0);" class="hworkExport resourcesGrey">导出匿评情况</a></li>
-              <li><a href="javascript:void(0);" class="hworkSetting resourcesGrey">评分设置</a></li>
+      <% if @is_teacher%>
+          <div class="fr mt5">
+            <ul class="resourcesSelect">
+              <li class="resourcesSelected">
+                <a href="javascript:void(0);" class="resourcesIcon"></a>
+                <ul class="hworkMenu">
+                  <li><a href="javascript:void(0);" class="hworkExport resourcesGrey">导出作业成绩</a></li>
+                  <li><a href="javascript:void(0);" class="hworkExport postTypeGrey">导出作业附件</a></li>
+                  <li><a href="javascript:void(0);" class="hworkExport postTypeGrey">导出缺评情况</a></li>
+                  <li><a href="javascript:void(0);" class="hworkExport resourcesGrey">导出匿评情况</a></li>
+                  <li><a href="javascript:void(0);" class="hworkSetting resourcesGrey">评分设置</a></li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+          </div>
+      <% end%>
       <div class="cl"></div>
     </div>
     <div class="hworkListContainer">
@@ -58,14 +61,14 @@
         <div class="dis" id="tbc_01">
           <div class="codeList">
             <span class="fl mt3">
-              <a href="javascript:void(0);" class="fl f14" >所有作品
-                <font class="f12 c_red">[共199份]</font>
-              </a>
+              <%= link_to "所有作品<font class='f12 c_red'>[共#{@homework.student_works.count}份]</font>".html_safe,student_work_index_path(:homework => @homework.id),:class => "fl f14"%>
             </span>
-            <form class="resourcesSearchloadBox fr">
-              <input type="text" name="serach" placeholder="输入资源关键词进行搜索" class="searchResource" />
-              <a href="javascript:void(0);" class="homepageSearchIcon"></a>
-            </form>
+            <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
+                <form class="resourcesSearchloadBox fr">
+                  <input type="text" id="course_student_name" value="<%= @name%>" placeholder="输入资源关键词进行搜索" class="searchResource" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
+                  <a class="homepageSearchIcon" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
+                </form>
+            <% end%>
             <div class="cl"></div>
           </div>
           <!---code_list end--->