From d54ff4fab4160715b7f0a4a63fbe4b142551d170 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 7 Apr 2021 14:03:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]ui=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/key-unit/basicinfo/basicinfo.component.ts     |  4 ++--
 src/app/plan-audit/plan-list/plan-list.component.html |  7 +++++--
 src/app/plan-audit/plan-list/plan-list.component.scss |  4 +++-
 src/app/plan-audit/plan-list/plan-list.component.ts   |  4 ++--
 .../wait-examineer/wait-examineer.component.html      | 11 ++++++++---
 .../wait-examineer/wait-examineer.component.ts        | 11 +++++++++++
 src/app/tabbar/tabbar.component.html                  |  2 +-
 src/app/tabbar/tabbar.component.scss                  |  2 +-
 8 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index 8a764f7..a93c1b0 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -1102,8 +1102,8 @@ export class BasicinfoComponent implements OnInit {
           }
           element.propertyInfos = arr
         }
-        //如果当前分组没勾选 则需先去重然后重置每一个value为空
-        if(!element.submitted){
+        //如果当前分组没勾选 则需先去重然后重置每一个value为空  （基本信息默认都是不可选的 所以不需要清空值）
+        if(!element.submitted && element.name != '基本信息'){
           const res = new Map();
           element.propertyInfos = element.propertyInfos.filter((a) => !res.has(a.propertyName) && res.set(a.propertyName, 1))
           element.propertyInfos.forEach(ele => {
diff --git a/src/app/plan-audit/plan-list/plan-list.component.html b/src/app/plan-audit/plan-list/plan-list.component.html
index 55ea6a8..fd814a3 100644
--- a/src/app/plan-audit/plan-list/plan-list.component.html
+++ b/src/app/plan-audit/plan-list/plan-list.component.html
@@ -1,5 +1,5 @@
 <div class="planlist" id="planlist">
-    <div style="margin: 10px 0;">
+    <div style="margin: 10px 0;" *ngIf="planType == 'zong'">
         <mat-accordion>
             <mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
               <mat-expansion-panel-header collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F2F9FF;">
@@ -18,7 +18,8 @@
             </mat-expansion-panel>
         </mat-accordion>
     </div>
-    <div *ngFor="let item of allBuildings;let key=index"  style="margin-bottom: 10px;">
+    <div *ngIf="planType == 'ceng'">
+      <div *ngFor="let item of allBuildings;let key=index"  style="margin-bottom: 10px;">
         <mat-accordion >
             <mat-expansion-panel  style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
               <mat-expansion-panel-header collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F2F9FF;">
@@ -38,5 +39,7 @@
               </ng-template>
             </mat-expansion-panel>
         </mat-accordion>
+      </div>
     </div>
+    
 </div>
\ No newline at end of file
diff --git a/src/app/plan-audit/plan-list/plan-list.component.scss b/src/app/plan-audit/plan-list/plan-list.component.scss
index a1939e9..9f43ce3 100644
--- a/src/app/plan-audit/plan-list/plan-list.component.scss
+++ b/src/app/plan-audit/plan-list/plan-list.component.scss
@@ -21,8 +21,10 @@
     padding: 20px;
     display: flex;
     flex-wrap: wrap;
-    justify-content: space-between;
+    // justify-content: space-between;
+    flex-wrap: wrap;
     .contantitem{
+        margin: 10px;
         div{
             width: 110px;
             height: 110px;
diff --git a/src/app/plan-audit/plan-list/plan-list.component.ts b/src/app/plan-audit/plan-list/plan-list.component.ts
index c8e41b2..0c76f51 100644
--- a/src/app/plan-audit/plan-list/plan-list.component.ts
+++ b/src/app/plan-audit/plan-list/plan-list.component.ts
@@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http';
-import { Component, Inject, OnInit, Renderer2, ViewChild } from '@angular/core';
+import { Component, Inject, Input, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 
@@ -10,7 +10,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 })
 export class PlanListComponent implements OnInit {
   constructor(private http: HttpClient,public snackBar: MatSnackBar,public dialog: MatDialog) { }
-  
+  @Input() public planType: any;//data名字根据引用场景自定义
   //单位相关数据
   unitId:any =  sessionStorage.getItem('companyId')
 
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index c81b24e..75e0767 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -97,15 +97,20 @@
         
       </div>
       <div id="company">
-        <mat-tab-group  *ngIf="showtype == 3" class="company"  [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
+        <mat-tab-group  *ngIf="showtype == 3" class="company"  [selectedIndex]="selected.value" (selectedIndexChange)="selectedIndexChange($event)">
           <mat-tab label="基本信息">
             <ng-template matTabContent>
               <app-basic-info></app-basic-info>
             </ng-template>
           </mat-tab>
-          <mat-tab label="平面图">
+          <mat-tab label="总平面图">
             <ng-template matTabContent>
-              <app-plan-list></app-plan-list>
+              <app-plan-list [planType]="planTypeIndex"></app-plan-list>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="层平面图">
+            <ng-template matTabContent>
+              <app-plan-list [planType]="planTypeIndex"></app-plan-list>
             </ng-template>
           </mat-tab>
           <mat-tab label="四周毗邻">
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
index 346a7e3..17e3ce0 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -77,6 +77,17 @@ export class WaitExamineerComponent implements OnInit {
     this.getAlltabledate()  
     this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
   }
+
+  planTypeIndex //平面图类型 是总平面图还是层平面图
+  selectedIndexChange(e){
+    this.selected.setValue(e)
+    // console.log(6666,e)
+    if(e == 1){
+      this.planTypeIndex = 'zong'
+    }else if(e == 2){
+      this.planTypeIndex = 'ceng'
+    }
+  }
   ngOnDestroy () {
     /* this.indexbar.clear()
     this.indexbar.dispose() */
diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index 0309e86..f68cd34 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -112,7 +112,7 @@
       </div>
     </div>
     
-    <p style="font-size: 16px;position: absolute; right: 233px;">欢迎您, {{realName}}</p>
+    <p *ngIf="!isUpdates" style="font-size: 16px;position: absolute; right: 233px;">欢迎您, {{realName}}</p>
     
 
     <div class="scoringRule"  *ngIf="companyIntegrityScore">
diff --git a/src/app/tabbar/tabbar.component.scss b/src/app/tabbar/tabbar.component.scss
index 97f1d73..c7cee28 100644
--- a/src/app/tabbar/tabbar.component.scss
+++ b/src/app/tabbar/tabbar.component.scss
@@ -285,7 +285,7 @@ mat-icon{
 
 
 .isUpdates{
-    left: 596px;
+    left: 564px;
 }
 .uploadFile{
     height: 64px;