Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
weiyu
2022-04-29 15:37:24 +08:00
parent 594f3bb5d3 23d6ad6150
commit 74dab3d4ea
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/routes/logs/logs-routing.module.ts
View File

@ -1,3 +1,13 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-21 13:49:21
* @LastEditors : Shiming
* @LastEditTime : 2022-04-29 15:25:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\logs\\logs-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { SystemLogsComponent } from './components/system-logs/system-logs.component';
@ -7,11 +17,11 @@ import { UserLogsComponent } from './components/user-logs/user-logs.component';
import { VersionLogsComponent } from './components/version-logs/version-logs.component';
const routes: Routes = [
{ path: 'system-logs', component: SystemLogsComponent },
{ path: 'user-logs', component: UserLogsComponent },
{ path: 'version-logs', component: VersionLogsComponent },
{ path: 'system-supply-logs', component: SystemSupplyLogsComponent },
{ path: 'system-waybill-logs', component: SystemWaybillLogsComponent }
{ path: 'system-logs', component: SystemLogsComponent, data: { guard: { ability: ['LOGS-LOGS-list'] } } },
{ path: 'user-logs', component: UserLogsComponent, data: { guard: { ability: ['LOGS-USER-LOGS-list'] } } },
{ path: 'version-logs', component: VersionLogsComponent , data: { guard: { ability: ['LOGS-VERSION-LOGS-list'] } }},
{ path: 'system-supply-logs', component: SystemSupplyLogsComponent , data: { guard: { ability: ['LOGS-SUPPLY-LOGS-list'] } }},
{ path: 'system-waybill-logs', component: SystemWaybillLogsComponent , data: { guard: { ability: ['LOGS-WAYBILL-LOGS-list'] } }}
];
@NgModule({

2
src/app/routes/partner/partner.module.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-09 14:34:55
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 11:28:31
* @LastEditTime : 2022-04-29 15:29:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

3
src/app/routes/routes-routing.module.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-13 19:22:47
* @LastEditors : Shiming
* @LastEditTime : 2022-03-30 14:09:00
* @LastEditTime : 2022-04-29 15:26:30
* @FilePath : \\tms-obc-web\\src\\app\\routes\\routes-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -42,7 +42,6 @@ const routes: Routes = [
{ path: 'system', loadChildren: () => import('./sys-setting/sys-setting.module').then(m => m.SysSettingModule) },
{ path: 'logs', loadChildren: () => import('./logs/logs.module').then(m => m.LogsModule) },
{ path: 'ticket', loadChildren: () => import('./ticket-management/ticket-management.module').then(m => m.TicketManagementModule) },
{ path: 'supplygoods', loadChildren: () => import('./supply-goods/supply-goods.module').then(m => m.SupplyGoodsModule) },
{ path: 'vehicle', loadChildren: () => import('./vehicle/vehicle.module').then(m => m.VehicleModule) },
{
path: 'supply-management',