From 48317ca7ef36e92f931495ebf389c27db27c583b Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Sat, 5 Sep 2020 15:16:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=A0=E9=99=A4=E7=95=8C=E9=9D=A2]=E4=BF=AE?= =?UTF-8?q?=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delete-four/delete-four.component.html | 6 +++- .../delete-four/delete-four.component.ts | 19 ++++++++++-- .../delete-there/delete-there.component.html | 5 +++- .../delete-there/delete-there.component.ts | 9 ++++-- .../delete-two/delete-two.component.ts | 30 ++++++++++++------- 5 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html index 6c4e2a5..ed350c1 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html +++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html @@ -4,8 +4,12 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:58 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-05 08:48:27 + * @LastEditTime: 2020-09-05 14:52:26 --> +
+ +
+
diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts index 011e610..b7115f1 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts @@ -1,6 +1,16 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-09-02 16:22:58 + * @LastEditors: sueRimn + * @LastEditTime: 2020-09-05 14:53:43 + */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import {EchartsDataService} from '../../echarts-data.service' +import {EchartsDataService} from '../../echarts-data.service'; +import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; +import { DateAdapter } from '@angular/material/core'; declare var echarts: any; @Component({ @@ -10,7 +20,7 @@ declare var echarts: any; }) export class DeleteFourComponent implements OnInit { - constructor(public route: ActivatedRoute,public data: EchartsDataService) { } + constructor(public route: ActivatedRoute,public data: EchartsDataService,public snackBar: MatSnackBar,private adapter: DateAdapter) { } zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] @@ -19,6 +29,11 @@ export class DeleteFourComponent implements OnInit { this.detailEcharts() }) } + //返回 + goBack () { + history.go(-1) + this.data.statefulInspectionToggle = true + } detailEcharts(){ var detailPlanEchart = echarts.init(document.getElementById('detailBox')); diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html index 71f0fbc..621c5bc 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html +++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:35 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-05 13:38:50 + * @LastEditTime: 2020-09-05 15:10:46 -->
+ +
diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts index b250906..f035989 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:35 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-05 13:28:37 + * @LastEditTime: 2020-09-05 14:43:05 */ import { Component, OnInit } from '@angular/core'; import { Router,ActivatedRoute } from '@angular/router'; @@ -43,6 +43,11 @@ export class DeleteThereComponent implements OnInit { } zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] + //返回 + goBack () { + history.go(-1) + this.echartsData.statefulInspectionToggle = true + } axisLabel = { interval: 0, @@ -122,7 +127,7 @@ export class DeleteThereComponent implements OnInit { this.zhutu.setOption(option); } - + /* 鼠标悬停提示 */ tableTooltip2(biaotou:string){ var shuju='[{"name":"浦东中队","number":"156","zhanbi":"3%"},{"name":"黄埔中队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇中队","number":"133","zhanbi":"2.1%"},{"name":"长宁中队","number":"122","zhanbi":"1.6%"},' diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts index 6ec3088..0726bfe 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:21:18 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-05 13:43:02 + * @LastEditTime: 2020-09-05 15:09:27 */ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; @@ -21,8 +21,8 @@ declare var echarts: any; }) export class DeleteTwoComponent implements OnInit { options:any; - datayuex=['一月', '二月', '三月', '四月', '五月', '六月', '七月','八月']; - datayuey=[210, 160, 150, 140, 130, 120, 110,120]; + datayuex=['一月', '二月', '三月', '四月', '五月', '六月', '七月','八月','九月']; + datayuey=[210, 160, 150, 140, 130, 120, 110,120,150]; datanianx=[2019,2020]; dataniany=[201,174] @@ -34,8 +34,8 @@ export class DeleteTwoComponent implements OnInit { this.dateInit() window.setTimeout(()=>{ console.log(this.selectType) - if(this.selectType=='month'){ - this.headZhexian('heads','删除数量总统计',this.datayuex,this.datayuey) + + this.headZhexian('heads','删除数量总统计',this.datayuex,this.datayuey) this.headZhexian('leftOne','高层',this.datayuex,this.datayuey) this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey) this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey) @@ -44,7 +44,7 @@ export class DeleteTwoComponent implements OnInit { this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey) this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey) this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey) - } + /* else if(this.selectType=='year'){ this.headZhexian('heads','删除数量总统计',this.datanianx,this.dataniany) this.headZhexian('leftOne','高层',this.datayuex,this.datayuey) @@ -148,8 +148,15 @@ export class DeleteTwoComponent implements OnInit { } } - /* 折线图 */ + /** + * @name: 折线图 + * @test: test font + * @msg: + * @param {divid(传入的div),headtext(标题)} + * @return {type} + */ headZhexian(divid:string,headtext:string,datayuex,datayuey){ + var dianji:boolean=headtext=="删除数量总统计" ? false:true; var ec = echarts as any; this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp'); var options = { @@ -220,7 +227,7 @@ export class DeleteTwoComponent implements OnInit { series: [{ data: datayuey, type: 'line', - + clickable:false, /* lineStyle:{ color:'#1369bf' }, */ @@ -245,8 +252,11 @@ export class DeleteTwoComponent implements OnInit { }; this.headZx.on('click', (params) => { console.log(params) - this.echartsData.statefulInspectionName =params.name+headtext; - this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`); + if(`${headtext}`!=="删除数量总统计"){ + this.echartsData.statefulInspectionName =params.name+headtext; + this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`); + } + }); this.headZx.setOption(options); }