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

src/app/app.module.ts

@@ -16,8 +16,9 @@ import { NzMessageModule } from 'ng-zorro-antd/message';
     AppComponent,
   ],
   imports: [
-    BrowserModule,
     AppRoutingModule,
+    BrowserModule,
+
     BrowserAnimationsModule,
     PagesModule,
     FormsModule,

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

@@ -867,12 +867,11 @@ export class HomePageComponent implements OnInit {
         nzWrapClassName: "vertical-center-modal",
         nzViewContainerRef: this.viewContainerRef,
         nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+        nzClosable: false,
+        nzClassName: 'modelnobg',
         nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
           'border-radius': '0px',
           'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
         },
         nzComponentParams: {
           data: data

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

@@ -18,6 +18,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { DisposeequipmentComponent } from '../records/warning-statistics-list/disposeequipment/disposeequipment.component';
 import { SelectedMenu } from 'src/app/service/selectedMenu.service';
 import { Location } from "@angular/common";
+import { SystemModelComponent } from './system-model/system-model.component';
 @Component({
   selector: 'app-home',
   templateUrl: './home.component.html',
@@ -383,12 +384,11 @@ export class HomeComponent implements OnInit {
             nzWrapClassName: "vertical-center-modal",
             nzViewContainerRef: this.viewContainerRef,
             nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+            nzClosable: false,
+            nzClassName: 'modelnobg',
             nzBodyStyle: {
-              'border': '1px solid #6d9cc7',
               'border-radius': '0px',
               'padding': '0px',
-              'box-shadow': '0 0 8px 0 #fff',
-              'background': '#000D21',
             },
             nzComponentParams: {
               data: copydata
@@ -500,13 +500,11 @@ export class HomeComponent implements OnInit {
       for (let k = 0; k < this.tap.length; k++) {
         if (this.tap[k] == this.menu3[index].name) {
           this.menuList2.push(this.menu3[index])
-
         }
-
       }
-
     }
-    this.router.navigate([this.menuList2[0].url])
+    // this.router.navigate([this.menuList2[0].url])
+    window.open(this.menuList2[0].url)
   }
   goback() {
     this.router.navigate(['/plan'])

src/app/pages/home/system-model/system-model.component.html

@@ -0,0 +1,3 @@
+<div class="box">
+    <iframe [src]="url" frameborder="0" width="100%" height="100%"></iframe>
+</div>

src/app/pages/home/system-model/system-model.component.scss

@@ -0,0 +1,6 @@
+.box{
+    width: 100%;
+    height: 600px;
+    border: 1px solid #6d9cc7;
+    box-shadow: 0 0 8px 0 #fff
+}

src/app/pages/home/system-model/system-model.component.ts

@@ -0,0 +1,18 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-system-model',
+  templateUrl: './system-model.component.html',
+  styleUrls: ['./system-model.component.scss']
+})
+export class SystemModelComponent implements OnInit {
+  @Input() url: any
+
+  constructor() { }
+
+  ngOnInit(): void {
+
+    console.log(this.url)
+  }
+
+}

src/app/pages/pages.module.ts

@@ -88,11 +88,11 @@ import { WarningStatisticsListComponent } from './records/warning-statistics-lis
 import { RecordsNavComponent } from './records/records-nav/records-nav.component';
 import { UserDetailsComponent } from './audit/audit-ing/user-details/user-details.component';
 import { AppealDetailsComponent } from './audit/audit-ing/appeal-details/appeal-details.component';
-
+import { SystemModelComponent } from './home/system-model/system-model.component';
 @NgModule({
   declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
     TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
-    AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName],
+    AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName, SystemModelComponent],
 
 
   imports: [

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

@@ -794,12 +794,11 @@ export class CriminalRecordsAdminComponent implements OnInit {
         nzWrapClassName: "vertical-center-modal",
         nzViewContainerRef: this.viewContainerRef,
         nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+        nzClosable: false,
+        nzClassName: 'modelnobg',
         nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
           'border-radius': '0px',
           'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
         },
         nzComponentParams: {
           data: item

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

@@ -758,12 +758,11 @@ export class CriminalRecordsComponent implements OnInit {
         nzWrapClassName: "vertical-center-modal",
         nzViewContainerRef: this.viewContainerRef,
         nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+        nzClosable: false,
+        nzClassName: 'modelnobg',
         nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
           'border-radius': '0px',
           'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
         },
         nzComponentParams: {
           data: item

src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts

@@ -3,7 +3,6 @@ import { Component, OnInit, ViewContainerRef, ElementRef } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import * as echarts from 'echarts';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { GetOutOfLineDetailsComponent } from '../../today-warning/get-out-of-line-details/get-out-of-line-details.component';
 import * as moment from 'moment';
 import { fromEvent } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';

src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts

@@ -627,12 +627,11 @@ export class WarningStatisticsListComponent implements OnInit {
         nzWrapClassName: "vertical-center-modal",
         nzViewContainerRef: this.viewContainerRef,
         nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+        nzClosable: false,
+        nzClassName: 'modelnobg',
         nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
           'border-radius': '0px',
           'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
         },
         nzComponentParams: {
           data: item

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

@@ -347,12 +347,11 @@ export class TodayWarningAdminComponent implements OnInit {
         nzWrapClassName: "vertical-center-modal",
         nzViewContainerRef: this.viewContainerRef,
         nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+        nzClosable: false,
+        nzClassName: 'modelnobg',
         nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
           'border-radius': '0px',
           'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
         },
         nzComponentParams: {
           data: item

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

@@ -1,6 +1,6 @@
-<div class="box">
+<div class="box" cdkDrag>
   <div class="titlebox">
-    <div class="title">
+    <div class="title" cdkDragHandle>
       <div (click)="contentType('img')" [ngClass]="{'selected': selectedType == 'img'}">
         预警截图
         <div class="border"></div>
@@ -11,6 +11,9 @@
         <div class="border"></div>
       </div>
     </div>
+    <div class="close" (click)="closeModel()">
+      <i nz-icon nzType="close" nzTheme="outline"></i>
+    </div>
   </div>
   <div class="details">
     预警详情：{{details}}

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

@@ -7,6 +7,8 @@
   flex-direction: column;
   background-image: linear-gradient(#003B6E, #000D21);
   position: relative;
+  border: 1px solid #6d9cc7;
+  box-shadow: 0 0 8px 0 #fff
 }
 
 .titlebox {
@@ -15,6 +17,7 @@
   background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%);
   display: flex;
   align-items: center;
+  position: relative;
 
   .title {
     width: 100%;
@@ -52,6 +55,16 @@
 
     }
   }
+
+  .close {
+    position: absolute;
+    right: 18px;
+    top: 18px;
+    cursor: pointer;
+    i {
+      font-size: 18px;
+    }
+  }
 }
 
 .details {
@@ -111,7 +124,7 @@
     .btn {
       display: flex;
       align-items: center;
-      
+
       span {
         margin: 0 4px;
         display: inline-block;

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

@@ -16,7 +16,7 @@ import Viewer from 'viewerjs';
 export class GetOutOfLineDetailsComponent implements OnInit {
   @Input() data: any
 
-  constructor(private objectsSrv: ObjectsSimpleService, private fb: FormBuilder, private http: HttpClient, private message: NzMessageService, private modal: NzModalService, private initialModal: NzModalRef, private sanitizer: DomSanitizer) { }
+  constructor(private objectsSrv: ObjectsSimpleService, private fb: FormBuilder, private http: HttpClient, private message: NzMessageService, private modal: NzModalService, private initialModal: NzModalRef, private sanitizer: DomSanitizer,private openmodal: NzModalRef) { }
 
 
   imgUrl: string
@@ -289,4 +289,8 @@ export class GetOutOfLineDetailsComponent implements OnInit {
       this.message.create('warning', '申诉撤销失败，请联系管理员！');
     })
   }
+
+  closeModel(){
+    this.openmodal.close()
+  }
 }

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

@@ -305,17 +305,17 @@ export class TodayWarningComponent implements OnInit {
       });
       const instance = modal.getContentComponent();
     } else {
+      console.log(777777777777)
       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,
+        nzClosable: false,
+        nzClassName: 'modelnobg',
         nzBodyStyle: {
-          'border': '1px solid #6d9cc7',
           'border-radius': '0px',
           'padding': '0px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background': '#000D21',
         },
         nzComponentParams: {
           data: item
@@ -334,6 +334,10 @@ export class TodayWarningComponent implements OnInit {
         }
       });
       const instance = modal.getContentComponent();
+      modal.afterOpen.subscribe(() => {
+        console.log(9999999999999999)
+      });
+      modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
     }
 
   }

src/theme.less

@@ -657,6 +657,12 @@
   justify-content: center;
 }
 
+.modelnobg {
+  .ant-modal-content {
+    background: none;
+  }
+}
+
 .vertical-center-modal .ant-modal {
   top: 0;
 }
@@ -771,8 +777,9 @@
     }
   }
 }
-.WarningEvents{
+
-  .ant-modal-close-x{
+.WarningEvents {
+  .ant-modal-close-x {
     color: #000;
   }
-}
+}