From 8b71d276b8bed26730932e4b27e0ba0fb87c9311 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 21 Jan 2021 10:01:26 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E6=B6=88?=
 =?UTF-8?q?=E9=98=B2=E5=8A=9B=E9=87=8F=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-collection/data-collection.module.ts |   4 +-
 .../fire-force/fire-force.component.html      |  23 ++-
 .../fire-force/fire-force.component.scss      |  16 +-
 .../fire-force/fire-force.component.ts        | 158 ++++++++++++++++--
 .../fire-force/viewdetails.html               |   1 +
 .../basicinfo-look/basicinfo.component.html   |  32 +++-
 .../basicinfo/basicinfo.component.html        |  40 +++--
 .../collection-tools.component.html           |   4 +-
 src/styles.scss                               |   2 +-
 9 files changed, 228 insertions(+), 52 deletions(-)
 create mode 100644 src/app/data-collection/fire-force/viewdetails.html

diff --git a/src/app/data-collection/data-collection.module.ts b/src/app/data-collection/data-collection.module.ts
index e901e7e..ad38bdf 100644
--- a/src/app/data-collection/data-collection.module.ts
+++ b/src/app/data-collection/data-collection.module.ts
@@ -44,12 +44,12 @@ import {MatTreeModule} from '@angular/material/tree';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { DataCollectionRoutingModule } from './data-collection.routing';
 import { AddWater, WaterCollectionComponent } from './water-collection/water-collection.component';
-import { AddFireForce, FireForceComponent } from './fire-force/fire-force.component';
+import { AddFireForce, FireForceComponent, ViewDetails } from './fire-force/fire-force.component';
 import { LinkageForcesComponent } from './linkage-forces/linkage-forces.component';
 import { NzTreeModule } from 'ng-zorro-antd/tree';
 
 @NgModule({
-  declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent,AddWater,AddFireForce],
+  declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent,AddWater,AddFireForce,ViewDetails],
   imports: [
     CommonModule,
     A11yModule,
diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html
index bebd0d4..94191c0 100644
--- a/src/app/data-collection/fire-force/fire-force.component.html
+++ b/src/app/data-collection/fire-force/fire-force.component.html
@@ -108,7 +108,16 @@
         <div class="detailsbox" *ngIf="selectedFireForceLevel != null">
             <div class="masklayer" *ngIf="isMasklayer">
                 <mat-spinner [diameter]='30'></mat-spinner>
-                <span>上传中...</span>
+                <span>请等待...</span>
+            </div>
+            <div class="masklayer" *ngIf="isMasklayerUploading">
+                <mat-progress-bar class="progressbar" mode="determinate" [value]="progressBarValue"></mat-progress-bar>
+                <span>上传中...({{progressBarValue}}%)</span>
+                <button (click)="cancelUploading()" class="cancelbtn" mat-flat-button>取消上传</button>
+            </div>
+            <div class="masklayer" *ngIf="isMasklayerDownload">
+                <mat-progress-bar class="progressbar" mode="determinate" [value]="progressBarValue"></mat-progress-bar>
+                <span>下载中...({{progressBarValue}}%)</span>
             </div>
             <div class="tabsbox">
                 <div class="tabs">
@@ -450,8 +459,8 @@
                             <span>
                                 管辖单位:
                             </span>
-                            <input disabled [(ngModel)]="selectedFireForce.name" class="smallwidth" type="text" placeholder="名称">
-                            <input disabled [(ngModel)]="selectedFireForce.code" class="smallwidth" type="text" placeholder="编号">
+                            <input disabled [(ngModel)]="superior.name" class="smallwidth" type="text" placeholder="名称">
+                            <input disabled [(ngModel)]="superior.code" class="smallwidth" type="text" placeholder="编号">
                         </mat-grid-tile>
                         <mat-grid-tile colspan='3' rowspan='1'>
                             <span>
@@ -537,9 +546,6 @@
                         </mat-grid-tile>
                     </mat-grid-list>
                 </div>
-                <div style="width: 100%;height: 22px;">
-
-                </div>
             </div>
             <!-- 车辆 -->
             <!-- <div class="contant" *ngIf="tabIndex == 2">
@@ -551,7 +557,8 @@
                     <mat-icon class="deleteFile" (click)="deleteFile(item,$event)">highlight_off</mat-icon>
                     <div class="imgbox">
                         <img *ngIf="item.fileName.split('.')[item.fileName.split('.').length-1] == 'png'
-                        || item.fileName.split('.')[item.fileName.split('.').length-1] == 'jpg'" 
+                        || item.fileName.split('.')[item.fileName.split('.').length-1] == 'jpg'
+                        || item.fileName.split('.')[item.fileName.split('.').length-1] == 'JPG'" 
                         class="thumbnailImg" src="/api/Objects/PlanPlatform/{{item.objectName}}" alt="">
                         <img *ngIf="item.fileName.split('.')[item.fileName.split('.').length-1] == 'docx'
                         || item.fileName.split('.')[item.fileName.split('.').length-1] == 'doc'" 
@@ -565,7 +572,7 @@
                     </div>
                     <span [title]="item.fileName">{{item.fileName}}</span>
                     <button (click)="clickFile(item)" class="btn btn1" mat-flat-button color="primary">查看</button>
-                    <button class="btn btn2" mat-flat-button color="primary">下载</button>
+                    <button (click)="download (item)" class="btn btn2" mat-flat-button color="primary">下载</button>
                 </div>
             </div>
         </div>
diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss
index e56576d..42dbcf1 100644
--- a/src/app/data-collection/fire-force/fire-force.component.scss
+++ b/src/app/data-collection/fire-force/fire-force.component.scss
@@ -356,7 +356,7 @@
         }
         .contant{
             width: 100%;
-            height:480px;
+            height:460px;
             overflow-y: auto;
             p{
                 color: #2196F3;
@@ -443,6 +443,7 @@
                     white-space: nowrap;
                     text-overflow: ellipsis;
                     color:  gray;
+                    font-size: 14px;
                 }
                 .deleteFile{
                     position: absolute;
@@ -461,10 +462,10 @@
                     display: none;
                 }
                 .btn1{
-                    top: 35px;
+                    top: 37px;
                 }
                 .btn2{
-                    top: 75px;
+                    top: 78px;
                 }
             }
             .fileDivBox:hover{
@@ -497,6 +498,15 @@
                 font-size: 14px;
                 margin-top: 5px;
             }
+            .progressbar{
+                width: 15%;
+            }
+            .cancelbtn{
+                height: 32px;
+                line-height: 32px;
+                font-size: 14px;
+                margin-top: 12px;
+            }
         }
     }
 }
diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts
index ea547cf..5784fa2 100644
--- a/src/app/data-collection/fire-force/fire-force.component.ts
+++ b/src/app/data-collection/fire-force/fire-force.component.ts
@@ -19,7 +19,7 @@ declare var AMap: any;
 export class FireForceComponent implements OnInit {
 
   constructor(private tree: TreeService,public snackBar: MatSnackBar,private http:HttpClient,private  elementRef: ElementRef,public renderer2: Renderer2,public dialog: MatDialog) { }
-  isMasklayer:boolean = false//遮罩层是否打开
+  
   isCheckedOfSearchDiv:boolean = true//列表过滤滑块
   slideChange(e){
     this.isCheckedOfSearchDiv = e.checked
@@ -146,7 +146,6 @@ export class FireForceComponent implements OnInit {
     this.isGisTopBox = false
     if(this.selectedFireForceId != node.id){
       this.clearData()
-     
       this.selectedFireForce = node
       this.selectedFireForceId = node.id
       if(node.forceType != 0){//如果是其他消防力量
@@ -158,6 +157,7 @@ export class FireForceComponent implements OnInit {
       if(this.newPositionMarker){
         this.map.remove(this.newPositionMarker);
       }
+
       if(node.fireForceDetailId){
         this.isPost = false//是否走post创建接口
         let type
@@ -166,7 +166,9 @@ export class FireForceComponent implements OnInit {
         }else{
           type = 1
         }
+        this.isMasklayer = true
         this.http.get(`/api/FireForceDetail/${type}/${node.id}`).subscribe((data:any) => {
+          this.isMasklayer = false
           this.FireForceDetailInfo = data
           if(data.location && data.location.x){//如果已经标注单位坐标
             console.log('开始标注')
@@ -207,6 +209,14 @@ export class FireForceComponent implements OnInit {
         
         this.map.setCity('上海市');
       }
+
+      //寻找管辖单位
+      this.allFireForceList.forEach(item => {
+        if(item.id == node.parentId){
+          this.superior.name = item.name
+          this.superior.code = item.code
+        }
+      })
     }
   }
   //搜索
@@ -270,7 +280,7 @@ export class FireForceComponent implements OnInit {
     let isDelete = window.confirm(`确定要删除${item.name}吗`)
     if(isDelete){
       this.http.delete(`/api/CustomFireForce/${item.id}`).subscribe(data => {
-        const config = new MatSnackBarConfig();
+        let config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
         this.snackBar.open('删除成功','确定',config);
@@ -363,10 +373,6 @@ export class FireForceComponent implements OnInit {
   clearData(){
     this.deletedFile = []//清空相关资料已删除缓存
     this.AttachmentArr = []//清空相关资料
-    this.superior = {
-      name:'',
-      code:''
-    }
     this.positionLngLat = {x:'',y:''}
     this.FireForceDetailInfo = {
       // id:'',//编号
@@ -707,14 +713,19 @@ export class FireForceComponent implements OnInit {
   AttachmentArr:any = []//上传附件地址集合
   uploadId:any//分块上传id
   objectName:any
+  progressBarValue:any = 0//分块上传进度
+  isMasklayer:boolean = false//圆圈遮罩层是否打开
+  isMasklayerUploading:boolean = false//上传进度条遮罩层是否打开
+  isMasklayerDownload:boolean = false//下载进度条遮罩层是否打开
   uploadAttachment(e){
     console.log('选择的文件',e)
     this.file = e.target.files[0] || null //上传的文件
     let file = e.target.files[0] || null //获取上传的文件
     let fileSize = file.size || null //上传文件的总大小
     let shardSize = 5 * 1024 * 1024 //5MB一个分片
-    this.isMasklayer = true
+    
     if (file && fileSize<=shardSize) { //上传文件<=5MB时
+      this.isMasklayer = true
       console.log('file',this.file)
       let formData = new FormData()
       formData.append("file",file)
@@ -729,8 +740,13 @@ export class FireForceComponent implements OnInit {
         this.AttachmentArr.push(obj)
         this.isMasklayer = false
         console.log('上传成功',data)
+        let config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('上传成功','确定',config);
       })
     } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传
+      this.isMasklayerUploading = true
       let data = {filename: file.name}
       this.http.post(`/api/NewMultipartUpload/PlanPlatform/FireForce/${this.selectedFireForce.id}`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传
         console.log('初始化分块上传成功',data)
@@ -741,14 +757,13 @@ export class FireForceComponent implements OnInit {
     }
   }
   PartNumberETag:any=[]; //每次返回需要保存的信息
+
   //开始分段上传
   async subsectionUploading () {
-    
     let file = this.file || null //获取上传的文件
     let fileSize = file.size || null //上传文件的总大小
     let shardSize = 5 * 1024 * 1024 //5MB一个分片
     let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段
-
     for (let i = 0;i < allSlice;i++) { //循环分段上传
         let start = i * shardSize //切割文件开始位置
         let end = Math.min(fileSize, start + shardSize); //切割文件结束位置
@@ -766,9 +781,10 @@ export class FireForceComponent implements OnInit {
           })
         });
         this.PartNumberETag.push(result)
-        // this.uploadProgress = Number((i/allSlice).toFixed(2))*100
+        // this.progressBarValue = Number((i/allSlice).toFixed(2))*100
+        this.progressBarValue = this.accMul(Number((i/allSlice).toFixed(2))*100,1,0)
         if (this.PartNumberETag.length === allSlice) {
-          // this.uploadProgress = 100
+          this.progressBarValue = 100
           this.endUploading()}
     }//for循环
 
@@ -786,11 +802,90 @@ export class FireForceComponent implements OnInit {
         fileLength:this.file.size
       }
       this.AttachmentArr.push(obj)
-      console.log('完成分块上传',data)
-      this.isMasklayer = false
+      this.isMasklayerUploading = false//关闭进度条遮罩层
+      this.progressBarValue = 0//重置进度数
+      let config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('上传成功','确定',config);
     })
   }
 
+  //取消分块上传
+  cancelUploading() {
+    this.http.delete(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data=>{
+      this.progressBarValue = 0;
+      this.isMasklayerUploading= false
+      this.PartNumberETag =[] //清空保存返回的信息
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('取消上传成功','确定',config);
+    })
+  }
+
+  //下载
+  download (e) {
+    this.isMasklayerDownload = true //开启下载进度条
+    let file = e //传递过来的文件元数据
+    let fileSize = file.fileLength //下载文件的总大小
+    let shardSize = 3 * 1024 * 1024 //文件大小是否大于10MB
+    if (file && fileSize<=shardSize) { //<=3MB时直接下载
+      this.progressBarValue = 60
+      this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`,{responseType: 'blob'},).subscribe(data=>{
+        let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址
+        let link = document.createElement("a");
+        link.style.display = "none";
+        link.href = url;
+        let fileName = e.fileName ? e.fileName : e.objectName.split('/')[e.objectName.split('/').length-1]
+        link.setAttribute("download", fileName);
+        document.body.appendChild(link);
+        link.click();
+        this.isMasklayerDownload = false //关闭下载进度条
+        this.progressBarValue = 0 //初始化进度条
+      })
+    } else if (file && fileSize>shardSize) { //>3MB时分块下载
+      this.blockingDownload(e) //分段下载
+    }
+
+  }
+
+  //分段下载并合并
+  async blockingDownload (e) {
+    let file = e //传递过来的文件元数据
+    let fileSize = file.fileLength //下载文件的总大小
+    let shardSize = 3 * 1024 * 1024 //3MB一个分片
+    let allSlice = Math.ceil(fileSize / shardSize) //总文件/3MB===共分多少段
+    let allFile:any = [] //所有的file分段
+
+    for (let i=0;i<allSlice;i++) {
+      let start = i * shardSize //每次下载文件开始位置
+      let end = Math.min(fileSize, start + shardSize-1); //每次下载文件结束为止
+
+      let result =  await new Promise ((result,reject)=>{
+        this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`,{headers:{'range':`bytes= ${start}-${end}`},responseType:'blob'}).subscribe(data=>{
+          result(data) }) 
+      })
+      allFile.push(result)
+      // this.progressBarValue = Number((i/allSlice).toFixed(2))*100 //文件进度数
+      this.progressBarValue = this.accMul(Number((i/allSlice).toFixed(2))*100,1,0)
+      if (allFile.length === allSlice) { //合并文件输出给浏览器
+        let url = window.URL.createObjectURL(new Blob(allFile)); //createObjectURL创建一个下载Blob的url地址
+        let link = document.createElement("a");
+        link.style.display = "none";
+        link.href = url;
+        let fileName = e.fileName ? e.fileName : e.objectName.split('/')[e.objectName.split('/').length-1]
+        link.setAttribute("download", fileName);
+        document.body.appendChild(link);
+        link.click();
+        this.isMasklayerDownload = false //关闭下载进度条
+        this.progressBarValue = 0 //初始化进度条
+      }
+
+    } //for循环结束
+
+  }
+
   //删除图片
   deletedFile:any = []
   deleteFile(item,e){
@@ -817,7 +912,7 @@ export class FireForceComponent implements OnInit {
   clickFile(item){
     console.log(item)
     let suffix = item.fileName.split('.')[item.fileName.split('.').length-1]
-    if(suffix == 'png' || suffix == 'jpg'){
+    if(suffix == 'png' || suffix == 'jpg' || suffix == 'JPG'){
       console.log('这是图片')
       let dom =  document.getElementById(`viewerjs`)
       let pObjs = dom.childNodes;
@@ -842,6 +937,13 @@ export class FireForceComponent implements OnInit {
       config.duration = 3000
       this.snackBar.open('暂不支持查看','确定',config);
     }
+    if(suffix == 'mp4'){
+      const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去
+        data: {item:item,type:"video"},
+        id:'videodialog'
+      });
+      dialogRef.afterClosed().subscribe();
+    }
   }
 }
 
@@ -876,4 +978,28 @@ export class AddFireForce {
     this.dialogRef.close(this.selectedFireForceTypeIndex)
   }
 
-}
\ No newline at end of file
+}
+
+//查看图片大图和视频
+@Component({
+  selector: 'viewdetails',
+  templateUrl: './viewdetails.html',
+  styleUrls: ['./fire-force.component.scss']
+})
+export class ViewDetails {
+  // myControl = new FormControl();
+  //注入MatDialogRef，可以用来关闭对话框
+  //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<ViewDetails>,@Inject(MAT_DIALOG_DATA) public data) {}
+  Url:string
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+  ngOnInit(): void {
+   this.Url = '/api/Objects/PlanPlatform/' + this.data.item.objectName
+  }
+  closeDialog(){
+    this.dialogRef.close();
+  }
+
+}
diff --git a/src/app/data-collection/fire-force/viewdetails.html b/src/app/data-collection/fire-force/viewdetails.html
new file mode 100644
index 0000000..7f1b9b4
--- /dev/null
+++ b/src/app/data-collection/fire-force/viewdetails.html
@@ -0,0 +1 @@
+<video autoplay controls *ngIf="data.type == 'video'" [src]="Url"></video>
diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.html b/src/app/key-unit/basicinfo-look/basicinfo.component.html
index 7ed3469..2cd6ccb 100644
--- a/src/app/key-unit/basicinfo-look/basicinfo.component.html
+++ b/src/app/key-unit/basicinfo-look/basicinfo.component.html
@@ -167,14 +167,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  readonly matInput  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  readonly matInput  name="{{i.propertyName}}{{www}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -182,9 +182,17 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                         <!-- 如果类型是耐火等级 -->
+                                         <mat-form-field *ngIf="i.propertyName == '耐火等级'">
+                                            <mat-select readonly 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 readonly  *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}{{key}}"></textarea>
+                                        <textarea readonly  *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;
@@ -249,14 +257,14 @@
 
                                         
                                          <!-- 如果类型是文本 -->
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
                                             <input readonly  matInput  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 readonly  matInput  name="{{i.propertyName}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -264,9 +272,17 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                         <!-- 如果类型是耐火等级 -->
+                                         <mat-form-field *ngIf="i.propertyName == '耐火等级'">
+                                            <mat-select readonly 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 readonly  *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}"></textarea>
+                                        <textarea readonly  *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;
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html
index 5e9f5f9..57c48e2 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.html
+++ b/src/app/key-unit/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  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  name="{{i.propertyName}}{{www}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -211,16 +211,24 @@
                                             >
                                             <!-- <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;
-                                        left: 205px;
-                                        top: 45px;
-                                        font-size: 11px;
-                                        color: red;">
+                                            left: 205px;
+                                            top: 45px;
+                                            font-size: 11px;
+                                            color: red;">
                                             <span>{{i.rulevalue}}</span>
                                         </div>
                                     </div>
@@ -278,14 +286,14 @@
 
                                         
                                          <!-- 如果类型是文本 -->
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
                                             <input matInput  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  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;
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index 3575416..58b9396 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -259,7 +259,7 @@
                   [(ngModel)]="sliderValue" (change)="assetAngleIunput()"  [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)"></mat-slider>
               </div>
             </div>
-            <!-- 如果是多点连线 -->
+            <!-- 如果是多点连线 或者 矢量图-->
             <div *ngIf="canvasAssetObj.InteractiveMode == 1 || canvasAssetObj.InteractiveMode == 3">
               <p>厚度</p>
               <div style="width: 100%;display: flex;vertical-align: top;height: 22px;">
@@ -374,8 +374,8 @@
                   <option value ="4" [selected]="item.PropertyValue ==4">消防</option>
                 </select>
               </div>
+            </div>
           </div>
-        </div>
         
         </div>
         <!-- 消防要素 -->
diff --git a/src/styles.scss b/src/styles.scss
index aee0200..2ef5a9e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -129,7 +129,7 @@ table td.mat-footer-cell:last-of-type{
 	
 }
 //弹出框样式取消padding
-#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater{
+#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater,#videodialog{
 	padding: 0;
 }