From 4c75dd3a77b5fc22e7ed7219b76418175657d566 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 24 Jan 2022 15:48:52 +0800 Subject: [PATCH] edit --- .../system-logs/system-logs.component.html | 0 .../system-logs/system-logs.component.ts | 6 ++-- .../system-supply-logs.component.html | 0 .../system-supply-logs.component.ts | 6 ++-- .../system-waybill-logs.component.html | 0 .../system-waybill-logs.component.ts | 6 ++-- .../user-logs/user-logs.component.html | 0 .../user-logs/user-logs.component.ts | 6 ++-- .../version-logs/version-logs.component.html | 0 .../version-logs/version-logs.component.ts | 6 ++-- src/app/routes/logs/logs-routing.module.ts | 21 ++++++++++++ src/app/routes/logs/logs.module.ts | 16 ++++++++++ src/app/routes/logs/services/logs.service.ts | 19 +++++++++++ src/app/routes/routes-routing.module.ts | 1 + .../system-logs/system-logs.component.less | 32 ------------------- .../system-supply-logs.component.less | 32 ------------------- .../system-waybill-logs.component.less | 32 ------------------- .../user-logs/user-logs.component.less | 32 ------------------- .../version-logs/version-logs.component.less | 32 ------------------- .../sys-setting/services/system.service.ts | 7 ---- .../sys-setting/sys-setting-routing.module.ts | 11 +------ .../routes/sys-setting/sys-setting.module.ts | 12 ++----- src/assets/mocks/menu-data.json | 21 +++++------- src/assets/mocks/platform/tms-obc-web.json | 20 +++++------- 24 files changed, 91 insertions(+), 227 deletions(-) rename src/app/routes/{sys-setting => logs}/components/system-logs/system-logs.component.html (100%) rename src/app/routes/{sys-setting => logs}/components/system-logs/system-logs.component.ts (91%) rename src/app/routes/{sys-setting => logs}/components/system-supply-logs/system-supply-logs.component.html (100%) rename src/app/routes/{sys-setting => logs}/components/system-supply-logs/system-supply-logs.component.ts (91%) rename src/app/routes/{sys-setting => logs}/components/system-waybill-logs/system-waybill-logs.component.html (100%) rename src/app/routes/{sys-setting => logs}/components/system-waybill-logs/system-waybill-logs.component.ts (91%) rename src/app/routes/{sys-setting => logs}/components/user-logs/user-logs.component.html (100%) rename src/app/routes/{sys-setting => logs}/components/user-logs/user-logs.component.ts (93%) rename src/app/routes/{sys-setting => logs}/components/version-logs/version-logs.component.html (100%) rename src/app/routes/{sys-setting => logs}/components/version-logs/version-logs.component.ts (92%) create mode 100644 src/app/routes/logs/logs-routing.module.ts create mode 100644 src/app/routes/logs/logs.module.ts create mode 100644 src/app/routes/logs/services/logs.service.ts delete mode 100644 src/app/routes/sys-setting/components/system-logs/system-logs.component.less delete mode 100644 src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.less delete mode 100644 src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.less delete mode 100644 src/app/routes/sys-setting/components/user-logs/user-logs.component.less delete mode 100644 src/app/routes/sys-setting/components/version-logs/version-logs.component.less diff --git a/src/app/routes/sys-setting/components/system-logs/system-logs.component.html b/src/app/routes/logs/components/system-logs/system-logs.component.html similarity index 100% rename from src/app/routes/sys-setting/components/system-logs/system-logs.component.html rename to src/app/routes/logs/components/system-logs/system-logs.component.html diff --git a/src/app/routes/sys-setting/components/system-logs/system-logs.component.ts b/src/app/routes/logs/components/system-logs/system-logs.component.ts similarity index 91% rename from src/app/routes/sys-setting/components/system-logs/system-logs.component.ts rename to src/app/routes/logs/components/system-logs/system-logs.component.ts index 82fc644f..775e4f4a 100644 --- a/src/app/routes/sys-setting/components/system-logs/system-logs.component.ts +++ b/src/app/routes/logs/components/system-logs/system-logs.component.ts @@ -3,12 +3,12 @@ import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { dateTimePickerUtil } from '@delon/util'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { SystemService } from '../../services/system.service'; +import { LogsService } from '../../services/logs.service'; @Component({ selector: 'app-system-logs', templateUrl: './system-logs.component.html', - styleUrls: ['./system-logs.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class SystemLogsComponent implements OnInit { @ViewChild('st', { static: true }) @@ -76,7 +76,7 @@ export class SystemLogsComponent implements OnInit { _$expand = false; - constructor(public service: SystemService, private nzModalService: NzModalService) {} + constructor(public service: LogsService, private nzModalService: NzModalService) {} ngOnInit(): void {} diff --git a/src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.html b/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html similarity index 100% rename from src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.html rename to src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html diff --git a/src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.ts b/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts similarity index 91% rename from src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.ts rename to src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts index 720c58b9..998d6ca1 100644 --- a/src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.ts +++ b/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts @@ -11,12 +11,12 @@ import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { dateTimePickerUtil } from '@delon/util'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { SystemService } from '../../services/system.service'; +import { LogsService } from '../../services/logs.service'; @Component({ selector: 'app-system-logs', templateUrl: './system-supply-logs.component.html', - styleUrls: ['./system-supply-logs.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class SystemSupplyLogsComponent implements OnInit { @ViewChild('st', { static: true }) @@ -56,7 +56,7 @@ export class SystemSupplyLogsComponent implements OnInit { _$expand = false; - constructor(public service: SystemService, private nzModalService: NzModalService) {} + constructor(public service: LogsService, private nzModalService: NzModalService) {} ngOnInit(): void {} diff --git a/src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.html b/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html similarity index 100% rename from src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.html rename to src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html diff --git a/src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.ts b/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts similarity index 91% rename from src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.ts rename to src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts index 0a490d32..f394883f 100644 --- a/src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.ts +++ b/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts @@ -11,12 +11,12 @@ import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { dateTimePickerUtil } from '@delon/util'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { SystemService } from '../../services/system.service'; +import { LogsService } from '../../services/logs.service'; @Component({ selector: 'app-system-logs', templateUrl: './system-waybill-logs.component.html', - styleUrls: ['./system-waybill-logs.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class SystemWaybillLogsComponent implements OnInit { @ViewChild('st', { static: true }) @@ -55,7 +55,7 @@ export class SystemWaybillLogsComponent implements OnInit { _$expand = false; - constructor(public service: SystemService, private nzModalService: NzModalService) {} + constructor(public service: LogsService, private nzModalService: NzModalService) {} ngOnInit(): void {} diff --git a/src/app/routes/sys-setting/components/user-logs/user-logs.component.html b/src/app/routes/logs/components/user-logs/user-logs.component.html similarity index 100% rename from src/app/routes/sys-setting/components/user-logs/user-logs.component.html rename to src/app/routes/logs/components/user-logs/user-logs.component.html diff --git a/src/app/routes/sys-setting/components/user-logs/user-logs.component.ts b/src/app/routes/logs/components/user-logs/user-logs.component.ts similarity index 93% rename from src/app/routes/sys-setting/components/user-logs/user-logs.component.ts rename to src/app/routes/logs/components/user-logs/user-logs.component.ts index fe780b3e..70bf123f 100644 --- a/src/app/routes/sys-setting/components/user-logs/user-logs.component.ts +++ b/src/app/routes/logs/components/user-logs/user-logs.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; -import { SystemService } from '../../services/system.service'; +import { LogsService } from '../../services/logs.service'; @Component({ selector: 'app-user-logs', templateUrl: './user-logs.component.html', - styleUrls: ['./user-logs.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class UserLogsComponent implements OnInit { @ViewChild('st', { static: true }) @@ -86,7 +86,7 @@ export class UserLogsComponent implements OnInit { _$expand = false; - constructor(public service: SystemService) {} + constructor(public service: LogsService) {} ngOnInit(): void {} diff --git a/src/app/routes/sys-setting/components/version-logs/version-logs.component.html b/src/app/routes/logs/components/version-logs/version-logs.component.html similarity index 100% rename from src/app/routes/sys-setting/components/version-logs/version-logs.component.html rename to src/app/routes/logs/components/version-logs/version-logs.component.html diff --git a/src/app/routes/sys-setting/components/version-logs/version-logs.component.ts b/src/app/routes/logs/components/version-logs/version-logs.component.ts similarity index 92% rename from src/app/routes/sys-setting/components/version-logs/version-logs.component.ts rename to src/app/routes/logs/components/version-logs/version-logs.component.ts index 246531b9..d53bad68 100644 --- a/src/app/routes/sys-setting/components/version-logs/version-logs.component.ts +++ b/src/app/routes/logs/components/version-logs/version-logs.component.ts @@ -3,12 +3,12 @@ import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; import { dateTimePickerUtil } from '@delon/util'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { SystemService } from '../../services/system.service'; +import { LogsService } from '../../services/logs.service'; @Component({ selector: 'app-version-logs', templateUrl: './version-logs.component.html', - styleUrls: ['./version-logs.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class VersionLogsComponent implements OnInit { @ViewChild('st', { static: true }) @@ -89,7 +89,7 @@ export class VersionLogsComponent implements OnInit { _$expand = false; - constructor(public service: SystemService, private nzModalService: NzModalService) {} + constructor(public service: LogsService, private nzModalService: NzModalService) {} beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { diff --git a/src/app/routes/logs/logs-routing.module.ts b/src/app/routes/logs/logs-routing.module.ts new file mode 100644 index 00000000..40e2ccb5 --- /dev/null +++ b/src/app/routes/logs/logs-routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { SystemLogsComponent } from './components/system-logs/system-logs.component'; +import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component'; +import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component'; +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 } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class LogsRoutingModule {} diff --git a/src/app/routes/logs/logs.module.ts b/src/app/routes/logs/logs.module.ts new file mode 100644 index 00000000..6454841b --- /dev/null +++ b/src/app/routes/logs/logs.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '@shared'; +import { LogsRoutingModule } from './logs-routing.module'; +import { SystemLogsComponent } from './components/system-logs/system-logs.component'; +import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component'; +import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component'; +import { UserLogsComponent } from './components/user-logs/user-logs.component'; +import { VersionLogsComponent } from './components/version-logs/version-logs.component'; + +const COMPONENTS = [SystemLogsComponent, UserLogsComponent, VersionLogsComponent, SystemSupplyLogsComponent, SystemWaybillLogsComponent]; +@NgModule({ + declarations: [...COMPONENTS], + imports: [CommonModule, LogsRoutingModule, SharedModule] +}) +export class LogsModule {} diff --git a/src/app/routes/logs/services/logs.service.ts b/src/app/routes/logs/services/logs.service.ts new file mode 100644 index 00000000..1c0a9489 --- /dev/null +++ b/src/app/routes/logs/services/logs.service.ts @@ -0,0 +1,19 @@ +import { Injectable, Injector } from '@angular/core'; +import { Menu } from '@delon/theme'; +import { BaseService } from '@shared'; + +@Injectable({ + providedIn: 'root' +}) +export class LogsService extends BaseService { + // 查询用户登录记录表 + public $api_user_login_logs = '/api/mdc/userLoginLog/list/page'; + // 获取操作日志列表 + public $api_get_systemt_logs = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList'; + // 查询版本发布表 + public $api_get_version_logs = '/api/mdc/versionPublish/list/page'; + + constructor(public injector: Injector) { + super(injector); + } +} diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index f3ec5f69..d538081c 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -37,6 +37,7 @@ const routes: Routes = [ loadChildren: () => import('./usercenter/usercenter.module').then(m => m.UsercenterModule) }, { 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) }, diff --git a/src/app/routes/sys-setting/components/system-logs/system-logs.component.less b/src/app/routes/sys-setting/components/system-logs/system-logs.component.less deleted file mode 100644 index 7512dfec..00000000 --- a/src/app/routes/sys-setting/components/system-logs/system-logs.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width: 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.less b/src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.less deleted file mode 100644 index 4d397f58..00000000 --- a/src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } -} - -.expend-options { - margin-top: 0; -} - - -@media (min-width: 1200px) { - .expend-options { - position : absolute; - right : 0; - bottom : 25px; - max-width: 400px; - } - -} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.less b/src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.less deleted file mode 100644 index 4d397f58..00000000 --- a/src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } -} - -.expend-options { - margin-top: 0; -} - - -@media (min-width: 1200px) { - .expend-options { - position : absolute; - right : 0; - bottom : 25px; - max-width: 400px; - } - -} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/user-logs/user-logs.component.less b/src/app/routes/sys-setting/components/user-logs/user-logs.component.less deleted file mode 100644 index 7512dfec..00000000 --- a/src/app/routes/sys-setting/components/user-logs/user-logs.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width: 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/version-logs/version-logs.component.less b/src/app/routes/sys-setting/components/version-logs/version-logs.component.less deleted file mode 100644 index 7512dfec..00000000 --- a/src/app/routes/sys-setting/components/version-logs/version-logs.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width: 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 23cdd1f7..a3191854 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -87,13 +87,6 @@ export class SystemService extends BaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; - // 查询用户登录记录表 - public $api_user_login_logs = '/api/mdc/userLoginLog/list/page'; - // 获取操作日志列表 - public $api_get_systemt_logs = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList'; - // 查询版本发布表 - public $api_get_version_logs = '/api/mdc/versionPublish/list/page'; - // 查询协议列表 public $api_get_agreement_page = '/api/mdc/pbc/agreementInfo/list/page'; // 编辑协议 diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index 93ceb933..239525f9 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -21,11 +21,7 @@ import { NetworkFreightComponent } from './components/network-freight/network-fr import { RoleManagementComponent } from './components/role-management/role-management.component'; import { StaffManagementComponent } from './components/staff-management/staff-management.component'; import { SystemConfigComponent } from './components/system-config/system-config.component'; -import { SystemLogsComponent } from './components/system-logs/system-logs.component'; -import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component'; -import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component'; -import { UserLogsComponent } from './components/user-logs/user-logs.component'; -import { VersionLogsComponent } from './components/version-logs/version-logs.component'; + import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; @@ -34,11 +30,6 @@ const routes: Routes = [ { path: 'role-management', component: RoleManagementComponent }, { path: 'basic-setting', component: BasicSettingComponent }, { path: 'basic-config', component: BasicConfigComponent }, - { 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: 'audit-reason-config', component: AuditReasonConfigComponent }, { path: 'cart-config', component: CartConfigComponent }, { path: 'agreement-config', component: AgreementConfigComponentsBaseComponent }, diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index 21e74b15..8f965465 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -14,9 +14,6 @@ import { SysSettingRoutingModule } from './sys-setting-routing.module'; import { BuyerTranspowerComponent } from './components/staff-management/transpower/transpower.component'; import { SystemStaffStaffModalComponent } from './components/staff-management/staff-modal/staff-modal.component'; import { RoleManagementComponent } from './components/role-management/role-management.component'; -import { SystemLogsComponent } from './components/system-logs/system-logs.component'; -import { UserLogsComponent } from './components/user-logs/user-logs.component'; -import { VersionLogsComponent } from './components/version-logs/version-logs.component'; import { BasicConfigComponent } from './components/basic-config/basic-config.component'; import { AuditReasonConfigComponent } from './components/audit-reason-config/audit-reason-config.component'; import { BasicConfigActionModalComponent } from './components/basic-config/basic-config-action-modal/basic-config-action-modal.component'; @@ -32,8 +29,6 @@ import { GoodsNameConfigComponent } from './components/goods-name-config/goods-n import { CrmManagementComponent } from './components/crm-management/crm-management.component'; import { NetworkFreightComponent } from './components/network-freight/network-freight.component'; import { CloseAccountComponent } from './components/close-account/close-account.component'; -import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component'; -import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component'; import { BtnManagementComponent } from './components/btn-management/btn-management.component'; import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; @@ -42,9 +37,7 @@ const COMPONENTS = [ StaffManagementComponent, RoleManagementComponent, BasicConfigComponent, - SystemLogsComponent, - UserLogsComponent, - VersionLogsComponent, + AuditReasonConfigComponent, CartConfigComponent, AgreementConfigComponentsBaseComponent, @@ -54,8 +47,7 @@ const COMPONENTS = [ CrmManagementComponent, NetworkFreightComponent, CloseAccountComponent, - SystemSupplyLogsComponent, - SystemWaybillLogsComponent, + BtnManagementComponent, AnnouncementMessageComponent, InsuranceSetComponent diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 3ba17bde..24ec1160 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -446,19 +446,23 @@ "children": [ { "text": "系统操作日志", - "link": "/system/system-logs" + "link": "/logs/system-logs" }, { "text": "货源操作日志", - "link": "/system/system-supply-logs" + "link": "/logs/system-supply-logs" }, { "text": "订单操作日志", - "link": "/system/system-waybill-logs" + "link": "/logs/system-waybill-logs" }, { "text": "用户登录日志", - "link": "/system/user-logs" + "link": "/logs/user-logs" + }, + { + "text": "版本发布记录", + "link": "/logs/version-logs" } ] }, @@ -478,10 +482,6 @@ "text": "基础设置", "link": "/system/basic-setting" }, - { - "text": "按钮管理设置", - "link": "/system/btn-management" - }, { "text": "保险配置", "link": "/system/insurance-set" @@ -498,11 +498,6 @@ "text": "基础配置", "link": "/system/basic-config" }, - - { - "text": "版本发布记录", - "link": "/system/version-logs" - }, { "text": "协议配置", "link": "/system/agreement-config" diff --git a/src/assets/mocks/platform/tms-obc-web.json b/src/assets/mocks/platform/tms-obc-web.json index d1c34ebb..8c6cf6f7 100644 --- a/src/assets/mocks/platform/tms-obc-web.json +++ b/src/assets/mocks/platform/tms-obc-web.json @@ -439,19 +439,23 @@ "children": [ { "text": "系统操作日志", - "link": "/system/system-logs" + "link": "/logs/system-logs" }, { "text": "货源操作日志", - "link": "/system/system-supply-logs" + "link": "/logs/system-supply-logs" }, { "text": "订单操作日志", - "link": "/system/system-waybill-logs" + "link": "/logs/system-waybill-logs" }, { "text": "用户登录日志", - "link": "/system/user-logs" + "link": "/logs/user-logs" + }, + { + "text": "版本发布记录", + "link": "/logs/version-logs" } ] }, @@ -471,10 +475,6 @@ "text": "基础设置", "link": "/system/basic-setting" }, - { - "text": "按钮管理设置", - "link": "/system/btn-management" - }, { "text": "公告信息管理", "link": "/system/announcement-message" @@ -487,10 +487,6 @@ "text": "基础配置", "link": "/system/basic-config" }, - { - "text": "版本发布记录", - "link": "/system/version-logs" - }, { "text": "协议配置", "link": "/system/agreement-config"