diff --git a/proxy.config.json b/proxy.config.json index df2c281..fe029a2 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,11 +1,11 @@ { "/api": { - "target": "http://121.36.37.70:8080", + "target": "http://10.156.134.54:8080", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "http://121.36.37.70:8080", + "target": "http://10.156.134.54:8080", "secure": false, "ws": true, "logLevel": "debug" diff --git a/src/app/system-management/system-management.module.ts b/src/app/system-management/system-management.module.ts index dbad3bc..4bd5bf6 100644 --- a/src/app/system-management/system-management.module.ts +++ b/src/app/system-management/system-management.module.ts @@ -44,8 +44,9 @@ import { StatusMonitoringComponent } from './status-monitoring/status-monitoring import { FileComponent } from './condition-monitoring/file/file.component'; import { ScriptComponent } from './status-monitoring/script/script.component'; import { VideoStreamingComponent } from './video-streaming/video-streaming.component'; +import { DetailsComponent } from './video-streaming/details/details.component'; @NgModule({ - declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, ImageListComponent, ImageLabelComponent, PlottingImageComponent, cameraType, ImageLabel2Component, ConfigFormComponent, ConditionMonitoringComponent, SendFileComponent, ModelComponent, KafkaComponent, StatusMonitoringComponent, FileComponent, ScriptComponent, VideoStreamingComponent], + declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, ImageListComponent, ImageLabelComponent, PlottingImageComponent, cameraType, ImageLabel2Component, ConfigFormComponent, ConditionMonitoringComponent, SendFileComponent, ModelComponent, KafkaComponent, StatusMonitoringComponent, FileComponent, ScriptComponent, VideoStreamingComponent, DetailsComponent], imports: [ CommonModule, SystemRoutingModule, @@ -70,7 +71,7 @@ import { VideoStreamingComponent } from './video-streaming/video-streaming.compo NzTabsModule, NzPopconfirmModule ], - entryComponents: [AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, SendFileComponent, ModelComponent, FileComponent,ScriptComponent] + entryComponents: [AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, SendFileComponent, ModelComponent, FileComponent, ScriptComponent, DetailsComponent] }) export class SystemManagementModule { } diff --git a/src/app/system-management/video-streaming/details/details.component.html b/src/app/system-management/video-streaming/details/details.component.html new file mode 100644 index 0000000..c066472 --- /dev/null +++ b/src/app/system-management/video-streaming/details/details.component.html @@ -0,0 +1 @@ +

{{data.detail}}

diff --git a/src/app/system-management/video-streaming/details/details.component.scss b/src/app/system-management/video-streaming/details/details.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/system-management/video-streaming/details/details.component.ts b/src/app/system-management/video-streaming/details/details.component.ts new file mode 100644 index 0000000..c060acc --- /dev/null +++ b/src/app/system-management/video-streaming/details/details.component.ts @@ -0,0 +1,15 @@ +import { Component, Input, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-details', + templateUrl: './details.component.html', + styleUrls: ['./details.component.scss'] +}) +export class DetailsComponent implements OnInit { + @Input() data?: any; + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/system-management/video-streaming/video-streaming.component.html b/src/app/system-management/video-streaming/video-streaming.component.html index 38d7f86..26c4bf9 100644 --- a/src/app/system-management/video-streaming/video-streaming.component.html +++ b/src/app/system-management/video-streaming/video-streaming.component.html @@ -93,13 +93,7 @@

- 详情 - - - {{data.detail}} - - + 详情 处置 diff --git a/src/app/system-management/video-streaming/video-streaming.component.ts b/src/app/system-management/video-streaming/video-streaming.component.ts index 3920434..9b3327a 100644 --- a/src/app/system-management/video-streaming/video-streaming.component.ts +++ b/src/app/system-management/video-streaming/video-streaming.component.ts @@ -4,6 +4,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; import { TreeService } from 'src/app/service/tree.service'; +import { DetailsComponent } from './details/details.component'; @Component({ selector: 'app-video-streaming', @@ -134,21 +135,19 @@ export class VideoStreamingComponent implements OnInit { } - - isVisible = false; - showModal(): void { - this.isVisible = true; - } - - handleOk(): void { - console.log('Button ok clicked!'); - this.isVisible = false; + showModal(data): void { + const modal = this.modal.create({ + nzTitle: '详情', + nzContent: DetailsComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 388, + nzFooter: null, + nzComponentParams: { + data: data, + } + }); } - handleCancel(): void { - console.log('Button cancel clicked!'); - this.isVisible = false; - } dispose(data) { let body = { isHandled: true