From ce2344eecd1ebc4bc703ded6434655e8ec31970a Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Tue, 2 Jul 2019 09:44:14 +0800
Subject: [PATCH] fix bug

---
 app/controllers/zips_controller.rb                    | 4 ++--
 app/templates/exercise_export/blank_exercise.html.erb | 2 +-
 app/templates/exercise_export/exercise_export.css     | 1 +
 app/templates/exercise_export/exercise_user.html.erb  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/zips_controller.rb b/app/controllers/zips_controller.rb
index 51761d023..c20546701 100644
--- a/app/controllers/zips_controller.rb
+++ b/app/controllers/zips_controller.rb
@@ -49,12 +49,12 @@ class ZipsController < ApplicationController
           @course = @exercise.course
 
           default_ex_users = @exercise.all_exercise_users(current_user.id).exercise_user_committed
-          @ex_users =  default_ex_users.limit 2   #仅导出已提交的，截止后则是全部为提交的。
+          @ex_users =  default_ex_users   #仅导出已提交的，截止后则是全部为提交的。
           #可以分班选择
           if group_id.present?
             exercise_students = @course.students.where(course_group_id: group_id)  # 试卷所分班的全部人数
             user_ids = exercise_students.pluck(:user_id).reject(&:blank?).uniq
-            @ex_users = @ex_users.where(user_id: user_ids).limit 2
+            @ex_users = @ex_users.where(user_id: user_ids)
           end
 
           default_ex_users_size = @ex_users.size
diff --git a/app/templates/exercise_export/blank_exercise.html.erb b/app/templates/exercise_export/blank_exercise.html.erb
index bb7b28f22..5e763d1cc 100644
--- a/app/templates/exercise_export/blank_exercise.html.erb
+++ b/app/templates/exercise_export/blank_exercise.html.erb
@@ -19,7 +19,7 @@
     </div>
     <div class="mbt20 bgc width100">
       <div class="ex-scores pd10 text-gray fs13">
-        <p class="clearfix">
+        <p class="clearfix inline-block width100">
           <% if @exercise_single_ques_count > 0 %>
         <span class="mr15">单选题<span class="mlr5"><%= @exercise_single_ques_count %></span>题,
         共<span class="mlr5"><%= @exercise_single_ques_scores %></span>分</span>
diff --git a/app/templates/exercise_export/exercise_export.css b/app/templates/exercise_export/exercise_export.css
index e34eefedc..119d92a05 100644
--- a/app/templates/exercise_export/exercise_export.css
+++ b/app/templates/exercise_export/exercise_export.css
@@ -340,6 +340,7 @@ textarea{
     /*width:100%;*/
     /*display:inline-block;*/
     word-break: break-all;
+    line-height:2;
 }
 
 
diff --git a/app/templates/exercise_export/exercise_user.html.erb b/app/templates/exercise_export/exercise_user.html.erb
index 847820d57..1c91baec2 100644
--- a/app/templates/exercise_export/exercise_user.html.erb
+++ b/app/templates/exercise_export/exercise_user.html.erb
@@ -19,7 +19,7 @@
     </div>
     <div class="mbt20 bgc width100">
       <div class="ex-scores pd10 text-gray fs13">
-        <p class="clearfix">
+        <p class="clearfix inline-block width100">
           <% if @exercise_single_ques_count > 0 %>
         <span class="mr15">单选题<span class="mlr5"><%= @exercise_single_ques_count %></span>题,
         共<span class="mlr5"><%= @exercise_single_ques_scores %></span>分</span>