Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

src/app/app.component.ts

@@ -28,6 +28,7 @@ export class AppComponent {
             }
           ).subscribe(
             (data: Data) => {
+              sessionStorage.setItem("token",data.token);
               this.cookieService.set("token",data.token,null,'/');
               this.cookieService.set("refreshToken",data.refreshToken,null,'/');
               this.token.startUp()

src/app/http-interceptors/cache-token.service.ts

@@ -5,38 +5,28 @@ import { CookieService } from 'ngx-cookie-service';
 @Injectable({
   providedIn: 'root'
 })
-
 export class CacheTokenService {
 
   constructor(private http:HttpClient,private cookieService: CookieService) { }
 
   public timer;
-  public settime = null;
 
   //刷新token令牌定时器
   startUp = ():void=>{
-    // this.getmenus();
-    this.timer = window.setInterval(
-      ()=>{
-        window.clearInterval(this.settime)
+    window.clearInterval(this.timer)
+    this.timer = window.setInterval( ()=>{
       var token = this.cookieService.get("token");
       var refreshToken = this.cookieService.get("refreshToken");
-        this.http.post(
-          '/api/CompanyAccount/RefreshToken', 
-          {
+      this.http.post('/api/CompanyAccount/RefreshToken', {
           token: token,
           refreshToken: refreshToken
-          }
-        ).subscribe(
-          (data:any) => {
+        }).subscribe( (data:any) => {
+          sessionStorage.setItem("token",data.token);
           this.cookieService.set("token",data.token,null,'/');
           this.cookieService.set("refreshToken",data.refreshToken,null,'/');
+      })
+    } ,18*60*1000)
   }
-        )
-      }  
-    ,18*60*1000)
-  }
-  
 
 
 
@@ -51,5 +41,4 @@ export class CacheTokenService {
     var newtime = time.substr(0,4) + '年' + time.substr(5,2) + '月' + time.substr(8,2) + '日' + time.substr(11,8)
   }
 
-  
 }

src/app/pages/login/login.component.ts

@@ -30,6 +30,7 @@ export class LoginComponent implements OnInit {
         password: e.password}).subscribe(
       (data: Data) => 
         {
+          sessionStorage.setItem("token",data.token);
           this.cookieService.set("token",data.token,null,'/');
           this.cookieService.set("refreshToken",data.refreshToken,null,'/');
           this.router.navigate(['/datacollection/basicinfo'])

src/app/ui/fire-fighting-device/fire-fighting-device.component.html

@@ -15,50 +15,53 @@
             <mat-accordion multi>
               <mat-expansion-panel disabled>
                 <mat-expansion-panel-header>
-                  <label class="textContent"></label>
+                  <label class="firstContent"></label>
                   <label class="textContent">项目</label>
                   <label class="textContent">照片</label>
+                  <label class="totalContent">总数</label>
                   <label class="lastTextContent">主要情况</label>
                 </mat-expansion-panel-header>
               </mat-expansion-panel>
 
               <mat-expansion-panel *ngFor="let items of item.facilityItems" disabled [expanded]=items.expanded>
                 <mat-expansion-panel-header>
-                  <label class="textContent">
+                  <label class="firstContent">
                     <mat-checkbox (change)='checkedCompany($event,item,items)' [disabled]='items.isBuiltin'></mat-checkbox>
                   </label>
                   <label class="textContent">{{items.name}}</label>
                   <label class="textContent"><a href="javascript:void(0)" (click)='previewImg(items)'>查看图片</a></label>
+                  <label class="totalContent">{{items.total ? items.total : '总数: 0'}}</label>
 
-                  <label class="lastTextContent" *ngIf="items.isBuiltin">{{items.details}}</label>
-                  <label class="lastTextContent" *ngIf="!items.isBuiltin">
-                    <input type="text" [(ngModel)]="items.details" style="width: 80%;">
+                  <label class="lastTextContent">
+                    <textarea maxlength="250" [(ngModel)]="items.details" style="width: 80%;"></textarea>
                   </label>
 
                   <label><mat-icon (click)='SwitchBoard(items)' *ngIf="items.isBuiltin">keyboard_arrow_down</mat-icon></label>
                 </mat-expansion-panel-header>
 
+                <div class="overflowTable">
                   <div class="detailsTable">
                     <table>
                       <tr>
                         <th *ngFor="let header of items.header">{{header}}</th>
                       </tr>
                       <tr *ngFor="let body of items.body">
-                      <td *ngFor="let header of items.header">{{body[header]}}</td>
+                        <td *ngFor="let header of items.header">{{body[header]? body[header] : '暂无数据'}}</td>
                       </tr>
                     </table>
                   </div>
                   <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
-                  <p style="text-align: center; font-size: 16px; margin: 5px 0;">{{tableMsg.name}}</p>
+                    <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p>
                     <table>
                       <tr>
                         <th *ngFor="let header of tableMsg.header">{{header}}</th>
                       </tr>
                       <tr *ngFor="let body of tableMsg.body">
-                      <td *ngFor="let header of tableMsg.header">{{body[header]}}</td>
+                        <td *ngFor="let header of tableMsg.header">{{body[header]? body[header] : '暂无数据'}}</td>
                       </tr>
                     </table>
                   </div>
+                </div>
               </mat-expansion-panel>
   
             </mat-accordion>
@@ -106,50 +109,53 @@
             <mat-accordion multi>
               <mat-expansion-panel disabled>
                 <mat-expansion-panel-header>
-                  <label class="textContent"></label>
+                  <label class="firstContent"></label>
                   <label class="textContent">项目</label>
                   <label class="textContent">照片</label>
+                  <label class="totalContent">总数</label>
                   <label class="lastTextContent">主要情况</label>
                 </mat-expansion-panel-header>
               </mat-expansion-panel>
 
               <mat-expansion-panel *ngFor="let items of item.facilityItems" disabled [expanded]=items.expanded>
                 <mat-expansion-panel-header>
-                  <label class="textContent">
+                  <label class="firstContent">
                     <mat-checkbox (change)='checkedCompany($event,item,items)' [disabled]='items.isBuiltin'></mat-checkbox>
                   </label>
                   <label class="textContent">{{items.name}}</label>
                   <label class="textContent"><a href="javascript:void(0)" (click)='previewBuildingImg(newItem,items)'>查看图片</a></label>
+                  <label class="totalContent">{{items.total ? items.total : '总数: 0'}}</label>
 
-                  <label class="lastTextContent" *ngIf="items.isBuiltin">{{items.details}}</label>
-                  <label class="lastTextContent" *ngIf="!items.isBuiltin">
-                    <input type="text" [(ngModel)]="items.details" style="width: 80%;">
+                  <label class="lastTextContent">
+                    <textarea maxlength="250" [(ngModel)]="items.details" style="width: 80%;"></textarea>
                   </label>
 
                   <label><mat-icon (click)='SwitchBuildingBoard(newItem,items)' *ngIf="items.isBuiltin">keyboard_arrow_down</mat-icon></label>
                 </mat-expansion-panel-header>
                 
+                <div class="overflowTable">
                   <div class="detailsTable">
                     <table>
                       <tr>
                         <th *ngFor="let header of items.header">{{header}}</th>
                       </tr>
                       <tr *ngFor="let body of items.body">
-                      <td *ngFor="let header of items.header">{{body[header]}}</td>
+                        <td *ngFor="let header of items.header">{{body[header]? body[header] : '暂无数据'}}</td>
                       </tr>
                     </table>
                   </div>
                   <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
-                  <p style="text-align: center; font-size: 16px; margin: 5px 0;">{{tableMsg.name}}</p>
+                    <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name : '暂无名称'}}</p>
                     <table>
                       <tr>
                         <th *ngFor="let header of tableMsg.header">{{header}}</th>
                       </tr>
                       <tr *ngFor="let body of tableMsg.body">
-                      <td *ngFor="let header of tableMsg.header">{{body[header]}}</td>
+                        <td *ngFor="let header of tableMsg.header">{{body[header]? body[header] : '暂无数据'}}</td>
                       </tr>
                     </table>
                   </div>
+                </div>
               </mat-expansion-panel>
   
             </mat-accordion>

src/app/ui/fire-fighting-device/fire-fighting-device.component.scss

@@ -4,7 +4,7 @@
   padding: 10px;
   overflow-y: auto;
   .contentBox {
-    width: 75%;
+    width: 90%;
     height: 100%;
     margin: 0 auto;
     overflow-y: auto;
@@ -18,21 +18,33 @@
 
 
 //可展开面板每一行css
+.mat-expansion-panel-header {
+  padding: 3px 24px;
+}
+
+.firstContent {
+  width: 3%;
+}
 .textContent {
-  width: 15%;
+  width: 12%;
   color: black;
   text-align: center;
   overflow: hidden;    
   text-overflow:ellipsis;    
   white-space: nowrap;
 }
-.lastTextContent {
-  width: 50%;
+.totalContent {
+  width: 25%;
+  color: black;
+  text-align: center;
+  white-space: pre-line;
+  max-height: 48px;
+  overflow-y: auto;
+}
+.lastTextContent { //textarea多行文本
+  width: 45%;
   color: black;
   text-align: center;
-  overflow: hidden;    
-  text-overflow:ellipsis;    
-  white-space: nowrap;
 }
 input {
   height: 22px;
@@ -44,34 +56,44 @@ a {
   color: #0000ff;
 }
 
+
+
 //bottom用户输入框
 .InputField {
   display: inline-block;
   width: 40%;
   text-align: right;
   margin: 10px 25px;
-  input {width: 300px;}
+  input {width: 60%;}
   label {margin-right: 10px;}
 }
 textarea {
   vertical-align: middle;
   border-radius: 5px;
   padding: 5px;
-  width: 300px;
+  width: 60%;
   height: 36px;
   resize: none;
 }
 
+
+
 //表格样式
-.detailsTable {
+.overflowTable {
   width: 95%;
-  margin: 0 auto 10px;
+  margin: 0 auto;
   max-height: 300px;
   overflow-y: auto;
+}
+.detailsTable {
+  margin: 10px 0;
   table {
     width: 100%;
     text-align: center;
     border-collapse:collapse;
+    word-break:break-all; 
+    word-wrap:break-all;
+    table-layout:fixed;
     th {
       height: 35px;
       border: 1px solid #999;}
@@ -81,15 +103,19 @@ textarea {
   }
 }
 
+
+
 //滚动条样式
 ::-webkit-scrollbar{
-  width: 8px;
+  width: 5px;
   background-color: white;
 }
 ::-webkit-scrollbar-thumb{
   background-color: #999;
 }
 
+
+
 //img图片列表页面
 .imageList {
   width: 100%;

src/app/ui/fire-fighting-device/fire-fighting-device.component.ts

@@ -47,11 +47,13 @@ export class FireFightingDeviceComponent implements OnInit {
           this.companyEachDetails = data[0].eachDetails
           this.companyBuiltInGrouping.forEach(element => { //循环单位内置分组项
             element.selectBuiltInGrouping = []
-            element.facilityItems.forEach(elements => {
+            element.facilityItems.forEach((elements,index) => {
+              elements.total = element.facilityCount[index]
               elements.expanded = false});
           });
         }) //http
       } //if
+
     })
   }
 
@@ -66,27 +68,24 @@ export class FireFightingDeviceComponent implements OnInit {
   //保存单位消防设施内置分组项
   editCompanyGrouping(e) {
     let header = {groupId:e.id}
-    if (e.facilityItems[e.facilityItems.length-1].isBuiltin) {
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
-      this.snackBar.open('数据更新成功','确定',config);
-    } else {
     let data = []
     e.facilityItems.forEach((element,index) => {
-        if (!element.isBuiltin) {
-          data.push(element)
+      let msg = {
+        isBuiltin: element.isBuiltin,
+        details: element.details,
+        name: element.name,
+        isEachFloor: element.isEachFloor,
+        order: element.order}
+      data.push(msg)
       if (index==e.facilityItems.length-1) {
         this.http.post('/api/CompanyAccount/CompanyFacilityItems/Batch',data,{params:header}).subscribe(data=>{
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-              this.snackBar.open('数据更新成功','确定',config);   })
-          } //if
-
-        } //if
+          this.snackBar.open('数据更新成功','确定',config);
+        }) }
     }); //forEach
-    }
+  
   }
 
   //checked单位消防设施内置分组项时
@@ -151,36 +150,60 @@ export class FireFightingDeviceComponent implements OnInit {
         let data = this.companyEachDetails[e.name]
         if (data) {
           e.loopTable = []
-          for (let key in data) {
-            let tableMsg = {name:data[key][0].sitePlanName, header:[], body:[]}
-            data[key][0].propertyInfos.forEach(element => { //表头
-              if (element.propertyType!=3) {tableMsg.header.push(element.propertyName)}
+          data.forEach(item => {
+            let tableMsg = {name:item.name, header:[], body:[]}
+            item.assets[0].propertyInfos.forEach(element => { //表头
+              if (element.propertyType!=3) {
+                let unit = element.physicalUnit? '('+ element.physicalUnit +')' : '' //单位
+                tableMsg.header.push(element.propertyName+unit)}
             });
-            data[key].forEach(element => { //表格内容
+            item.assets.forEach(element => { //表格内容
               let everyBody = {}
               element.propertyInfos.forEach((elements,index) => {
-                if (elements.propertyType!=3 && elements.propertyType!=6) { everyBody[elements.propertyName] = elements.propertyValue+elements.physicalUnit }
-                if (elements.propertyType==6) { everyBody[elements.propertyName] = elements.propertyValue=='1'?'是':'否' }
-              });
+                if (elements.propertyType!=3 && elements.propertyName!='图片' && elements.propertyType!=6) { 
+                  let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                  everyBody[elements.propertyName+unit] = elements.propertyValue }
+                if (elements.propertyType==6) { 
+                  let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                  everyBody[elements.propertyName+unit] = elements.propertyValue=='1'?'是':'否' }
+                if (elements.propertyType!=3 && elements.propertyName=='图片') { 
+                  let imgLength = []
+                  element.propertyInfos.find(item=>{ if(item.propertyType==3){imgLength.push(item)} })
+                  let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                  everyBody[elements.propertyName+unit] = String(imgLength.length) } 
+
+              }); //propertyInfos
               tableMsg.body.push(everyBody)
-            });
+            }); //assets
             e.loopTable.push(tableMsg)
-          }
+          });
 
-        } //有对应信息时
+        } //data有数据时
       } else { //非逐层统计时
         let data = this.companyDetails[e.name]
         if (data) { 
           e.header = []
           e.body = []
           data[0].propertyInfos.forEach(element => { //表头
-            if (element.propertyType!=3) {e.header.push(element.propertyName)}
+            if (element.propertyType!=3) {
+              let unit = element.physicalUnit? '('+ element.physicalUnit +')' : '' //单位
+              e.header.push(element.propertyName+unit)}
           });
           data.forEach(element => { //表格内容
             let everyBody = {}
             element.propertyInfos.forEach((elements,index) => {
-              if (elements.propertyType!=3 && elements.propertyType!=6) { everyBody[elements.propertyName] = elements.propertyValue+elements.physicalUnit }
-              if (elements.propertyType==6) { everyBody[elements.propertyName] = elements.propertyValue=='1'?'是':'否' }
+              if (elements.propertyType!=3 && elements.propertyName!='图片' && elements.propertyType!=6) { 
+                let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                everyBody[elements.propertyName+unit] = elements.propertyValue }
+              if (elements.propertyType==6) { 
+                let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                everyBody[elements.propertyName+unit] = elements.propertyValue=='1'?'是':'否' }
+              if (elements.propertyType!=3 && elements.propertyName=='图片') { 
+                let imgLength = []
+                element.propertyInfos.find(item=>{ if(item.propertyType==3){imgLength.push(item)} })
+                let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                everyBody[elements.propertyName+unit] = String(imgLength.length) }
+
             });
             e.body.push(everyBody)
           });
@@ -213,13 +236,16 @@ export class FireFightingDeviceComponent implements OnInit {
         element.buildingOptionalGroups = data[0].summary.buildingOptionalGroups
         element.buildingDetails = data[0].details
         element.buildingEachDetails = data[0].eachDetails
-        element.buildingFacilityGroups.forEach(elements => { //循环每个建筑内置分组项
+        element.buildingFacilityGroups.forEach((elements) => { //循环每个建筑内置分组项
           elements.selectBuiltInGrouping = []
-          elements.facilityItems.forEach(newElement => { newElement.expanded = false });
+          elements.facilityItems.forEach((newElement,index) => { 
+            newElement.total = elements.facilityCount[index]
+            newElement.expanded = false });
         });
       })
 
     });
+
   }
 
   //创建建筑消防设施内置分组项
@@ -234,27 +260,24 @@ export class FireFightingDeviceComponent implements OnInit {
   //保存建筑消防设施内置分组项
   editBuildingGrouping (e,item) {
     let header = {buildingId:e.id, groupId:item.id}
-    if (item.facilityItems[item.facilityItems.length-1].isBuiltin) {
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
-      this.snackBar.open('数据更新成功','确定',config);
-    } else {
     let data = []
     item.facilityItems.forEach((element,index) => {
-        if (!element.isBuiltin) {
-          data.push(element)
+      let msg = {
+        isBuiltin: element.isBuiltin,
+        details: element.details,
+        name: element.name,
+        isEachFloor: element.isEachFloor,
+        order: element.order}
+      data.push(msg)
       if (index==item.facilityItems.length-1) {
         this.http.post('/api/CompanyAccount/BuildingFacilityItems/Batch',data,{params:header}).subscribe(data=>{
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-              this.snackBar.open('数据更新成功','确定',config); })
-          } //if
-
-        } //if
+          this.snackBar.open('数据更新成功','确定',config);
+        }) }
     }); //forEach
-    }
+
   }
 
   //删除建筑消防设施内置分组项
@@ -310,36 +333,60 @@ export class FireFightingDeviceComponent implements OnInit {
         let data = item.buildingEachDetails[e.name]
         if (data) {
           e.loopTable = []
-          for (let key in data) {
-            let tableMsg = {name:data[key][0].buildingAreaName, header:[], body:[]}
-            data[key][0].propertyInfos.forEach(element => { //表头
-              if (element.propertyType!=3) {tableMsg.header.push(element.propertyName)}
+          data.forEach(item => {
+            let tableMsg = {name:item.name, header:[], body:[]}
+            item.assets[0].propertyInfos.forEach(element => { //表头
+              if (element.propertyType!=3) {
+                let unit = element.physicalUnit? '('+ element.physicalUnit +')' : '' //单位
+                tableMsg.header.push(element.propertyName+unit)}
             });
-            data[key].forEach(element => { //表格内容
+            item.assets.forEach(element => { //表格内容
               let everyBody = {}
               element.propertyInfos.forEach((elements,index) => {
-                if (elements.propertyType!=3 && elements.propertyType!=6) { everyBody[elements.propertyName] = elements.propertyValue+elements.physicalUnit }
-                if (elements.propertyType==6) { everyBody[elements.propertyName] = elements.propertyValue=='1'?'是':'否' }
-              });
+                if (elements.propertyType!=3 && elements.propertyName!='图片' && elements.propertyType!=6) { 
+                  let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                  everyBody[elements.propertyName+unit] = elements.propertyValue }
+                if (elements.propertyType==6) { 
+                  let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                  everyBody[elements.propertyName+unit] = elements.propertyValue=='1'?'是':'否' }
+                if (elements.propertyType!=3 && elements.propertyName=='图片') { 
+                  let imgLength = []
+                  element.propertyInfos.find(item=>{ if(item.propertyType==3){imgLength.push(item)} })
+                  let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                  everyBody[elements.propertyName+unit] = String(imgLength.length) }
+
+              }); //propertyInfos
               tableMsg.body.push(everyBody)
-            });
+            }); //assets
             e.loopTable.push(tableMsg)
-          }
+          });
           
-        } //有对应信息时
+        } //data有数据时
       } else { //非逐层统计时
         let data = item.buildingDetails[e.name]
         if (data) { 
           e.header = []
           e.body = []
           data[0].propertyInfos.forEach(element => { //表头
-            if (element.propertyType!=3) {e.header.push(element.propertyName)}
+            if (element.propertyType!=3) {
+              let unit = element.physicalUnit? '('+ element.physicalUnit +')' : '' //单位
+              e.header.push(element.propertyName+unit)}
           });
           data.forEach(element => { //表格内容
             let everyBody = {}
             element.propertyInfos.forEach((elements,index) => {
-              if (elements.propertyType!=3 && elements.propertyType!=6) { everyBody[elements.propertyName] = elements.propertyValue+elements.physicalUnit }
-              if (elements.propertyType==6) { everyBody[elements.propertyName] = elements.propertyValue=='1'?'是':'否' }
+              if (elements.propertyType!=3 && elements.propertyName!='图片' && elements.propertyType!=6) { 
+                let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                everyBody[elements.propertyName+unit] = elements.propertyValue }
+              if (elements.propertyType==6) { 
+                let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                everyBody[elements.propertyName+unit] = elements.propertyValue=='1'?'是':'否' }
+              if (elements.propertyType!=3 && elements.propertyName=='图片') { 
+                let imgLength = []
+                element.propertyInfos.find(item=>{ if(item.propertyType==3){imgLength.push(item)} })
+                let unit = elements.physicalUnit? '('+ elements.physicalUnit +')' : '' //单位
+                everyBody[elements.propertyName+unit] = String(imgLength.length) }
+
             });
             e.body.push(everyBody)
           });
@@ -359,15 +406,16 @@ export class FireFightingDeviceComponent implements OnInit {
       if (newData) {
         let data = {name:e.name, images:[]}
         let imgName 
-        for (let key in newData) {
-          newData[key].forEach(element => {
+        newData.forEach(item => {
+          item.assets.forEach(element => {
             element.propertyInfos.forEach( elements => { 
               if (elements.propertyName.includes('名称')) {imgName = elements.propertyValue}
-              if (elements.propertyType==3) {
+              if (elements.propertyType===3) {
                elements.propertyName = imgName
                data.images.push(elements)} });
           });
-        } //for
+        }); //newDate
+
         if (data.images.length) {
           let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗
         } else {
@@ -390,7 +438,7 @@ export class FireFightingDeviceComponent implements OnInit {
         newData.forEach(element => {
           element.propertyInfos.forEach(elements => { 
             if (elements.propertyName.includes('名称')) {imgName = elements.propertyValue}
-            if (elements.propertyType==3) {
+            if (elements.propertyType===3) {
               elements.propertyName = imgName
               data.images.push(elements)} });
         });
@@ -419,15 +467,16 @@ export class FireFightingDeviceComponent implements OnInit {
       if (newData) {
         let data = {name:e.name, images:[]}
         let imgName
-        for (let key in newData) {
-          newData[key].forEach(element => {
-            element.propertyInfos.forEach(elements => { 
+        newData.forEach(item => {
+          item.assets.forEach(element => {
+            element.propertyInfos.forEach( elements => { 
               if (elements.propertyName.includes('名称')) {imgName = elements.propertyValue}
-              if (elements.propertyType==3) {
+              if (elements.propertyType===3) {
                elements.propertyName = imgName
                data.images.push(elements)} });
           });
-        } //for
+        }); //newDate
+      
         if (data.images.length) {
           let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗
         } else {
@@ -450,9 +499,10 @@ export class FireFightingDeviceComponent implements OnInit {
         newData.forEach(element => {
           element.propertyInfos.forEach(elements => { 
             if (elements.propertyName.includes('名称')) {imgName = elements.propertyValue}
-            if (elements.propertyType==3) 
+            if (elements.propertyType===3) {
               elements.propertyName = imgName
-            {data.images.push(elements)} });
+              data.images.push(elements)} 
+            });
         });
         if (data.images.length) {
           let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗

src/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="zh-CN">
 <head>
   <meta charset="utf-8">
   <title>数据采集平台</title>

src/styles.scss

@@ -57,6 +57,9 @@ table td.mat-footer-cell:last-of-type{
   height: 100%;
   overflow-y: auto;
 }
+.mat-content { //可展开面板垂直居中
+  align-items: center;
+}
 
 //x轴滚动条隐藏
 .example-sidenav-content {