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 @@ - + 变更为 - + @@ -254,8 +254,8 @@ 修改 新增 删除 - 文件夹 - {{- item.propertyName}} + 文件夹 - + {{item.propertyName}} 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 @@
- 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 @@ 基本信息名称 visibility - + 多选
预案名称 {{element.name}}