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

fix bug

Browse Source
This commit is contained in:
Lingzi
2022-03-30 17:54:15 +08:00
parent 6bbbc68ff7 bd55b5fd74
commit 5baa6b5f12
81 changed files with 2568 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/datatable/components/customtable/customindex/customindex.component.html
View File

@ -32,7 +32,6 @@
<nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
<nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
</div>
</div>
</div>
@ -51,7 +50,7 @@
<label nz-radio-button nzValue="month">月</label>
</nz-radio-group>
<div class="dateBox">
<nz-date-picker [nzDisabledDate]="disabledDate" [nzMode]="mode" (ngModelChange)="onChange($event)"></nz-date-picker>
<nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext" (ngModelChange)="onChangeNext($event)"></nz-date-picker>
</div>
</div>
</div>

48
src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
View File

@ -20,6 +20,9 @@ export class DatatableCustomindexComponent implements OnInit {
time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd';
today = new Date();
dateNext: any = null;
modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00']
columns: STColumn[] = [
{ title: '用户类型', index: 'networkTransporterName', className: 'text-center' },
@ -34,12 +37,12 @@ export class DatatableCustomindexComponent implements OnInit {
/**
* 查询参数
*/
get reqParams() {
if(this.mode === 'year') {
get reqParams() {
if (this.mode === 'year') {
this.type = 1
} else if(this.mode === 'month') {
} else if (this.mode === 'month') {
this.type = 2
} else if(this.mode === 'date') {
} else if (this.mode === 'date') {
this.type = 3
} else {
this.type = 4
@ -47,8 +50,8 @@ export class DatatableCustomindexComponent implements OnInit {
let params: any = {
time: this.time,
type: this.type
};
};
delete params._$expand;
return { ...params };
}
@ -56,23 +59,23 @@ export class DatatableCustomindexComponent implements OnInit {
constructor(public service: DataService, private datePipe: DatePipe) { }
ngOnInit(): void { }
changeData(){
if(this.mode === 'year') {
changeData() {
if (this.mode === 'year') {
this.dateFormat = 'yyyy'
} else if(this.mode === 'month') {
} else if (this.mode === 'month') {
this.dateFormat = 'yyyy-MM'
} else {
this.dateFormat = 'yyyy-MM-dd'
}
}
}
onChange(result: any) {
if(this.mode === 'year') {
if (this.mode === 'year') {
this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00']
} else if(this.mode === 'month') {
} else if (this.mode === 'month') {
this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00']
} else if(this.mode === 'date') {
} else if (this.mode === 'date') {
this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00']
} else{
} else {
this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00']
}
this.st.reload({ ...this.reqParams });
@ -80,7 +83,22 @@ export class DatatableCustomindexComponent implements OnInit {
disabledDate = (current: Date): boolean =>
// Can not select days before today and today
differenceInCalendarDays(current, this.today) > 0;
exportFun(){
changeDataNext() {
if (this.mode === 'year') {
this.dateFormat = 'yyyy'
} else if (this.mode === 'month') {
this.dateFormat = 'yyyy-MM'
}
}
onChangeNext(result: any) {
if (this.mode === 'year') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00']
} else if (this.mode === 'month') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00']
}
}
exportFun() {
}