修改

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.170",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/app.component.ts

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

src/app/services/tool.service.ts

@@ -7,6 +7,7 @@ import { MainService } from "./main.service";
 export class ToolService {
   logoUrl = '';
   logoTitle = '';
+  faviconUrl = '';
 
   constructor(private mainService: MainService) {}
 
@@ -25,6 +26,11 @@ export class ToolService {
     this.logoUrl = logoUrl;
   }
 
+  // 设置faviconUrl
+  setFavicon(faviconUrl){
+    this.faviconUrl = faviconUrl;
+  }
+
   // 获取权限中的院区
   getHospitalList() {
     return (

src/app/views/hushijiandan/hushijiandan.component.html

@@ -9,7 +9,7 @@
       <div
         class="sidebar-logo display_flex align-items_center justify-content_flex-center"
       >
-        <div style="line-height: normal;">
+        <div style="line-height: normal;height: 100%;">
           <!-- <img src="../../assets/images/xiehe_logo.jpg" style="width:100%;" alt="logo" /> -->
           <img [src]="tool.logoUrl" alt="logo" />
           <span>{{tool.logoTitle}}</span>

src/app/views/main/main.component.html

@@ -1,7 +1,7 @@
 <nz-layout class="app-layout display_flex flex_auto ant-layout-has-sider">
   <overlay-scrollbars #osComponentRef1 class="menu-sidebar">
-    <div class="sidebar-logo display_flex align-items_center">
-      <div style="line-height: normal;">
+    <div class="sidebar-logo display_flex align-items_center justify-content_flex-center">
+      <div style="line-height: normal;height:100%;">
         <img [src]="tool.logoUrl" [alt]="tool.logoTitle">
         <span>{{tool.logoTitle}}</span>
       </div>

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

@@ -27,7 +27,7 @@
               nzListType="picture-card"
               [nzShowUploadList]="false"
               [nzBeforeUpload]="beforeUpload"
-              (nzChange)="handleChange($event)"
+              (nzChange)="handleChange($event, 'avatarUrl')"
             >
               <ng-container *ngIf="!avatarUrl">
                 <i class="upload-icon" nz-icon [nzType]="avatarLoading ? 'avatarLoading' : 'plus'"></i>
@@ -38,6 +38,27 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
+          <nz-form-label [nzSpan]="24" class="label" nzFor="favicon">favicon图标</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请选择系统favicon图标!">
+            <nz-upload nzFor="favicon"
+              class="avatar-uploader"
+              nzAction="/service/common/common/uploadAttachment/faviconLogo/777/777"
+              [nzCustomRequest]="customReq"
+              nzName="file"
+              nzListType="picture-card"
+              [nzShowUploadList]="false"
+              [nzBeforeUpload]="beforeUpload"
+              (nzChange)="handleChange($event, 'avatarUrl1')"
+            >
+              <ng-container *ngIf="!avatarUrl1">
+                <i class="upload-icon" nz-icon [nzType]="avatarLoading ? 'avatarLoading' : 'plus'"></i>
+                <div class="ant-upload-text">点击上传</div>
+              </ng-container>
+              <img *ngIf="avatarUrl1" [src]="avatarUrl1" class="avatar" />
+            </nz-upload>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item class="formItem">
           <nz-form-label [nzSpan]="24" nzFor="defaultPwd" nzRequired class="label">用户默认密码</nz-form-label>
           <nz-form-control [nzSpan]="24" nzErrorTip="请输入用户默认密码!">
             <input nz-input formControlName="defaultPwd" id="defaultPwd" placeholder="请输入用户默认密码">

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

@@ -4,8 +4,8 @@
   flex-direction: column;
   justify-content: space-between;
   .avatar {
-    width: 128px;
-    max-height: 128px;
+    width: 86px;
+    max-height: 86px;
   }
   .upload-icon {
     font-size: 32px;

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

@@ -55,6 +55,7 @@ export class SysConfigComponent implements OnInit {
       systemName: [""],
       largeScreenName: [""],
       logo: [""],
+      favicon: [""],
       defaultRoleOfNurse: [null, [Validators.required]],
       formUrl: [{ value: null, disabled: true }, [Validators.required]],
       serviceUrl: [{ value: null, disabled: true }, [Validators.required]],
@@ -65,8 +66,16 @@ export class SysConfigComponent implements OnInit {
     this.getDeptType();
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getRoleList();
+    this.getLogoOrFavicon();
     this.avatarUrl = this.tool.logoUrl;
-    this.validateForm.controls.logo.setValue(this.tool.logoUrl);
+    this.avatarUrl1 = this.tool.logoUrl;
+  }
+
+  getLogoOrFavicon(){
+    this.tool.getSysNameAndLogoAsync().subscribe(result => {
+      this.avatarUrl = result.logo || '';
+      this.avatarUrl1 = result.favicon || '';
+    })
   }
 
   // 角色列表
@@ -289,6 +298,7 @@ export class SysConfigComponent implements OnInit {
 
   avatarLoading = false;
   avatarUrl: string;
+  avatarUrl1: string;
   beforeUpload = (file: File) => {
     return new Observable((observer: Observer<boolean>) => {
       const isPic = (file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg');
@@ -314,20 +324,7 @@ export class SysConfigComponent implements OnInit {
     reader.readAsDataURL(img);
   }
 
-  private checkImageDimension(file: File): Promise<boolean> {
-    return new Promise(resolve => {
-      const img = new Image(); // create image
-      img.src = window.URL.createObjectURL(file);
-      img.onload = () => {
-        const width = img.naturalWidth;
-        const height = img.naturalHeight;
-        window.URL.revokeObjectURL(img.src!);
-        resolve(width === height && width >= 300);
-      };
-    });
-  }
-
-  handleChange(info: { file: UploadFile }): void {
+  handleChange(info: { file: UploadFile }, avatarUrl): void {
     switch (info.file.status) {
       case 'uploading':
         this.avatarLoading = true;
@@ -336,7 +333,7 @@ export class SysConfigComponent implements OnInit {
         // Get this url from response in real world.
         this.getBase64(info.file!.originFileObj!, (img: string) => {
           this.avatarLoading = false;
-          this.avatarUrl = img;
+          this[avatarUrl] = img;
         });
         break;
       case 'error':