[完善]推送消息增加确定框

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

@@ -27,7 +27,6 @@ export class BaseInterceptor implements HttpInterceptor {
     }
     req = req.clone({ params });
     // debugger
-    //     console.log('xxxxxx',req)
     let newReq = req.clone({
       url: req.hadBaseurl ? `${req.url}` : `${req.url}`,
     });
@@ -84,7 +83,12 @@ export class BaseInterceptor implements HttpInterceptor {
       this.message.create('error', `请核对您的输入信息或格式是否正确!`);
     }
     if (error.status === 500) {
-      this.message.create('error', `状态500,服务器错误!`);
+      if (error.error.error.code == 404) {
+        this.message.create('error', error.error.error.message);
+      } else {
+        this.message.create('error', `500!`);
+      }
+
     }
     if (error.error instanceof ErrorEvent) {
       // 发生客户端或网络错误。相应处理。

src/app/pages/criminal-records-admin/criminal-records-admin.component.ts

@@ -232,7 +232,6 @@ export class CriminalRecordsAdminComponent implements OnInit {
     this.list = []
     this.SkipCount = '0'
     this.getViolateRecordList()
-    // this.getAggregations()
   }
 
   resetForm(e: MouseEvent): void {
@@ -373,8 +372,6 @@ export class CriminalRecordsAdminComponent implements OnInit {
         },
         nzFooter: null,
         nzOnOk: async () => {
-          console.log('推送成功了！！！', item)
-
           for (let index = 0; index < this.list.length; index++) {
             const element = this.list[index];
             if (element.id == item.id) {
@@ -383,10 +380,6 @@ export class CriminalRecordsAdminComponent implements OnInit {
               this.SkipCount = String(Number(this.SkipCount) - 1)
             }
           }
-          // this.list = []
-          // this.SkipCount = '0'
-          // this.getViolateRecordList()
-          console.log(this.totalCount)
         }
       });
       const instance = modal.getContentComponent();

src/app/pages/get-out-of-line-details/get-out-of-line-details.component.ts

@@ -35,19 +35,28 @@ export class GetOutOfLineDetailsComponent implements OnInit {
   isMisinformationLoading = false
   //推送
   push() {
-    this.isPushLoading = true
-    let body = {
-      id: this.data.id,
-      positive: true
-    }
-    this.http.post('/api/services/app/ViolateRecordVerification/VerifyViolateRecord', body).subscribe(data => {
-      this.message.create('success', '处置成功！');
-      this.isPushLoading = false
-      this.initialModal.triggerOk()
-    }, err => {
-      this.message.create('error', '处置失败！请联系管理员');
-      this.isPushLoading = false
-    })
+    this.modal.confirm({
+      nzTitle: '确定推送该预警吗?',
+      nzOkText: '确定',
+      nzOkType: 'danger',
+      nzOnOk: () => {
+        this.isPushLoading = true
+        let body = {
+          id: this.data.id,
+          positive: true
+        }
+        this.http.post('/api/services/app/ViolateRecordVerification/VerifyViolateRecord', body).subscribe(data => {
+          this.message.create('success', '处置成功！');
+          this.isPushLoading = false
+          this.initialModal.triggerOk()
+        }, err => {
+          this.message.create('error', '处置失败！请联系管理员');
+          this.isPushLoading = false
+        })
+      },
+      nzCancelText: '取消',
+      nzOnCancel: () => console.log('Cancel')
+    });
   }
   //误报
   misinformation() {