Browse Source

[完善]修改差异显示bug

tangshan
邵佳豪 4 years ago
parent
commit
278067d3b4
  1. 8
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  2. 11
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  3. 1
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  4. 1
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  5. 2
      src/app/ui/collection-tools-plan/collection-tools.component.html

8
src/app/plan-audit/wait-examineer/wait-examineer.component.html

@ -149,9 +149,9 @@
<ng-container *ngIf="i.propertyName == 'imageUrl'; else elseTemplate"> <ng-container *ngIf="i.propertyName == 'imageUrl'; else elseTemplate">
<td> <td>
<span class="spantext" style="vertical-align: top;"></span> <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> <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> </td>
</ng-container> </ng-container>
<ng-template #elseTemplate> <ng-template #elseTemplate>
@ -254,8 +254,8 @@
<span *ngIf="item.operation == 1">修改</span> <span *ngIf="item.operation == 1">修改</span>
<span *ngIf="item.operation == 0">新增</span> <span *ngIf="item.operation == 0">新增</span>
<span *ngIf="item.operation == 2">删除</span> <span *ngIf="item.operation == 2">删除</span>
文件夹 文件夹 -
<span>{{- item.propertyName}}</span> <span>{{item.propertyName}}</span>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>

11
src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@ -139,13 +139,18 @@ export class WaitExamineerComponent implements OnInit {
this.getAlltabledate() this.getAlltabledate()
} }
lookImg(imgUrl) { lookImg(imgUrl,type?:boolean) {
console.log(imgUrl) // console.log(imgUrl)
let dom = document.getElementById(`viewerjs`) let dom = document.getElementById(`viewerjs`)
let pObjs = dom.childNodes; let pObjs = dom.childNodes;
let node = document.createElement("img") let node = document.createElement("img")
node.style.display = "none"; node.style.display = "none";
if(type){
let src = imgUrl.split("?")[0]
node.src = src
}else{
node.src = "/api/Objects/PlanPlatform/" + imgUrl; node.src = "/api/Objects/PlanPlatform/" + imgUrl;
}
node.id = 'imgxxx' node.id = 'imgxxx'
dom.appendChild(node) dom.appendChild(node)
setTimeout(() => { setTimeout(() => {
@ -217,7 +222,7 @@ export class WaitExamineerComponent implements OnInit {
this.differentContentOfBuildingsInfo.childrens.forEach(element => { this.differentContentOfBuildingsInfo.childrens.forEach(element => {
element.difData = resolveDiff(element.childrens) 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])) let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0]))
this.differentContentOfFunction = [] this.differentContentOfFunction = []

1
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@ -630,6 +630,7 @@ export class OpenPlanToolDialog {
//通知 子组件 传递参数 //通知 子组件 传递参数
noticePlan() { noticePlan() {
this.plan.isEditPattern = false
let parameter = { //查询 节点 对应 建筑/楼层 index,id let parameter = { //查询 节点 对应 建筑/楼层 index,id
buildingIndex: this.data.key, //总平面图/建筑 index buildingIndex: this.data.key, //总平面图/建筑 index
storeyId: this.data.select.id storeyId: this.data.select.id

1
src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@ -40,7 +40,6 @@
</div> </div>
<div class="tablebox"> <div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8"> <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="planname"> <ng-container matColumnDef="planname">
<th mat-header-cell *matHeaderCellDef>预案名称</th> <th mat-header-cell *matHeaderCellDef>预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">{{element.name}}</td>

2
src/app/ui/collection-tools-plan/collection-tools.component.html

@ -11,7 +11,7 @@
基本信息名称 基本信息名称
<mat-icon>visibility</mat-icon> <mat-icon>visibility</mat-icon>
</span> </span>
<span class="marginLeftRight"> <span class="marginLeftRight" *ngIf="isEditPattern">
<mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选 <mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
</span> </span>
<span class="marginLeftRight"> <span class="marginLeftRight">

Loading…
Cancel
Save