From 771c2e51dcefa41acb2eb8b410aba7c45aa3c286 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 18 Apr 2022 15:28:25 +0800
Subject: [PATCH] fix bug

---
 .../busiindex/busiindex.component.ts          | 22 ++++++++++----
 .../busiindex/curve/curve.component.ts        | 30 +++++++++----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
index 3ddc4d37..a5cc2092 100644
--- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
+++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
@@ -75,6 +75,11 @@ export class DatatableBusiindexComponent implements OnInit {
     } else if(this.mode === 'month') {
       type = 2
     }
+    if(this.modeNext === 'year') {
+      type = 1
+    } else if(this.modeNext === 'month') {
+      type = 2
+    }
     const params: any = {
       time: this.timeNext,
       type
@@ -83,8 +88,8 @@ export class DatatableBusiindexComponent implements OnInit {
       if (res) {
         this.chartData = res
         if(flag) {
-          this.pillar.reRender()
-          this.curve.reRender()
+          // this.pillar.reRender()
+          // this.curve.reRender()
         }
       }
     })
@@ -112,9 +117,9 @@ export class DatatableBusiindexComponent implements OnInit {
   }
 
   changeDataNext() {
-    if(this.mode === 'year') {
+    if(this.modeNext === 'year') {
       this.dateFormat = 'yyyy'
-    } else if(this.mode === 'month') {
+    } else if(this.modeNext === 'month') {
       this.dateFormat = 'yyyy-MM'
     }
   }
@@ -122,10 +127,15 @@ export class DatatableBusiindexComponent implements OnInit {
     if(result === null) {
       return
     }
-    if(this.mode === 'year') {
+    console.log(this.mode);
+    if(this.modeNext === 'year') {
       this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00']
-    } else if(this.mode === 'month') {
+    } else if(this.modeNext === 'month') {
       this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00']
+
+      console.log(this.dateNext);
+      console.log(this.timeNext);
+      
     }
     this.initData(true)
   }
diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
index a8bf9f8b..764a1747 100644
--- a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
+++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
@@ -15,9 +15,9 @@ export class BusitableCurveComponent implements OnInit, OnChanges {
   }
   ngOnChanges(changes: SimpleChanges): void {
     if (this.chartData) {
-      // setTimeout(()=>{
-      //   this.chart.render(true)
-      // }, 1000)
+      setTimeout(()=>{
+        this.chart.render(true)
+      }, 1000)
 
     }
   }
@@ -48,25 +48,23 @@ export class BusitableCurveComponent implements OnInit, OnChanges {
       year: {
         range: [0, 1],
       },
-      value: {
-        min: 0,
+      number: {
+        min: -9999,
         nice: true,
       },
     });
-    this.chart.axis('value', {
-      label: {
-        formatter: (val: any) => {
-          return val;
-        },
-      },
-    });
+    const itemTpl = `
+        <div style="padding: 15px; color: red">
+            环比:&nbsp;&nbsp;{value}%
+        </div>
+`
     this.chart.tooltip({
       showCrosshairs: true, // 展示 Tooltip 辅助线
       shared: true,
-    });
-
-    this.chart.line().position('time*value').label('value');
-    this.chart.point().position('time*value');
+      itemTpl: itemTpl
+  });
+    this.chart.line().position('time*number').label('number');
+    this.chart.point().position('time*number');
 
     this.chart.render();
   }