From ad360d586153df73aa4ebf4f7660db74632c7a9b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 28 Apr 2022 16:41:54 +0800
Subject: [PATCH] fix bug

---
 proxy.conf.js                                         |  4 ++--
 .../components/compliance/index/index.component.html  |  8 ++++----
 .../components/compliance/index/index.component.ts    | 11 +++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index 4690cd30..50eec04b 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-28 14:09:56
+ * @LastEditTime : 2022-04-28 16:08:43
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/routes/datatable/components/compliance/index/index.component.html b/src/app/routes/datatable/components/compliance/index/index.component.html
index 5b3c4635..8063729e 100644
--- a/src/app/routes/datatable/components/compliance/index/index.component.html
+++ b/src/app/routes/datatable/components/compliance/index/index.component.html
@@ -24,7 +24,7 @@
 
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'订单合格率'" [bordered]="true" [total]="cardData1?.proportion" [footer]="footer1" contentHeight="46">
+    <g2-card [title]="'订单合格率'" [bordered]="true" [total]="cardData1?.proportion || '0'" [footer]="footer1" contentHeight="46">
       <ng-template #footer1>
         <div class="card-f">
           <span class="card-f-l">合格：{{cardData1?.leftQuantity}}</span> <span>不合格：{{cardData1?.rightQuantity}}</span>
@@ -33,7 +33,7 @@
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'货源单占比'" [bordered]="true" [total]="cardData2?.proportion" [footer]="footer2" contentHeight="46">
+    <g2-card [title]="'货源单占比'" [bordered]="true" [total]="cardData2?.proportion|| '0'" [footer]="footer2" contentHeight="46">
       <ng-template #footer2>
         <div class="card-f">
           <span class="card-f-l">货源单：{{cardData2?.leftQuantity}}</span> <span>合同单：{{cardData2?.rightQuantity}}</span>
@@ -42,7 +42,7 @@
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'运费直付占比'" [bordered]="true" [total]="cardData3?.proportion" [footer]="footer3" contentHeight="46">
+    <g2-card [title]="'运费直付占比'" [bordered]="true" [total]="cardData3?.proportion|| '0'" [footer]="footer3" contentHeight="46">
       <ng-template #footer3>
         <div class="card-f">
           <span class="card-f-l">司机：{{cardData3?.leftQuantity}}</span> <span>车队长：{{cardData3?.rightQuantity}}</span>
@@ -51,7 +51,7 @@
     </g2-card>
     </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'付款及时率'" [bordered]="true" [total]="cardData4?.proportion" [footer]="footer4" contentHeight="46">
+    <g2-card [title]="'付款及时率'" [bordered]="true" [total]="cardData4?.proportion|| '0'" [footer]="footer4" contentHeight="46">
       <ng-template #footer4>
         <div class="card-f">
           <span class="card-f-l">准时：{{cardData4?.leftQuantity}}</span> <span>逾期：{{cardData4?.rightQuantity}}</span>
diff --git a/src/app/routes/datatable/components/compliance/index/index.component.ts b/src/app/routes/datatable/components/compliance/index/index.component.ts
index b545a4f5..f531e14e 100644
--- a/src/app/routes/datatable/components/compliance/index/index.component.ts
+++ b/src/app/routes/datatable/components/compliance/index/index.component.ts
@@ -47,27 +47,30 @@ export class DatatableComplianceIndexComponent implements OnInit {
       time:this.time
     }
     this.service.request(this.service.$api_getBillRateQualified, params).subscribe(res => {
+
         if (res) {
          this.cardData1 = res;
-         this.cardData1.proportion = this.cardData1.proportion*100 +'%'
+         console.log(this.cardData1);
+         
+         this.cardData1.proportion = (this.cardData1?.proportion*100).toFixed(2) +'%'
         }
     });
     this.service.request(this.service.$api_getBillRateProportion, params).subscribe(res => {
         if (res) {
          this.cardData2 = res;
-         this.cardData2.proportion = this.cardData2.proportion*100 +'%'
+         this.cardData2.proportion = (this.cardData2?.proportion*100).toFixed(2) +'%'
         }
     });
     this.service.request(this.service.$api_getBillRateDirectPayment, params).subscribe(res => {
         if (res) {
          this.cardData3 = res;
-         this.cardData3.proportion = this.cardData3.proportion*100 +'%'
+         this.cardData3.proportion = (this.cardData3?.proportion*100).toFixed(2) +'%'
         }
     });
     this.service.request(this.service.$api_getBillTimelyPayment, params).subscribe(res => {
         if (res) {
          this.cardData4 = res;
-         this.cardData4.proportion = this.cardData4.proportion*100 +'%'
+         this.cardData4.proportion = (this.cardData4?.proportion*100).toFixed(2) +'%'
         }
     });