From 08e0f5afe063934e9c6aebbcdcc6ed5ac6b62c72 Mon Sep 17 00:00:00 2001
From: chenjingyu <bobsun@hotmail.com>
Date: Fri, 20 Aug 2021 16:05:56 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E9=A2=84=E6=A1=88=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=86=E6=9E=90=E6=8C=89=E6=BA=90=E7=A0=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=BA=95?=
 =?UTF-8?q?=E5=B1=82=E7=9A=84=E5=8D=95=E4=BD=8D=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../all-plan/all-plan.component.html                |  2 +-
 .../all-plan/all-plan.component.ts                  | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

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
 -->
 <div class="body">
     <div class="topbox">
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