diff --git a/app/controllers/cooperative/base_controller.rb b/app/controllers/cooperative/base_controller.rb index 5ab08582d..556cd7aa9 100644 --- a/app/controllers/cooperative/base_controller.rb +++ b/app/controllers/cooperative/base_controller.rb @@ -16,7 +16,7 @@ class Cooperative::BaseController < ApplicationController private def current_laboratory - @_current_laboratory ||= Laboratory.find_by_subdomain('hut' || request.subdomain) + @_current_laboratory ||= Laboratory.find_by_subdomain(request.subdomain) end def current_setting_or_default(name) diff --git a/public/react/src/modules/courses/poll/PollDetailTabFirst.js b/public/react/src/modules/courses/poll/PollDetailTabFirst.js index 07b9ee197..052382067 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabFirst.js +++ b/public/react/src/modules/courses/poll/PollDetailTabFirst.js @@ -246,13 +246,13 @@ class PollDetailTabFirst extends Component{ dataIndex: 'No', key: 'No', className:"edu-txt-center", - width:110 + width:120 }, { title: '姓名', dataIndex: 'name', key: 'name', className:"edu-txt-center", - width:160 + width:170 }, { title: '学号', dataIndex: 'StudentNo', @@ -269,11 +269,11 @@ class PollDetailTabFirst extends Component{ title: '分班', key: 'classes', dataIndex: 'classes', - width:160, + width:220, className:poll_types && poll_types.groups_count > 0 ? "edu-txt-center":"edu-txt-center none", render:(classes,item,index)=>{ return( - item.classes ? {item.classes} : -- + item.classes ? {item.classes} : -- ) } }, { @@ -281,7 +281,7 @@ class PollDetailTabFirst extends Component{ dataIndex: 'status', key: 'status', className:"edu-txt-center", - width:160, + width:170, render:(status,item,index)=>{ return( item.status == 1 ?按时提交:未提交 @@ -292,7 +292,7 @@ class PollDetailTabFirst extends Component{ dataIndex: 'time', key: 'time', className:"edu-txt-center", - width:160, + width:170, sorter: true, defaultSortOrder: 'descend', sortDirections: sortDirections, @@ -395,7 +395,7 @@ class PollDetailTabFirst extends Component{ {/* */} {/*}*/} } -