diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index cf64e7f3e..f34319569 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -1,33 +1,28 @@
-<div><!--编辑多选start-->
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%><!--编辑多选start-->
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
-      <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
-      <input type="checkbox" name="required" value="true" checked=""/>
-      <label >必答</label>
+      <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+      <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+      <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+      <label>必答</label>
     </div>
     <div class="ur_editor_content">
       <ul>
-        <li class="ur_item">
-          <label>选项 <span class="ur_index">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
-        <li class="ur_item">
-          <label >选项 <span class="ur_index">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
+        <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+            <li class='ur_item'>
+              <label>选项<span class='ur_index'></span>：</label>
+              <input type='text' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
+              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+            </li>
+            <div class='cl'></div>
+        <% end%>
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
     </div>
     <div class="cl"></div>
-  </div>
-</div><!--编辑多选 end-->
\ No newline at end of file
+  </div><!--编辑多选 end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index 013bf0ed0..f4f1ef676 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -1,6 +1,5 @@
 <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
-  <div>
-    <!--编辑单选start-->
+    <!--新建单选start-->
     <div class="ur_editor radio">
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
@@ -35,11 +34,10 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
+        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
         <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
       </div>
       <div class="cl"></div>
     </div>
     <!--编辑单选 end-->
-  </div>
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 6739c233e..23f216427 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -1,33 +1,41 @@
-<div><!--编辑多选start-->
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%><!--新建多选start-->
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
-      <label >问题：&nbsp;&nbsp;</label>
+      <label>问题：&nbsp;&nbsp;</label>
+      <input type="hidden" name="question_type" value="2"/>
       <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题标题"/>
-      <input type="checkbox" name="required" value="true" checked=""/>
-      <label >必答</label>
+      <input type="checkbox" name="is_necessary" value="true" checked/>
+      <label>必答</label>
     </div>
     <div class="ur_editor_content">
       <ul>
-        <li class="ur_item">
-          <label>选项 <span class="ur_index">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input type='text' name='question_answer[0]' placeholder='新建选项'/>
+          <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+          <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
         </li>
-        <div class="cl"></div>
-        <li class="ur_item">
-          <label >选项 <span class="ur_index">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
+        <div class='cl'></div>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input type='text' name='question_answer[1]' placeholder='新建选项'/>
+          <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+          <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
         </li>
-        <div class="cl"></div>
+        <div class='cl'></div>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input type='text' name='question_answer[2]' placeholder='新建选项'/>
+          <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+          <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+        </li>
+        <div class='cl'></div>
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
     </div>
     <div class="cl"></div>
   </div>
-</div><!--编辑多选 end-->
\ No newline at end of file
+<% end%><!--编辑多选 end-->
\ No newline at end of file
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index f3fc9c8b5..594baea9d 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -7,7 +7,7 @@
     <%if poll_question.is_necessary == 1%>
         <span class="ur_required" title="必答">*</span>
     <%end%>
-
+    (单选题)
   </div>
   <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb
index e56de53b9..64e39523a 100644
--- a/app/views/poll/_show_MCQ.html.erb
+++ b/app/views/poll/_show_MCQ.html.erb
@@ -1,28 +1,31 @@
 <div  class="ur_question_item checkbox ur_editor02">
   <div class="ur_title">
-    <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+    (多选题)
   </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
   <div class="cl"></div>
   <div class="ur_inputs">
     <table class="ur_table">
       <tbody>
-      <tr>
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
-      <tr >
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
+      <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+          <tr>
+            <td>
+              <label>
+                <input class="ur_radio" type="checkbox" name="<%= poll_question  %>" value="<%= poll_answer.answer_text%>" >
+                <%= poll_answer.answer_text%>
+              </label>
+            </td>
+          </tr>
+      <% end %>
       </tbody>
     </table>
   </div>
diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb
index 18f999157..ac44ebb4c 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -1,10 +1,26 @@
 $("#new_poll_question").html("");
 $("#poll_content").append("<div id='poll_questions_<%= @poll_questions.id%>'>" +
         "<div id='show_poll_questions_<%= @poll_questions.id %>'>" +
+        "<% if @poll_questions.question_type == 1%>" +
             "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 2%>" +
+            "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 3%>" +
+            "<%= escape_javascript(render :partial => 'show_single', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 4%>" +
+            "<%= escape_javascript(render :partial => 'show_mulit', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% end%>" +
         "</div>" +
         "<div id='edit_poll_questions_<%= @poll_questions.id %>' style='display: none;'>" +
+        "<% if @poll_questions.question_type == 1%>" +
             "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 2%>" +
+            "<%= escape_javascript(render :partial => 'edit_MCQ', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 3%>" +
+            "<%= escape_javascript(render :partial => 'edit_single', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 4%>" +
+            "<%= escape_javascript(render :partial => 'edit_mulit', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% end%>" +
         "</div>" +
     "</div>");