From 9f951e2ecd687f1c09c4f70afd9b473b38cb1b99 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Sat, 25 Dec 2021 11:13:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E6=A1=88=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=96=B0=E5=A2=9E=E8=B7=9F=E7=BB=B4=E6=8A=A4=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry-plan-look/entry-plan-look.component.scss | 2 +- src/app/plan-management/meet-plan/meet-plan.component.scss | 2 +- .../onetwo-entry-plan/onetwo-entry-plan.component.scss | 2 +- src/app/plan-management/open-plan/open-plan.component.scss | 2 +- src/app/plan-management/pass-plan/pass-plan.component.scss | 2 +- .../reinforce-plan/reinforce-plan.component.scss | 2 +- src/app/plan-management/type-plan/type-plan.component.scss | 2 +- .../scheduled-updates/scheduled-updates.component.ts | 4 ++++ 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss index 789d27e..a50c639 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss @@ -33,7 +33,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss index 6d53cef..644ca36 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.scss +++ b/src/app/plan-management/meet-plan/meet-plan.component.scss @@ -119,7 +119,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss index 102e91e..c2a8398 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss @@ -129,7 +129,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/open-plan/open-plan.component.scss b/src/app/plan-management/open-plan/open-plan.component.scss index 6d6857b..a67a989 100644 --- a/src/app/plan-management/open-plan/open-plan.component.scss +++ b/src/app/plan-management/open-plan/open-plan.component.scss @@ -97,7 +97,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/pass-plan/pass-plan.component.scss b/src/app/plan-management/pass-plan/pass-plan.component.scss index 4672320..1bc22b6 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.scss +++ b/src/app/plan-management/pass-plan/pass-plan.component.scss @@ -103,7 +103,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss index 30d199d..3b8a265 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss @@ -98,7 +98,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss index 42f8719..9126325 100644 --- a/src/app/plan-management/type-plan/type-plan.component.scss +++ b/src/app/plan-management/type-plan/type-plan.component.scss @@ -119,7 +119,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; 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 60a422e..360e0e2 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -171,6 +171,7 @@ export class ScheduledUpdatesComponent implements OnInit { this.echartsData.findShow=false this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); } */ + this.echartsData.zhiorBuinding='zhi' this.echartsData.scheduledUpdatesToggle = 2 this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?pieid=pieTwo&type=${params.data.name=='维护通过审核'?2:params.data.name=='未维护'?1:3}&dwOryuan=${this.dwOryuan}`); this.echartsData.findShow=false @@ -881,6 +882,8 @@ export class yueDateComponent implements OnInit { this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) console.log(this.tabledata) this.zhiNameData=[] + this.ynum=[] + this.organizationId=[] if(this.router.snapshot.queryParams.type=='1'){ this.tabledata[0].unMaintainCount.organizationCounts.forEach(element => { this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) @@ -1060,6 +1063,7 @@ export class yueDateComponent implements OnInit { console.log(option.xAxis.id[xIndex]) */ }else if(this.echartsData.zhiorBuinding=='zhi'&&this.router.snapshot.queryParams.pieid=='pieTwo'){ this.OrganizationIds=option.xAxis.id[xIndex] + //console.log(xIndex,option.xAxis.id[xIndex],this.organizationId) this.getechartsdata() if((this.router.snapshot.queryParams.type=='1'&&this.tabledata[0].unMaintainCount.organizationCounts.length>=1) ||(this.router.snapshot.queryParams.type=='2'&&this.tabledata[0].maintainedCount.organizationCounts.length>=1)