|
|
@ -171,6 +171,7 @@ export class ScheduledUpdatesComponent implements OnInit { |
|
|
|
this.echartsData.findShow=false |
|
|
|
this.echartsData.findShow=false |
|
|
|
this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); |
|
|
|
this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); |
|
|
|
} */ |
|
|
|
} */ |
|
|
|
|
|
|
|
this.echartsData.zhiorBuinding='zhi' |
|
|
|
this.echartsData.scheduledUpdatesToggle = 2 |
|
|
|
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.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?pieid=pieTwo&type=${params.data.name=='维护通过审核'?2:params.data.name=='未维护'?1:3}&dwOryuan=${this.dwOryuan}`); |
|
|
|
this.echartsData.findShow=false |
|
|
|
this.echartsData.findShow=false |
|
|
@ -881,6 +882,8 @@ export class yueDateComponent implements OnInit { |
|
|
|
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) |
|
|
|
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) |
|
|
|
console.log(this.tabledata) |
|
|
|
console.log(this.tabledata) |
|
|
|
this.zhiNameData=[] |
|
|
|
this.zhiNameData=[] |
|
|
|
|
|
|
|
this.ynum=[] |
|
|
|
|
|
|
|
this.organizationId=[] |
|
|
|
if(this.router.snapshot.queryParams.type=='1'){ |
|
|
|
if(this.router.snapshot.queryParams.type=='1'){ |
|
|
|
this.tabledata[0].unMaintainCount.organizationCounts.forEach(element => { |
|
|
|
this.tabledata[0].unMaintainCount.organizationCounts.forEach(element => { |
|
|
|
this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) |
|
|
|
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]) */ |
|
|
|
console.log(option.xAxis.id[xIndex]) */ |
|
|
|
}else if(this.echartsData.zhiorBuinding=='zhi'&&this.router.snapshot.queryParams.pieid=='pieTwo'){ |
|
|
|
}else if(this.echartsData.zhiorBuinding=='zhi'&&this.router.snapshot.queryParams.pieid=='pieTwo'){ |
|
|
|
this.OrganizationIds=option.xAxis.id[xIndex] |
|
|
|
this.OrganizationIds=option.xAxis.id[xIndex] |
|
|
|
|
|
|
|
//console.log(xIndex,option.xAxis.id[xIndex],this.organizationId)
|
|
|
|
this.getechartsdata() |
|
|
|
this.getechartsdata() |
|
|
|
if((this.router.snapshot.queryParams.type=='1'&&this.tabledata[0].unMaintainCount.organizationCounts.length>=1) |
|
|
|
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) |
|
|
|
||(this.router.snapshot.queryParams.type=='2'&&this.tabledata[0].maintainedCount.organizationCounts.length>=1) |
|
|
|