[合并]合并代码

src/app/http-interceptors/base-interceptor.ts

@@ -6,9 +6,8 @@ import {
 import { throwError } from 'rxjs'
 import { catchError, retry } from 'rxjs/operators';
 import { Router,ActivatedRoute } from '@angular/router'
-
 import {CacheTokenService} from './cache-token.service'
-import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import { CookieService } from 'ngx-cookie-service';
 
 //baseurl
@@ -62,6 +61,12 @@ export class BaseInterceptor implements HttpInterceptor {
         duration: 3000
       });
     }
+    if (error.status === 400) {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('请核对您的输入格式是否正确','确定',config);
+    }
 
     if (error.error instanceof ErrorEvent) {
       // 发生客户端或网络错误。相应处理。

src/app/ui/basicinfo/basicinfo.component.ts

@@ -51,6 +51,7 @@ export class BasicinfoComponent implements OnInit {
     url: `/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,   
     method: "POST",    
     itemAlias: "uploadedfile",
+    autoUpload: false,
     removeAfterUpload:true //上传之后是否在队列中移除，如果不移除就会出现无法上传第二次的情况
   });
     
@@ -865,7 +866,7 @@ export class BasicinfoComponent implements OnInit {
       this.imgsrc = `/api/Objects/PlanPlatform/${this.objectName}?x-oss-process=image/resize,m_fill,h_170,w_299`
       this.isspinner = false
       this.PartNumberETag = []
-      this.file = null
+      this.uploader.clearQueue(); //清空input控件文件
     })
   }
   //删除具体建筑
@@ -1113,7 +1114,13 @@ export class BasicinfoComponent implements OnInit {
           alert("自定义信息保存失败")
         })
       }
-      if(item.buildtype !="石油化工类" && item.buildtype !="地铁类"){
+      
+
+      
+      
+
+
+      if(item.buildtype != "石油化工类" && item.buildtype != "地铁类"){
         this.houses[key].buildingBasicGroups[0].propertyInfos.forEach(item => {
           for (const key in value) {
             if(item.propertyName == key){