解决冲突
This commit is contained in:
		@ -38,7 +38,7 @@ export class DatatableCustomindexComponent implements OnInit {
 | 
			
		||||
    { title: '未激活用户数', index: 'notActivationTotal', className: 'text-center' },
 | 
			
		||||
    { title: '沉默用户数', index: 'silentTotal', className: 'text-center' },
 | 
			
		||||
    { title: '流失用户数', index: 'drainTotal', className: 'text-center' },
 | 
			
		||||
    { title: '流失率', index: 'drainRate', className: 'text-center' }
 | 
			
		||||
    { title: '流失率', index: 'drainRate', className: 'text-center',format: (item: any) => {return (item?.drainRate)*100 + '%'  }}
 | 
			
		||||
  ];
 | 
			
		||||
  hzData: any;
 | 
			
		||||
  hhrData: any;
 | 
			
		||||
@ -51,26 +51,11 @@ export class DatatableCustomindexComponent implements OnInit {
 | 
			
		||||
    this.initCurveData();
 | 
			
		||||
  }
 | 
			
		||||
  initCurveData() {
 | 
			
		||||
    let type = 1;
 | 
			
		||||
    if (this.mode === 'year') {
 | 
			
		||||
      type = 1;
 | 
			
		||||
    } else if (this.mode === 'month') {
 | 
			
		||||
      type = 2;
 | 
			
		||||
    }
 | 
			
		||||
    // const params: any = {
 | 
			
		||||
    //   time: this.timeNext,
 | 
			
		||||
    //   type
 | 
			
		||||
    // };
 | 
			
		||||
    this.flag = true;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    this.cardData();
 | 
			
		||||
    this.listData();
 | 
			
		||||
    this.addData('year', '2022-01-01');
 | 
			
		||||
  }
 | 
			
		||||
  listData(type?: string,  stime?: any, etime?: any) { 
 | 
			
		||||
    console.log('88888');
 | 
			
		||||
    
 | 
			
		||||
    this.reportData = [];
 | 
			
		||||
    this.service
 | 
			
		||||
      .request(this.service.$api_statistics_totalDetail, {
 | 
			
		||||
@ -194,7 +179,6 @@ export class DatatableCustomindexComponent implements OnInit {
 | 
			
		||||
        }
 | 
			
		||||
      });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  changeData() {
 | 
			
		||||
    if (this.mode === 'year') {
 | 
			
		||||
      this.dateFormat = 'yyyy';
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user