Bladeren bron

删除配置中心菜单

seimin 6 maanden geleden
bovenliggende
commit
c6d469c3b8

+ 14 - 6
src/app/app-routing.module.ts

@@ -17,8 +17,10 @@ import { SpecimenRoomViewGuard } from './guard/SpecimenRoomViewGuard.guard';
17 17
 import { PathologyGuard } from './guard/Pathology.guard';
18 18
 // 全局业务查看权限
19 19
 import { DisinfectionSupplyGuard } from './guard/DisinfectionSupplyGuard.guard';
20
-// 配置中心查看权限
21
-import { ConfigurationCenterGuard } from './guard/ConfigurationCenter.guard';
20
+// 事件配置查看权限
21
+import { IncidentConfigGuard } from './guard/IncidentConfig.guard';
22
+// 三方配置查看权限
23
+import { OtherConfigGuard } from './guard/OtherConfig.guard';
22 24
 
23 25
 const routes: Routes = [
24 26
   // 默认
@@ -96,11 +98,17 @@ const routes: Routes = [
96 98
     loadChildren: () => import('./views/disinfection-supply/disinfection-supply.module').then(m => m.DisinfectionSupplyModule),
97 99
     canActivate: [DisinfectionSupplyGuard]
98 100
   },
99
-  // 配置中心查看
101
+  // 事件配置查看
100 102
   {
101
-    path: 'configurationCenter',
102
-    loadChildren: () => import('./views/configuration-center/configuration-center.module').then(m => m.ConfigurationCenterModule),
103
-    canActivate: [ConfigurationCenterGuard]
103
+    path: 'incidentConfig',
104
+    loadChildren: () => import('./views/incident-config/incident-config.module').then(m => m.IncidentConfigModule),
105
+    canActivate: [IncidentConfigGuard]
106
+  },
107
+  // 三方配置查看
108
+  {
109
+    path: 'otherConfig',
110
+    loadChildren: () => import('./views/other-config/other-config.module').then(m => m.OtherConfigModule),
111
+    canActivate: [OtherConfigGuard]
104 112
   },
105 113
   // 问卷预览
106 114
   {

+ 7 - 3
src/app/components/select-menu/select-menu.component.ts

@@ -19,11 +19,15 @@ export class SelectMenuComponent implements OnInit {
19 19
 
20 20
   ngOnInit() {
21 21
     let menus = JSON.parse(localStorage.getItem("menu"));
22
-    let configurationCenter = menus.find(item => item.link == 'configurationCenter');
23
-    this.configurationCenterMenus = configurationCenter ? (configurationCenter.childrens || []) : [];
22
+    let configurationCenterMenus = [];
23
+    let incidentConfig = menus.find(item => item.link == 'incidentConfig');
24
+    incidentConfig && configurationCenterMenus.push(incidentConfig);
25
+    let otherConfig = menus.find(item => item.link == 'otherConfig');
26
+    otherConfig && configurationCenterMenus.push(otherConfig);
27
+    this.configurationCenterMenus = configurationCenterMenus;
24 28
   }
25 29
   clickHandle(item){
26
-    this.router.navigateByUrl("configurationCenter/" + item.link);
30
+    this.router.navigateByUrl(item.link);
27 31
   }
28 32
   // 隐藏模态框
29 33
   hideModal() {

+ 2 - 2
src/app/guard/ConfigurationCenter.guard.ts

@@ -4,14 +4,14 @@ import { CanActivate, Router } from '@angular/router';
4 4
 @Injectable({
5 5
   providedIn: 'root'
6 6
 })
7
-export class ConfigurationCenterGuard implements CanActivate  {
7
+export class IncidentConfigGuard implements CanActivate  {
8 8
   constructor(public router: Router) { }
9 9
 
10 10
   canActivate(): boolean {
11 11
     const menus = JSON.parse(localStorage.getItem('menu'));
12 12
     let can = false;
13 13
     if (menus) {
14
-      can = menus.some(e => e.link == 'configurationCenter');
14
+      can = menus.some(e => e.link == 'incidentConfig');
15 15
     }
16 16
     if (!can) {
17 17
       this.router.navigate(['login']);

+ 22 - 0
src/app/guard/otherConfig.guard.ts

@@ -0,0 +1,22 @@
1
+import { Injectable } from '@angular/core';
2
+import { CanActivate, Router } from '@angular/router';
3
+
4
+@Injectable({
5
+  providedIn: 'root'
6
+})
7
+export class OtherConfigGuard implements CanActivate  {
8
+  constructor(public router: Router) { }
9
+
10
+  canActivate(): boolean {
11
+    const menus = JSON.parse(localStorage.getItem('menu'));
12
+    let can = false;
13
+    if (menus) {
14
+      can = menus.some(e => e.link == 'otherConfig');
15
+    }
16
+    if (!can) {
17
+      this.router.navigate(['login']);
18
+      return false
19
+    }
20
+    return true;
21
+  }
22
+}

+ 0 - 36
src/app/views/configuration-center/configuration-center-routing.module.ts

@@ -1,36 +0,0 @@
1
-import { NgModule } from '@angular/core';
2
-import { Routes, RouterModule } from '@angular/router';
3
-import { ConfigurationCenterComponent } from './configuration-center.component';
4
-
5
-
6
-const routes: Routes = [
7
-  {
8
-    path: '',
9
-    component: ConfigurationCenterComponent,
10
-    children: [
11
-      // 默认
12
-      {
13
-        path: '',
14
-        redirectTo: 'incidentConfig',
15
-        pathMatch: 'full'
16
-      },
17
-      {
18
-        // 事件配置
19
-        path: 'incidentConfig',
20
-        loadChildren: () => import('../incident-config/incident-config.module').then(m => m.IncidentConfigModule)
21
-      },
22
-      {
23
-        // 三方配置
24
-        path: 'otherConfig',
25
-        loadChildren: () => import('../other-config/other-config.module').then(m => m.OtherConfigModule)
26
-      }
27
-    ]
28
-  }
29
-];
30
-
31
-@NgModule({
32
-  imports: [RouterModule.forChild(routes)],
33
-  exports: [RouterModule]
34
-})
35
-export class ConfigurationCenterRoutingModule { }
36
-

+ 0 - 1
src/app/views/configuration-center/configuration-center.component.html

@@ -1 +0,0 @@
1
-<router-outlet></router-outlet>

+ 0 - 5
src/app/views/configuration-center/configuration-center.component.less

@@ -1,5 +0,0 @@
1
-@import "../../../../src/theme.less";
2
-:host{
3
-  width: 100%;
4
-}
5
-

+ 0 - 10
src/app/views/configuration-center/configuration-center.component.ts

@@ -1,10 +0,0 @@
1
-import { Component, OnInit } from "@angular/core";
2
-@Component({
3
-  selector: "app-configuration-center",
4
-  templateUrl: "./configuration-center.component.html",
5
-  styleUrls: ["./configuration-center.component.less"],
6
-})
7
-export class ConfigurationCenterComponent implements OnInit{
8
-  constructor(){}
9
-  ngOnInit(): void {}
10
-}

+ 0 - 19
src/app/views/configuration-center/configuration-center.module.ts

@@ -1,19 +0,0 @@
1
-import { NgModule } from '@angular/core';
2
-import { CommonModule } from '@angular/common';
3
-
4
-import { ConfigurationCenterRoutingModule } from './configuration-center-routing.module';
5
-import { ConfigurationCenterComponent } from './configuration-center.component';
6
-import { ShareModule } from 'src/app/share/share.module';
7
-
8
-
9
-@NgModule({
10
-  declarations: [
11
-    ConfigurationCenterComponent
12
-  ],
13
-  imports: [
14
-    CommonModule,
15
-    ConfigurationCenterRoutingModule,
16
-    ShareModule
17
-  ]
18
-})
19
-export class ConfigurationCenterModule { }

+ 1 - 1
src/app/views/main/main.component.html

@@ -32,7 +32,7 @@
32 32
         <div class="left">
33 33
           <i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
34 34
           <i class="icon_transport transport-hushizhihanghuligongzuo green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
35
-          <i class="icon_transport transport-peizhi1 green" *ngIf="configurationCenterRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
35
+          <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
36 36
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
37 37
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
38 38
           <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole">

+ 9 - 4
src/app/views/main/main.component.ts

@@ -32,7 +32,8 @@ export class MainComponent implements OnInit {
32 32
 	specimenRoomView: boolean = false; //标本间权限
33 33
 	pathology: boolean = false; //病理科权限
34 34
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
35
-  configurationCenterRole: boolean = false; //配置中心权限
35
+  incidentConfigRole: boolean = false; //事件配置权限
36
+  otherConfigRole: boolean = false; //三方配置权限
36 37
   PCCommutesToWork: boolean = false; //PC上下班权限
37 38
   @ViewChild("osComponentRef1", {
38 39
     read: OverlayScrollbarsComponent,
@@ -303,9 +304,13 @@ export class MainComponent implements OnInit {
303 304
         this.disinfectionSupplyRole = true;
304 305
         console.log("全局业务查看权限");
305 306
       }
306
-      if (e.link == "configurationCenter") {
307
-        this.configurationCenterRole = true;
308
-        console.log("配置中心权限");
307
+      if (e.link == "incidentConfig") {
308
+        this.incidentConfigRole = true;
309
+        console.log("事件配置权限");
310
+      }
311
+      if (e.link == "otherConfig") {
312
+        this.otherConfigRole = true;
313
+        console.log("三方配置权限");
309 314
       }
310 315
       if (e.link == "PCCommutesToWork") {
311 316
         this.PCCommutesToWork = true;