diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts index a7a7d54..d8cbb27 100644 --- a/src/app/system-management/organization/organization.component.ts +++ b/src/app/system-management/organization/organization.component.ts @@ -185,14 +185,8 @@ export class OrganizationComponent implements OnInit { nzContent: WarningEventsComponent, nzViewContainerRef: this.viewContainerRef, nzWidth: 388, - nzFooter: [{ - label: '确定', // 按钮文本 - type: 'primary', // 类型 - // 按钮点击回调 - onClick(this: ModalButtonOptions, contentComponentInstance?: object): void { - modal.close() - } - }], + nzClassName: 'WarningEvents', + nzFooter: null, nzMaskClosable: false, nzComponentParams: { data: node.origin, diff --git a/src/app/system-management/organization/warning-events/warning-events.component.scss b/src/app/system-management/organization/warning-events/warning-events.component.scss index 4f5501c..0f79ce5 100644 --- a/src/app/system-management/organization/warning-events/warning-events.component.scss +++ b/src/app/system-management/organization/warning-events/warning-events.component.scss @@ -2,4 +2,5 @@ li{ display: flex; align-items: center; justify-content: space-between; + margin-bottom: 6px; } \ No newline at end of file diff --git a/src/app/system-management/organization/warning-events/warning-events.component.ts b/src/app/system-management/organization/warning-events/warning-events.component.ts index 85c9b58..391be29 100644 --- a/src/app/system-management/organization/warning-events/warning-events.component.ts +++ b/src/app/system-management/organization/warning-events/warning-events.component.ts @@ -18,17 +18,20 @@ export class WarningEventsComponent implements OnInit { warningList: any getWarningList() { + this.isLoading = true this.http.get('/api/services/app/Violation/GetStationViolationConfig', { params: { organizationId: this.data.id } }).subscribe((data: any) => { - + this.isLoading = false data.result.forEach(element => { element.enable = !element.disabled }); this.warningList = data.result // console.log('预警列表', this.warningList) + }, err => { + this.isLoading = false }) } diff --git a/src/theme.less b/src/theme.less index 4df9c4c..cbaf74f 100644 --- a/src/theme.less +++ b/src/theme.less @@ -771,3 +771,8 @@ } } } +.WarningEvents{ + .ant-modal-close-x{ + color: #000; + } +} \ No newline at end of file