diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 5e465ece..04c70e0f 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -836,19 +836,20 @@ class ManagementsController < ApplicationController if search if "u_name" == keyword - @evaluate_recods = EvaluateRecord.joins("join users u on evaluate_records.user_id = u.id").where("concat(u.lastname, u.firstname) like '%#{@search}%'") + @evaluate_recods = EvaluateRecord.joins("join users u on evaluate_records.user_id = u.id").where("concat(u.lastname, u.firstname) like '%#{search}%'") # @evaluate_recods = EvaluateRecord.where(user_id: User.where("concat(lastname, firstname) like '%#{search}%'").pluck(:id)) else - @evaluate_recods = EvaluateRecord.joins("join user_extensions ue on evaluate_records.user_id = ue.user_id").where("ue.school_id in (select id from schools where name like '%#{@search}%')") + @evaluate_recods = EvaluateRecord.joins("join user_extensions ue on evaluate_records.user_id = ue.user_id").where("ue.school_id in (select id from schools where name like '%#{search}%')") # @evaluate_recods = EvaluateRecord.where(user_id: UserExtensions.where(school_id: School.where("name like '%#{search}%'").pluck(:id)).pluck(:user_id)) end else - @evaluate_recods = EvaluateRecord.all + @evaluate_recods = EvaluateRecord.where("0=0") end @evaluate_recods_count = @evaluate_recods.count @evaluate_recods_pages = Paginator.new @evaluate_recods_count, limit, page - @evaluate_recods = @evaluate_recods.includes(:shixun, :user).page(page).per(limit) + @evaluate_recods = @evaluate_recods.page(page).per(limit) + @evaluate_recods = @evaluate_recods.includes(:shixun, :user) respond_to do |format| format.js format.html diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.css b/public/react/src/modules/ec/ecTitle/ecTitle.css index 402465be..332e6142 100644 --- a/public/react/src/modules/ec/ecTitle/ecTitle.css +++ b/public/react/src/modules/ec/ecTitle/ecTitle.css @@ -1,3 +1,14 @@ +#traningNav { + display: flex +} + #traningNav>li { + float: none !important; +} + /* 最后一个item 占满剩余空间 */ +#traningNav>li:last-child{ + flex: 1; +} + #traningNav>li>.ecTitle { width: 24px; height: 24px; diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.js b/public/react/src/modules/ec/ecTitle/ecTitle.js index e16a8080..0c6d4e7d 100644 --- a/public/react/src/modules/ec/ecTitle/ecTitle.js +++ b/public/react/src/modules/ec/ecTitle/ecTitle.js @@ -32,7 +32,7 @@ class EcTitleCourseEvaluations extends Component { -