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

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

@@ -532,30 +532,32 @@ export class CriminalRecordsAdminComponent implements OnInit {
     if (!item.violateImage && !item.violateVideo) {
       this.message.create('warning', '没有预警照片或视频！');
     } else {
-      const modal = this.modal.create({
-        nzContent: GetOutOfLineDetailsComponent,
-        nzWrapClassName: "vertical-center-modal",
-        nzViewContainerRef: this.viewContainerRef,
-        nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
-        nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
-          'border-radius': '0px',
-          'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
-        },
-        nzComponentParams: {
-          data: item
-        },
-        nzFooter: null,
-        nzOnOk: async () => {
+      if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
+        this.message.create('warning', item.desc);
+      } else {
+        const modal = this.modal.create({
+          nzContent: GetOutOfLineDetailsComponent,
+          nzWrapClassName: "vertical-center-modal",
+          nzViewContainerRef: this.viewContainerRef,
+          nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+          nzBodyStyle: {
+            'border': '1px solid #6d9cc7',
+            'border-radius': '0px',
+            'padding': '0px',
+            'box-shadow': '0 0 8px 0 #fff',
+            'background': '#000D21',
+          },
+          nzComponentParams: {
+            data: item
+          },
+          nzFooter: null,
+          nzOnOk: async () => {
 
-        }
-      });
-      const instance = modal.getContentComponent();
+          }
+        });
+        const instance = modal.getContentComponent();
+      }
     }
-
-
   }
 
 

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

@@ -513,31 +513,32 @@ export class CriminalRecordsComponent implements OnInit {
     if (!item.violateImage && !item.violateVideo) {
       this.message.create('warning', '没有预警照片或视频！');
     } else {
-      const modal = this.modal.create({
-        nzContent: GetOutOfLineDetailsComponent,
-        nzWrapClassName: "vertical-center-modal",
-        nzViewContainerRef: this.viewContainerRef,
-        nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
-        nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
-          'border-radius': '0px',
-          'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
-        },
-        nzComponentParams: {
-          data: item
-        },
-        nzFooter: null,
-        nzOnOk: async () => {
+      if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
+        this.message.create('warning', item.desc);
+      } else {
+        const modal = this.modal.create({
+          nzContent: GetOutOfLineDetailsComponent,
+          nzWrapClassName: "vertical-center-modal",
+          nzViewContainerRef: this.viewContainerRef,
+          nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+          nzBodyStyle: {
+            'border': '1px solid #6d9cc7',
+            'border-radius': '0px',
+            'padding': '0px',
+            'box-shadow': '0 0 8px 0 #fff',
+            'background': '#000D21',
+          },
+          nzComponentParams: {
+            data: item
+          },
+          nzFooter: null,
+          nzOnOk: async () => {
 
-        }
-      });
-      const instance = modal.getContentComponent();
+          }
+        });
+        const instance = modal.getContentComponent();
+      }
     }
-
-
-
   }
 
   goOilList() {

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

@@ -410,7 +410,7 @@ export class HomePageComponent implements OnInit {
                 color: '#fff'
               },
               active: {
-                fontSize: document.documentElement.clientHeight < 750 ? 12 :  14,
+                fontSize: document.documentElement.clientHeight < 750 ? 12 : 14,
                 color: '#fff',
                 fontFamily: 'Microsoft YaHei',
               },
@@ -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 = {
@@ -668,7 +668,7 @@ export class HomePageComponent implements OnInit {
         nzContent: GetOutOfLineDetailsComponent,
         nzWrapClassName: "vertical-center-modal",
         nzViewContainerRef: this.viewContainerRef,
-        nzWidth: (document.documentElement.clientHeight<650 || document.documentElement.clientWidth<1400) ? 1000 : 1200,
+        nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
         nzBodyStyle: {
           'border': '1px solid #6d9cc7',
           'border-radius': '0px',

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

@@ -106,20 +106,21 @@ 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) => {
+    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",
           nzViewContainerRef: this.viewContainerRef,
-          nzWidth: (document.documentElement.clientHeight<650 || document.documentElement.clientWidth<1400) ? 1000 : 1200,
+          nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
           nzBodyStyle: {
             'border': '1px solid #6d9cc7',
             'border-radius': '0px',
@@ -142,10 +143,9 @@ export class HomeComponent implements OnInit {
           }
         })
         this.readMess(item.notification.id)
-      })
-
-    }
+      }
 
+    })
   }
 
   //标记为已读
@@ -266,7 +266,7 @@ export class HomeComponent implements OnInit {
   //修改密码
 
   changePassword() {
-    const modal:any = this.modal.create({
+    const modal: any = this.modal.create({
       nzTitle: '修改密码',
       nzContent: ChangePasswordComponent,
       nzViewContainerRef: this.viewContainerRef,
@@ -278,7 +278,7 @@ export class HomeComponent implements OnInit {
             this.message.create('warning', '两次密码输入不一致！');
             return false
           } else {
-            await new Promise((resolve,reject) => {
+            await new Promise((resolve, reject) => {
               let body = {
                 currentPassword: instance.validateForm.value.oldpassword,
                 newPassword: instance.validateForm.value.newpassword
@@ -287,7 +287,7 @@ export class HomeComponent implements OnInit {
                 resolve(data)
                 this.message.create('success', '修改成功！');
                 return true
-              },err=>{
+              }, err => {
                 this.message.create('warning', err.error.error.message);
                 modal.config.nzOkLoading = false
                 return false

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,