diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.html b/src/app/statistic-analysis/all-plan/all-plan.component.html index 451f921..b9fa765 100644 --- a/src/app/statistic-analysis/all-plan/all-plan.component.html +++ b/src/app/statistic-analysis/all-plan/all-plan.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-03-05 15:57:08 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-21 09:45:49 + * @LastEditTime: 2021-08-20 14:15:23 -->
diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.ts b/src/app/statistic-analysis/all-plan/all-plan.component.ts index 077786a..b691fef 100644 --- a/src/app/statistic-analysis/all-plan/all-plan.component.ts +++ b/src/app/statistic-analysis/all-plan/all-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-03-15 11:32:30 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-22 14:12:43 + * @LastEditTime: 2021-08-20 14:50:15 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -51,7 +51,11 @@ export class AllPlanComponent implements OnInit { if(this.tid=='pieone'&&(this.yuantype=='Ⅲ级预案'||this.yuantype=='Ⅳ级预案'||this.yuantype=='Ⅴ级预案')){ this.danwei=true this.displayedColumns=['unitname', 'modifiedTime','unitName','buildtype', 'organizationName', 'buildingTypes', 'operation'] - }else{ + }else if(this.tid=='pieone'&&(this.yuantype=='二维预案'||this.yuantype=='三维预案'||this.yuantype=='其他预案'||this.yuantype=='文本预案')){ + this.danwei=true + this.displayedColumns=['unitname', 'modifiedTime', 'organizationName', 'buildingTypes', 'operation'] + } + else{ this.danwei=false this.displayedColumns=['unitname', 'modifiedTime', 'organizationName', 'buildingTypes', 'operation'] } @@ -161,7 +165,7 @@ export class AllPlanComponent implements OnInit { const dialogRef = this.dialog.open(lookunit, { width: '350px', height: '700px', - data: {jsId:this.jsId,type:this.type} + data: {jsId:this.jsId,type:this.type,planType:this.planType,tid:this.tid,pieonetype:this.pieonetype} }); } @@ -213,7 +217,8 @@ export class lookunit{ getAlltabledate(){ let paramtedate: any = { organizationId: this.data.jsId || '', - PlanCategory:this.data.type ||'' + PlanCategory:this.data.tid=='pieone'&&this.data.pieonetype=='true'?this.data.type:'', + PlanType:this.data.tid=='pieone'&&this.data.pieonetype=='false'?this.data.planType:'', } this.http.get(`/api/StatisticsAnalysis/Plans/BuildingTypes`, { params: paramtedate }).subscribe((data: any) => { this.tabledataSource=data.planBuildingTypes