From 4a52639e791dbb916bc58c90716e977a7acd8b51 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 14 Apr 2022 15:44:41 +0800
Subject: [PATCH] fix bug

---
 .../customindex/customindex.component.html    | 20 +++++++++----------
 .../customindex/customindex.component.ts      |  3 +++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html
index 6606c383..dece86a1 100644
--- 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-14 15:36:53
+ * @LastEditTime : 2022-04-14 15:43:56
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -12,19 +12,19 @@
 <page-header-wrapper [title]="'客户报表'"></page-header-wrapper>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || 0" [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || '0'" [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total ? hhrData?.total  : 0" [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total || '0'" [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total || 0" [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total || '0'" [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total || 0" [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total || '0'" [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
 </div>
@@ -32,24 +32,24 @@
   <ng-template #extraTemplate>
     <div class="chooseBox">
       <div class="timeBox">
-        <!-- <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
           <label nz-radio-button nzValue="date">日</label>
           <label nz-radio-button nzValue="define">自定义</label>
-        </nz-radio-group> -->
+        </nz-radio-group>
         <div class="dateBox">
           <nz-date-picker
             [(ngModel)]="date"
-            nzMode="date"
-            nzFormat="yyyy-MM-dd"
+            [nzMode]="mode"
+            [nzFormat]="dateFormat"
             *ngIf="mode !== 'define'"
             [nzDisabledDate]="disabledDate"
             (ngModelChange)="onChange($event)"
           ></nz-date-picker>
           <nz-range-picker
             [(ngModel)]="defineDate"
-            nzFormat="yyyy-MM-dd"
+            [nzFormat]="dateFormat"
             *ngIf="mode === 'define'"
             [nzDisabledDate]="disabledDate"
             (ngModelChange)="onChange($event)"
diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
index 36c5ed05..7f9d4954 100644
--- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
+++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
@@ -116,7 +116,10 @@ export class DatatableCustomindexComponent implements OnInit {
     });
     this.service.request(this.service.$api_statistics_total, { type: 2 }).subscribe(res => {
       if (res) {
+        
         this.hhrData = res;
+        console.log(this.hhrData);
+
       }
     });
     this.service.request(this.service.$api_statistics_total, { type: 3 }).subscribe(res => {