From 892c362b3194babff3553d4b77f8e1126aafd5b7 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 19 Jan 2021 16:56:40 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E8=80=90?=
 =?UTF-8?q?=E7=81=AB=E7=AD=89=E7=BA=A7=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/ui/basicinfo/basicinfo.component.html | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/app/ui/basicinfo/basicinfo.component.html b/src/app/ui/basicinfo/basicinfo.component.html
index 5e0206a..7133d45 100644
--- a/src/app/ui/basicinfo/basicinfo.component.html
+++ b/src/app/ui/basicinfo/basicinfo.component.html
@@ -196,14 +196,14 @@
                                         <span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
                                         
                                         <!-- 如果类型是文本 --> 
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
                                             <input matInput id="floorspace" name="{{i.propertyName}}{{www}}" type='text'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue">
                                         </mat-form-field>
 
                                         <!-- 如果类型是数字 -->
-                                        <mat-form-field *ngIf="i.propertyType == 2">
+                                        <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
                                             <input matInput id="floorspace" name="{{i.propertyName}}{{www}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -211,9 +211,17 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                        <!-- 如果类型是耐火等级 -->
+                                        <mat-form-field *ngIf="i.propertyName == '耐火等级'">
+                                            <mat-select  name="{{i.propertyName}}{{www}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
+                                                <mat-option value="0">1级</mat-option>
+                                                <mat-option value="1">2级</mat-option>
+                                                <mat-option value="2">3级</mat-option>
+                                                <mat-option value="3">其他</mat-option>
+                                            </mat-select>
+                                        </mat-form-field>
                                         <!-- 如果类型是多行文本 -->
-                                        <textarea *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}{{key}}"></textarea>
+                                        <textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}{{key}}"></textarea>
     
                                         <span style="color: red;"  *ngIf="i.required">*</span>
                                         <div *ngIf="i.isshowrule" style="position: absolute;
@@ -278,14 +286,14 @@
 
                                         
                                          <!-- 如果类型是文本 -->
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
                                             <input matInput id="floorspace" name="{{i.propertyName}}" type='text'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue">
                                         </mat-form-field>
 
                                         <!-- 如果类型是数字 -->
-                                        <mat-form-field *ngIf="i.propertyType == 2">
+                                        <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
                                             <input matInput id="floorspace" name="{{i.propertyName}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -293,9 +301,17 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                        <!-- 如果类型是耐火等级 -->
+                                        <mat-form-field *ngIf="i.propertyName == '耐火等级'">
+                                            <mat-select  name="{{i.propertyName}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
+                                                <mat-option value="0">1级</mat-option>
+                                                <mat-option value="1">2级</mat-option>
+                                                <mat-option value="2">3级</mat-option>
+                                                <mat-option value="3">其他</mat-option>
+                                            </mat-select>
+                                        </mat-form-field>
                                         <!-- 如果类型是多行文本 -->
-                                        <textarea *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}"></textarea>
+                                        <textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}"></textarea>
                                         <span style="color: red;"  *ngIf="i.required">*</span>
                                         <div *ngIf="i.isshowrule" style="    position: absolute;
                                         left: 205px;