From 80165dca80fcd014ad208dfa2e7bf58ca8f781eb Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 9 Apr 2022 14:48:21 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=A2=9E=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../criminal-records-admin.component.html       |  3 ++-
 .../criminal-records-admin.component.scss       | 14 ++++++++++++++
 .../criminal-records-admin.component.ts         | 17 +++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
index 7e60d8b..6bf9952 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
@@ -141,8 +141,9 @@
         </div>
         <div class="tbody" id="tbody">
           <div nz-row class="tr" *ngFor="let item of list;let key = index">
-            <div nz-col nzSpan="1" style="text-align: center;">
+            <div nz-col nzSpan="1" style="text-align: center;position: relative;">
               <span>{{key + 1}}</span>
+              <span class="new" *ngIf="item.isNewMessage">新</span>
             </div>
             <div nz-col nzSpan="2">
               <img style="margin-left: 18px;" *ngIf="item.violation.level == 1" src="../../../assets/images/level1.png"
diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss
index 33965e7..1ef398e 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss
@@ -289,6 +289,20 @@
             width: 36px;
           }
 
+          .new {
+            position: absolute;
+            right: 0;
+            top: 10px;
+            display: inline-block;
+            background: rgb(255, 56, 82);
+            width: 20px;
+            height: 20px;
+            border-radius: 4px;
+            line-height: 20px;
+            text-align: center;
+            font-size: 14px;
+            color: white;
+          }
         }
       }
     }
diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
index 3b5f685..4078961 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
@@ -111,7 +111,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
       ViolateArea: this.validateForm.value.site,
       OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
       IsContainsChildren: 'true',
-      IsCensored: 'false',
+      CanCensor: 'true',
       // IsHandled: disposalState,
       ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
       SkipCount: this.SkipCount,
@@ -147,7 +147,20 @@ export class CriminalRecordsAdminComponent implements OnInit {
   }
   reloadPage = (userNotification) => {
     console.log('abp.notifications.received收到通知', userNotification);
-    
+    console.log('违规记录列表', this.list)
+    let params = {
+      id: userNotification.notification.entityId
+    }
+    this.http.get('/api/services/app/ViolateRecordCensorship/Get', {
+      params: params
+    }).subscribe((data: any) => {
+      data.result.isNewMessage = true
+      this.list.unshift(data.result)
+      this.message.create('success', '收到一条新预警！');
+      this.totalCount = String(Number(this.totalCount) + 1)
+      this.SkipCount = String(Number(this.SkipCount) + 1)
+      console.log('新获取一条', data.result)
+    })
   };
   ngOnDestroy() {
     console.log('退出')