fix bug

2022-04-06 15:12:45 +08:00
parent eb7ba37bf3
commit e0073230e5
4 changed files with 61 additions and 44 deletions
--- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html
+++ b/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 13:55:19
+ * @LastEditTime : 2022-04-06 15:00:01
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -39,17 +39,43 @@
          <label nz-radio-button nzValue="define">自定义</label>
        </nz-radio-group>
        <div class="dateBox">
-          <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>
+          <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>
-
  </ng-template>
-  <st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listOperationalReportPage"
+  <st
+    #st
+    multiSort
+    [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.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st>
+    [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>
+      <div *ngIf="item.type == '1'">货主</div>
+      <div *ngIf="item.type == '2'">合伙人</div>
+      <div *ngIf="item.type == '3'">司机</div>
+      <div *ngIf="item.type == '4'">车辆</div>
+  </ng-template>
+</st>
 </nz-card>
 <nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate">
  <ng-template #extraTemplate01>
@ -60,10 +86,15 @@
          <label nz-radio-button nzValue="month">月</label>
        </nz-radio-group>
        <div class="dateBox">
-          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext" (ngModelChange)="onChangeNext($event)"></nz-date-picker>
+          <nz-date-picker
+            [nzDisabledDate]="disabledDate"
+            [(ngModel)]="dateNext"
+            [nzMode]="modeNext"
+            (ngModelChange)="onChangeNext($event)"
+          ></nz-date-picker>
        </div>
      </div>
    </div>
  </ng-template>
-  <app-datatable-customindex-curve #curve [chartData]="chartData.lineChart"></app-datatable-customindex-curve>
+  <app-datatable-customindex-curve #curve [chartData]="chartData?.lineChart"></app-datatable-customindex-curve>
 </nz-card>
--- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
+++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
@ -28,19 +28,21 @@ export class DatatableCustomindexComponent implements OnInit {
  flag = false;

  columns: STColumn[] = [
-    { title: '用户类型', index: 'networkTransporterName', className: 'text-center' },
-    { title: '用户总数', index: 'zsl', className: 'text-center' },
-    { title: '已认证数量', index: 'yingsje', className: 'text-center' },
-    { title: '活跃用户数', index: 'cys', className: 'text-center' },
-    { title: '未激活用户数', index: 'yingfyf', className: 'text-center' },
-    { title: '沉默用户数', index: 'yl', className: 'text-center' },
-    { title: '流失用户数', index: 'djd', className: 'text-center' },
-    { title: '流失率', index: 'ysz', className: 'text-center' }
+    { title: '用户类型', render: 'type', className: 'text-center' },
+    { title: '用户总数', index: '总数', className: 'text-center' },
+    { title: '已认证数量', index: 'auditPassTotal', className: 'text-center' },
+    { title: '活跃用户数', index: 'activeTotal', className: 'text-center' },
+    { title: '未激活用户数', index: 'notActivationTotal', className: 'text-center' },
+    { title: '沉默用户数', index: 'silentTotal', className: 'text-center' },
+    { title: '流失用户数', index: 'drainTotal', className: 'text-center' },
+    { title: '流失率', index: 'drainRate', className: 'text-center' }
  ];
  hzData: any;
  hhrData: any;
  sjData: any;
  clData: any;
+  reportData: any = [];
+
  /**
   * 查询参数
   */
@ -79,15 +81,14 @@ export class DatatableCustomindexComponent implements OnInit {
    //   type
    // };
    this.flag = true;
-    
    this.service
      .request(this.service.$api_statistics_totalDetail, {
        time: this.timeNext,
-        type: 1
+        type: 1   //用户角色类型 1：货主 2：合伙人 3：司机 4：车辆
      })
      .subscribe(res => {
        if (res) {
-          this.chartData = res;
+          this.reportData.push(res);
        }
      });
    this.service.request(this.service.$api_statistics_totalDetail, {
@ -95,7 +96,7 @@ export class DatatableCustomindexComponent implements OnInit {
      type: 2
    }).subscribe(res => {
      if (res) {
-        this.chartData = res;
+        this.reportData.push(res);
      }
    });
    this.service.request(this.service.$api_statistics_totalDetail, {
@ -103,7 +104,7 @@ export class DatatableCustomindexComponent implements OnInit {
      type: 3
    }).subscribe(res => {
      if (res) {
-        this.chartData = res;
+        this.reportData.push(res);
      }
    });
    this.service.request(this.service.$api_statistics_totalDetail, {
@ -111,7 +112,8 @@ export class DatatableCustomindexComponent implements OnInit {
      type: 4
    }).subscribe(res => {
      if (res) {
-        this.chartData = res;
+        this.reportData.push(res);
+        this.st.reload();
      }
    });
    this.service.request(this.service.$api_statistics_total, { type: 1 }).subscribe(res => {
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-23 13:39:58
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-23 14:49:18
+ * @LastEditTime : 2022-04-06 15:12:24
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -83,15 +83,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
    {
      title: '支付状态',
      className: 'text-center',
-      index: 'paymentStatus',
-      type: 'badge',
-      width: '120px',
-      badge: {
-        '1': { text: '待申请', color: 'warning' },
-        '2': { text: '已支付', color: 'success' },
-        '3': { text: '已拒绝', color: 'warning' },
-        '4': { text: '申请中', color: 'warning' }
-      }
+      index: 'paymentStatusLabel',
    }
  ];
  trajectory = 'car';
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-28 14:42:03
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 16:08:56
+ * @LastEditTime : 2022-04-06 15:12:10
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -55,15 +55,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
    {
      title: '支付状态',
      className: 'text-center',
-      index: 'paymentStatus',
-      type: 'badge',
-      width: '120px',
-      badge: {
-        '1': { text: '待申请', color: 'warning' },
-        '2': { text: '已支付', color: 'success' },
-        '3': { text: '已拒绝', color: 'warning' },
-        '4': { text: '申请中', color: 'warning' }
-      }
+      index: 'paymentStatusLabel',
    }
  ];
  constructor(