院区系统名称和大屏名称

src/app/app-routing.module.ts

@@ -26,6 +26,11 @@ const routes: Routes = [
     path: 'login',
     loadChildren: () => import('./views/login/login.module').then(m => m.LoginModule)
   },
+  // 登录
+  {
+    path: 'login/:hosId',
+    loadChildren: () => import('./views/login/login.module').then(m => m.LoginModule)
+  },
   // 管理端
   {
     path: 'main',

src/app/app.component.ts

@@ -9,7 +9,22 @@ import { MarkingService } from './services/marking.service';
 })
 export class AppComponent {
   constructor(private titleService:Title, private tool:ToolService, private markingService: MarkingService){
-    this.tool.getSysNameAndLogoAsync().subscribe(result => {
+    let reg = /^#\/login\/?(\d*)$/;
+    let isHosIdLogin = reg.test(location.hash);
+    let hosId;
+    console.log(isHosIdLogin)
+    if(isHosIdLogin){
+      // 登录页
+      hosId = location.hash.replace(reg, '$1');
+    }else if(location.hash == '#/main/sysConfig'){
+      // 系统配置页
+      hosId = '';
+    }else{
+      // 其他页面
+      hosId = this.tool.getCurrentHospital().id;
+    }
+    console.log(hosId);
+    this.tool.getSysNameAndLogoAsync(hosId).subscribe(result => {
       let marking = result.project || '';
       let logoTitle = result.sysName || '';
       let logoUrl = location.origin + '/file' + result.logo || '';

src/app/services/main.service.ts

@@ -715,8 +715,8 @@ export class MainService {
     );
   }
   // 获取logo和title
-  getSysNameAndLogo(): any {
-    return this.http.get(host.host + "/auth/getSysNameAndLogo", {});
+  getSysNameAndLogo(hosId): any {
+    return this.http.get(host.host + "/auth/getSysNameAndLogo" + (hosId ? '?hosId=' + hosId : ''), {});
   }
 
   //获取启动中的工作分配方案

src/app/services/tool.service.ts

@@ -12,8 +12,8 @@ export class ToolService {
   constructor(private mainService: MainService) {}
 
   // 获取logoUrl和logoTitle
-  getSysNameAndLogoAsync(){
-    return this.mainService.getSysNameAndLogo();
+  getSysNameAndLogoAsync(hosId = ''){
+    return this.mainService.getSysNameAndLogo(hosId);
   }
 
   // 设置logoTitle

src/app/views/data-dictionary/data-dictionary.component.ts

@@ -71,7 +71,13 @@ export class DataDictionaryComponent implements OnInit {
         dictionaryName: '统计分类',
         key: 'statistics_date_type',
         type: 'dictionary',
-      }
+      },
+      {
+        id: -3,
+        dictionaryName: '大扫描提示',
+        key: 'bigScan_special_msg',
+        type: 'dictionary',
+      },
     ];
     if (Object.keys(this.checkedDictionary).length) {
       this.dictionaryList.forEach((item) => {

src/app/views/fuwutai/fuwutai.component.ts

@@ -19,6 +19,7 @@ import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { SourceId } from "src/app/type/types";
+import { ToolService } from 'src/app/services/tool.service';
 @Component({
   selector: "app-fuwutai",
   templateUrl: "./fuwutai.component.html",
@@ -106,7 +107,8 @@ export class FuwutaiComponent implements OnInit {
     private msg: NzMessageService,
     private notification: NzNotificationService,
     private phones: WebsocketPhoneService,
-    private sers: WebsocketSerService
+    private sers: WebsocketSerService,
+    private tool: ToolService,
   ) {}
   validateFormZy!: FormGroup;
   validateFormQt!: FormGroup;
@@ -1185,21 +1187,30 @@ export class FuwutaiComponent implements OnInit {
     // 假退出
     this.btnLoading = false;
     this.closeLogoutModal();
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
     localStorage.removeItem("phones");
     localStorage.removeItem("index");
-    this.router.navigateByUrl("login");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
       this.btnLoading = false;
       this.closeLogoutModal();
       if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
         localStorage.removeItem("phones");
         localStorage.removeItem("index");
-        this.router.navigateByUrl("login");
       }
     });
   }

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -4156,19 +4156,29 @@ export class HushijiandanComponent implements OnInit {
   logOut(): void {
     let that = this;
     // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
     localStorage.removeItem("phones");
     localStorage.removeItem("index");
-    that.router.navigateByUrl("login");
+
     // 假退出
     that.mainService.logOut().subscribe((data) => {
       if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
         localStorage.removeItem("phones");
         localStorage.removeItem("index");
-        that.router.navigateByUrl("login");
       }
     });
   }

src/app/views/login/login.component.ts

@@ -7,6 +7,8 @@ import http from "../../../assets/js/http";
 import { AES, mode, pad, enc } from "crypto-js";
 import { baseUrlType } from "src/app/type/types";
 import { ToolService } from 'src/app/services/tool.service';
+import { Title } from '@angular/platform-browser';
+import { MarkingService } from 'src/app/services/marking.service';
 @Component({
   selector: "app-login",
   templateUrl: "./login.component.html",
@@ -22,7 +24,9 @@ export class LoginComponent implements OnInit {
     private fb: FormBuilder,
     private mainService: MainService,
     private msg: NzMessageService,
-    private tool: ToolService
+    private tool: ToolService,
+    private titleService: Title,
+    private markingService: MarkingService,
   ) {}
   ngOnInit() {
     this.http = http;
@@ -163,8 +167,24 @@ export class LoginComponent implements OnInit {
             localStorage.removeItem("remember");
           }
         }
-        this.toRoute2(data);
-        this.initMenu(data.user.menu);
+        // 重置系统名称和大屏名称
+        console.log(data.user);
+        let hosId = data.user.user.currentHospital ? data.user.user.currentHospital.id : ''
+        this.tool.getSysNameAndLogoAsync(hosId).subscribe(result => {
+          let marking = result.project || '';
+          let logoTitle = result.sysName || '';
+          let logoUrl = location.origin + '/file' + result.logo || '';
+          let faviconUrl = location.origin + '/file' + result.favicon || '';
+          this.markingService.setMarking(marking);
+          this.tool.setSysName(logoTitle);
+          this.tool.setLogo(logoUrl);
+          this.tool.setFavicon(faviconUrl);
+          this.titleService.setTitle(this.tool.logoTitle);
+          (document.querySelector('#favicon') as any).href = this.tool.faviconUrl;
+
+          this.toRoute2(data);
+          this.initMenu(data.user.menu);
+        })
       } else {
         this.msg.error(data.remarks, {
           nzDuration: 1000,

src/app/views/main/main.component.ts

@@ -452,21 +452,32 @@ export class MainComponent implements OnInit {
   // 退出
   logOut(): void {
     // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
     localStorage.removeItem("phones");
     localStorage.removeItem("index");
-    this.router.navigateByUrl("login");
+
     // 假退出
     this.mainService.logOut().subscribe((data) => {
       if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
         localStorage.removeItem("phones");
         localStorage.removeItem("index");
-        this.router.navigateByUrl("login");
       }
     });
+
   }
 
   // 连接websocket

src/app/views/pharmacy/pharmacy.component.ts

@@ -248,21 +248,32 @@ export class PharmacyComponent implements OnInit {
   // 退出
   logOut(): void {
     // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
     localStorage.removeItem("phones");
     localStorage.removeItem("index");
-    this.router.navigateByUrl("login");
+
     // 假退出
     this.mainService.logOut().subscribe((data) => {
       if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
         localStorage.removeItem("phones");
         localStorage.removeItem("index");
-        this.router.navigateByUrl("login");
       }
     });
+
   }
   //待配药
   print(id?) {

src/app/views/pharmacy2/pharmacy2.component.ts

@@ -419,21 +419,32 @@ export class Pharmacy2Component implements OnInit, OnDestroy {
   // 退出
   logOut(): void {
     // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
     localStorage.removeItem("phones");
     localStorage.removeItem("index");
-    this.router.navigateByUrl("login");
+
     // 假退出
     this.mainService.logOut().subscribe((data) => {
       if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
         localStorage.removeItem("phones");
         localStorage.removeItem("index");
-        this.router.navigateByUrl("login");
       }
     });
+
   }
   //待配药
   print(id?) {

src/app/views/specimen-view2/specimen-view2.component.ts

@@ -453,21 +453,31 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
   // 退出
   logOut(): void {
     // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
     localStorage.removeItem("phones");
     localStorage.removeItem("index");
-    this.router.navigateByUrl("login");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
       if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
         localStorage.removeItem("phones");
         localStorage.removeItem("index");
-        this.router.navigateByUrl("login");
       }
     });
+
   }
 
   // 右侧菜单