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

reuse

Browse Source
This commit is contained in:
Taric Xin
2022-05-09 11:23:33 +08:00
parent 1f462ebdfe
commit d971d09d12
18 changed files with 75 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -10,7 +10,6 @@ import {
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { AmapPoiPickerComponent, AmapService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component';
@ -20,7 +19,6 @@ import { of } from 'rxjs';
import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component';
import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component';
import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component';
@Component({
selector: 'app-publish-goods-bulk-publish',
@ -58,7 +56,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
};
patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
constructor(
private http: _HttpClient,
fb: FormBuilder,
private router: Router,
private route: ActivatedRoute,

6
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -3,9 +3,8 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import format from 'date-fns/format';
import { Subject } from 'rxjs';
import { ActivatedRoute, Router } from '@angular/router';
import { ActivatedRoute } from '@angular/router';
import {
SFCheckboxWidgetSchema,
SFComponent,
SFNumberWidgetSchema,
SFSchema,
@ -14,7 +13,6 @@ import {
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { AmapPoiPickerComponent, AmapService, EACacheService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
@ -67,9 +65,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
envCache: any;
enterpriseProjectIds: any;
constructor(
private http: _HttpClient,
fb: FormBuilder,
private router: Router,
private route: ActivatedRoute,
private modalService: NzModalService,
public service: SupplyManagementService,

7
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -1,10 +1,8 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { cacheConf } from '@conf/cache.conf';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import {
SFCheckboxWidgetSchema,
SFComponent,
SFNumberWidgetSchema,
SFSchema,
@ -13,7 +11,6 @@ import {
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { SettingsService, _HttpClient } from '@delon/theme';
import { EACacheService, ShipperBaseService } from '@shared';
import format from 'date-fns/format';
import { NzModalService } from 'ng-zorro-antd/modal';
@ -54,13 +51,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
shipperName = '';
patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
constructor(
private http: _HttpClient,
fb: FormBuilder,
private modalService: NzModalService,
private settingSrv: SettingsService,
public service: SupplyManagementService,
private router: Router,
private route: ActivatedRoute,
private eaCacheSrv: EACacheService,
private amapService: AmapService,
public shipperSrv: ShipperBaseService

3
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -2,12 +2,10 @@ import { ActivatedRoute, Router } from '@angular/router';
import { Component, OnInit, ViewChild, OnChanges } from '@angular/core';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/supply-management.service';
import { SupplyManagementVehicleAssignedCarComponent } from '../assigned-car/assigned-car.component';
import { SupplyManagementUpdateExternalSnComponent } from '../update-external-sn/update-external-sn.component';
import { of } from 'rxjs';
import { SearchDrawerService, ShipperBaseService } from '@shared';
import { SupplyManagementImportSupplyComponent } from '../../model/import-supply/import-supply.component';
@ -44,7 +42,6 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem
public service: SupplyManagementService,
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
public shipperSrv: ShipperBaseService,
public searchDrawerService: SearchDrawerService
) {

8
src/app/routes/sys-setting/components/note-management/note-management.component.ts
View File

@ -9,10 +9,8 @@
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SystemService } from '../../services/system.service';
@Component({
@ -20,7 +18,7 @@ import { SystemService } from '../../services/system.service';
templateUrl: './note-management.component.html',
styleUrls: ['../../../commom/less/box.less']
})
export class NoTeManagementComponent implements OnInit {
export class NoTeManagementComponent {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
@ -52,11 +50,9 @@ export class NoTeManagementComponent implements OnInit {
},
];
constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) {
constructor(public service: SystemService) {
}
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf?.value });

5
src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
View File

@ -1,9 +1,8 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form';
import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
@ -214,7 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent {
className: 'text-center',
index: 'paymentMethodRate',
width: 130,
format: record => `${record.paymentMethodRate*100}%`
format: record => `${record.paymentMethodRate * 100}%`
},
{ title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
{ title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },

10
src/app/routes/usercenter/components/driver/captain/captain.component.ts
View File

@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { ModalHelper } from '@delon/theme';
import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
@ -26,7 +26,6 @@ export class UserCenterComponentsDriverCaptainComponent extends BasicTableCompon
public service: UsermanageService,
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
private modalHelper: ModalHelper,
public searchDrawerService: SearchDrawerService
) {
@ -57,8 +56,7 @@ export class UserCenterComponentsDriverCaptainComponent extends BasicTableCompon
return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit() {
}
ngOnInit() {}
dataProcess(data: STData[]): STData[] {
return data.map((i, index) => {
i.showSortFlag = false;

1
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
View File

@ -1,5 +1,4 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';

2
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Router } from '@angular/router';
import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { SearchDrawerService } from '@shared';

1
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -1,5 +1,4 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { STColumn, STComponent, STRequestOptions, STData, STChange } from '@delon/abc/st';
import { SFUISchema, SFSchema, SFComponent, SFDateWidgetSchema } from '@delon/form';
import { ShipperBaseService, DynamicSettingModalComponent, SearchDrawerService } from '@shared';

73
src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
View File

@ -1,14 +1,7 @@
import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { EAEnvironmentService, ShipperBaseService } from '@shared';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import format from 'date-fns/format';
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer, of } from 'rxjs';
import { apiConf } from '@conf/api.conf';
import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
import { NzModalRef } from 'ng-zorro-antd/modal';
@ -23,39 +16,33 @@ export class EditPartnerComponentsAddComponent implements OnInit {
sts: any;
rows: any;
schema: SFSchema = {};
detailData: any = {}
detailData: any = {};
ui: SFUISchema = {};
constructor(
public msgSrv: NzMessageService,
public http: _HttpClient,
private route: ActivatedRoute,
private router: Router,
public service: UsermanageService,
private envSrv: EAEnvironmentService,
private modal: NzModalRef,
public shipperservice: ShipperBaseService
) { }
) {}
ngOnInit(): void {
if(this.sts == '2') {
this.initDetailData()
if (this.sts == '2') {
this.initDetailData();
}
this.initSF();
}
initDetailData() {
const params = {
id: this.i.id
}
};
this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => {
if(res) {
this.detailData = res
if (res) {
this.detailData = res;
} else {
this.service.msgSrv.error(res.msg)
this.service.msgSrv.error(res.msg);
}
})
});
}
initSF() {
this.schema = {
@ -98,7 +85,7 @@ export class EditPartnerComponentsAddComponent implements OnInit {
settStartTime: {
title: '结算起算日期',
type: 'string',
format: 'date',
format: 'date'
},
remark: {
type: 'string',
@ -107,30 +94,30 @@ export class EditPartnerComponentsAddComponent implements OnInit {
widget: 'textarea',
placeholder: '请不要超过50个字',
maxLength: 50,
autosize: { minRows: 2, maxRows: 6 },
},
autosize: { minRows: 2, maxRows: 6 }
}
},
effectiveNode: {
type: 'string',
title: '生效节点',
ui: {
widget: 'radio',
showRequired: true,
showRequired: true
} as SFRadioWidgetSchema,
enum: [
{ label: '修改成功后立即生效', value: 1 },
{ label: 'CRM流程审核后生效', value: 2 },
{ label: 'CRM流程审核通过后生效', value: 3 }
],
},
]
}
},
required: ['channelId', 'remark', 'effectiveNode'],
required: ['channelId', 'remark', 'effectiveNode']
};
this.ui = {
'*': {
spanLabelFixed: 180,
grid: { span: 18 },
width: 600,
width: 600
}
};
}
@ -138,27 +125,27 @@ export class EditPartnerComponentsAddComponent implements OnInit {
return {};
}
close(): void {
this.modal.close(true)
this.modal.close(true);
}
save() {
console.log(this?.rows);
let enterId : any;
if(this.sts == '1') {
enterId = this.rows
let enterId: any;
if (this.sts == '1') {
enterId = this.rows;
} else {
enterId = [this.i.id]
enterId = [this.i.id];
}
const params = {
...this.sf?.value,
enterpriceIds: enterId,
settStartTime: this.sf?.value?.settStartTime + ' 00:00:00'
}
};
this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
if(res) {
if (res) {
this.service.msgSrv.success('修改成功');
this.modal.destroy(true)
this.modal.destroy(true);
}
})
});
}
}

76
src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
View File

@ -1,14 +1,7 @@
import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { EAEnvironmentService, ShipperBaseService } from '@shared';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import format from 'date-fns/format';
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer, of } from 'rxjs';
import { apiConf } from '@conf/api.conf';
import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
import { NzModalRef } from 'ng-zorro-antd/modal';
@ -24,39 +17,33 @@ export class EditSaleComponentsAddComponent implements OnInit {
sts: any;
rows: any;
schema: SFSchema = {};
detailData: any = {}
detailData: any = {};
ui: SFUISchema = {};
constructor(
public msgSrv: NzMessageService,
public http: _HttpClient,
private route: ActivatedRoute,
private router: Router,
public service: UsermanageService,
private envSrv: EAEnvironmentService,
private modal: NzModalRef,
public shipperservice: ShipperBaseService
) { }
) {}
ngOnInit(): void {
if(this.sts == '2') {
this.initDetailData()
}
if (this.sts == '2') {
this.initDetailData();
}
this.initSF();
}
initDetailData() {
const params = {
id: this.i.id
}
};
this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => {
if(res) {
this.detailData = res
if (res) {
this.detailData = res;
} else {
this.service.msgSrv.error(res.msg)
this.service.msgSrv.error(res.msg);
}
})
});
}
initSF() {
this.schema = {
@ -81,30 +68,30 @@ export class EditSaleComponentsAddComponent implements OnInit {
widget: 'textarea',
placeholder: '请不要超过50个字',
maxLength: 50,
autosize: { minRows: 2, maxRows: 6 },
},
autosize: { minRows: 2, maxRows: 6 }
}
},
effectiveNode: {
type: 'string',
title: '生效节点',
ui: {
widget: 'radio',
showRequired: true,
showRequired: true
} as SFRadioWidgetSchema,
enum: [
{ label: '修改成功后立即生效', value: 1 },
{ label: 'CRM流程审核后生效', value: 2 },
{ label: 'CRM流程审核通过后生效', value: 3 }
],
},
]
}
},
required: ['channelId', 'remark', 'effectiveNode'],
required: ['channelId', 'remark', 'effectiveNode']
};
this.ui = {
'*': {
spanLabelFixed: 180,
grid: { span: 18 },
width: 600,
width: 600
}
};
}
@ -112,31 +99,30 @@ export class EditSaleComponentsAddComponent implements OnInit {
return {};
}
save() {
let enterId : any;
if(this.sts == '1') {
enterId = this.rows
let enterId: any;
if (this.sts == '1') {
enterId = this.rows;
} else {
enterId = [this.i.id]
enterId = [this.i.id];
}
this.service.nzModalService.create({
nzContent: '确定提交吗？',
nzOnOk: () => {
const params = {
...this.sf?.value,
enterpriceIds: enterId,
}
enterpriceIds: enterId
};
this.service.request(this.service.$api_batchUpdateEnterpriceChannel, params).subscribe(res => {
if(res) {
this.service.msgSrv.success('修改成功')
this.modal.destroy(true)
if (res) {
this.service.msgSrv.success('修改成功');
this.modal.destroy(true);
}
})
});
}
});
}
close(): void {
this.modal.close(true)
this.modal.close(true);
}
}

2
src/app/routes/usercenter/components/freight/list/new/new.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Router } from '@angular/router';
import { apiConf } from '@conf/api.conf';
import {
SFCascaderWidgetSchema,

9
src/app/routes/usercenter/components/freight/list/view/view.component.ts
View File

@ -1,8 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { STComponent } from '@delon/abc/st';
import { UsermanageService } from '../../../../services/usercenter.service';
import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
import { Observable, Observer } from 'rxjs';
@ -31,16 +29,11 @@ export class FreightComponentsListViewComponent implements OnInit {
FreightsData: any = {};
constructor(
private http: _HttpClient,
private modal: ModalHelper,
public service: UsermanageService,
private route: ActivatedRoute,
private modalHelper: ModalHelper,
private msgSrv: NzMessageService,
) {}
ngOnInit() {
console.log(this.route.snapshot);
this.initData();
this.initSF();
// this.launchSign();

7
src/app/routes/vehicle/components/list/detail/detail.component.ts
View File

@ -2,14 +2,12 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { ModalHelper } from '@delon/theme';
import { VehicleService } from '../../../services/vehicle.service';
import { VehicleComponentsListEditComponent } from '../edit/edit.component';
import { VehicleImgViewComponent } from '../img-view/img-view.component';
import { apiConf } from '@conf/api.conf';
import { NzModalService } from 'ng-zorro-antd/modal';
import { ImageViewComponent } from 'src/app/shared/components/imagelist';
import { EADateUtil } from '@shared';
import { NzImageService } from 'ng-zorro-antd/image';
@ -44,12 +42,9 @@ export class VehicleComponentsListDetailComponent implements OnInit {
contenCarEnergy: any;
constructor(
private http: _HttpClient,
private modal: ModalHelper,
public service: VehicleService,
private route: ActivatedRoute,
private modalHelper: ModalHelper,
private msgSrv: NzMessageService,
private nzModalService: NzModalService,
private nzImageService: NzImageService
) {}

4
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -9,9 +9,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import format from 'date-fns/format';
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
@ -63,7 +60,6 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
];
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private modal: NzModalService,
private service: WaybillManagementServe,
private modalService: NzModalService

4
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -9,10 +9,7 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import format from 'date-fns/format';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { Subscription, fromEvent } from 'rxjs';
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
@ -59,7 +56,6 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
subscribeScoll!: Subscription;
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: WaybillManagementServe,
private modal: NzModalService
) {}

4
src/app/shared/services/business/user.service.ts
View File

@ -7,9 +7,8 @@
* @Reference:
*/
import { Inject, Injectable, Injector } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Router } from '@angular/router';
import { cacheConf } from '@conf/cache.conf';
import { eventConf } from '@conf/event.conf';
import { sysConf } from '@conf/sys.conf';
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
import { MenuService, SettingsService } from '@delon/theme';
@ -78,7 +77,6 @@ export class EAUserService extends BaseService {
public settings: SettingsService,
private menuService: MenuService,
public router: Router,
public ar: ActivatedRoute,
@Inject(DA_SERVICE_TOKEN) public tokenSrv: ITokenService,
private settingSrv: SettingsService
) {