From 2663a3a6e4c9972dcc8d9bea415206acade4bec9 Mon Sep 17 00:00:00 2001 From: jingbowen <970029315@qq.com> Date: Tue, 9 Aug 2022 10:02:46 +0800 Subject: [PATCH] =?UTF-8?q?word=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unit-details/unit-details.component.html | 99 ++++++++++--------- .../unit-details/unit-details.component.scss | 4 +- .../unit-details/unit-details.component.ts | 30 ++++-- .../home/basic-info/unit/unit.component.html | 10 +- .../home/basic-info/unit/unit.component.scss | 2 +- 5 files changed, 83 insertions(+), 62 deletions(-) diff --git a/src/app/home/basic-info/unit-details/unit-details.component.html b/src/app/home/basic-info/unit-details/unit-details.component.html index cdc2807..b10aae4 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.html +++ b/src/app/home/basic-info/unit-details/unit-details.component.html @@ -1,6 +1,6 @@ - +
+ style="font-family:宋体; font-size:9pt">
+ style="font-family:宋体; font-size:9pt">
+ style="font-family:'Times New Roman'; font-size:9pt">
+
+
+
+ style="font-family:宋体; font-size:9pt">
+ style="font-family:'Times New Roman'; font-size:9pt">
+ style="font-family:'Times New Roman'; font-size:9pt">
+ style="font-family:宋体; font-size:9pt">
东:
+ style="font-family:宋体; font-size:9pt">东:南:
+ style="font-family:宋体; font-size:9pt">南:西:
+ style="font-family:宋体; font-size:9pt">西:北:
+ style="font-family:宋体; font-size:9pt">北:+ style="font-family:宋体; font-size:9pt">
+ + +
+ + +
+ + +
0个
无
+ style="font-family:宋体; font-size:9pt">数量:0
+ style="font-family:'Times New Roman'; font-size:9pt">扬程:0m
流量:0L/S
数量:0
+ style="font-family:'Times New Roman'; font-size:9pt">0
+ style="font-family:'Times New Roman'; font-size:9pt">数量:0
+ style="font-family:'Times New Roman'; font-size:9pt">扬程:0m
流量:0L/S
数量:0
+ style="font-family:'Times New Roman'; font-size:9pt">0
+ style="font-family:'Times New Roman'; font-size:9pt">0 +
0,无
+ style="font-family:'Times New Roman'; font-size:9pt">4,南北两侧
+ style="font-family:'Times New Roman'; font-size:9pt">8个
5,均匀分布
+ style="font-family:'Times New Roman'; font-size:9pt">+ style="font-family:'Times New Roman'; font-size:9pt">
diff --git a/src/app/home/basic-info/unit-details/unit-details.component.scss b/src/app/home/basic-info/unit-details/unit-details.component.scss index c0c9024..a318d01 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.scss +++ b/src/app/home/basic-info/unit-details/unit-details.component.scss @@ -7,8 +7,8 @@ .top { text-align: left; margin: 20px; - border-bottom: 1px solid #eee; - + // border-bottom: 1px solid #eee; + color: #000; span { color: #000D21; margin-right: 16px; diff --git a/src/app/home/basic-info/unit-details/unit-details.component.ts b/src/app/home/basic-info/unit-details/unit-details.component.ts index 515a687..da0e878 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.ts +++ b/src/app/home/basic-info/unit-details/unit-details.component.ts @@ -21,7 +21,7 @@ export class UnitDetailsComponent implements OnInit { comment: [''] }); } - datas: { + datas= { basicInfo: { name: "", addr: "", @@ -49,17 +49,31 @@ export class UnitDetailsComponent implements OnInit { waterSources:"", waterSourcesPosition:"", alarm:false, - - } + spray:false, + broadcast:false, + smoke:false, + hydrantsNumber:"", + hydrantsPosition:"", + pumpNumber:"", + pumpRange:"", + pumpFlow:"", + pumpAdapter:"", + SprayPumpNumber:"", + SprayPumpRange:"", + SprayPumpFlow:"", + SprayPumpAdapter:"", + elevator:"", + stairs:"", + Export:"", + indoorHydrant:"", + standardIndoorHydrant:"" + }, + tips:"" } - aaa = "山东小满园" + aaa = true validateForm!: FormGroup; ngOnInit(): void { - setTimeout(() => { console.log(666,this.datas); - }, 0); - - } submitForm(value: { userName: string; email: string; password: string; confirm: string; comment: string }): void { for (const key in this.validateForm.controls) { diff --git a/src/app/home/basic-info/unit/unit.component.html b/src/app/home/basic-info/unit/unit.component.html index 8c22bb9..c56375d 100644 --- a/src/app/home/basic-info/unit/unit.component.html +++ b/src/app/home/basic-info/unit/unit.component.html @@ -8,13 +8,13 @@