From da62ad6fce7aab9496ff51f0afe0c6b29b1a0e5e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 24 Jan 2022 14:03:52 +0800 Subject: [PATCH 1/3] edit --- src/app/core/guards/auth.guard.ts | 2 + .../alian-demo/alian-demo.component.html | 44 ---- .../alian-demo/alian-demo.component.less | 5 - .../alian-demo/alian-demo.component.ts | 206 ------------------ .../zorro-demo/edit/edit.component.html | 10 - .../zorro-demo/edit/edit.component.spec.ts | 24 -- .../zorro-demo/edit/edit.component.ts | 63 ------ .../zorro-demo/zorro-demo.component.html | 129 ----------- .../zorro-demo/zorro-demo.component.less | 0 .../zorro-demo/zorro-demo.component.ts | 161 -------------- src/app/routes/demo/demo-routing.module.ts | 15 -- src/app/routes/demo/demo.module.ts | 15 -- src/app/routes/demo/services/demo.service.ts | 11 - .../api-auth/api-auth.component.html | 4 +- .../components/index/index.component.ts | 2 +- src/app/routes/routes-routing.module.ts | 1 - .../agreement-config.component.ts | 9 +- .../sys-setting/sys-setting-routing.module.ts | 6 +- .../driver/detail/detail.component.spec.ts | 31 --- .../components/driver/driver.component.ts | 4 +- .../user/detail/detail.component.spec.ts | 31 --- 21 files changed, 12 insertions(+), 761 deletions(-) delete mode 100644 src/app/routes/demo/components/alian-demo/alian-demo.component.html delete mode 100644 src/app/routes/demo/components/alian-demo/alian-demo.component.less delete mode 100644 src/app/routes/demo/components/alian-demo/alian-demo.component.ts delete mode 100644 src/app/routes/demo/components/zorro-demo/edit/edit.component.html delete mode 100644 src/app/routes/demo/components/zorro-demo/edit/edit.component.spec.ts delete mode 100644 src/app/routes/demo/components/zorro-demo/edit/edit.component.ts delete mode 100644 src/app/routes/demo/components/zorro-demo/zorro-demo.component.html delete mode 100644 src/app/routes/demo/components/zorro-demo/zorro-demo.component.less delete mode 100644 src/app/routes/demo/components/zorro-demo/zorro-demo.component.ts delete mode 100644 src/app/routes/demo/demo-routing.module.ts delete mode 100644 src/app/routes/demo/demo.module.ts delete mode 100644 src/app/routes/demo/services/demo.service.ts delete mode 100644 src/app/routes/usercenter/components/driver/detail/detail.component.spec.ts delete mode 100644 src/app/routes/usercenter/components/freight/user/detail/detail.component.spec.ts diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 23ae320d..dc51f81d 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -22,6 +22,8 @@ const auths = ['YUNLI-CART-SEARCH', 'YUNLI-CART-DAOCHU', 'YUNLI-CART-DETAIL']; export class AuthGuard implements CanActivate, CanActivateChild, CanLoad { constructor(srv: ACLService, router: Router, private eaUserSrv: CoreService, private router2: Router, private inject: Injector) {} canLoad(route: Route, segments: UrlSegment[]): boolean | UrlTree | Observable | Promise { + console.log(route); + throw true; } diff --git a/src/app/routes/demo/components/alian-demo/alian-demo.component.html b/src/app/routes/demo/components/alian-demo/alian-demo.component.html deleted file mode 100644 index e403a762..00000000 --- a/src/app/routes/demo/components/alian-demo/alian-demo.component.html +++ /dev/null @@ -1,44 +0,0 @@ - - - -
-
- -
-
- - - - -
-
- - - - -
    -
  • 删除
    • -
  • 批量审批
    • -
- - -
- - - 已选择 - {{ selectedRows.length }} 项   服务调用总计 {{ - totalCallNo }} 万 - 清空 - - -
- - - \ No newline at end of file diff --git a/src/app/routes/demo/components/alian-demo/alian-demo.component.less b/src/app/routes/demo/components/alian-demo/alian-demo.component.less deleted file mode 100644 index 73710dfa..00000000 --- a/src/app/routes/demo/components/alian-demo/alian-demo.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host::ng-deep { - nz-range-picker { - width: 100%; - } -} \ No newline at end of file diff --git a/src/app/routes/demo/components/alian-demo/alian-demo.component.ts b/src/app/routes/demo/components/alian-demo/alian-demo.component.ts deleted file mode 100644 index 0dbbe39c..00000000 --- a/src/app/routes/demo/components/alian-demo/alian-demo.component.ts +++ /dev/null @@ -1,206 +0,0 @@ -import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { STComponent, STColumn, STChange } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { _HttpClient, ModalHelper } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { DemoService } from '../../services/demo.service'; -import { DemoEditComponent } from '../zorro-demo/edit/edit.component'; - -@Component({ - selector: 'app-alian-demo', - templateUrl: './alian-demo.component.html', - styleUrls: ['./alian-demo.component.less'] -}) -export class AlianDemoComponent implements OnInit { - url = `/rule?_allow_anonymous=true`; - - status = [ - { index: 0, text: '关闭', value: false, type: 'default', checked: false }, - { - index: 1, - text: '运行中', - value: false, - type: 'processing', - checked: false - }, - { index: 2, text: '已上线', value: false, type: 'success', checked: false }, - { index: 3, text: '异常', value: false, type: 'error', checked: false } - ]; - @ViewChild('st', { static: true }) - st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; - columns: STColumn[] = [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '规则编号', index: 'no' }, - { title: '描述', index: 'description' }, - { - title: '服务调用次数', - index: 'callNo', - type: 'number', - format: item => `${item.callNo} 万`, - sort: { - compare: (a, b) => a.callNo - b.callNo - } - }, - { - title: '状态', - index: 'status', - render: 'status', - filter: { - menus: this.status, - fn: (filter, record) => record.status === filter.index - } - }, - { - title: '更新时间', - index: 'updatedAt', - type: 'date', - sort: { - compare: (a, b) => a.updatedAt - b.updatedAt - } - }, - { - title: '操作', - buttons: [ - { - text: '修改', - click: item => this.edit(item) - }, - { - text: '删除', - click: item => this.delete(item) - } - ] - } - ]; - searchSchema: SFSchema = { - properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, - orderSn: { - type: 'string', - title: '订单号', - ui: { - autocomplete: 'off' - } - }, - receiveName: { - type: 'string', - title: '收件人' - }, - receiveMobile: { - type: 'string', - title: '收件人电话' - }, - tenantName: { - type: 'string', - title: '下单商家', - ui: { - visibleIf: { - expand: (value: boolean) => value - } - } - }, - createTime: { - title: '下单时间', - type: 'string', - ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema - } - } - }; - - ui: SFUISchema = { - '*': { - spanLabelFixed: 90, - grid: { span: 8, gutter: 4 } - }, - $orderSn: { - grid: { span: 8 } - }, - $receiveName: { - grid: { span: 8 } - }, - $createTime: { grid: { span: 8 } } - }; - _$expand = false; - - selectedRows: any[] = []; - totalCallNo = 0; - constructor(public service: DemoService, public msg: NzMessageService, private modal: ModalHelper) {} - - ngOnInit(): void {} - - stChange(e: STChange): void { - switch (e.type) { - case 'checkbox': - this.selectedRows = e.checkbox!; - this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0); - break; - case 'filter': - this.st.load(); - break; - } - } - - remove(): void { - this.service.request('/delete/rule?_allow_anonymous=true', { nos: this.selectedRows.map(i => i.no).join(',') }).subscribe(() => { - this.st.load(); - this.st.clearCheck(); - }); - } - - approval(): void { - this.msg.success(`审批了 ${this.selectedRows.length} 笔`); - } - - add(): void { - this.modal.createStatic(DemoEditComponent, { i: { id: 0 } }).subscribe(res => { - if (res) { - console.log(res); - } - }); - } - - edit(item: any) { - this.modal - .createStatic(DemoEditComponent, { i: { no: 1, owner: '22222', callNo: 111, status: 1, description: '222' } }) - .subscribe(res => { - if (res) { - this.st.setRow(item, res); - } - }); - } - - delete(item: any) { - this.st.removeRow(item); - } - - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } -} diff --git a/src/app/routes/demo/components/zorro-demo/edit/edit.component.html b/src/app/routes/demo/components/zorro-demo/edit/edit.component.html deleted file mode 100644 index 97f50494..00000000 --- a/src/app/routes/demo/components/zorro-demo/edit/edit.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
编辑 {{ record.id }} 信息
-
- - -
- - -
- diff --git a/src/app/routes/demo/components/zorro-demo/edit/edit.component.spec.ts b/src/app/routes/demo/components/zorro-demo/edit/edit.component.spec.ts deleted file mode 100644 index 5fa67a8b..00000000 --- a/src/app/routes/demo/components/zorro-demo/edit/edit.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DemoEditComponent } from './edit.component'; - -describe('DemoEditComponent', () => { - let component: DemoEditComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DemoEditComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DemoEditComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/demo/components/zorro-demo/edit/edit.component.ts b/src/app/routes/demo/components/zorro-demo/edit/edit.component.ts deleted file mode 100644 index 989ed27f..00000000 --- a/src/app/routes/demo/components/zorro-demo/edit/edit.component.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { SFSchema, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalRef } from 'ng-zorro-antd/modal'; - -@Component({ - selector: 'app-demo-edit', - templateUrl: './edit.component.html', -}) -export class DemoEditComponent implements OnInit { - record: any = {}; - i: any; - schema: SFSchema = { - properties: { - no: { type: 'string', title: '编号' }, - owner: { type: 'string', title: '姓名', maxLength: 15 }, - callNo: { type: 'number', title: '调用次数' }, - status: { type: 'number', title: '链接' }, - description: { type: 'string', title: '描述', maxLength: 140 }, - }, - required: ['owner', 'callNo', 'description'], - }; - ui: SFUISchema = { - '*': { - spanLabelFixed: 100, - grid: { span: 12 }, - }, - $no: { - widget: 'text' - }, - $href: { - widget: 'string', - }, - $description: { - widget: 'textarea', - grid: { span: 24 }, - }, - }; - - constructor( - private modal: NzModalRef, - private msgSrv: NzMessageService, - public http: _HttpClient, - ) {} - - ngOnInit(): void { - if (this.record.id > 0) - this.http.get(`/user/${this.record.id}`).subscribe(res => (this.i = res)); - } - - save(value: any): void { - this.modal.close(value); - // this.http.post(`/user/${this.record.id}`, value).subscribe(res => { - // this.msgSrv.success('保存成功'); - // this.modal.close(true); - // }); - } - - close(): void { - this.modal.destroy(); - } -} diff --git a/src/app/routes/demo/components/zorro-demo/zorro-demo.component.html b/src/app/routes/demo/components/zorro-demo/zorro-demo.component.html deleted file mode 100644 index ec55f6ee..00000000 --- a/src/app/routes/demo/components/zorro-demo/zorro-demo.component.html +++ /dev/null @@ -1,129 +0,0 @@ - - - - -
-
-
- - 规则编号 - - - - -
-
- - 使用状态 - - - - - - - -
-
- - 调用次数 - - - - -
-
- - 更新日期 - - - - -
-
- - 使用状态 - - - - - - - -
-
- - - - - {{ expandForm ? '收起' : '展开' }} - - -
-
-
- - - - - -
    -
  • 删除
    • -
  • 批量审批
    • -
- - -
- - - 已选择 - {{ selectedRows.length }} 项   服务调用总计 {{ - totalCallNo }} 万 - 清空 - - -
- - - - - - - No - Name - Description - Option - - - - - - - {{ data.no }} - {{ data.callNo }} - {{ data.description }} - - Edit - - Delete - - - - - - - - - - - 描述 - - - - - \ No newline at end of file diff --git a/src/app/routes/demo/components/zorro-demo/zorro-demo.component.less b/src/app/routes/demo/components/zorro-demo/zorro-demo.component.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/routes/demo/components/zorro-demo/zorro-demo.component.ts b/src/app/routes/demo/components/zorro-demo/zorro-demo.component.ts deleted file mode 100644 index 1bfa7d26..00000000 --- a/src/app/routes/demo/components/zorro-demo/zorro-demo.component.ts +++ /dev/null @@ -1,161 +0,0 @@ -import { ChangeDetectorRef, Component, OnInit, TemplateRef } from '@angular/core'; -import { NzSafeAny } from 'ng-zorro-antd/core/types'; -import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { map, tap } from 'rxjs/operators'; -import { DemoService } from '../../services/demo.service'; - -@Component({ - selector: 'app-zorro-demo', - templateUrl: './zorro-demo.component.html', - styleUrls: ['./zorro-demo.component.less'] -}) -export class ZorroDemoComponent implements OnInit { - data: any[] = []; - loading = false; - expandForm = false; - - q: { - pi: number; - ps: number; - no: string; - sorter: string; - status: number | null; - statusList: NzSafeAny[]; - } = { - pi: 1, - ps: 10, - no: '', - sorter: '', - status: null, - statusList: [] - }; - - status = [ - { index: 0, text: '关闭', value: false, type: 'default', checked: false }, - { - index: 1, - text: '运行中', - value: false, - type: 'processing', - checked: false - }, - { index: 2, text: '已上线', value: false, type: 'success', checked: false }, - { index: 3, text: '异常', value: false, type: 'error', checked: false } - ]; - - selectedRows: any[] = []; - totalCallNo = 0; - description: string = ''; - checkedAll = false; - indeterminate = false; - constructor( - private service: DemoService, - public msg: NzMessageService, - private modalSrv: NzModalService, - private cdr: ChangeDetectorRef - ) {} - - ngOnInit(): void { - this.getData(); - } - - getData(): void { - this.loading = true; - this.q.statusList = this.status.filter(w => w.checked).map(item => item.index); - if (this.q.status !== null && this.q.status > -1) { - this.q.statusList.push(this.q.status); - } - this.service - .request('/rule?_allow_anonymous=true', this.q) - .pipe( - map((list: { records: Array<{ status: number; statusText: string; statusType: string }> }) => - list.records.map(i => { - const statusItem = this.status[i.status]; - i.statusText = statusItem.text; - i.statusType = statusItem.type; - return i; - }) - ), - tap(() => (this.loading = false)) - ) - .subscribe(res => { - this.data = res; - }); - } - - action(tpl: TemplateRef<{}>, data?: any): void { - if (data) { - this.description = data.description; - } - this.modalSrv.create({ - nzTitle: '新建规则', - nzContent: tpl, - nzOnOk: () => { - this.loading = true; - - // this.http.post('/rule', { description: this.description }).subscribe(() => this.getData()); - if (data) { - Object.assign(data, { description: this.description }); - } else { - this.data.push({ - checked: false, - key: this.data.length, - callNo: 111, - description: this.description - }); - this.data = [...this.data]; - } - setTimeout(() => { - this.loading = false; - }, 1000); - } - }); - } - - remove(): void { - this.service.request('/delete/rule?_allow_anonymous=true', { nos: this.selectedRows.map((i: any) => i.no).join(',') }).subscribe(() => { - this.getData(); - this.clearCheck(); - }); - } - - deleteAction(item: any) { - this.data = this.data.filter(({ no }) => no !== item.no); - } - - approval(): void { - this.msg.success(`审批了 ${this.selectedRows.length} 笔`); - } - - onAllChecked(checked: boolean): void { - this.data.filter(({ disabled }) => !disabled).forEach(item => (item.checked = checked)); - this.selectedRows = this.data.filter(({ checked }) => checked); - } - - onItemChecked(checked: boolean, item: any): void { - if (checked) { - this.selectedRows.push(item); - } else { - this.selectedRows = this.selectedRows.filter(({ no }) => no !== item.no); - } - this.refreshCheckedStatus(); - } - - refreshCheckedStatus(): void { - this.checkedAll = this.data.every(item => item.checked); - this.indeterminate = this.data.some(item => item.checked) && !this.checkedAll; - } - - clearCheck() { - this.data.forEach(item => (item.checked = false)); - this.selectedRows = []; - this.checkedAll = false; - this.indeterminate = false; - } - - reset(): void { - // wait form reset updated finished - setTimeout(() => this.getData()); - } -} diff --git a/src/app/routes/demo/demo-routing.module.ts b/src/app/routes/demo/demo-routing.module.ts deleted file mode 100644 index 2f6625d7..00000000 --- a/src/app/routes/demo/demo-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { AlianDemoComponent } from './components/alian-demo/alian-demo.component'; -import { ZorroDemoComponent } from './components/zorro-demo/zorro-demo.component'; - -const routes: Routes = [ - { path: 'zorro', component: ZorroDemoComponent }, - { path: 'alain', component: AlianDemoComponent }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class DemoRoutingModule { } diff --git a/src/app/routes/demo/demo.module.ts b/src/app/routes/demo/demo.module.ts deleted file mode 100644 index b1828a1e..00000000 --- a/src/app/routes/demo/demo.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule, Type } from '@angular/core'; -import { SharedModule } from '@shared'; -import { AlianDemoComponent } from './components/alian-demo/alian-demo.component'; -import { DemoEditComponent } from './components/zorro-demo/edit/edit.component'; - -import { ZorroDemoComponent } from './components/zorro-demo/zorro-demo.component'; -import { DemoRoutingModule } from './demo-routing.module'; - -const COMPONENTS: Array> = [DemoEditComponent, ZorroDemoComponent, AlianDemoComponent]; - -@NgModule({ - imports: [SharedModule, DemoRoutingModule], - declarations: COMPONENTS -}) -export class DemoModule {} diff --git a/src/app/routes/demo/services/demo.service.ts b/src/app/routes/demo/services/demo.service.ts deleted file mode 100644 index 0bc392c4..00000000 --- a/src/app/routes/demo/services/demo.service.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Injectable, Injector } from '@angular/core'; -import { BaseService } from 'src/app/shared/services'; - -@Injectable({ - providedIn: 'root' -}) -export class DemoService extends BaseService { - constructor(public injector: Injector) { - super(injector); - } -} diff --git a/src/app/routes/menu-manager/components/api-auth/api-auth.component.html b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html index 4af86ae4..2e9b45b3 100644 --- a/src/app/routes/menu-manager/components/api-auth/api-auth.component.html +++ b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html @@ -45,7 +45,7 @@ 路由地址 菜单图标 菜单排序 - 操作 + 操作 @@ -64,7 +64,7 @@ {{ item.sorted }} - + 权限配置 diff --git a/src/app/routes/menu-manager/components/index/index.component.ts b/src/app/routes/menu-manager/components/index/index.component.ts index f1f9573d..00f03d03 100644 --- a/src/app/routes/menu-manager/components/index/index.component.ts +++ b/src/app/routes/menu-manager/components/index/index.component.ts @@ -76,7 +76,7 @@ export class MenuManagerComponentsIndexComponent implements OnInit { }); modal.afterClose.subscribe(res => { if (res) { - // this.loadMemu(this.selectedPlatform.appId); + this.loadMemu(this.selectedPlatform.appId); } }); } diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index 693b3707..f3ec5f69 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -28,7 +28,6 @@ const routes: Routes = [ children: [ { path: '', redirectTo: 'dashboard', pathMatch: 'full' }, { path: 'dashboard', component: DashboardComponent }, - { path: 'demo', loadChildren: () => import('./demo/demo.module').then(m => m.DemoModule) }, { path: 'account', loadChildren: () => import('./account/account.module').then(m => m.AccountModule) diff --git a/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.ts b/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.ts index 90799802..823fe820 100644 --- a/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.ts +++ b/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.ts @@ -1,12 +1,7 @@ -import { DatePipe } from '@angular/common'; -import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { SFComponent, SFSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema } from '@delon/form'; import { _HttpClient } from '@delon/theme'; -import { Observable, Observer } from 'rxjs'; -import { Router } from '@angular/router'; import { SystemService } from '../../services/system.service'; -import { EnvironmentService } from '@env/environment.service'; @Component({ selector: 'app-agreement-config-components-base', styleUrls: ['./agreement-config.component.less'], 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 2b8db6a3..93ceb933 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -37,6 +37,8 @@ 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: 'audit-reason-config', component: AuditReasonConfigComponent }, { path: 'cart-config', component: CartConfigComponent }, { path: 'agreement-config', component: AgreementConfigComponentsBaseComponent }, @@ -45,11 +47,9 @@ const routes: Routes = [ { path: 'crm-management', component: CrmManagementComponent }, { path: 'network-freight', component: NetworkFreightComponent }, { path: 'close-account', component: CloseAccountComponent }, - { path: 'system-supply-logs', component: SystemSupplyLogsComponent }, - { path: 'system-waybill-logs', component: SystemWaybillLogsComponent }, { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent }, - { path: 'insurance-set', component: InsuranceSetComponent }, + { path: 'insurance-set', component: InsuranceSetComponent } ]; @NgModule({ diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.spec.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.spec.ts deleted file mode 100644 index c2215295..00000000 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-11-29 20:19:08 - * @LastEditTime: 2021-11-29 20:31:00 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts - */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserCenterComponentsDriverDetailComponent } from './detail.component'; - -describe('UserCenterComponentsDriverDetailComponent', () => { - let component: UserCenterComponentsDriverDetailComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [UserCenterComponentsDriverDetailComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(UserCenterComponentsDriverDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index 6842d26f..e7812572 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -298,7 +298,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { className: 'text-center', buttons: [ { - text: '查看　　', + text: '查看', click: item => { this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar }); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); @@ -309,7 +309,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { click: item => this.settingAction(item) }, { - text: '资金账户　', + text: '资金账户', click: item => this.showAccountDetail(item) } ] diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.spec.ts b/src/app/routes/usercenter/components/freight/user/detail/detail.component.spec.ts deleted file mode 100644 index 00666a0b..00000000 --- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-11-29 20:19:08 - * @LastEditTime: 2021-11-29 20:31:00 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts - */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FreightComponentsListDetailComponent } from './detail.component'; - -describe('FreightComponentsListDetailComponent', () => { - let component: FreightComponentsListDetailComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FreightComponentsListDetailComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FreightComponentsListDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); From 4c75dd3a77b5fc22e7ed7219b76418175657d566 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 24 Jan 2022 15:48:52 +0800 Subject: [PATCH 2/3] 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" From eff67c4b0f62b3a70629568f90aa88b7ea4ca6a7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 24 Jan 2022 15:52:27 +0800 Subject: [PATCH 3/3] edit --- .../components/api-auth/auth-drawer/auth-drawer.component.html | 2 +- src/app/routes/sys-setting/sys-setting-routing.module.ts | 3 +-- src/app/routes/sys-setting/sys-setting.module.ts | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.html b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.html index 2c0432ab..6f9ad98b 100644 --- a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.html +++ b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.html @@ -17,7 +17,7 @@ [req]="{ method: 'POST', allInBody: true, process: beforeReq }" [res]="{ reName: { list: 'data' } }" [page]="{ show: false}" [loading]="service.http.loading" class="mt-md"> -

+

{{code}}-{{item.permissionsCode}}

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 239525f9..f9a94ad5 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -13,7 +13,6 @@ import { AuditReasonConfigComponent } from './components/audit-reason-config/aud import { BasicConfigComponent } from './components/basic-config/basic-config.component'; import { BasicSettingComponent } from './components/basic-setting/basic-setting.component'; import { CartConfigComponent } from './components/cart-config/cart-config.component'; -import { BtnManagementComponent } from './components/btn-management/btn-management.component'; import { CloseAccountComponent } from './components/close-account/close-account.component'; import { CrmManagementComponent } from './components/crm-management/crm-management.component'; import { GoodsNameConfigComponent } from './components/goods-name-config/goods-name-config.component'; @@ -38,7 +37,7 @@ const routes: Routes = [ { path: 'crm-management', component: CrmManagementComponent }, { path: 'network-freight', component: NetworkFreightComponent }, { path: 'close-account', component: CloseAccountComponent }, - { path: 'btn-management', component: BtnManagementComponent }, + // { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent }, { path: 'insurance-set', component: InsuranceSetComponent } ]; diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index 8f965465..8c3426e6 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -29,7 +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 { 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'; @@ -48,7 +47,6 @@ const COMPONENTS = [ NetworkFreightComponent, CloseAccountComponent, - BtnManagementComponent, AnnouncementMessageComponent, InsuranceSetComponent ];