Merge pull request '更新pm_logo_url' (#403) from standalone_develop into pre_trustie_server

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

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')

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

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')

app/views/admins/laboratory_settings/show.html.erb

@@ -42,7 +42,7 @@
       <div class="setting-item-head"><h6>Logo设置</h6></div>
       <div class="dropdown-divider"></div>
       <div class="pl-0 py-3 row setting-item-body">
-        <div class="col-12 col-md-4 logo-item">
+        <div class="col-12 col-md-3 logo-item">
           <% nav_logo_img = setting.nav_logo_url %>
           <div class="logo-item-left mr-3 <%= nav_logo_img ? 'has-img' : '' %>">
             <img class="logo-item-img nav-logo-img" src="<%= nav_logo_img %>" style="<%= nav_logo_img.present? ? '' : 'display: none' %>"/>
@@ -56,7 +56,7 @@
           </div>
         </div>
 
-        <div class="col-12 col-md-4 logo-item">
+        <div class="col-12 col-md-3 logo-item">
           <% login_logo_img = setting.login_logo_url %>
           <div class="logo-item-left mr-3 <%= login_logo_img ? 'has-img' : '' %>">
             <img class="logo-item-img login-logo-img" src="<%= login_logo_img %>" style="<%= login_logo_img.present? ? '' : 'display: none' %>"/>
@@ -70,7 +70,7 @@
           </div>
         </div>
 
-        <div class="col-12 col-md-4 logo-item">
+        <div class="col-12 col-md-3 logo-item">
           <% tab_logo_img = setting.tab_logo_url %>
           <div class="logo-item-left mr-3 <%= tab_logo_img ? 'has-img' : '' %>">
             <img class="logo-item-img tab-logo-img" src="<%= tab_logo_img %>" style="<%= tab_logo_img.present? ? '' : 'display: none' %>"/>
@@ -83,6 +83,21 @@
             <div>尺寸：16*16  32*32  48*48  64*64 </div>
           </div>
         </div>
+
+        <div class="col-12 col-md-3 logo-item">
+          <% pm_logo_img = setting.pm_logo_url %>
+          <div class="logo-item-left mr-3 <%= pm_logo_img ? 'has-img' : '' %>">
+            <img class="logo-item-img tab-logo-img" src="<%= pm_logo_img %>" style="<%= tab_logo_img.present? ? '' : 'display: none' %>"/>
+            <%= file_field_tag(:pm_logo, accept: 'image/png,image/jpg,image/jpeg', style: 'display: none', value: params[:pm_logo]) %>
+            <label for="pm_logo" class="logo-item-upload" data-toggle="tooltip" data-title="选择图片"></label>
+          </div>
+          <div class="logo-item-right">
+            <div class="logo-item-title flex-1">PM管理端logo</div>
+            <div>格式：PNG、JPG</div>
+            <div>尺寸：高度90px以内，宽等比例缩放</div>
+          </div>
+        </div>
+
       </div>
     </div>
 

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