From 79014159ea6c58428e3ac9ebd6a80e0b20a37bbe Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 13 Apr 2022 10:24:05 +0800
Subject: [PATCH] fix bug

---
 .../components/datascreen/curve/curve.component.ts          | 4 ++--
 .../components/datascreen/datascreen.component.html         | 6 +++---
 .../datatable/components/datascreen/map/map.component.html  | 4 ++--
 .../datatable/components/datascreen/map/map.component.ts    | 5 ++++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
index dc30343e..b6cd6e92 100644
--- a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
+++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-07 17:57:23
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 19:28:24
+ * @LastEditTime : 2022-04-13 10:22:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -75,7 +75,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges {
     this.chart = new Chart({
       container: el,
       autoFit: true,
-      height: 200,
+      height: 320,
     });
     let value: any = []
       this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html
index ee417920..20477479 100644
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.html
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 19:51:32
+ * @LastEditTime : 2022-04-13 10:23:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -86,10 +86,10 @@
         </nz-col>
       </nz-row>
     </nz-card>
-    <app-datatable-customindex-map style="max-height: 600px" #map [chartData]="chartData"></app-datatable-customindex-map>
+      <app-datatable-customindex-map style="max-height: 680px" #map [chartData]="chartData"></app-datatable-customindex-map>
     <nz-card>
       <nz-row [nzGutter]="24">
-        <g2-bar #bar height="200" [delay]='500' repaint='true' [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
+        <g2-bar #bar height="310" [delay]='500' repaint='true' [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
       </nz-row>
     </nz-card>
   </div>
diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.html b/src/app/routes/datatable/components/datascreen/map/map.component.html
index 99a40aa8..f82fc220 100644
--- a/src/app/routes/datatable/components/datascreen/map/map.component.html
+++ b/src/app/routes/datatable/components/datascreen/map/map.component.html
@@ -4,8 +4,8 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 17:57:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 19:44:32
+ * @LastEditTime : 2022-04-13 10:17:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<g2-custom delay="200" (render)="render($event)" ></g2-custom>
\ No newline at end of file
+<g2-custom div style="height: 680px; " delay="200" (render)="render($event)" ></g2-custom>
\ No newline at end of file
diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts
index 66c3a677..4df67fe2 100644
--- a/src/app/routes/datatable/components/datascreen/map/map.component.ts
+++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts
@@ -49,7 +49,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
       this.chart = new Chart({
         container: el,
         autoFit: true,
-        height: 680,
         padding: [0, 0]
       });
       this.chart.tooltip({
@@ -108,6 +107,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
        });
        console.log(value);
        this.userData = value
+       
+if (!(this.userData instanceof Array) || this.userData.length === 0) {
+	return;
+  }
     this.userDv = this.ds.createView().source(this.userData).transform({
         geoDataView: this.worldMap,
         field: 'name',