From 278067d3b4cbe2f13e734639623418ea753ceb2b Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 7 Aug 2021 10:06:37 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9=E5=B7=AE?=
 =?UTF-8?q?=E5=BC=82=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wait-examineer/wait-examineer.component.html    |  8 ++++----
 .../wait-examineer/wait-examineer.component.ts      | 13 +++++++++----
 .../create-plan-online-five.component.ts            |  1 +
 .../entry-plan-look/entry-plan-look.component.html  |  1 -
 .../collection-tools.component.html                 |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

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 f86086a..d030830 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -149,9 +149,9 @@
                       <ng-container *ngIf="i.propertyName == 'imageUrl'; else elseTemplate">
                         <td>
                           <span class="spantext" style="vertical-align: top;">由</span> 
-                          <img (click)="lookImg(i.oldValue)" class="spantext" style="width: 150px;height: 105px;" [src]="i.oldValue" alt="">
+                          <img (click)="lookImg(i.oldValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.oldValue" alt="">
                           <span class="spantext" style="vertical-align: top;">变更为</span>
-                          <img (click)="lookImg(i.newValue)" class="spantext" style="width: 150px;height: 105px;" [src]="i.newValue" alt="">
+                          <img (click)="lookImg(i.newValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.newValue" alt="">
                         </td>
                       </ng-container>
                       <ng-template #elseTemplate>
@@ -254,8 +254,8 @@
                       <span *ngIf="item.operation == 1">修改</span>
                       <span *ngIf="item.operation == 0">新增</span>
                       <span *ngIf="item.operation == 2">删除</span>
-                      文件夹
-                      <span>{{- item.propertyName}}</span>
+                      文件夹 - 
+                      <span>{{item.propertyName}}</span>
                       
                     </mat-panel-title>
                   </mat-expansion-panel-header>
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 7092417..81e19ff 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -139,13 +139,18 @@ export class WaitExamineerComponent implements OnInit {
     this.getAlltabledate()
   }
 
-  lookImg(imgUrl) {
-    console.log(imgUrl)
+  lookImg(imgUrl,type?:boolean) {
+    // console.log(imgUrl)
     let dom = document.getElementById(`viewerjs`)
     let pObjs = dom.childNodes;
     let node = document.createElement("img")
     node.style.display = "none";
-    node.src = "/api/Objects/PlanPlatform/" + imgUrl;
+    if(type){
+      let src = imgUrl.split("?")[0]
+      node.src = src
+    }else{
+      node.src = "/api/Objects/PlanPlatform/" + imgUrl;
+    }
     node.id = 'imgxxx'
     dom.appendChild(node)
     setTimeout(() => {
@@ -217,7 +222,7 @@ export class WaitExamineerComponent implements OnInit {
         this.differentContentOfBuildingsInfo.childrens.forEach(element => {
           element.difData = resolveDiff(element.childrens)
         });
-        // console.log('建筑信息', this.differentContentOfBuildingsInfo
+        console.log('建筑信息', this.differentContentOfBuildingsInfo)
         //功能分区
         let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0]))
         this.differentContentOfFunction = []
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
index b1906fa..eb865aa 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@@ -630,6 +630,7 @@ export class OpenPlanToolDialog {
 
   //通知 子组件 传递参数
   noticePlan() {
+    this.plan.isEditPattern = false
     let parameter = { //查询 节点 对应 建筑/楼层 index,id
       buildingIndex: this.data.key, //总平面图/建筑 index
       storeyId: this.data.select.id
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
index 61276b8..b86f89d 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
@@ -40,7 +40,6 @@
         </div>
         <div class="tablebox">
             <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
-
                 <ng-container matColumnDef="planname">
                     <th mat-header-cell *matHeaderCellDef>预案名称</th>
                     <td mat-cell *matCellDef="let element">{{element.name}}</td>
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html
index a4ca870..0b296c8 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.html
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.html
@@ -11,7 +11,7 @@
       基本信息名称
       <mat-icon>visibility</mat-icon>
     </span>
-    <span class="marginLeftRight">
+    <span class="marginLeftRight" *ngIf="isEditPattern">
       <mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
     </span>
     <span class="marginLeftRight">