解决冲突

src/app/routes/datatable/components/customtable/customindex/customindex.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 13:20:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 15:00:01
+ * @LastEditTime : 2022-04-06 20:08:24
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -64,12 +64,11 @@
     [columns]="columns"
     [ps]="20"
     [data]="reportData"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [scroll]="{ x: '1200px' }"
     [res]="{ reName: { list: 'data', total: 'data.total' } }"
     [page]="{ show: false, showSize: false, pageSizes: [20, 50, 100] }"
   >
-  <ng-template sf-template="type" let-item>
+  <ng-template  st-row="type"  let-item>
       <div *ngIf="item.type == '1'">货主</div>
       <div *ngIf="item.type == '2'">合伙人</div>
       <div *ngIf="item.type == '3'">司机</div>
@@ -77,11 +76,11 @@
   </ng-template>
 </st>
 </nz-card>
-<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate">
+<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate01">
   <ng-template #extraTemplate01>
     <div class="chooseBox">
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()">
+        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
         </nz-radio-group>
@@ -96,5 +95,5 @@
       </div>
     </div>
   </ng-template>
-  <app-datatable-customindex-curve #curve [chartData]="chartData?.lineChart"></app-datatable-customindex-curve>
+  <app-datatable-customindex-curve #curve [chartData]="chartData"></app-datatable-customindex-curve>
 </nz-card>