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

# Conflicts:
#	proxy.config.json

package.json

@@ -84,4 +84,4 @@
         "tslint": "~6.1.0",
         "typescript": "~4.5.2"
     }
-}
+}

proxy.config.json

@@ -1,17 +1,13 @@
 {
-    "/api": {
-        "测试": "http://121.36.37.70:8906",
-        "生产": "https://znaq.sinochemoilmarketing.com",
-        "target": "http://121.36.37.70:8906",
-        "secure": false,
-        "changeOrigin": true
-    },
-    "/signalr": {
-        "测试": "http://121.36.37.70:8906",
-        "生产": "https://znaq.sinochemoilmarketing.com",
-        "target": "http://121.36.37.70:8906",
-        "secure": false,
-        "ws": true,
-        "logLevel": "debug"
-    }
+  "/api": {
+    "target": "http://121.36.37.70:8906/",
+    "secure": false,
+    "changeOrigin": true
+  },
+  "/signalr": {
+    "target": "http://121.36.37.70:8906/",
+    "secure": false,
+    "ws": true,
+    "logLevel": "debug"
+  }
 }

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,16 @@ 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])
+    if (this.menuList2[0].url) {
+      window.open(this.menuList2[0].url)
+    } else {
+      this.message.create('warning', '未分配系统管理菜单');
+    }
+
   }
   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/login/login.component.ts

@@ -137,7 +137,7 @@ export class LoginComponent implements OnInit {
         sessionStorage.setItem("encryptedAccessToken", data.result.encryptedAccessToken);
         this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe(async (data: any) => {
           console.log('GetCurrentLoginInformations', data.result)
-          if (data.result.user.menus.length == 0 && data.result.user.userName != "admin") {
+          if (data.result.user.menus.length == 0) {
             this.message.create('error', `当前用户未分配菜单`);
             this.isLoading = false
             return
@@ -163,43 +163,47 @@ export class LoginComponent implements OnInit {
           this.rememberInfo()
           //自动登录
           this.autoLogin()
-          if (data.result.user.userName == 'admin') {
-            sessionStorage.setItem("isGasStation", 'false');
-            this.router.navigate(['/system/organization'])
+
+          if (data.result.user.organization.isGasStation) {
+            sessionStorage.setItem("isGasStation", 'true');
+            let a = sessionStorage.getItem('userdataOfgasstation')
+            let menuList = this.returnLastMenus(a, this.menu2)
+            let isTrue = menuList.find((item) => {
+              return item.name == "今日预警"
+            });
+            if (isTrue) {
+              this.router.navigate(['/todaywarning/petrolStation'])
+              sessionStorage.setItem('selectedMenu', '今日预警')
+            } else if (data.result.user.menus[0].name == "数字油站" && !this.init3D) {
+              this.router.navigate([menuList[1].url])
+              sessionStorage.setItem('selectedMenu', menuList[1].name)
+            } else if (menuList.length == 0) {
+              return this.message.create('warning', `当前用户未分配菜单`);
+            } else {
+              this.router.navigate([menuList[0].url])
+              sessionStorage.setItem('selectedMenu', menuList[0].name)
+            }
           } else {
-            if (data.result.user.organization.isGasStation) {
-              sessionStorage.setItem("isGasStation", 'true');
-              let a = sessionStorage.getItem('userdataOfgasstation')
-              let menuList = this.returnLastMenus(a, this.menu2)
-              let isTrue = menuList.find((item) => {
-                return item.name == "今日预警"
-              });
-              if (isTrue) {
-                this.router.navigate(['/todaywarning/petrolStation'])
-                sessionStorage.setItem('selectedMenu', '今日预警')
-              } else if (data.result.user.menus[0].name == "数字油站" && !this.init3D) {
-                this.router.navigate([menuList[1].url])
-                sessionStorage.setItem('selectedMenu', menuList[1].name)
-              } else {
-                this.router.navigate([menuList[0].url])
-                sessionStorage.setItem('selectedMenu', menuList[0].name)
-              }
+            sessionStorage.setItem("isGasStation", 'false');
+            let a = sessionStorage.getItem('userdata')
+            let menuList = this.returnLastMenus(a, this.menu1)
+            let isTrue = menuList.find((item) => {
+              return item.name == "首页"
+            });
+            if (menuList.length == 0) {
+
+              return this.message.create('warning', `当前用户未分配菜单`);
+
+            }
+            if (isTrue) {
+              this.router.navigate(['/homepage'])
+              sessionStorage.setItem('selectedMenu', '首页')
             } else {
-              sessionStorage.setItem("isGasStation", 'false');
-              let a = sessionStorage.getItem('userdata')
-              let menuList = this.returnLastMenus(a, this.menu1)
-              let isTrue = menuList.find((item) => {
-                return item.name == "首页"
-              });
-              if (isTrue) {
-                this.router.navigate(['/homepage'])
-                sessionStorage.setItem('selectedMenu', '首页')
-              } else {
-                this.router.navigate([menuList[0].url])
-                sessionStorage.setItem('selectedMenu', menuList[0].name)
-              }
-              // 
+              this.router.navigate([menuList[0].url])
+              sessionStorage.setItem('selectedMenu', menuList[0].name)
             }
+            // 
+
           }
           this.message.create('success', `登录成功`);
         }, err => {

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/plan-admin/file-license-list/file-license-list.component.html

@@ -54,7 +54,8 @@
                 <tr>
                     <th style="text-align: center" nzLeft="0px" nzWidth="60px">序号</th>
                     <th *ngFor="let item of headerTable.data[0];let k = index"
-                        [nzLeft]=" k <=2 ? (k*120 + 60)+'px' : false" [nzWidth]="k <= 2 ? '120px' : '200px'">
+                        [nzLeft]=" k <=2 ? (k*120 + 60)+'px' : false" [nzWidth]="k <= 2 ? '120px' : '80px'"
+                        style="line-height: 18px;">
                         {{item.name}}
                     </th>
 

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

@@ -793,12 +793,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,119 +1,119 @@
-<div class="box">
-    <div class="titlebox">
-        <div class="title">
-            <div (click)="contentType('img')" [ngClass]="{'selected': selectedType == 'img'}">
-                预警截图
-                <div class="border"></div>
-            </div>
-            <div *ngIf="data.violation && data.violation.violationType != '设备监测' && data.violation.violationType != '证照资质'"
-                (click)="contentType('video')" [ngClass]="{'selected': selectedType == 'video'}">
-                预警视频
-                <div class="border"></div>
-            </div>
-        </div>
+<div class="box" cdkDrag>
+  <div class="titlebox">
+    <div class="title" cdkDragHandle>
+      <div (click)="contentType('img')" [ngClass]="{'selected': selectedType == 'img'}">
+        预警截图
+        <div class="border"></div>
+      </div>
+      <div *ngIf="data.violation && data.violation.violationType != '设备监测' && data.violation.violationType != '证照资质'"
+        (click)="contentType('video')" [ngClass]="{'selected': selectedType == 'video'}">
+        预警视频
+        <div class="border"></div>
+      </div>
     </div>
-    <div class="details">
-        预警详情：{{details}}
+    <div class="close" (click)="closeModel()">
+      <i nz-icon nzType="close" nzTheme="outline"></i>
     </div>
-    <div class="content">
-        <div *ngIf="selectedType == 'img'" class="imgbox">
-            <ng-container *ngIf="imgUrl; else elseTemplate">
-                <ng-container *ngIf="isImage; else elseTemplate2">
-                    <img [src]="imgUrl" alt="">
-                </ng-container>
-                <ng-template #elseTemplate2>
-                    <iframe width="100%" height="100%" [src]="fileUrl" frameborder="0"></iframe>
-                </ng-template>
-            </ng-container>
-            <ng-template #elseTemplate>
-                暂无图片
-            </ng-template>
-        </div>
-        <div *ngIf="selectedType == 'video'" class="vediobox">
-            <ng-container *ngIf="vedioUrl; else elseTemplate3">
-                <video controls style="width: 100%;height: 100%;" [src]="vedioUrl"></video>
-            </ng-container>
-            <ng-template #elseTemplate3>
-                暂无视频
-            </ng-template>
-        </div>
+  </div>
+  <div class="details">
+    预警详情：{{details}}
+  </div>
+  <div class="content">
+    <div *ngIf="selectedType == 'img'" class="imgbox">
+      <ng-container *ngIf="imgUrl; else elseTemplate">
+        <ng-container *ngIf="isImage; else elseTemplate2">
+          <img [src]="imgUrl" alt="">
+        </ng-container>
+        <ng-template #elseTemplate2>
+          <iframe width="100%" height="100%" [src]="fileUrl" frameborder="0"></iframe>
+        </ng-template>
+      </ng-container>
+      <ng-template #elseTemplate>
+        暂无图片
+      </ng-template>
     </div>
-    <p style="margin-bottom: 0px;margin-top: 3px;box-sizing: border-box;padding: 0 12px;"
-        *ngIf="data.appealStatus == 3 && data.handleStateStr != '已处置'">
-        <span style="margin-right: 10px;">驳回人:{{data.appealLog.auditUser.name}}</span>
-        <span style="margin-right: 10px;">驳回时间:{{data.appealLog.auditTime | date:"yyyy-MM-dd HH:mm:ss"}}</span>
-        <span>驳回说明:{{data.appealLog.rejectReason}}</span>
-    </p>
-    <!-- 只有非证照预警才可以处置 或者 申诉-->
-    <div class="disposebox" *ngIf="!isLicenseWarning">
-        <div class="title">
-            <span>处置内容</span>
-            <ng-container *ngIf="!data.positive; else elseTemplate">
-                <span *ngIf="data.appealStatus == 5" style="color: #4BFFD4;">申诉成功 ( 处理人 : {{data.handleUserName}}&nbsp;
-                    处理时间 : {{data.lastModificationTime |
+    <div *ngIf="selectedType == 'video'" class="vediobox">
+      <ng-container *ngIf="vedioUrl; else elseTemplate3">
+        <video crossorign="anonymous" controls style="width: 100%;height: 100%;" [src]="vedioUrl"></video>
+      </ng-container>
+      <ng-template #elseTemplate3>
+        暂无视频
+      </ng-template>
+    </div>
+  </div>
+  <p style="margin-bottom: 0px;margin-top: 3px;box-sizing: border-box;padding: 0 12px;"
+    *ngIf="data.appealStatus == 3 && data.handleStateStr != '已处置'">
+    <span style="margin-right: 10px;">驳回人:{{data.appealLog.auditUser.name}}</span>
+    <span style="margin-right: 10px;">驳回时间:{{data.appealLog.auditTime | date:"yyyy-MM-dd HH:mm:ss"}}</span>
+    <span>驳回说明:{{data.appealLog.rejectReason}}</span>
+  </p>
+  <!-- 只有非证照预警才可以处置 或者 申诉-->
+  <div class="disposebox" *ngIf="!isLicenseWarning">
+    <div class="title">
+      <span>处置内容</span>
+      <ng-container *ngIf="!data.positive; else elseTemplate">
+        <span *ngIf="data.appealStatus == 5" style="color: #4BFFD4;">申诉成功 ( 处理人 : {{data.handleUserName}}&nbsp;
+          处理时间 : {{data.lastModificationTime |
                     date:"yyyy-MM-dd HH:mm:ss"}} ) </span>
-                <span style="color: #4BFFD4;cursor: default;">已进行误报处置</span>
-            </ng-container>
-            <ng-template #elseTemplate>
-                <div class="btn">
-                    <span *ngIf="!data.handleTime && data.appealStatus ==1 && isSubmit"
-                        style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="Unappeal()">申诉撤销</span>
-                    <span
-                        *ngIf="!data.handleTime && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4) && isSubmit"
-                        style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="appeal()">申诉</span>
-                    <nz-modal [(nzVisible)]="isAppeal" nzTitle="申诉原因" (nzOnOk)="handleOk()"
-                        (nzOnCancel)="handleCancel()">
+        <span style="color: #4BFFD4;cursor: default;">已进行误报处置</span>
+      </ng-container>
+      <ng-template #elseTemplate>
+        <div class="btn">
+          <span *ngIf="!data.handleTime && data.appealStatus ==1 && isSubmit"
+            style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="Unappeal()">申诉撤销</span>
+          <span
+            *ngIf="!data.handleTime && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4) && isSubmit"
+            style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="appeal()">申诉</span>
+          <nz-modal [(nzVisible)]="isAppeal" nzTitle="申诉原因" (nzOnOk)="handleOk()" (nzOnCancel)="handleCancel()">
 
-                        <ng-container *nzModalContent>
-                            <textarea nz-input rows="2" placeholder="请输入申诉原因" name="appeal"
-                                [(ngModel)]="appealValue"></textarea>
-                            <div class="appealUploadbox">
-                                <div class="title">
-                                    上传附件:
-                                </div>
-                                <div class="btn">
-                                    <button nz-button [nzLoading]="isLoadingSave">
-                                        <span nz-icon nzType="upload"></span>上传
-                                    </button>
-                                    <input type="file" name="" id="" (change)="filechange($event)"
-                                        *ngIf="!isLoadingSave">
-                                    <ul>
-                                        <li *ngFor="let item of fileList;let key = index">
-                                            <span class="filename" (click)="lookfile(item)">{{item | fileName}}</span>
-                                            <span (click)="delete(fileList,key)">x</span>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </ng-container>
+            <ng-container *nzModalContent>
+              <textarea nz-input rows="2" placeholder="请输入申诉原因" name="appeal" [(ngModel)]="appealValue"></textarea>
+              <div class="appealUploadbox">
+                <div class="title">
+                  上传附件:
+                </div>
+                <div class="btn">
+                  <button nz-button [nzLoading]="isLoadingSave">
+                    <span nz-icon nzType="upload"></span>上传
+                  </button>
+                  <input type="file" name="" id="" (change)="filechange($event)" *ngIf="!isLoadingSave">
+                  <ul>
+                    <li *ngFor="let item of fileList;let key = index">
+                      <span class="filename" (click)="lookfile(item)">{{item | fileName}}</span>
+                      <span (click)="delete(fileList,key)">x</span>
+                    </li>
+                  </ul>
+                </div>
+              </div>
+            </ng-container>
 
-                    </nz-modal>
-                    <span
-                        *ngIf="isMisinformation &&  (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4)"
-                        style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="misinformation()">误报</span>
-                    <span
-                        *ngIf="!data.handleTime && isSubmit && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4)"
-                        style="
+          </nz-modal>
+          <span
+            *ngIf="isMisinformation &&  (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4)"
+            style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="misinformation()">误报</span>
+          <span
+            *ngIf="!data.handleTime && isSubmit && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4)"
+            style="
                         color: #36A2FF;cursor: pointer;" (click)="submit()">提交</span>
-                    <span *ngIf="data.handleTime" style="color: #4BFFD4;cursor: default;">已处置</span>
-                    <span *ngIf="data.appealStatus == 1" style="color: #4BFFD4;cursor: default;">申诉中</span>
-                </div>
-            </ng-template>
+          <span *ngIf="data.handleTime" style="color: #4BFFD4;cursor: default;">已处置</span>
+          <span *ngIf="data.appealStatus == 1" style="color: #4BFFD4;cursor: default;">申诉中</span>
         </div>
+      </ng-template>
+    </div>
 
-        <div class="disposeContent">
-            <textarea
-                *ngIf="!data.handleTime && isSubmit && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4)"
-                [(ngModel)]="content"></textarea>
-            <span *ngIf="data.handleTime">{{content}}</span>
-        </div>
-        <div class="disposeTime" *ngIf="data.handleTime">
-            <span style="margin-right: 12px;">
-                处置人：{{data.handleUserName}}
-            </span>
-            <span>
-                处置时间：{{data.handleTime|date:"yyyy-MM-dd HH:mm:ss"}}
-            </span>
-        </div>
+    <div class="disposeContent">
+      <textarea
+        *ngIf="!data.handleTime && isSubmit && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4)"
+        [(ngModel)]="content"></textarea>
+      <span *ngIf="data.handleTime">{{content}}</span>
+    </div>
+    <div class="disposeTime" *ngIf="data.handleTime">
+      <span style="margin-right: 12px;">
+        处置人：{{data.handleUserName}}
+      </span>
+      <span>
+        处置时间：{{data.handleTime|date:"yyyy-MM-dd HH:mm:ss"}}
+      </span>
     </div>
-</div>
+  </div>
+</div>

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;
   }
-}
+}