From e6a03c8bb911b83d88a92caeab76614a9a64fcd6 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Sat, 25 Dec 2021 17:14:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=B4=E6=8A=A4=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=BB=9F=E8=AE=A1=E6=8F=90=E7=A4=BA=E6=A1=86=E6=9C=80?= =?UTF-8?q?=E5=A4=96=E5=B1=82=E5=B5=8C=E5=A5=97=E4=B8=80=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/statistic-analysis/echarts-data.service.ts | 8 ++++---- .../scheduled-updates/scheduled-updates.component.ts | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 1992916..22dd7ea 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -594,7 +594,7 @@ export class EchartsDataService { } //维护更新左侧内部提示框 weihuTooltip(datas){ - this.tishiData=this.obdata[0].items[0].organizations + this.tishiData=this.obdata[0].items[0].organizations[datas[0].dataIndex].subOrganizations var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 @@ -629,11 +629,11 @@ export class EchartsDataService { //维护更新右侧内部提示框 weihuTooltipRight(datas,type){ if(type=='1'){ - this.tishiData=this.obdata[0].unMaintainCount.organizationCounts + this.tishiData=this.obdata[0].unMaintainCount.organizationCounts[datas[0].dataIndex].subOrganizationCounts }else if(type=='2'){ - this.tishiData=this.obdata[0].maintainedCount.organizationCounts + this.tishiData=this.obdata[0].maintainedCount.organizationCounts[datas[0].dataIndex].subOrganizationCounts }else if(type=='3'){ - this.tishiData=this.obdata[0].maintainingCount.organizationCounts + this.tishiData=this.obdata[0].maintainingCount.organizationCounts[datas[0].dataIndex].subOrganizationCounts } var countall=0//总计 diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts index 360e0e2..2f5c52c 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -951,12 +951,16 @@ export class yueDateComponent implements OnInit { fontSize :18 }, formatter: (params)=>{ - if(this.router.snapshot.queryParams.pieid=='pieTwo'){ - return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltipRight(params,this.router.snapshot.queryParams.type):'' - }else{ - return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltip(params):'' + console.log(params) + if(params[0].axisValue.indexOf('救援站')==-1){ + if(this.router.snapshot.queryParams.pieid=='pieTwo'){ + return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltipRight(params,this.router.snapshot.queryParams.type):'' + }else{ + return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltip(params):'' + } } + //return this.echartsData.zhiorBuinding=="zhi"?this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.echartsData.tableTooltip(this.echartsData.buildingType,params[0].name) }, position:this.echartsData.tableTooltipNoShow2