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

package.json

@@ -80,4 +80,4 @@
     "tslint": "~5.15.0",
     "typescript": "~3.7.5"
   }
-}
+}

src/app/babylon/controller/config-manager.ts

@@ -43,8 +43,8 @@ export class ConfigManager {
             case FacilityType.QY:
             case FacilityType.TPBZ:
             case FacilityType.DWBZ:
-            // case FacilityType.JY_JYJ://临时
+                // case FacilityType.JY_JYJ://临时
-            case FacilityType.JY_YG://临时
+                // case FacilityType.JY_YG://临时
                 result = true;
 
                 break;
@@ -82,9 +82,9 @@ export class ConfigManager {
             case FacilityType.TPBZ: result = "图片"; break;
             case FacilityType.DWBZ: result = "点位"; break;
             //内建
-            case FacilityType.XF_MHQ_PT_4: result = "4kg普通灭火器"; break;
+            case FacilityType.XF_MHQ_PT_4: result = "4kg二氧化碳灭火器"; break;
-            case FacilityType.XF_MHQ_PT_8: result = "8kg普通灭火器"; break;
+            case FacilityType.XF_MHQ_PT_8: result = "8kg二氧化碳灭火器"; break;
-            case FacilityType.XF_MHQ_PT_35: result = "35kg普通灭火器"; break;
+            case FacilityType.XF_MHQ_PT_35: result = "35kg二氧化碳灭火器"; break;
             case FacilityType.XF_MHQ_GF_4: result = "4kg干粉灭火器"; break;
             case FacilityType.XF_MHQ_GF_8: result = "8kg干粉灭火器"; break;
             case FacilityType.XF_MHQ_GF_25: result = "25kg干粉灭火器"; break;
@@ -154,7 +154,7 @@ export class ConfigManager {
         [MarkType.YGCSJ, "油罐车司机"],
         [MarkType.XFSD, "消防沙(堆)"],
         [MarkType.XFSQ, "消防沙(圈)"],
-        [MarkType.PTMHQ, "普通灭火器"],
+        [MarkType.PTMHQ, "二氧化碳灭火器"],
         [MarkType.GFMHQ, "干粉灭火器"],
         [MarkType.TCMHQ, "推车灭火器"],
         [MarkType.ZYMBRQ, "专用密闭容器"],

src/app/babylon/controller/mode-manager.ts

@@ -23,7 +23,7 @@ export class ModeManager {
     /**
      * 制作模式代表内部编辑人员，可新增单位、上传模型，查看模式代表交付的模式
      */
-    public static s_isMakeMode = true;
+    public static s_isMakeMode = false;
 
     /**
      * 调试模式

src/app/babylon/controller/scene-manager.ts

@@ -431,7 +431,7 @@ export class SceneManager {
     if (ev.altKey && ev.key == 'd' && ModeManager.isDebug) {
       SceneManager.showDebug = !SceneManager.showDebug;
       if (SceneManager.showDebug) {
-        SceneManager.Instance.scene.debugLayer.show();
+        SceneManager.Instance.scene.debugLayer.show({ embedMode: true });
       } else {
         SceneManager.Instance.scene.debugLayer.hide();
       }

src/app/babylon/model/data/model-data/model-data-facility.ts

@@ -158,15 +158,15 @@ export enum FacilityType {
     //模型内置
 
     /**
-     * 普通灭火器 - 4kg
+     * 二氧化碳灭火器 - 4kg
      */
     XF_MHQ_PT_4 = "XF_MHQ_PT_4",
     /**
-     * 普通灭火器 - 8kg
+     * 二氧化碳灭火器 - 8kg
      */
     XF_MHQ_PT_8 = "XF_MHQ_PT_8",
     /**
-     * 普通灭火器 - 35kg (手推)
+     * 二氧化碳灭火器 - 35kg (手推)
      */
     XF_MHQ_PT_35 = "XF_MHQ_PT_35",
     /**

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

@@ -56,7 +56,8 @@ export class BaseInterceptor implements HttpInterceptor {
     if (error.status === 401 || error.status === 614) {
       this.token.delete()
       sessionStorage.clear()
-      window.localStorage.clear()
+      // window.localStorage.clear()
+      localStorage.removeItem("isautologin")
       this.cookieService.set("token", '', new Date(new Date().getTime() + 1), '/')
       this.cookieService.set("refreshToken", '', new Date(new Date().getTime() + 1), '/')
       this.message.create('error', `用户认证信息过期,请重新登录!`);

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

@@ -5,6 +5,7 @@ import * as echarts from 'echarts';
 import * as moment from 'moment';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component';
+import { NzMessageService } from 'ng-zorro-antd/message';
 @Component({
   selector: 'app-home-page',
   templateUrl: './home-page.component.html',
@@ -12,7 +13,7 @@ import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-d
 })
 export class HomePageComponent implements OnInit {
 
-  constructor(private http: HttpClient, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
+  constructor(private http: HttpClient, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService) { }
 
   warningechartpie//预警饼图
   warningechartpieOption = {
@@ -75,7 +76,7 @@ export class HomePageComponent implements OnInit {
                 textShadowColor: '#8df',
                 textShadowBlur: 3,
                 color: '#fff',
-               
+
               },
               active: {
                 fontSize: 14,
@@ -272,10 +273,10 @@ export class HomePageComponent implements OnInit {
     violationType: {
       violationTypeAgg: []
     },
-    dev:{
+    dev: {
-      stationCount:'',
+      stationCount: '',
-      violationCount:'',
+      violationCount: '',
-      cameraCount:''
+      cameraCount: ''
     }
   }
   totalCount
@@ -641,36 +642,43 @@ export class HomePageComponent implements OnInit {
   isOpenModel: boolean = false
 
   look(item) {
-    this.isOpenModel = true
+    console.log(item)
-    let data = {
+    if (item.notification.data.eventSystemName == '灭火器维护' || item.notification.data.eventSystemName == '证照预警') {
-      violateImage: item.notification.data.violateImage,
+      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
-      violateVideo: item.notification.data.violateVideo
+    } else {
+      this.isOpenModel = true
+      let data = {
+        violateImage: item.notification.data.violateImage,
+        violateVideo: item.notification.data.violateVideo
+      }
+      const modal = this.modal.create({
+        nzContent: GetOutOfLineDetailsComponent,
+        nzViewContainerRef: this.viewContainerRef,
+        nzWidth: 1200,
+        nzBodyStyle: {
+          'border': '1px solid #6d9cc7',
+          'border-radius': '0px',
+          'padding': '0px',
+          'box-shadow': '0 0 8px 0 #fff',
+          'background': '#000D21',
+        },
+        nzComponentParams: {
+          data: data
+        },
+        nzFooter: null,
+        nzOnOk: async () => {
+
+        }
+      });
+      const instance = modal.getContentComponent();
+      modal.afterClose.subscribe(result => {
+        this.isOpenModel = false
+        this.rollStart()
+      });
+      this.readMess(item.notification.id)
     }
-    const modal = this.modal.create({
-      nzContent: GetOutOfLineDetailsComponent,
-      nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 1200,
-      nzBodyStyle: {
-        'border': '1px solid #6d9cc7',
-        'border-radius': '0px',
-        'padding': '0px',
-        'box-shadow': '0 0 8px 0 #fff',
-        'background': '#000D21',
-      },
-      nzComponentParams: {
-        data: data
-      },
-      nzFooter: null,
-      nzOnOk: async () => {
 
-      }
+
-    });
-    const instance = modal.getContentComponent();
-    modal.afterClose.subscribe(result => {
-      this.isOpenModel = false
-      this.rollStart()
-    });
-    this.readMess(item.notification.id)
   }
 
   //标记为已读

src/app/pages/home/home.component.html

@@ -87,4 +87,8 @@
             忽略
         </div>
     </div>
-</ng-template>
+</ng-template>
+<!-- 
+<nz-modal [(nzVisible)]="isVisible">
+    <app-get-out-of-line-details [data]="modalData"></app-get-out-of-line-details>
+</nz-modal> -->

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

@@ -85,7 +85,7 @@ export class HomeComponent implements OnInit {
 
   }
 
-  reloadPage =  (userNotification) => {
+  reloadPage = (userNotification) => {
     console.log('abp.notifications.received收到通知', userNotification);
     this.receiptOfNotification(userNotification)
   };
@@ -102,42 +102,49 @@ export class HomeComponent implements OnInit {
     }
     this.messageId.push(obj)
   }
+  isVisible = false
 
+  modalData
   look(item) {
-    let params = {
+    if (item.notification.data.properties.EventSystemName == '灭火器维护' || item.notification.data.properties.EventSystemName == '证照预警') {
-      id: item.notification.entityId
+      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
-    }
+    } else {
-    this.http.get('/api/services/app/ViolateRecord/Get', {
+      let params = {
-      params: params
+        id: item.notification.entityId
-    }).subscribe((data: any) => {
+      }
-      const modal = this.modal.create({
+      this.http.get('/api/services/app/ViolateRecord/Get', {
-        nzContent: GetOutOfLineDetailsComponent,
+        params: params
-        nzViewContainerRef: this.viewContainerRef,
+      }).subscribe((data: any) => {
-        nzWidth: 1200,
+        const modal = this.modal.create({
-        nzBodyStyle: {
+          nzContent: GetOutOfLineDetailsComponent,
-          'border': '1px solid #6d9cc7',
+          nzViewContainerRef: this.viewContainerRef,
-          'border-radius': '0px',
+          nzWidth: 1200,
-          'padding': '0px',
+          nzBodyStyle: {
-          'box-shadow': '0 0 8px 0 #fff',
+            'border': '1px solid #6d9cc7',
-          'background': '#000D21',
+            'border-radius': '0px',
-        },
+            'padding': '0px',
-        nzComponentParams: {
+            'box-shadow': '0 0 8px 0 #fff',
-          data: data.result
+            'background': '#000D21',
-        },
+          },
-        nzFooter: null,
+          nzComponentParams: {
-        nzOnOk: async () => {
+            data: data.result
-
+          },
-        }
+          nzFooter: null,
-      });
+          nzOnOk: async () => {
-      const instance = modal.getContentComponent();
+
-      this.messageId.forEach((element) => {
+          }
-        if (element.id == item.notification.entityId) {
+        });
-          this.notificationService.remove(element.messageId)
+        const instance = modal.getContentComponent();
-        }
+        this.messageId.forEach((element) => {
+          if (element.id == item.notification.entityId) {
+            this.notificationService.remove(element.messageId)
+          }
+        })
+        this.readMess(item.notification.id)
       })
-    })
 
-    this.readMess(item.notification.id)
+    }
+
   }
 
   //标记为已读

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

@@ -159,34 +159,33 @@ export class TodayWarningAdminComponent implements OnInit {
   }
 
 
-
+  isVisible=false
   look(item) {
-    let type
+    if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
-    if (item.violation.violationType.indexOf('卸油')) {
+      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
-      type = 1
     } else {
-      type = 0
+      const modal = this.modal.create({
+        nzContent: GetOutOfLineDetailsComponent,
+        nzViewContainerRef: this.viewContainerRef,
+        nzWidth: 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 modal = this.modal.create({
-      nzContent: GetOutOfLineDetailsComponent,
-      nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 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();
   }
 
   dispose(item) {

src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html

@@ -13,12 +13,6 @@
     </div>
     <div class="content">
         <div *ngIf="selectedType == 'img'" class="imgbox">
-            <!-- <div class="imglist">
-                <span class="imglisttitle">截图列表</span>
-                <div class="img">
-                    <img src="../../../../assets/images/bgImg.jpg" alt="">
-                </div>
-            </div> -->
             <div class="bigimg">
                 <img [src]="imgUrl" alt="">
             </div>

src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss

@@ -98,6 +98,7 @@
     }
 
     .bigimg {
+      // min-width: 1149px;
       flex: 1;
       box-sizing: border-box;
       padding-left: 13px;

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

@@ -113,32 +113,30 @@ export class TodayWarningComponent implements OnInit {
 
 
   look(item) {
-    let type
+    if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
-    if (item.violation.violationType.indexOf('卸油')) {
+      this.message.create('warning', `证照或者器材即将临期，请联系加油站处理！`);
-      type = 1
     } else {
-      type = 0
+      const modal = this.modal.create({
-    }
+        nzContent: GetOutOfLineDetailsComponent,
-    const modal = this.modal.create({
+        nzViewContainerRef: this.viewContainerRef,
-      nzContent: GetOutOfLineDetailsComponent,
+        nzWidth: 1200,
-      nzViewContainerRef: this.viewContainerRef,
+        nzBodyStyle: {
-      nzWidth: 1200,
+          'border': '1px solid #6d9cc7',
-      nzBodyStyle: {
+          'border-radius': '0px',
-        'border': '1px solid #6d9cc7',
+          'padding': '0px',
-        'border-radius': '0px',
+          'box-shadow': '0 0 8px 0 #fff',
-        'padding': '0px',
+          'background': '#000D21',
-        'box-shadow': '0 0 8px 0 #fff',
+        },
-        'background': '#000D21',
+        nzComponentParams: {
-      },
+          data: item
-      nzComponentParams: {
+        },
-        data: item
+        nzFooter: null,
-      },
+        nzOnOk: async () => {
-      nzFooter: null,
-      nzOnOk: async () => {
 
-      }
+        }
-    });
+      });
-    const instance = modal.getContentComponent();
+      const instance = modal.getContentComponent();
+    }
   }
 
   dispose(item) {