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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-01-24 15:48:52 +08:00
parent bb18cc386e
commit 4c75dd3a77
24 changed files with 91 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/app/routes/sys-setting/components/system-logs/system-logs.component.html → src/app/routes/logs/components/system-logs/system-logs.component.html
View File

6
src/app/routes/sys-setting/components/system-logs/system-logs.component.ts → src/app/routes/logs/components/system-logs/system-logs.component.ts
View File

@ -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 {}

0
src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.html → src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html
View File

6
src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.ts → src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts
View File

@ -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 {}

0
src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.html → src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html
View File

6
src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.ts → src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts
View File

@ -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 {}

0
src/app/routes/sys-setting/components/user-logs/user-logs.component.html → src/app/routes/logs/components/user-logs/user-logs.component.html
View File

6
src/app/routes/sys-setting/components/user-logs/user-logs.component.ts → src/app/routes/logs/components/user-logs/user-logs.component.ts
View File

@ -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 {}

0
src/app/routes/sys-setting/components/version-logs/version-logs.component.html → src/app/routes/logs/components/version-logs/version-logs.component.html
View File

6
src/app/routes/sys-setting/components/version-logs/version-logs.component.ts → src/app/routes/logs/components/version-logs/version-logs.component.ts
View File

@ -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) {

21
src/app/routes/logs/logs-routing.module.ts Normal file
View File

@ -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 {}

16
src/app/routes/logs/logs.module.ts Normal file
View File

@ -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 {}

19
src/app/routes/logs/services/logs.service.ts Normal file
View File

@ -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);
}
}

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

@ -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) },

32
src/app/routes/sys-setting/components/system-logs/system-logs.component.less
View File

@ -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;
}
}

32
src/app/routes/sys-setting/components/system-supply-logs/system-supply-logs.component.less
View File

@ -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;
}
}

32
src/app/routes/sys-setting/components/system-waybill-logs/system-waybill-logs.component.less
View File

@ -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;
}
}

32
src/app/routes/sys-setting/components/user-logs/user-logs.component.less
View File

@ -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;
}
}

32
src/app/routes/sys-setting/components/version-logs/version-logs.component.less
View File

@ -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;
}
}

7
src/app/routes/sys-setting/services/system.service.ts
View File

@ -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';
// 编辑协议

11
src/app/routes/sys-setting/sys-setting-routing.module.ts
View File

@ -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 },

12
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -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

21
src/assets/mocks/menu-data.json
View File

@ -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"

20
src/assets/mocks/platform/tms-obc-web.json
View File

@ -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"