From 3192659a179ea893d7db76dafb7a427e8fbc79f5 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Thu, 10 Sep 2020 14:44:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=BC=E5=90=88=E5=88=86=E6=9E=90]=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=A1=86=E8=B0=83=E6=95=B4=E5=8F=8A=E6=B0=94=E6=B3=A1?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../building-type-three-details.component.ts | 17 ++----------- .../building-type-two-forward.component.ts | 5 ++-- .../delete-four/delete-four.component.ts | 18 +++----------- .../delete-one/delete-one.component.ts | 2 +- .../delete-there/delete-there.component.ts | 4 ++-- .../delete-two/delete-two.component.ts | 24 ++++++------------- .../echarts-data.service.ts | 24 +++++++++---------- .../page-two-name/page-two-name.component.ts | 22 ++++++++--------- .../page-two-time/page-two-time.component.ts | 12 +++++----- .../page-zhong-dui-details.component.ts | 20 +++------------- 10 files changed, 49 insertions(+), 99 deletions(-) diff --git a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts index be484f1..3eab6d3 100644 --- a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts @@ -28,7 +28,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit { ngOnInit(): void { this.route.queryParams.subscribe(params => { - this.bianli() + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.zhongNumData,this.zhongNameData) this.organizationName = params['organizationName']; this.buildingTypeName = params['buildingTypeName']; }); @@ -53,18 +53,6 @@ export class BuildingTypeThreeDetailsComponent implements OnInit { zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] tiaoshiPao:any - //气泡提示数据获取 - bianli(){ - var arrshuzu='['; - for(var i=0;i{ return this.tableTooltip(params) - }, - position: this.echartsData.tableTooltipNoShow2 + } }, series: [{ data: this.zhongNumData, diff --git a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts index 46dd671..40b212b 100644 --- a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts @@ -18,7 +18,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit { } ngOnInit(): void { window.setTimeout(()=>{ - this.bianli() + this.tiaoshiPao=this.data.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData) this.initCharts() this.barEcharts() },0) @@ -262,8 +262,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.tableTooltip(this.tableDataZhong,params.name) - }, - position: this.data.tableTooltipNoShow2 + } }, series: [{ data: this.buildingTypeNum, 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 798bacc..45241d3 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 @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:58 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-10 09:17:32 + * @LastEditTime: 2020-09-10 14:23:36 */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; @@ -23,22 +23,10 @@ export class DeleteFourComponent implements OnInit { 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] - tiaoshiPao:any - //气泡提示数据获取 - bianli(){ - var arrshuzu='['; - for(var i=0;i{ this.level=param.level //console.log(this.level) diff --git a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts index 9c96473..f69e414 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts @@ -42,7 +42,7 @@ export class DeleteOneComponent implements OnInit { }, tooltip: { trigger: 'item', - position: this.echartsData.tableTooltipNoShow2, + //position: this.echartsData.tableTooltipNoShow2, formatter: (params)=>{ //return this.biaogeTishi(params.name) return this.echartsData.biaogeTishi(params.name) 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 fbaddb8..fe7b32b 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-10 09:16:42 + * @LastEditTime: 2020-09-10 14:33:07 */ import { Component, OnInit } from '@angular/core'; import { Router,ActivatedRoute } from '@angular/router'; @@ -33,7 +33,7 @@ export class DeleteThereComponent implements OnInit { } ngOnInit(): void { - this.bianli(); + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData) this.dateInit(); //let headtext:string; let datayuex:string; 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 1e0a65e..8c07e11 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-10 10:56:58 + * @LastEditTime: 2020-09-10 14:31:18 */ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; @@ -25,6 +25,7 @@ export class DeleteTwoComponent implements OnInit { datayuey=[210, 160, 150, 140, 130, 120, 110,120,150]; datanianx=[2019,2020]; dataniany=[201,174] + tiaoshiPao:any//气泡 constructor(private router: Router,public snackBar: MatSnackBar,private adapter: DateAdapter,public echartsData:EchartsDataService) { } /* @ViewChild('appEcharts')appEcharts :echartsComponent; //父组件中获得子组件的引用 @@ -32,7 +33,8 @@ export class DeleteTwoComponent implements OnInit { ngOnInit(): void { this.dateInit() - this.bianli() + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.datayuey,this.datayuex) + //this.bianli() window.setTimeout(()=>{ this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey) @@ -69,20 +71,8 @@ export class DeleteTwoComponent implements OnInit { zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] - tiaoshiPao:any - //气泡提示数据获取 - bianli(){ - var arrshuzu='['; - for(var i=0;i { - this.bianli() + this.tiaoshiPao=this.data.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData) this.planState() this.planAdd() this.passPlanEchart() @@ -137,8 +137,8 @@ export class PageTwoNameComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.data.biaogeTishi(params.name) - }, - position: this.data.tableTooltipNoShow2 + }/* , + position: this.data.tableTooltipNoShow2 */ }, series: [{ data: this.zhiNumData, @@ -193,8 +193,8 @@ export class PageTwoNameComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.data.biaogeTishi(params.name) - }, - position: this.data.tableTooltipNoShow2 + }/* , + position: this.data.tableTooltipNoShow2 */ }, series: [{ data: this.zhiNumData, @@ -249,8 +249,8 @@ export class PageTwoNameComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.data.biaogeTishi(params.name) - }, - position: this.data.tableTooltipNoShow2 + }/* , + position: this.data.tableTooltipNoShow2 */ }, series: [{ @@ -306,8 +306,8 @@ export class PageTwoNameComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.data.biaogeTishi(params.name) - }, - position: this.data.tableTooltipNoShow2 + }/* , + position: this.data.tableTooltipNoShow2 */ }, series: [{ @@ -363,8 +363,8 @@ export class PageTwoNameComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.data.biaogeTishi(params.name) - }, - position: this.data.tableTooltipNoShow2 + }/* , + position: this.data.tableTooltipNoShow2 */ }, series: [{ diff --git a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts index 596caca..384b231 100644 --- a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts +++ b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts @@ -153,7 +153,7 @@ export class echartsComponent implements OnInit { } ngOnInit(): void { window.setTimeout(()=>{ - this.bianli() + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.datayuey,this.datayuex) this.oneInit() this.twoInit() this.threeInit() @@ -340,7 +340,7 @@ export class echartsComponent implements OnInit { ], }; this.twoExample.setOption(option); - this.twoExample.on('click', function (params) { + this.twoExample.getZr().on('click', function (params) { that.echartsData.statefulInspectionName = '预案新增' that.echartsData.statefulInspectionToggle = false }); @@ -423,7 +423,7 @@ export class echartsComponent implements OnInit { ], }; this.threeExample.setOption(option); - this.threeExample.on('click', function (params) { + this.threeExample.getZr().on('click', function (params) { that.echartsData.statefulInspectionName = '预案审核通过' that.echartsData.statefulInspectionToggle = false }); @@ -507,7 +507,7 @@ export class echartsComponent implements OnInit { ], }; this.fourExample.setOption(option); - this.fourExample.on('click', function (params) { + this.fourExample.getZr().on('click', function (params) { that.echartsData.statefulInspectionName = '预案编制' that.echartsData.statefulInspectionToggle = false }); @@ -592,7 +592,7 @@ export class echartsComponent implements OnInit { ], }; this.fiveExample.setOption(option); - this.fiveExample.on('click', function (params) { + this.fiveExample.getZr().on('click', function (params) { that.echartsData.statefulInspectionName = '预案审核退回' that.echartsData.statefulInspectionToggle = false }); @@ -676,7 +676,7 @@ export class echartsComponent implements OnInit { ], }; this.sixExample.setOption(option); - this.sixExample.on('click', function (params) { + this.sixExample.getZr().on('click', function (params) { that.echartsData.statefulInspectionName = '预案审核中' that.echartsData.statefulInspectionToggle = false }); diff --git a/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts b/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts index 98b0e83..9336c08 100644 --- a/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts +++ b/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-05 13:50:45 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-10 09:51:32 + * @LastEditTime: 2020-09-10 14:38:17 */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; @@ -22,22 +22,9 @@ export class PageZhongDuiDetailsComponent implements OnInit { zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] tiaoshiPao:any - //气泡提示数据获取 - bianli(){ - var arrshuzu='['; - for(var i=0;i{ - this.bianli() + this.tiaoshiPao=this.data.qipao(this.tiaoshiPao,this.zhongNumData,this.zhongNameData) this.detailEcharts() }) } @@ -83,8 +70,7 @@ export class PageZhongDuiDetailsComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.tableTooltip(params) - }, - position: this.data.tableTooltipNoShow2 + } }, series: [{ data: this.zhongNumData,