-
预警详情：{{details}}
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
index cd1fa75..d4651c1 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
+++ b/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;
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
index 6b1884f..e79c91b 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
+++ b/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()
+ }
}
diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts
index 296a437..08fe295 100644
--- a/src/app/pages/today-warning/today-warning.component.ts
+++ b/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!'));
}
}
diff --git a/src/theme.less b/src/theme.less
index cbaf74f..00354b6 100644
--- a/src/theme.less
+++ b/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;
}
-}
\ No newline at end of file
+}