diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 9177e044b..e1439b7f9 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -54,7 +54,9 @@ class PollController < ApplicationController
   end
 
   def edit
-
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
   end
 
   def update
@@ -82,8 +84,8 @@ class PollController < ApplicationController
   end
 
   #添加单选题
-  def add_mc
-
+  def create_poll_question
+    a = 1
   end
 
   private
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 73d967ca9..492126827 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,33 +1,26 @@
-<div><!--编辑单选start-->
-  <div class="ur_editor radio">
-    <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>
-    </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>
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+    <div>
+      <!--编辑单选start-->
+      <div class="ur_editor radio">
+        <div class="ur_editor_title">
+          <label>问题：&nbsp;&nbsp;</label>
+          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
+          <input type="checkbox" name="is_necessary" value="true" checked/>
+          <label>必答</label>
+        </div>
+        <div class="ur_editor_content">
+          <ul>
+            <%= render :partial => 'question_answer'%>
+            <%= render :partial => 'question_answer'%>
+            <%= render :partial => 'question_answer'%>
+          </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_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
+        </div>
         <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>
+      </div>
+      <!--编辑单选 end-->
     </div>
-    <div class="cl"></div>
-  </div>
-</div><!--编辑单选 end-->
\ No newline at end of file
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 0387bb9c6..a8ad46694 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -10,6 +10,22 @@
       function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+      //单选题
+      function add_single_answer(doc)
+      {
+          doc.parent().after("<%= escape_javascript(render :partial => 'question_answer') %>");
+      }
+      function remove_single_answer(doc)
+      {
+          if(doc.parent().siblings("li").length == 0)
+          {
+              doc.parent().parent().parent().parent().parent().parent().remove();
+          }
+          else
+          {
+              doc.parent().remove();
+          }
+      }
   </script>
 </head>
 
@@ -45,6 +61,7 @@
   <%= render :partial => 'edit_head'%>
 
   <div id="poll_content">
+    <%#= render :partial => 'edit_MC'%>
   </div>
 
   <div class="ur_buttons">
diff --git a/app/views/poll/_question_answer.html.erb b/app/views/poll/_question_answer.html.erb
new file mode 100644
index 000000000..765d71787
--- /dev/null
+++ b/app/views/poll/_question_answer.html.erb
@@ -0,0 +1,11 @@
+<li class="ur_item">
+  <label>
+    选项
+    <span class="ur_index">
+    </span>：
+  </label>
+  <input type="text" name="option" 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>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index af0b75ae7..d2d0c73a8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -61,7 +61,7 @@ RedmineApp::Application.routes.draw do
   resources :poll do
     member do
       get 'statistics_result'
-      get 'add_mc'
+      post 'create_poll_question'
     end
   end