样式调整

src/app/app.component.ts

@@ -8,6 +8,14 @@ import { ToolService } from './services/tool.service';
 })
 export class AppComponent {
   constructor(private titleService:Title, private tool:ToolService){
-    this.titleService.setTitle(this.tool.logoTitle);
+    this.tool.getSysNameAndLogoAsync().subscribe(result => {
+      let logoTitle = '';
+      let logoUrl = result.logo || '';
+      this.tool.setSysName(logoTitle);
+      this.tool.setLogo(logoUrl);
+      this.titleService.setTitle(this.tool.logoTitle);
+      console.log(document.querySelector('#favicon'));
+      (document.querySelector('#favicon') as any).href = this.tool.logoUrl;
+    })
   }
 }

src/app/services/tool.service.ts

@@ -8,17 +8,21 @@ export class ToolService {
   logoUrl = '';
   logoTitle = '';
 
-  constructor(private mainService: MainService) {
-    this.getSysNameAndLogo();
-  }
+  constructor(private mainService: MainService) {}
 
   // 获取logoUrl和logoTitle
-  getSysNameAndLogo(){
-    this.mainService.getSysNameAndLogo().subscribe(result => {
-      console.log(result);
-      this.logoTitle = result.sysName || '大势医院输送保障管理平台';
-      this.logoUrl = result.logo || '/assets/images/login_logo.png';
-    })
+  getSysNameAndLogoAsync(){
+    return this.mainService.getSysNameAndLogo();
+  }
+
+  // 设置logoTitle
+  setSysName(logoTitle){
+    this.logoTitle = logoTitle;
+  }
+
+  // 设置logoUrl
+  setLogo(logoUrl){
+    this.logoUrl = logoUrl;
   }
 
   // 获取权限中的院区

src/app/views/hushijiandan/hushijiandan.component.less

@@ -675,12 +675,13 @@
         position: relative;
 
         img {
-          width: 32px;
+          max-width: 100%;
+          max-height: 100%;
           vertical-align: middle;
-          margin-right: 8px;
         }
 
         span {
+          margin-left: 8px;
           color: #fff;
           font-weight: 600;
           font-size: 14px;

src/app/views/login/login.component.less

@@ -27,9 +27,10 @@
       bottom: 100%;
 
       img {
-        width: 60px;
         height: 48px;
-        margin-right: 8px;
+      }
+      strong{
+        margin-left: 8px;
       }
     }
 

src/app/views/main/main.component.less

@@ -122,13 +122,13 @@ nz-sider {
 .sidebar-logo {
   position: relative;
   height: 88px;
-  padding-left: 8px;
   overflow: hidden;
   line-height: 64px;
   background: #001529;
   transition: all 0.3s;
 
   span {
+    margin-left: 8px;
     color: #fff;
     font-weight: 600;
     font-size: 13px;
@@ -137,7 +137,8 @@ nz-sider {
 
 .sidebar-logo img {
   display: inline-block;
-  width: 32px;
+  max-width: 100%;
+  max-height: 100%;
   vertical-align: middle;
 }
 

src/app/views/sys-config/sys-config.component.html

@@ -5,23 +5,23 @@
       <div class="form">
         <h3>基本配置</h3>
         <nz-form-item class="formItem">
-          <nz-form-label [nzSpan]="24" nzFor="systemName" nzRequired class="label">系统名称</nz-form-label>
+          <nz-form-label [nzSpan]="24" nzFor="systemName" class="label">系统名称</nz-form-label>
           <nz-form-control [nzSpan]="24" nzErrorTip="请输入系统名称!">
             <input nz-input formControlName="systemName" id="systemName" placeholder="请输入系统名称">
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
-          <nz-form-label [nzSpan]="24" nzFor="largeScreenName" nzRequired class="label">名称</nz-form-label>
-          <nz-form-control [nzSpan]="24" nzErrorTip="请输入名称!">
-            <input nz-input formControlName="largeScreenName" id="largeScreenName" placeholder="请输入名称">
+          <nz-form-label [nzSpan]="24" nzFor="largeScreenName" class="label">大屏名称</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请输入大屏名称!">
+            <input nz-input formControlName="largeScreenName" id="largeScreenName" placeholder="请输入大屏名称">
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
-          <nz-form-label [nzSpan]="24" class="label" nzFor="logo" nzRequired>系统logo</nz-form-label>
+          <nz-form-label [nzSpan]="24" class="label" nzFor="logo">系统logo</nz-form-label>
           <nz-form-control [nzSpan]="24" nzErrorTip="请选择系统logo!">
             <nz-upload nzFor="logo"
               class="avatar-uploader"
-              nzAction="/service/common/common/uploadAttachment/sysLogo/777/777" 
+              nzAction="/service/common/common/uploadAttachment/sysLogo/777/777"
               [nzCustomRequest]="customReq"
               nzName="file"
               nzListType="picture-card"

src/app/views/sys-config/sys-config.component.less

@@ -5,7 +5,7 @@
   justify-content: space-between;
   .avatar {
     width: 128px;
-    height: 128px;
+    max-height: 128px;
   }
   .upload-icon {
     font-size: 32px;

src/app/views/sys-config/sys-config.component.ts

@@ -52,9 +52,9 @@ export class SysConfigComponent implements OnInit {
       workOrderSettings: [5, [Validators.required]],
       nurseDeptSwitchTip: [0, [Validators.required]],
       updateTipsForNurses: [""],
-      systemName: ["", [Validators.required]],
-      largeScreenName: ["", [Validators.required]],
-      logo: ["", [Validators.required]],
+      systemName: [""],
+      largeScreenName: [""],
+      logo: [""],
       defaultRoleOfNurse: [null, [Validators.required]],
       formUrl: [{ value: null, disabled: true }, [Validators.required]],
       serviceUrl: [{ value: null, disabled: true }, [Validators.required]],

src/index.html

@@ -11,7 +11,7 @@
   <meta http-equiv="Cache" content="no-cache">
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" id="favicon" type="image/x-icon" href="favicon.ico">
 </head>
 
 <body>