diff --git a/app/controllers/admins/laboratory_settings_controller.rb b/app/controllers/admins/laboratory_settings_controller.rb index d522a479b..0427462f0 100644 --- a/app/controllers/admins/laboratory_settings_controller.rb +++ b/app/controllers/admins/laboratory_settings_controller.rb @@ -23,7 +23,7 @@ class Admins::LaboratorySettingsController < Admins::BaseController def form_params params.permit(:identifier, :name, - :nav_logo, :login_logo, :tab_logo, :oj_banner, + :nav_logo, :login_logo, :tab_logo, :pm_logo, :oj_banner, :subject_banner, :course_banner, :competition_banner, :moop_cases_banner, :footer, navbar: %i[name link hidden index]) end diff --git a/app/models/laboratory.rb b/app/models/laboratory.rb index 0517c0df6..161c65cfb 100644 --- a/app/models/laboratory.rb +++ b/app/models/laboratory.rb @@ -39,7 +39,7 @@ class Laboratory < ApplicationRecord validates :identifier, uniqueness: { case_sensitive: false }, allow_nil: true - delegate :name, :navbar, :footer, :login_logo_url, :nav_logo_url, :tab_logo_url, :default_navbar, to: :laboratory_setting + delegate :name, :navbar, :footer, :login_logo_url, :nav_logo_url, :pm_logo_url, :tab_logo_url, :default_navbar, to: :laboratory_setting def site rails_env = EduSetting.get('rails_env') diff --git a/app/models/laboratory_setting.rb b/app/models/laboratory_setting.rb index 61c677def..d44ee7d73 100644 --- a/app/models/laboratory_setting.rb +++ b/app/models/laboratory_setting.rb @@ -34,7 +34,9 @@ class LaboratorySetting < ApplicationRecord def nav_logo_url image_url('nav') end - + def pm_logo_url + image_url('pm_logo') + end def tab_logo_url image_url('tab') end diff --git a/app/services/admins/save_laboratory_setting_service.rb b/app/services/admins/save_laboratory_setting_service.rb index ad040585f..29729b385 100644 --- a/app/services/admins/save_laboratory_setting_service.rb +++ b/app/services/admins/save_laboratory_setting_service.rb @@ -40,6 +40,7 @@ class Admins::SaveLaboratorySettingService < ApplicationService save_image_file(params[:nav_logo], 'nav') save_image_file(params[:login_logo], 'login') save_image_file(params[:tab_logo], 'tab') + save_image_file(params[:pm_logo], 'pm_logo') save_image_file(params[:subject_banner], '_subject_banner') save_image_file(params[:course_banner], '_course_banner') save_image_file(params[:competition_banner], '_competition_banner') diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb index 95fe5b38e..95273eea5 100644 --- a/app/views/admins/laboratory_settings/show.html.erb +++ b/app/views/admins/laboratory_settings/show.html.erb @@ -42,7 +42,7 @@
Logo设置
-
+
<% nav_logo_img = setting.nav_logo_url %>
-
+
<% login_logo_img = setting.login_logo_url %>
-
+
<% tab_logo_img = setting.tab_logo_url %>
@@ -83,6 +83,21 @@
尺寸:16*16 32*32 48*48 64*64
+ +
+ <% pm_logo_img = setting.pm_logo_url %> +
+ + <%= file_field_tag(:pm_logo, accept: 'image/png,image/jpg,image/jpeg', style: 'display: none', value: params[:pm_logo]) %> + +
+
+
PM管理端logo
+
格式:PNG、JPG
+
尺寸:高度90px以内,宽等比例缩放
+
+
+
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index 1701103da..b7aec5c38 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -2,6 +2,7 @@ json.setting do json.name default_setting.name json.nav_logo_url default_setting.nav_logo_url&.[](1..-1) json.login_logo_url default_setting.login_logo_url&.[](1..-1) + json.pm_logo_url default_setting.pm_logo_url&.[](1..-1) json.tab_logo_url default_setting.tab_logo_url.present? ? default_setting.tab_logo_url&.[](1..-1) : "favicon.ico" json.site_page_deploy_domain @deploy_domain