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 1/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B7=AE=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 @@ 由 - + 变更为 - + @@ -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 - + 多选 From d2ee5efe33ffea8d8046c1c35ce9c60e5b2ff5fd Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 7 Aug 2021 11:05:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=B6=88=E9=98=B2?= =?UTF-8?q?=E8=AE=BE=E6=96=BD=E5=9B=BA=E5=AE=9A=E5=80=BC=E7=8F=AD=E7=94=B5?= =?UTF-8?q?=E8=AF=9D=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=96=87=E6=9C=AC=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fire-fighting-device.component.html | 199 +++++++++++------- .../wait-examineer.component.html | 4 +- 2 files changed, 126 insertions(+), 77 deletions(-) diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html index b21169d..573d925 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html @@ -1,5 +1,5 @@
- + - +
预案名称 {{element.name}}
@@ -251,7 +293,8 @@
-

楼层/区域名称: {{tableMsg.name? tableMsg.name : '暂无名称'}}

+

楼层/区域名称: {{tableMsg.name? + tableMsg.name : '暂无名称'}}

@@ -263,7 +306,7 @@ - + @@ -274,17 +317,23 @@

{{item.name}}

- description + description +
- - - + + + + - {{radio.name}} + {{radio.name}}
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 d030830..8bda0f7 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -157,9 +157,9 @@ From d474f09212acdbc8c65e3ea48bfef46e25edf183 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 7 Aug 2021 14:49:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E4=BF=A1=E6=81=AF=E5=AF=B9=E6=AF=94=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pipes/boolean.pipe.ts | 2 ++ .../wait-examineer.component.html | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/app/pipes/boolean.pipe.ts b/src/app/pipes/boolean.pipe.ts index 3df03f5..025507f 100644 --- a/src/app/pipes/boolean.pipe.ts +++ b/src/app/pipes/boolean.pipe.ts @@ -53,6 +53,8 @@ export class differentContentTitle implements PipeTransform { return '是' } else if (typeof (value) == 'boolean' && !value) { return '否' + } else if (JSON.stringify(value) == "{}") { + return '空' } else if (!value) { return '空' } else { 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 8bda0f7..b4435e5 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -155,12 +155,22 @@ - + + + + + + +
{{header}} 由 - {{i.oldValue}} + {{i.oldValue | differentContentTitle}} 变更为 - {{i.newValue}} + {{i.newValue | differentContentTitle}}
- 由 - {{i.oldValue | differentContentTitle}} - 变更为 - {{i.newValue | differentContentTitle}} - + + {{i.displayName}} 发生变化 + + + 由 + {{i.oldValue | differentContentTitle}} + 变更为 + {{i.newValue | differentContentTitle}} +