Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

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

@@ -531,6 +531,9 @@ export class CriminalRecordsAdminComponent implements OnInit {
     // OilUnloadingProcessComponent
     if (!item.violateImage && !item.violateVideo) {
       this.message.create('warning', '没有预警照片或视频！');
+    } else {
+      if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
+        this.message.create('warning', item.desc);
       } else {
         const modal = this.modal.create({
           nzContent: GetOutOfLineDetailsComponent,
@@ -554,8 +557,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
         });
         const instance = modal.getContentComponent();
       }
-
-
+    }
   }
 
 

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

@@ -512,6 +512,9 @@ export class CriminalRecordsComponent implements OnInit {
 
     if (!item.violateImage && !item.violateVideo) {
       this.message.create('warning', '没有预警照片或视频！');
+    } else {
+      if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
+        this.message.create('warning', item.desc);
       } else {
         const modal = this.modal.create({
           nzContent: GetOutOfLineDetailsComponent,
@@ -535,9 +538,7 @@ export class CriminalRecordsComponent implements OnInit {
         });
         const instance = modal.getContentComponent();
       }
-
-
-
+    }
   }
 
   goOilList() {

src/app/pages/home-page/home-page.component.ts

@@ -655,9 +655,9 @@ export class HomePageComponent implements OnInit {
   isOpenModel: boolean = false
 
   look(item) {
-    console.log(item)
+    // console.log(item)
     if (item.notification.data.eventSystemName == '灭火器维护' || item.notification.data.eventSystemName == '证照预警') {
-      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
+      this.message.create('warning', item.notification.data.desc);
     } else {
       this.isOpenModel = true
       let data = {

src/app/pages/home/home.component.ts

@@ -106,15 +106,16 @@ export class HomeComponent implements OnInit {
 
   modalData
   look(item) {
-    if (item.notification.data.properties.EventSystemName == '灭火器维护' || item.notification.data.properties.EventSystemName == '证照预警') {
-      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
-    } else {
     let params = {
       id: item.notification.entityId
     }
     this.http.get('/api/services/app/ViolateRecord/Get', {
       params: params
     }).subscribe((data: any) => {
+      // console.log(data)
+      if (item.notification.data.properties.EventSystemName == '灭火器维护' || item.notification.data.properties.EventSystemName == '证照预警') {
+        this.message.create('warning', data.result.desc);
+      } else {
         const modal = this.modal.create({
           nzContent: GetOutOfLineDetailsComponent,
           nzWrapClassName: "vertical-center-modal",
@@ -142,10 +143,9 @@ export class HomeComponent implements OnInit {
           }
         })
         this.readMess(item.notification.id)
-      })
-
       }
 
+    })
   }
 
   //标记为已读

src/app/pages/today-warning-admin/today-warning-admin.component.ts

@@ -162,7 +162,7 @@ export class TodayWarningAdminComponent implements OnInit {
   isVisible=false
   look(item) {
     if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
-      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
+      this.message.create('warning', item.desc);
     } else {
       const modal = this.modal.create({
         nzContent: GetOutOfLineDetailsComponent,

src/app/pages/today-warning/today-warning.component.ts

@@ -113,8 +113,9 @@ export class TodayWarningComponent implements OnInit {
 
 
   look(item) {
+    console.log(item)
     if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
-      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
+      this.message.create('warning', item.desc);
     } else {
       const modal = this.modal.create({
         nzContent: GetOutOfLineDetailsComponent,