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

src/app/ui/allaround/allaround.component.html

@@ -29,7 +29,7 @@
           </div>
         </div>
 
-        <p style="width: 100%;text-align: center;" *ngIf="!AllAdjoining.length">暂无数据,请前往平面图进行相关数据录入</p>
+        <p style="width: 100%;text-align: center;margin-top: 25px;" *ngIf="!AllAdjoining.length">暂无数据,请前往平面图进行相关数据录入</p>
       </div>
     </mat-tab>
 
@@ -60,7 +60,7 @@
           </div>
         </div>
 
-        <p style="width: 100%;text-align: center;" *ngIf="!item.allImgs.length">暂无数据,请前往平面图进行相关数据录入</p>
+        <p style="width: 100%;text-align: center;margin-top: 25px;" *ngIf="!item.allImgs.length">暂无数据,请前往平面图进行相关数据录入</p>
       </div>
     </mat-tab>
 

src/app/ui/allaround/allaround.component.scss

@@ -9,11 +9,12 @@
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  margin: 25px;
+  align-items:center;
+  justify-content:center;
   .imgBox{
     width: 300px;
     height: 230px;
-    margin: 0 35px 35px 0;
+    margin: 25px 35px 35px 35px;
     display: inline-block;
     position: relative;
     .fixedImg {

src/app/ui/changepassword/changepassword.component.scss

@@ -7,7 +7,7 @@
     width: 300px;
 }
 .group-error-content {
-    font-size: 8px;
+    font-size: 12px;
     color: red;
 }
 .mat-dialog-content {

src/app/ui/function-division/function-division.component.html

@@ -34,8 +34,9 @@
             <th mat-header-cell *matHeaderCellDef>面积</th>
             <td mat-cell *matCellDef="let element">
               <mat-form-field class="example-full-width">
-                <input matInput type="number" [(ngModel)]="element.area">
+                <input matInput type="number" [(ngModel)]="element.area" onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" placeholder="请输入正整数">
               </mat-form-field>
+              <label style="margin-left: 5px;">m²</label>
             </td>
           </ng-container>
   
@@ -82,8 +83,9 @@
             <th mat-header-cell *matHeaderCellDef>面积</th>
             <td mat-cell *matCellDef="let element">
               <mat-form-field class="example-full-width">
-                <input matInput type="number"  [(ngModel)]="element.area">
+                <input matInput type="number"  [(ngModel)]="element.area" onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" placeholder="请输入正整数">
               </mat-form-field>
+              <label style="margin-left: 5px;">m²</label>
             </td>
           </ng-container>
   

src/app/ui/realistic-picture/realistic-picture.component.html

@@ -25,7 +25,7 @@
           <span class="title" *ngIf="selectReal">{{selectReal.name}}</span>
           <button mat-raised-button color="primary" class="uploadFileFixed" *ngIf="!isLoading">
             上传图片
-            <input type="file" class="uploadFile" (change)='uploadFile($event)' ng2FileSelect [uploader]="uploader">
+            <input type="file" id="uploadFile" class="uploadFile" (change)='uploadFile($event)' ng2FileSelect [uploader]="uploader">
           </button>
           <button mat-raised-button color="primary" style="margin-left: 15px;" (click)='download()'>批量下载</button>
           <button mat-raised-button color="primary" style="margin-left: 15px;" *ngIf="isDownload && !isLoading" (click)='batchDownload()'>下载</button>

src/app/ui/realistic-picture/realistic-picture.component.ts

@@ -295,6 +295,7 @@ export class RealisticPictureComponent implements OnInit {
       realityImageGroupId: this.selectReal.id,
     }
     this.http.post('/api/CompanyAccount/RealityImages',data).subscribe(data=>{
+      (<HTMLInputElement>document.getElementById('uploadFile')).value = null //清空input框缓存
       this.getAllRealPicture()
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
@@ -359,7 +360,7 @@ export class previewImg {
   ngOnInit(): void {
     this.allImages = this.data.allImages
     this.allImages.forEach(element => {
-      element.previewImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/resize,m_fill,h_700,w_1200` //处理图片URL地址
+      element.previewImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}` //处理图片URL地址
     });
   }