From f70758c62194ee7624f401d3ea0770eb73c780ab Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Thu, 29 Aug 2019 15:56:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?MD=E6=B8=B2=E6=9F=93=E5=90=8E=E6=AE=B5?=
 =?UTF-8?q?=E8=90=BD=E7=9A=84=E8=A1=8C=E9=AB=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/App.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/react/src/App.css b/public/react/src/App.css
index 2b3d8d08c..42e40f8c8 100644
--- a/public/react/src/App.css
+++ b/public/react/src/App.css
@@ -55,6 +55,9 @@ html, body {
 .markdown-body p {
   white-space: pre-wrap;
 }
+.markdown-body > p {
+  line-height: 25px;
+}
 /* https://www.educoder.net/courses/2346/group_homeworks/34405/question */
 .renderAsHtml.markdown-body p {
   white-space: inherit;

From 8c69332c9ceb6e1785308de8466548ade131403d Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Thu, 29 Aug 2019 17:39:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=95=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/exercise/question/fillEmpty.js  | 2 +-
 .../src/modules/courses/exercise/question/simpleAnswer.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/question/fillEmpty.js b/public/react/src/modules/courses/exercise/question/fillEmpty.js
index 24ff7b641..737fef682 100644
--- a/public/react/src/modules/courses/exercise/question/fillEmpty.js
+++ b/public/react/src/modules/courses/exercise/question/fillEmpty.js
@@ -129,7 +129,7 @@ class fillEmpty extends Component{
         }
         {
           // 答案公开，且试卷已经截止
-          isAdmin && 
+          questionType.standard_answer && 
           <div>
             <p className="bor-top-greyE pt20 mt20 font-16 mb10">参考答案：</p>
             { questionType.standard_answer && questionType.standard_answer.map((item,k)=>{
diff --git a/public/react/src/modules/courses/exercise/question/simpleAnswer.js b/public/react/src/modules/courses/exercise/question/simpleAnswer.js
index 527044968..1dfcbdb2a 100644
--- a/public/react/src/modules/courses/exercise/question/simpleAnswer.js
+++ b/public/react/src/modules/courses/exercise/question/simpleAnswer.js
@@ -85,9 +85,9 @@ class simpleAnswer extends Component{
           </div>
         }
         {
-          isStudent && exercise.answer_open==true && exercise.exercise_status == 3 ?
+          isStudent && questionType.standard_answer ?
           <div className="bor-top-greyE pt20 mt20 standardAnswer">
-            <p>参考答案：</p>
+            <p className="mb10 font-16">参考答案：</p>
             {/* <li className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML1(questionType.standard_answer && questionType.standard_answer[0])}}></li> */}
             <MarkdownToHtml content={questionType.standard_answer && questionType.standard_answer[0]} selector={'simgle_standard2_' + (this.props.index + 1)}
               className="answerStyle"                       

From 4c74b6fa444beec69561ee259366fc519e1c85d1 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 29 Aug 2019 18:18:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=BB=93=E6=9E=9C=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/polls_controller.rb         | 2 +-
 app/views/polls/commit_result.json.jbuilder | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 022574045..bc549cf1d 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -936,7 +936,7 @@ class PollsController < ApplicationController
   def commit_result
     ActiveRecord::Base.transaction do
       begin
-        @poll_users = @poll.all_poll_users(current_user.id)
+        @poll_users = @poll.all_poll_users(current_user.id).where(commit_status:1)  # 问卷已提交的用户
         @poll_commit_ids = @poll_users.commit_by_status(1).pluck(:user_id) #问卷提交用户的id
         @page  = params[:page] || 1
         @limit = params[:limit] || 10
diff --git a/app/views/polls/commit_result.json.jbuilder b/app/views/polls/commit_result.json.jbuilder
index 51f70afa2..795d609a7 100644
--- a/app/views/polls/commit_result.json.jbuilder
+++ b/app/views/polls/commit_result.json.jbuilder
@@ -14,7 +14,7 @@ if @poll_questions_count > 0
     json.array! @poll_questions do |question|
       json.partial! "polls/commit_answers_result", question: question,
                     answers:question.poll_answers,
-                    question_votes:question.poll_votes    #问题的全部答案
+                    question_votes:question.poll_votes.where(user_id:@poll_commit_ids)    #问题的全部答案
     end
   end
 else