From 8f3be9a7f6e42c8e3678df80eb6b0f660b748d4c Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Mon, 1 Jul 2019 12:37:13 +0800
Subject: [PATCH] fix bug

---
 .../exercise_export/blank_exercise.html.erb      | 16 ++++++----------
 .../exercise_export/exercise_export.css          |  6 ++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/templates/exercise_export/blank_exercise.html.erb b/app/templates/exercise_export/blank_exercise.html.erb
index f281a55a0..b253d86b9 100644
--- a/app/templates/exercise_export/blank_exercise.html.erb
+++ b/app/templates/exercise_export/blank_exercise.html.erb
@@ -68,17 +68,13 @@
               <span class="text-gray mlr5">(<%= q&.question_score %>分)</span>
             </div>
             <div class="pbt5">
-              <img src="http://47.96.87.25:48080/api/attachments/368984" alt="电脑的电路图" title="电脑的电路图">
-              <img class="myavatar avatar-48" alt="udasker_picture" src="http://images.udask.cn/uploaders/user/picture/2/2_udasker.jpg?v=1556452947">
-              <% q_markdown = to_markdown(q.question_title) %>
               <% if q.question_type == 5 %>
-                <% q_markdown_name = to_markdown(q.shixun_name) %>
-                <span class="ques-title" ><%= q_markdown_name %></span>
+                <span class="ques-title" ><%= to_markdown(q.shixun_name) %></span>
                 <div class="mt8 text-gray">
-                  <span><%= q_markdown %></span>
+                  <span><%= to_markdown(q.question_title) %></span>
                 </div>
               <% else %>
-                <span class="ques-title"><%= q_markdown %></span>
+                <span class="ques-title"><%= to_markdown(q.question_title) %></span>
               <% end %>
             </div>
             <div class="pbt5">
@@ -86,14 +82,14 @@
                 <% q.exercise_choices.each do |s| %>
                   <div class="pbt5 clearfix">
                     <span class="choose-radio pull-left"></span>
-                    <span class="inline-block pull-left"><%= to_markdown(s.choice_text) %></span>
+                    <span class="inline-block pull-left line-20"><%= to_markdown(s.choice_text) %></span>
                   </div>
                 <% end %>
               <% elsif q.question_type == 1 %>
                 <% q.exercise_choices.each do |s| %>
                   <div class="pbt5 clearfix">
                     <span class="choose-checkbox pull-left"></span>
-                    <span class="inline-block pull-left"><%= to_markdown(s.choice_text) %></span>
+                    <span class="inline-block pull-left line-20"><%= to_markdown(s.choice_text) %></span>
                   </div>
                 <% end %>
               <% elsif q.question_type == 2 %>
@@ -101,7 +97,7 @@
                   <% q.exercise_choices.each do |s| %>
                     <span class="mr15 clearfix">
                       <span class="choose-radio pull-left"></span>
-                      <span class="mlr5 inline-block pull-left"><%= to_markdown(s.choice_text) %></span>
+                      <span class="mlr5 inline-block pull-left line-20"><%= to_markdown(s.choice_text) %></span>
                     </span>
                   <% end %>
                 </div>
diff --git a/app/templates/exercise_export/exercise_export.css b/app/templates/exercise_export/exercise_export.css
index 9190e9251..bbe523972 100644
--- a/app/templates/exercise_export/exercise_export.css
+++ b/app/templates/exercise_export/exercise_export.css
@@ -309,6 +309,12 @@ textarea{
     clear:both;
     zoom:1;
 }
+.line-20{
+    line-height: 20px;
+}
+.line-20 P{
+    margin-bottom:0;
+}