Merge branch 'master' of http://39.106.78.171:3000/13562321995/AnxinCloudDisk

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">

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}});
     });
 
   }