From b2307721ec608f88856b98f168730603b2c69934 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Mon, 13 Jul 2020 11:30:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E4=B8=8E=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=AF=A6=E6=83=85=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eharts-statistics.component.html                 |  4 ++--
 .../eharts-statistics/eharts-statistics.component.ts | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.html b/src/app/ui/eharts-statistics/eharts-statistics.component.html
index cd93988..32e74be 100644
--- a/src/app/ui/eharts-statistics/eharts-statistics.component.html
+++ b/src/app/ui/eharts-statistics/eharts-statistics.component.html
@@ -5,8 +5,8 @@
       <div class="queryBox">
   
         <div class="queryField" style="margin-right: 90px;">
-          <button type="button" mat-raised-button color="primary" style="margin-right: 10px;"><mat-icon style="vertical-align: middle; font-size: 20px;">reply</mat-icon>返回</button>
-          <button type="button" mat-raised-button color="primary">查看全部详情</button>
+          <button type="button" mat-raised-button color="primary" style="margin-right: 10px;" (click)='goBack()'><mat-icon style="vertical-align: middle; font-size: 20px;">reply</mat-icon>返回</button>
+          <button type="button" mat-raised-button color="primary" (click)='queryAll()'>查看全部详情</button>
         </div>
   
         <div class="queryField">
diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.ts b/src/app/ui/eharts-statistics/eharts-statistics.component.ts
index f740a2b..cb805ff 100644
--- a/src/app/ui/eharts-statistics/eharts-statistics.component.ts
+++ b/src/app/ui/eharts-statistics/eharts-statistics.component.ts
@@ -74,6 +74,16 @@ export class EhartsStatisticsComponent implements OnInit {
     })
   }
 
+  //查询全部详情
+  queryAll () {
+    this.router.navigate(['/home/learningrecorddetails'],{queryParams:{'Catalog': '','id':this.idCard}});
+  }
+
+  //返回上一页
+  goBack () {
+    history.go(-1)
+  }
+
   //处理时间 传入 new Date()格式
   getTime(date){
     let year = date.getFullYear(); //年
@@ -199,7 +209,7 @@ export class EhartsStatisticsComponent implements OnInit {
 
     //柱状图点击事件
     chartHynyxf.on('click', function(e) {
-      that.router.navigate(['/home/learningrecorddetails'],{queryParams:{'Catalog':catalogs[e.dataIndex],'id':that.idCard}});
+      that.router.navigate(['/home/learningrecorddetails'],{queryParams:{'Catalog':catalogs[e.dataIndex],'id':that.idCard,'PostName':e.name}});
     });
 
   }