Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

app/assets/javascripts/colleges/statistics.js

@@ -34,7 +34,7 @@ $(document).on('turbolinks:load', function() {
     $.get('/colleges/' + schoolId + '/shixun_chart_data', function(data){
       $statisticBody.find('.shixun-chart-loading').hide();
       if (data.data.length > 0) {
-        $shixunChart.css('height', '400px').css('width', '400px');
+        $shixunChart.css('height', '400px').css('width', '100%');
         initShixunChart(data.names, data.data);
       } else {
         $statisticBody.find('.shixun-chart-empty').show();
@@ -146,7 +146,7 @@ $(document).on('turbolinks:load', function() {
     $.get('/colleges/' + schoolId + '/student_hot_evaluations', function(data){
       $statisticBody.find('.hot-chart-loading').hide();
       if (data.names.length > 0) {
-        $statisticBody.find('.hot-chart').css('height', '400px').css('width', '400px');
+        $statisticBody.find('.hot-chart').css('height', '400px').css('width', '100%');
         initHotEvaluating(data.names.reverse(), data.values.reverse());
       } else {
         $statisticBody.find('.hot-chart-empty').show();

app/controllers/courses_controller.rb

@@ -1085,11 +1085,15 @@ class CoursesController < ApplicationController
 
   # 导出课堂信息
   def export_couser_info
-    set_export_cookies
+    if params[:export].present? && params[:export]
-    course_info_to_xlsx @course
+      normal_status(0,"正在下载中")
-    filename_ = "#{current_user.real_name}_#{@course.name}_课堂信息_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
+    else
-    render xlsx: "#{format_sheet_name filename_.strip}",template: "courses/export_course_info.xlsx.axlsx",
+      set_export_cookies
-           locals: {course_info: @course_info}
+      course_info_to_xlsx @course
+      filename_ = "#{current_user.real_name}_#{@course.name}_课堂信息_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
+      render xlsx: "#{format_sheet_name filename_.strip}",template: "courses/export_course_info.xlsx.axlsx",
+             locals: {course_info: @course_info}
+    end
   end
 
   # 导出活跃度

app/controllers/exercise_bank_questions_controller.rb

@@ -372,7 +372,7 @@ class ExerciseBankQuestionsController < ApplicationController
   private
 
   def bank_admin
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && @bank.user_id == current_user.id) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin?
   end
 
   def get_exercise

app/controllers/exercise_banks_controller.rb

@@ -17,9 +17,9 @@ class ExerciseBanksController < ApplicationController
   end
 
   def update
-    tip_exception("试卷标题不能为空！") if params[:exercise_name].blank?
+    tip_exception("标题不能为空！") if params[:exercise_name].blank?
     @bank.update_attributes!(name: params[:exercise_name], description: params[:exercise_description])
-    normal_status(0,"试卷更新成功！")
+    normal_status(0,"更新成功")
   end
 
   def choose_shixun
@@ -58,11 +58,12 @@ class ExerciseBanksController < ApplicationController
 
   def find_bank
     @bank = ExerciseBank.find_by!(id: params[:id])
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && (@bank.is_public || @bank.user_id == current_user.id)) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin? ||
+      (current_user.certification_teacher? && @bank.is_public)
   end
 
   def bank_admin
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && @bank.user_id == current_user.id) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin?
   end
 
   #判断实训是否已选择

app/controllers/exercise_questions_controller.rb

@@ -280,11 +280,12 @@ class ExerciseQuestionsController < ApplicationController
                   if null_choice_text_count >= ex_answer_pre_count
                     new_add_choice = null_choice_text_count_array - ex_answer_pre_count_array
                     ex_answer_pre_count_array.each do |n|
-                      standard_option = {
+                      @hash_symbol_null_ = {
-                          :exercise_question_id => @exercise_question.id,
+                        :exercise_question_id => @exercise_question.id,
-                          :exercise_choice_id => null_choice_id,
+                        :exercise_choice_id => null_choice_id,
-                          :answer_text => null_choice_text[n-1]
+                        :answer_text => null_choice_text[n - 1]
                       }
+                      standard_option = @hash_symbol_null_
                       ex_answer_pre[n-1].update(standard_option)
                     end
                     if new_add_choice.count > 0  #表示有新增的

app/controllers/gtopic_banks_controller.rb

@@ -23,11 +23,12 @@ class GtopicBanksController < ApplicationController
 
   def find_bank
     @bank = GtopicBank.find_by!(id: params[:id])
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && (@bank.is_public || @bank.user_id == current_user.id)) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin? ||
+      (current_user.certification_teacher? && @bank.is_public)
   end
 
   def bank_admin
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && @bank.user_id == current_user.id) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin?
   end
 
   def gtopic_bank_params

app/controllers/homework_banks_controller.rb

@@ -39,11 +39,12 @@ class HomeworkBanksController < ApplicationController
 
   def find_bank
     @bank = HomeworkBank.find_by!(id: params[:id])
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && (@bank.is_public || @bank.user_id == current_user.id)) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin? ||
+      (current_user.certification_teacher? && @bank.is_public)
   end
 
   def bank_admin
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && @bank.user_id == current_user.id) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin?
   end
 
   def bank_params

app/controllers/poll_bank_questions_controller.rb

@@ -0,0 +1,157 @@
+class PollBankQuestionsController < ApplicationController
+  before_action :require_login, :check_auth  #用户需登陆
+  before_action :get_poll, only:[:create]  #获取试卷
+  before_action :get_poll_question, except: [:create]  #获取试卷的问题及试卷
+  before_action :bank_admin  #是否为老师
+  before_action :validates_params, only: [:create, :update]  #传入参数的验证
+
+  def create
+    ActiveRecord::Base.transaction do
+      begin
+        poll_options = {
+          :question_title => params[:question_title],
+          :question_type => params[:question_type],
+          :is_necessary => params[:is_necessary].to_i,
+          :question_number => @poll.exercise_bank_questions.count + 1,
+          :max_choices => params[:max_choices] || nil,
+          :min_choices => params[:min_choices] || nil
+        }
+        @poll_question = @poll.exercise_bank_questions.new(poll_options)
+
+        if params[:insert_id].present? #插入问题时，那么从插入的这个id以后的question_num都将要+1
+          insert_poll = @poll.exercise_bank_questions.find_by(id: params[:insert_id])
+          if insert_poll.present?  #如果该问题存在的话，意思是如果是第一题，那么就不存在插入
+            ques_num = insert_poll.question_number.to_i
+            @poll_question.question_number = ques_num + 1  #更新了问题的位置
+            @poll.exercise_bank_questions.insert_question_ex(ques_num).update_all("question_number = question_number + 1")
+          end
+        end
+        if @poll_question.save!
+          if params[:question_type] != 3
+            p_answer = params[:question_answers]
+            p_other_answer = params[:question_other_answer]
+            # 新增选择题答案选择的选项
+            (1..p_answer.count).each do |i|
+              answer = p_answer[i-1] # 传入的答案的内容
+              question_option = {
+                :choice_position => i,
+                :choice_text => answer
+              }
+              poll_answers = @poll_question.exercise_bank_choices.new question_option
+              poll_answers.save
+            end
+            # 新增答案的其他选项
+            if p_other_answer
+              question_option = {
+                :choice_position => p_answer.count + 1,
+                :choice_text => ''
+              }
+              poll_answers = @poll_question.exercise_bank_choices.new question_option
+              poll_answers.save
+            end
+          end
+        end
+        normal_status("创建成功")
+      rescue Exception => e
+        uid_logger_error(e.message)
+        tip_exception("问卷的问题创建失败！")
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+
+  def update
+    ActiveRecord::Base.transaction do
+      begin
+        if @poll_question.question_type < 3  #当为单选题或多选题时
+          p_answer = params[:question_answers]
+          p_other_answer = params[:question_other_answer]
+          p_answer_count = p_answer.count
+          @poll_question.exercise_bank_choices.each do |an|
+            if (p_answer_count < @poll_current_answers) && (p_answer_count..@poll_current_answers).to_a.include?(an.choice_position)
+              an.destroy
+            end
+          end
+          (1..p_answer_count).each do |i|
+            answer = @poll_question.exercise_bank_choices.find_by_custom("choice_position",i).first
+            if answer  # 判断该位置的answer是否存在，存在则更新.不存在则跳到下一步
+              answer.choice_text = p_answer[i-1]
+              answer.choice_position = i
+              answer.save
+            else
+              answer_options = {
+                :choice_position => i,
+                :choice_text => p_answer[i-1]
+              }
+              @poll_question.exercise_bank_choices.new answer_options
+            end
+          end
+          if p_other_answer  #判断答案的其他选项是否存在
+            other_answer = @poll_question.exercise_bank_choices.find_by_custom("choice_text","").first
+            if other_answer.blank?
+              question_option = {
+                :choice_position => p_answer_count + 1,
+                :choice_text => ''
+              }
+              @poll_question.exercise_bank_choices.new question_option
+            else
+              other_answer.choice_position = p_answer_count + 1
+              other_answer.save
+            end
+          end
+        end
+        @poll_question.update_attributes(poll_questions_params)
+        normal_status("问卷更新成功")
+      rescue Exception => e
+        uid_logger_error(e.message)
+        tip_exception("更新失败")
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+
+  private
+
+  def bank_admin
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin?
+  end
+
+  def get_poll
+    @poll = ExerciseBank.find_by!(id: params[:exercise_bank_id])
+  end
+
+  def get_poll_question
+    @poll_question = ExerciseBankQuestion.find_by!(id: params[:id])
+    @poll = @poll_question.exercise_bank
+  end
+
+  def poll_questions_params
+    params.require(:poll_question).permit(:question_title,:question_type,:is_necessary,:question_number,:max_choices,:min_choices)
+  end
+
+  def validates_params
+    normal_status(-1, "问题标题不能为空！") if params[:question_title].blank?
+    normal_status(-1, "是否要求必答的值不能为空！") if params[:is_necessary].blank?
+    normal_status(-1, "问题类型不能为空！") if params[:question_type].blank?
+    if params[:min_choices].present? && params[:max_choices].present? && (params[:min_choices].to_i > params[:max_choices].to_i)
+      normal_status(-1, "最小可选不能大于最大可选！")
+    elsif params[:question_answers].present? && (params[:max_choices].to_i > params[:question_answers].count)
+      normal_status(-1, "选择题的最大可选项不能大于答案数！")
+    elsif [1,3].include?(params[:question_type]) && (params[:max_choices].to_i > 0 || params[:min_choices].to_i > 0)
+      normal_status(-1, "单选题或主观题不能有最大或最小选择数！")
+    elsif params[:question_type] == 3 && (params[:question_answers] || params[:question_other_answer])
+      normal_status(-1, "主观问题不需要可选答案！")
+    elsif params[:question_type] != 3
+      if params[:question_answers].present? && params[:question_answers].include?("")
+        normal_status(-1, "选择题不能有空值！")
+      elsif params[:question_other_answer].present? && params[:question_other_answer].length > 0
+        normal_status(-1, "其他选项不能有值！")
+      elsif params[:question_type] == 1 && params[:question_answers].count < 2
+        normal_status(-1, "单选题选项不能小于2！")
+      elsif params[:question_type] == 2 && params[:question_answers].count < 3
+        normal_status(-1, "多选题选项不能小于3！")
+      end
+    end
+  end
+
+end

app/controllers/task_banks_controller.rb

@@ -25,11 +25,12 @@ class TaskBanksController < ApplicationController
 
   def find_bank
     @bank = GtaskBank.find_by!(id: params[:id])
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && (@bank.is_public || @bank.user_id == current_user.id)) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin? ||
+      (current_user.certification_teacher? && @bank.is_public)
   end
 
   def bank_admin
-    tip_exception(403, "无权限") unless (current_user.certification_teacher? && @bank.user_id == current_user.id) || current_user.admin?
+    tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin?
   end
 
   def gtask_bank_params

app/views/admins/departments/shared/_department_item.html.erb

@@ -14,7 +14,13 @@
 <td class="member-container">
   <%= render partial: 'admins/departments/shared/member_users', locals: { department: department } %>
 </td>
-<td><%= link_to department.identifier.to_s, '#', target: '_blank' %></td>
+<td>
+  <% if department.identifier.present? %>
+    <%= link_to department.identifier.to_s, statistics_college_path(department.identifier), target: '_blank' %>
+  <% else %>
+    --
+  <% end %>
+</td>
 <td><%= department.host_count %></td>
 <td><%= department.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
 <td class="action-container">

app/views/colleges/_course_statistics.html.erb

@@ -17,10 +17,10 @@
     <% if @courses.present? %>
       <% @courses.each do |course| %>
         <tr>
-          <td class="text-left"><a href="/courses/<%= course.id %>/students" target="_blank" class="task-hide pl20 edu-txt-left" style="max-width: 220px"><%= course.name %></a></td>
+          <td class="text-left"><a href="/courses/<%= course.id %>/students" target="_blank" class="d-inline-block text-truncate" style="max-width: 220px"><%= course.name %></a></td>
           <% teacher_names = course.teacher_users.map(&:real_name).join('、') %>
           <td class="text-left">
-            <span class="d-inline-block text-truncate" style="max-width: 220px" data-toggle="tooltip" title="<%= teacher_names %>">
+            <span class="d-inline-block text-truncate" style="max-width: 150px" data-toggle="tooltip" title="<%= teacher_names %>">
               <%= teacher_names || '--' %>
             </span>
           </td>

app/views/colleges/statistics.html.erb

@@ -104,8 +104,8 @@
             <th>排名</th>
             <th>姓名</th>
             <th>管理课堂</th>
-            <th>已发布实训作业</th>
+            <th width="15%">已发布实训作业</th>
-            <th>未发布实训作业</th>
+            <th width="15%">未发布实训作业</th>
             <th>学生数</th>
             <th>完成率</th>
             <th>发布实训</th>

config/routes.rb

@@ -663,6 +663,8 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :poll_bank_questions
+
     resources :attachments
 
     resources :schools do

public/assets/application-555b621615e9dae684fceecd0966645e87b536664cea8c6f7c6031c5c32cd17a.js

@@ -129134,7 +129134,7 @@ $(document).on('turbolinks:load', function() {
     $.get('/colleges/' + schoolId + '/shixun_chart_data', function(data){
       $statisticBody.find('.shixun-chart-loading').hide();
       if (data.data.length > 0) {
-        $shixunChart.css('height', '400px').css('width', '400px');
+        $shixunChart.css('height', '400px').css('width', '100%');
         initShixunChart(data.names, data.data);
       } else {
         $statisticBody.find('.shixun-chart-empty').show();
@@ -129246,7 +129246,7 @@ $(document).on('turbolinks:load', function() {
     $.get('/colleges/' + schoolId + '/student_hot_evaluations', function(data){
       $statisticBody.find('.hot-chart-loading').hide();
       if (data.names.length > 0) {
-        $statisticBody.find('.hot-chart').css('height', '400px').css('width', '400px');
+        $statisticBody.find('.hot-chart').css('height', '400px').css('width', '100%');
         initHotEvaluating(data.names.reverse(), data.values.reverse());
       } else {
         $statisticBody.find('.hot-chart-empty').show();

public/assets/college-18f5e8400331634e898a35acc2187815c096c25e0ab74aba341ae916166cd287.js

@@ -109199,7 +109199,7 @@ $(document).on('turbolinks:load', function() {
     $.get('/colleges/' + schoolId + '/shixun_chart_data', function(data){
       $statisticBody.find('.shixun-chart-loading').hide();
       if (data.data.length > 0) {
-        $shixunChart.css('height', '400px').css('width', '400px');
+        $shixunChart.css('height', '400px').css('width', '100%');
         initShixunChart(data.names, data.data);
       } else {
         $statisticBody.find('.shixun-chart-empty').show();
@@ -109311,7 +109311,7 @@ $(document).on('turbolinks:load', function() {
     $.get('/colleges/' + schoolId + '/student_hot_evaluations', function(data){
       $statisticBody.find('.hot-chart-loading').hide();
       if (data.names.length > 0) {
-        $statisticBody.find('.hot-chart').css('height', '400px').css('width', '400px');
+        $statisticBody.find('.hot-chart').css('height', '400px').css('width', '100%');
         initHotEvaluating(data.names.reverse(), data.values.reverse());
       } else {
         $statisticBody.find('.hot-chart-empty').show();

public/react/src/modules/courses/members/studentsList.js

@@ -128,7 +128,8 @@ class studentsList extends Component{
   }
 /// 确认是否下载
   confirmysl(url){
-    axios.get(url).then((response) => {
+    // this.props.showGlobalLoading('正在生成文件，请稍后...')
+    axios.get(url + 'export=true').then((response) => {
       if(response === undefined){
         return
       }

public/react/src/modules/courses/poll/PollDetailTabThird.js

@@ -1,14 +1,13 @@
 import React,{ Component } from "react";
-import {Checkbox,Radio} from "antd";
-
 
 import '../css/members.css'
 import '../css/busyWork.css'
 import './pollStyle.css'
 
+import PollDetailTabThirdInfo from './PollDetailTabThirdInfo'
+
 import axios from 'axios';
 
-const map={1:"单选题",2:"多选题",3:"主观题",4:"主观题"}
 class PollDetailTabThird extends Component{
   constructor(props){
     super(props);
@@ -36,105 +35,7 @@ class PollDetailTabThird extends Component{
     let {pollDetail}=this.state;
     return(
       <div>
-        {
+        <PollDetailTabThirdInfo {...this.props} {...this.state} pollDetail = {pollDetail}></PollDetailTabThirdInfo>
-          pollDetail && pollDetail.poll.polls_description && 
-          <p style={{backgroundColor:"#F2F9FF",whiteSpace:"pre-wrap"}} className="color-blue pt15 pb15 pl30 pr30">{ pollDetail.poll.polls_description }</p>
-        }
-        <div className="edu-back-white">
-          <p className="padding20-30 clearfix bor-bottom-greyE edu-txt-left">
-						{ pollDetail && pollDetail.question_types.q_counts===0 ? "" :
-              <span className="color-grey-3">
-                {
-                  pollDetail && pollDetail.question_types.q_counts > 0 &&
-                  <span>合计{pollDetail.question_types.q_counts}题：</span>
-                }
-                {
-                  pollDetail && pollDetail.question_types.q_singles > 0 &&
-                  <span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span>
-                }
-                {
-                  pollDetail && pollDetail.question_types.q_doubles > 0 &&
-                  <span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span>
-                }
-                {
-                  pollDetail && pollDetail.question_types.q_mains > 0 &&
-                  <span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span>
-                }
-              </span>
-            }
-          </p>
-
-          {
-            pollDetail && pollDetail.questions.map((item,key)=>{
-              console.log("ddd");
-              console.log(item.question.min_choices);
-              return(
-                <div className="previewList">
-                  <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
-                    <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
-                    { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
-                    { item.question.question_type == 2 && item.question.min_choices != undefined && item.question.min_choices != null && item.question.max_choices != undefined && item.question.max_choices != null ? 
-                      <span className="color-grey-9 font-14 fl mt2">
-                        {
-                          item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
-                          "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
-                        }
-                      </span>:""
-                    }
-                  </p>
-                  <li className="pl30 pr30 pb15">{item.question.question_title}</li>
-                  {
-                    // 单选题
-                    item.question.question_type==1 &&
-                    <Radio.Group className="answerList" disabled>
-                      {
-                        item.question.answers.map((index,k)=>{
-                          return(
-                            <li className="df">
-                              <Radio className="fl" value={index.answer_id}></Radio>
-                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
-                              {
-                                index.answer_text=="其他" ? <p className="textLine"></p>:""
-                              }
-                              
-                            </li>
-                          )
-                        })
-                      }
-                    </Radio.Group>
-                  }
-                  {
-                    // 多选题
-                    item.question.question_type==2 &&
-                    <Checkbox.Group className="answerList" disabled>
-                      {
-                        item.question.answers.map((index,k)=>{
-                          return(
-                            <li className="df" key={k}>
-                              <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
-                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
-                              {
-                                index.answer_text=="其他" ? <p className="textLine"></p>:""
-                              }
-                            </li>
-                          )
-                        })
-                      }
-                    </Checkbox.Group>
-                  }
-                  {
-                    // 主观题
-                    item.question.question_type == 3 &&
-                    <div className="mt10 pl30 pr30 pb20">
-                      <textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
-                    </div>
-                  }
-                  
-                </div>
-              )
-            })
-          }
-        </div>
       </div>
     )
   }

public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js

@@ -0,0 +1,117 @@
+import React,{ Component } from "react";
+import {Checkbox,Radio} from "antd";
+
+
+import '../css/members.css'
+import '../css/busyWork.css'
+import './pollStyle.css'
+
+
+const map={1:"单选题",2:"多选题",3:"主观题",4:"主观题"}
+class PollDetailTabThirdInfo extends Component{
+  constructor(props){
+    super(props);
+  }
+  render(){
+    let { pollDetail }=this.props;
+    return(
+        <div className="edu-back-white">
+          {
+            pollDetail && pollDetail.poll.polls_description && 
+            <p style={{whiteSpace:"pre-wrap"}} className="color-grey-3 padding20-30">{ pollDetail.poll.polls_description }</p>
+          }
+          <p className="padding20-30 clearfix edu-txt-left" style={{background:"#fafafa"}}>
+						{ pollDetail && pollDetail.question_types.q_counts===0 ? "" :
+              <span className="color-grey-3">
+                {
+                  pollDetail && pollDetail.question_types.q_counts > 0 &&
+                  <span>合计{pollDetail.question_types.q_counts}题：</span>
+                }
+                {
+                  pollDetail && pollDetail.question_types.q_singles > 0 &&
+                  <span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span>
+                }
+                {
+                  pollDetail && pollDetail.question_types.q_doubles > 0 &&
+                  <span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span>
+                }
+                {
+                  pollDetail && pollDetail.question_types.q_mains > 0 &&
+                  <span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span>
+                }
+              </span>
+            }
+          </p>
+
+          {
+            pollDetail && pollDetail.questions.map((item,key)=>{
+              return(
+                <div className="previewList">
+                  <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
+                    <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
+                    { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
+                    { item.question.question_type == 2 && item.question.min_choices != undefined && item.question.min_choices != null && item.question.max_choices != undefined && item.question.max_choices != null ? 
+                      <span className="color-grey-9 font-14 fl mt2">
+                        {
+                          item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
+                          "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
+                        }
+                      </span>:""
+                    }
+                  </p>
+                  <li className="pl30 pr30 pb15">{item.question.question_title}</li>
+                  {
+                    // 单选题
+                    item.question.question_type==1 &&
+                    <Radio.Group className="answerList" disabled>
+                      {
+                        item.question.answers.map((index,k)=>{
+                          return(
+                            <li className="df">
+                              <Radio className="fl" value={index.answer_id}></Radio>
+                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
+                              {
+                                index.answer_text=="其他" ? <p className="textLine"></p>:""
+                              }
+                              
+                            </li>
+                          )
+                        })
+                      }
+                    </Radio.Group>
+                  }
+                  {
+                    // 多选题
+                    item.question.question_type==2 &&
+                    <Checkbox.Group className="answerList" disabled>
+                      {
+                        item.question.answers.map((index,k)=>{
+                          return(
+                            <li className="df" key={k}>
+                              <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
+                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
+                              {
+                                index.answer_text=="其他" ? <p className="textLine"></p>:""
+                              }
+                            </li>
+                          )
+                        })
+                      }
+                    </Checkbox.Group>
+                  }
+                  {
+                    // 主观题
+                    item.question.question_type == 3 &&
+                    <div className="pl30 pr30 pb20">
+                      <textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
+                    </div>
+                  }
+                </div>
+              )
+            })
+          }
+        </div>
+    )
+  }
+}
+export default PollDetailTabThirdInfo

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -81,7 +81,7 @@ export function TPMIndexHOC(WrappedComponent) {
             isRender: false,
             AccountProfiletype: false,
 
-            slowDownloading: false
+            globalLoading: false
 	      }
 	    }
 
@@ -137,7 +137,7 @@ export function TPMIndexHOC(WrappedComponent) {
 
       keyupListener = (e) => {
         if (e.key === "Escape") {
-          this.setState({ slowDownloading: false })
+          this.setState({ globalLoading: false })
         }
       }
       componentWillUnmount() {
@@ -378,20 +378,27 @@ export function TPMIndexHOC(WrappedComponent) {
 				type===true?window.open(url):window.location.href=url;
 			}
       slowDownload = (url, tip) => {
-        this._slowDownloadTip = tip || '正在生成文件，请稍后...';
+        this._gLoadingTip = tip || '正在生成文件，请稍后...';
-        this.setState({ slowDownloading: true })
+        this.setState({ globalLoading: true })
         const fileUrl = url;
         downloadFile({
           url: fileUrl,
           successCallback: (url) => {
-            this.setState({ slowDownloading: false })
+            this.setState({ globalLoading: false })
             console.log('successCallback')
           },
           failCallback: (responseHtml, url) => {
-            this.setState({ slowDownloading: false })
+            this.setState({ globalLoading: false })
             console.log('failCallback')
           }
         })
+      }
+      showGlobalLoading = (tip) => {
+        this._gLoadingTip = tip || '加载中，请稍后...';
+        this.setState({ globalLoading: true })
+      }
+      hideGlobalLoading = () => {
+        this.setState({ globalLoading: false })
       }
 	  	render() {
           let{Headertop,Footerdown, isRender, AccountProfiletype}=this.state;
@@ -418,7 +425,10 @@ export function TPMIndexHOC(WrappedComponent) {
 						DownloadFileA:(title,url)=>this.DownloadFileA(title,url),
 						DownloadOpenPdf:(type,url)=>this.DownloadOpenPdf(type,url),
 
-            slowDownload: this.slowDownload
+            slowDownload: this.slowDownload,
+            showGlobalLoading: this.showGlobalLoading,
+            hideGlobalLoading: this.hideGlobalLoading,
+            
           }
 		    return (
 		    	<div className="indexHOC">
@@ -456,7 +466,7 @@ export function TPMIndexHOC(WrappedComponent) {
 							}
 
               .globalSpin {
-
+                max-height: 700px !important;
               }
               .indexHOC > .ant-spin-nested-loading {
                 background: #000;
@@ -471,9 +481,9 @@ export function TPMIndexHOC(WrappedComponent) {
               }
 							`
 						}</style>
-            <Spin spinning={this.state.slowDownloading} delay={0} className="globalSpin"
+            <Spin spinning={this.state.globalLoading} delay={0} className="globalSpin"
               size="large"
-              tip= {this._slowDownloadTip || "加载中..."}
+              tip= {this._gLoadingTip || "加载中..."}
             >
 
 						<NewHeader {...this.state} {...this.props}></NewHeader>

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -55,7 +55,7 @@ class InfosTopics extends Component{
 			let url=`/users/${user_id}/question_banks.json`;
 			axios.get(url,{params:{
 					type,
-					category,
+					object_type:category,
 					course_list_id,
 					sort_by,
 					sort_direction,

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -70,7 +70,7 @@ class BanksIndex extends Component{
           <p className="clearfix mt20 mb20">
             <span className="fl font-24 color-grey-3 task-hide lineh-30" style={{maxWidth:'800px'}}>{crumbData && crumbData.title}</span>
             {
-              crumbData && crumbData.is_public && <span className="bank_is_public">{crumbData.is_public == true ? '公开':'私有'}</span>
+              crumbData && <span className="bank_is_public">{crumbData.is_public == true ? '公开':'私有'}</span>
             }
           </p>
 
@@ -89,7 +89,12 @@ class BanksIndex extends Component{
                   return (<BanksTabIndex {...this.props} {...props} {...this.state} {...common}/>)
                 }
             }></Route>
-            
+            <Route path='/banks/poll/:bankId' 
+              render={
+                (props) => {
+                  return (<BanksTabIndex {...this.props} {...props} {...this.state} {...common} />)
+                }
+            }></Route>
           </Switch>
 
         </div>

public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js

@@ -12,6 +12,11 @@ const GtopicBanks = Loadable({
 	loader: () => import('./GtopicBanks'),
 	loading: Loading,
 })
+// 问卷内容
+const PollBanks = Loadable({
+	loader: () => import('./PollBanksContent'),
+	loading: Loading,
+})
 
 class BanksTabIndex extends Component{
   constructor(props){
@@ -56,6 +61,12 @@ class BanksTabIndex extends Component{
                 return (<GtopicBanks {...this.props} {...props} {...this.state} {...common} />)
               }
           }></Route>
+          <Route path='/banks/poll/:bankId' 
+            render={
+              (props) => {
+                return (<PollBanks {...this.props} {...props} {...this.state} {...common} />)
+              }
+          }></Route>
 
         </Switch>
       </React.Fragment>

public/react/src/modules/user/usersInfo/banks/PollBanksContent.js

@@ -0,0 +1,64 @@
+import React, { Component } from 'react';
+import axios from 'axios'
+
+import PollDetailTabThirdInfo from '../../../courses/poll/PollDetailTabThirdInfo'
+
+class PollBanksContent extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      pollDetail:undefined
+    }
+  }
+
+  componentDidMount = () =>{
+    let bankId=this.props.match.params.bankId;
+    let url = `/exercise_banks/${bankId}.json`
+    axios.get(url).then((result)=>{
+      if(result){
+        let pollDetail = {
+          poll:{
+            id: result.data.poll && result.data.poll.id ,
+            polls_description: result.data.poll && result.data.poll.description,
+            polls_name: result.data.poll && result.data.poll.name,
+            is_public:result.data.poll && result.data.poll.is_public
+          },
+          question_types:result.data.question_types,
+          questions:result.data.questions,
+        }
+        const crumbData={
+          title:result.data.poll && result.data.poll.name,
+          is_public:result.data.poll && result.data.poll.is_public,
+          crumbArray:[
+            {content:'详情'},
+          ]
+        }
+        const menuData={
+          tab:'0',//tab选中的index
+          menuArray:[//tab以及tab路由
+            {to:`/banks/poll/${bankId}`,content:'内容详情'}
+          ],
+          category:'poll',//毕设选题
+          id:bankId
+        }
+        this.props.initPublic(crumbData,menuData);
+        this.setState({
+          pollDetail
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+
+  render(){
+    let { pollDetail } = this.state
+    
+    return(
+      <div>
+        <PollDetailTabThirdInfo {...this.props} {...this.state} pollDetail = {pollDetail}></PollDetailTabThirdInfo>
+      </div>
+    )
+  }
+}
+export default PollBanksContent