diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index fc23166ff..28c44f0cb 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -24,6 +24,7 @@ class PollController < ApplicationController
       render_403
     else
       @can_edit_poll = (!has_commit_poll?(@poll.id,User.current.id)) || User.current.admin?
+      @percent = get_percent(@poll,User.current)
       poll_questions = @poll.poll_questions
       @poll_questions = paginateHelper poll_questions,3 #分页
       respond_to do |format|
@@ -169,7 +170,7 @@ class PollController < ApplicationController
   def commit_answer
     pq = PollQuestion.find(params[:poll_question_id])
     if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
-      render :text => 'failure'
+      render :json => {:text => "failure"}
       return
     end
     if pq.question_type == 1
@@ -182,9 +183,10 @@ class PollController < ApplicationController
       end
       pv.poll_answer_id = params[:poll_answer_id]
       if pv.save
-        render :text => "ok"
+        @percent = get_percent(@poll,User.current)
+        render :json => {:text => "ok" ,:percent => format("%.2f" ,@percent)}
       else
-        render :text => "failure"
+        render :json => {:text => "failure"}
       end
     elsif pq.question_type == 2
       pv = PollVote.find_by_poll_answer_id_and_user_id(params[:poll_answer_id],User.current.id)
@@ -194,38 +196,64 @@ class PollController < ApplicationController
         pv.poll_question_id = params[:poll_question_id]
         pv.poll_answer_id = params[:poll_answer_id]
         if pv.save
-          render :text => "true"
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => "true",:percent => format("%.2f" ,@percent)}
         else
-          render :text => "failure"
+          render :json => {:text => "failure"}
         end
       else
         if pv.delete
-          render :text => "false"
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => "false" ,:percent => format("%.2f" ,@percent)}
         else
-          render :text => "failure"
+          render :json => {:text => "failure"}
         end
       end
     elsif pq.question_type == 3 || pq.question_type == 4
       pv = PollVote.find_by_poll_question_id_and_user_id(params[:poll_question_id],User.current.id)
       if pv.nil?
-        pv = PollVote.new
-        pv.user_id = User.current.id
-        pv.poll_question_id = params[:poll_question_id]
-      end
-      pv.vote_text = params[:vote_text]
-      if pv.save
-        render :text => pv.vote_text
+        if params[:vote_text].nil? || params[:vote_text].blank?
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+        else
+          pv = PollVote.new
+          pv.user_id = User.current.id
+          pv.poll_question_id = params[:poll_question_id]
+          pv.vote_text = params[:vote_text]
+          if pv.save
+            @percent = get_percent(@poll,User.current)
+            render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        end
       else
-        render :text => "failure"
+        if params[:vote_text].nil? || params[:vote_text].blank?
+          if pv.delete
+            @percent = get_percent(@poll,User.current)
+            render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        else
+          pv.vote_text = params[:vote_text]
+          if pv.save
+            @percent = get_percent(@poll,User.current)
+            render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        end
       end
+
     else
-      render :text => "failure"
+      render :json => {:text => "failure"}
     end
   end
 
   #提交问卷
   def commit_poll
-    @uncomplete_question = get_uncomplete_question(@poll)
+    @uncomplete_question = get_uncomplete_question(@poll,User.current)
     if @uncomplete_question.count < 1
       pu = get_poll_user(@poll.id,User.current.id)
       pu.user_id = User.current.id
@@ -274,17 +302,41 @@ class PollController < ApplicationController
   end
 
   #获取未完成的题目
-  def get_uncomplete_question poll
+  def get_uncomplete_question poll,user
     necessary_questions = poll.poll_questions.where("#{PollQuestion.table_name}.is_necessary = 1")
     uncomplete_question = []
     necessary_questions.each do |question|
-      if question.poll_votes.nil? || question.poll_votes.count < 1
+      answers = get_user_answer(question,user)
+      if answers.nil? || answers.count < 1
         uncomplete_question << question
       end
     end
     uncomplete_question
   end
 
+  #获取用户对某个问题的答案
+  def get_user_answer(question,user)
+    user_answer = question.poll_votes.where("#{PollVote.table_name}.user_id = #{user.id}")
+    user_answer
+  end
+
+  def get_complete_question(poll,user)
+    questions = poll.poll_questions
+    complete_question = []
+    questions.each do |question|
+      answers = get_user_answer(question,user)
+      if !(answers.nil? || answers.count < 1)
+        complete_question << question
+      end
+    end
+    complete_question
+  end
+
+  def get_percent poll,user
+    complete_count = get_complete_question(poll,user).count
+    (complete_count.to_f / poll.poll_questions.count.to_f)*100
+  end
+
   #PollUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个
   def get_poll_user poll_id,user_id
     pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
diff --git a/app/views/poll/_commit_alert.html.erb b/app/views/poll/_commit_alert.html.erb
index 76bbda416..3910bc8b5 100644
--- a/app/views/poll/_commit_alert.html.erb
+++ b/app/views/poll/_commit_alert.html.erb
@@ -3,7 +3,7 @@
     <h3 style="font-weight: normal;color: green">提交成功!</h3>
     <%= link_to "确定", poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course'),:class => 'commit'%>
   <% elsif status == 1 %>
-    <h3 style="font-weight: normal;color: red">您还有尚未作答的题目请完成后在提交!</h3>
+    <h3 style="font-weight: normal;color: red">您还有尚未作答的必答题目请完成后再提交!</h3>
     <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
   <% else %>
     <h3 style="font-weight: normal;color: red">发生未知错误，请检查您的网络。</h3>
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index e45bdfabb..0e5e956ca 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -11,34 +11,46 @@
   <div class="cl"></div>
   <div class="polls_list">
     <% @polls.each do |poll|%>
-        <ul id="polls_<%= poll.id %>">
-          <li>
-            <% if has_commit_poll?(poll.id ,User.current) %>
-                <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
-            <% else %>
-              <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-            <% end %>
-          </li>
-          <li>
-            <%if @is_teacher%>
-                <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
-            <% end%>
-          </li>
-          <li>
-            <% if @is_teacher%>
-                <%= link_to(l(:button_delete), poll,
-                            method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
-            <% end%>
-          </li>
-          <li>
-            <% if @is_teacher%>
-                <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
-            <% end%>
-          </li>
-          <li class="polls_date fr">
-            <%= format_time poll.created_at%>
-          </li>
-        </ul>
+
+          <% unless !@is_teacher && poll.polls_status != 2 %>
+            <ul id="polls_<%= poll.id %>">
+              <li>
+                <% if @is_teacher %>
+                    <% if has_commit_poll?(poll.id ,User.current) %>
+                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+                    <% else %>
+                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+                    <% end %>
+                <% else %>
+                    <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
+                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+                    <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
+                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+                    <% end %>
+                <% end %>
+              </li>
+              <li>
+                <%if @is_teacher%>
+                    <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+                <% end%>
+              </li>
+              <li>
+                <% if @is_teacher && poll.polls_status == 1 #新建状态的问卷可删除%>
+                    <%= link_to(l(:button_delete), poll,
+                                method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
+                <% end%>
+              </li>
+              <li>
+                <% if @is_teacher && poll.polls_status == 1 #新建状态的问卷可编辑%>
+                    <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+                <% end%>
+              </li>
+              <li class="polls_date fr">
+                <%= format_time poll.created_at%>
+              </li>
+            </ul>
+          <% end %>
+
         <div class="cl"></div>
     <% end%>
 
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index dca45c25c..42818dd34 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -72,7 +72,10 @@
                                               poll_question_id: <%= pq.id %>
                                           },
                                           success: function (data) {
-                                             obj.checked = true;
+                                            var dataObj = eval(data);
+                                            obj.checked = true;
+                                            var span = $('#percent');
+                                            span.html(dataObj.percent);
                                           }
                                       });
                                   }
@@ -118,7 +121,8 @@
                                                 poll_question_id: <%= pq.id %>
                                             },
                                             success: function (data) {
-                                                if(data == "true")
+                                                var dataObj = eval(data);
+                                                if(dataObj.text == "true")
                                                 {
                                                     obj.checked = true;
                                                 }
@@ -126,6 +130,8 @@
                                                 {
                                                     obj.checked = false;
                                                 }
+                                                var span = $('#percent');
+                                                span.html(dataObj.percent);
                                             }
                                         });
                                     }
@@ -165,6 +171,9 @@
                                   vote_text: obj.value
                               },
                               success: function (data) {
+                                  var dataObj = eval(data);
+                                  var span = $('#percent');
+                                  span.html(dataObj.percent);
 //                                 obj.value = data;
                               }
                           });
@@ -198,7 +207,17 @@
                                     vote_text: obj.innerHTML
                                 },
                                 success: function (data) {
-//                                 obj.value = data;
+                                    var dataObj = eval(data);
+                                    if(dataObj.text != 'failure')
+                                    {
+                                      var span = $('#percent');
+                                      span.html(dataObj.percent);
+                                    }
+                                    else
+                                    {
+                                        alert("error");
+                                    }
+
                                 }
                             });
                         }
@@ -217,10 +236,12 @@
     </ul>
     <div class="cl"></div>
     <div class="ur_buttons" style="width: 100px;">
-      <%= link_to "提交",commit_poll_poll_path(@poll), :method => :post,:class => "ur_button",:format => 'js',:remote=>true %>
+      <% if @poll.polls_status == 2 %>
+        <%= link_to "提交",commit_poll_poll_path(@poll), :method => :post,:class => "ur_button",:format => 'js',:remote=>true %>
+      <% end %>
     </div>
     <div class="cl"></div>
-    <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div>
+    <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number"><span id="percent"><%= format "%.2f" ,@percent %></span>%</strong> </div>
 
   </div>