diff --git a/src/app/system-management/host-config/host-config.component.html b/src/app/system-management/host-config/host-config.component.html
index 8a6693c..d6d17c7 100644
--- a/src/app/system-management/host-config/host-config.component.html
+++ b/src/app/system-management/host-config/host-config.component.html
@@ -32,7 +32,7 @@
diff --git a/src/app/system-management/host-config/host-config.component.ts b/src/app/system-management/host-config/host-config.component.ts
index de9dec5..1675c28 100644
--- a/src/app/system-management/host-config/host-config.component.ts
+++ b/src/app/system-management/host-config/host-config.component.ts
@@ -130,4 +130,9 @@ export class HostConfigComponent implements OnInit {
nzCancelText: '取消'
});
}
+
+ connect() {
+ this.router.navigate(['/system/host/camera/imageList'])
+ }
+
}
diff --git a/src/app/system-management/image-label/image-label.component.html b/src/app/system-management/image-label/image-label.component.html
new file mode 100644
index 0000000..550feef
--- /dev/null
+++ b/src/app/system-management/image-label/image-label.component.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
![]()
+
+
diff --git a/src/app/system-management/image-label/image-label.component.scss b/src/app/system-management/image-label/image-label.component.scss
new file mode 100644
index 0000000..627f256
--- /dev/null
+++ b/src/app/system-management/image-label/image-label.component.scss
@@ -0,0 +1,24 @@
+.box {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+}
+
+.btnbox {
+ margin-bottom: 6px;
+ button {
+ margin-right: 12px;
+ }
+}
+
+.imgbox {
+ width: 100%;
+ height:500px;
+ overflow: auto;
+
+ img {
+ width: 1920px;
+ height: 1080px;
+ }
+}
diff --git a/src/app/system-management/image-label/image-label.component.ts b/src/app/system-management/image-label/image-label.component.ts
new file mode 100644
index 0000000..45fc1e8
--- /dev/null
+++ b/src/app/system-management/image-label/image-label.component.ts
@@ -0,0 +1,23 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-image-label',
+ templateUrl: './image-label.component.html',
+ styleUrls: ['./image-label.component.scss']
+})
+export class ImageLabelComponent implements OnInit {
+
+ constructor() { }
+
+ imgItem: any
+
+ ngOnInit(): void {
+
+ }
+ heightCount() {
+ let style: any = {}
+ let height = document.documentElement.clientHeight
+ style.height = (height - 180) + 'px';
+ return style
+ }
+}
diff --git a/src/app/system-management/image-list/image-list.component.html b/src/app/system-management/image-list/image-list.component.html
new file mode 100644
index 0000000..1d1d62e
--- /dev/null
+++ b/src/app/system-management/image-list/image-list.component.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
![]()
+
+
+ 监控坐标点:{{item.showCoord}}
+
+
+ 禁止坐标点:{{item.banCoord}}
+
+
+
+
+
diff --git a/src/app/system-management/image-list/image-list.component.scss b/src/app/system-management/image-list/image-list.component.scss
new file mode 100644
index 0000000..72933a4
--- /dev/null
+++ b/src/app/system-management/image-list/image-list.component.scss
@@ -0,0 +1,48 @@
+.box {
+ width: 100%;
+ height: 100%;
+ background: #fff;
+ font-size: 15px;
+ color: black;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ overflow-y: auto;
+}
+
+.imgbox {
+ display: flex;
+ flex-wrap: wrap;
+ align-content: flex-start;
+}
+
+.imageItemBox {
+ display: flex;
+ flex-direction: column;
+ width: 220px;
+ border: 1px solid #F2F2F2;
+ margin: 6px;
+
+ .imgbox {
+ width: 100%;
+ height: 250px;
+
+ img {
+ display: block;
+ width: 100%;
+ height: 100%;
+ cursor: pointer;
+ }
+ }
+
+ .coord {
+ height: 25px;
+ display: flex;
+ align-items: center;
+ }
+}
+.footer{
+ margin: 6px 0;
+ display: flex;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/src/app/system-management/image-list/image-list.component.ts b/src/app/system-management/image-list/image-list.component.ts
new file mode 100644
index 0000000..3a0cf51
--- /dev/null
+++ b/src/app/system-management/image-list/image-list.component.ts
@@ -0,0 +1,49 @@
+import { Component, OnInit, ViewContainerRef } from '@angular/core';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ImageLabelComponent } from '../image-label/image-label.component';
+
+@Component({
+ selector: 'app-image-list',
+ templateUrl: './image-list.component.html',
+ styleUrls: ['./image-list.component.scss']
+})
+export class ImageListComponent implements OnInit {
+
+ constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
+ imgList = [
+ { url: '../../../assets/images/test/dog.jpg', showCoord: '', banCoord: '' },
+ { url: '../../../assets/images/bgImg.png', showCoord: '', banCoord: '' },
+ { url: '../../../assets/images/test/dog.jpg', showCoord: '', banCoord: '' },
+ { url: '../../../assets/images/test/dog.jpg', showCoord: '', banCoord: '' },
+ { url: '../../../assets/images/test/dog.jpg', showCoord: '', banCoord: '' },
+ { url: '../../../assets/images/test/dog.jpg', showCoord: '', banCoord: '' },
+ { url: '../../../assets/images/test/dog.jpg', showCoord: '', banCoord: '' },
+ { url: '../../../assets/images/test/dog.jpg', showCoord: '', banCoord: '' }
+ ]
+ ngOnInit(): void {
+ }
+ goback() {
+ history.go(-1)
+ }
+ label(item) {
+ let width = document.documentElement.clientWidth
+ const modal = this.modal.create({
+ nzContent: ImageLabelComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzComponentParams: {
+ imgItem: item,
+ },
+ nzWidth: width - 100,
+ nzCentered: true,
+ nzOnOk: () => new Promise(resolve => {
+ item.showCoord = ''
+ item.banCoord = ''
+ resolve(1)
+ }),
+ });
+ const instance = modal.getContentComponent();
+ modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
+ // Return a result when closed
+ modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
+ }
+}
diff --git a/src/app/system-management/system-management-routing.module.ts b/src/app/system-management/system-management-routing.module.ts
index c105346..42dd47a 100644
--- a/src/app/system-management/system-management-routing.module.ts
+++ b/src/app/system-management/system-management-routing.module.ts
@@ -3,12 +3,14 @@ import { NgModule } from '@angular/core';
import { OrganizationComponent } from './organization/organization.component';
import { AnalysisOfTheHostComponent } from './analysis-of-the-host/analysis-of-the-host.component';
import { HostConfigComponent } from './host-config/host-config.component';
+import { ImageListComponent } from './image-list/image-list.component';
const routes: Routes = [
{ path: 'organization', component: OrganizationComponent },
{ path: 'host', component: AnalysisOfTheHostComponent },
{ path: 'host/camera', component: HostConfigComponent },
+ { path: 'host/camera/imageList', component: ImageListComponent },
];
@NgModule({
diff --git a/src/app/system-management/system-management.module.ts b/src/app/system-management/system-management.module.ts
index 024c02c..a303963 100644
--- a/src/app/system-management/system-management.module.ts
+++ b/src/app/system-management/system-management.module.ts
@@ -29,8 +29,10 @@ import { EditcameraComponent } from './host-config/editcamera/editcamera.compone
import { HostConfigComponent } from './host-config/host-config.component';
import { NzPageHeaderModule } from 'ng-zorro-antd/page-header';
import { cameraType } from '../pipe/cameraTypePipe';
+import { ImageListComponent } from './image-list/image-list.component';
+import { ImageLabelComponent } from './image-label/image-label.component';
@NgModule({
- declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, cameraType],
+ declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, cameraType, ImageListComponent, ImageLabelComponent],
imports: [
CommonModule,
SystemRoutingModule,
diff --git a/src/assets/images/test/dog.jpg b/src/assets/images/test/dog.jpg
new file mode 100644
index 0000000..61e30f8
Binary files /dev/null and b/src/assets/images/test/dog.jpg differ
diff --git a/src/styles.scss b/src/styles.scss
index 95d3f5c..530c0e6 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -15,7 +15,7 @@ a { text-decoration: none; color:#000; }
ul,ol,li { list-style: none; overflow-x: hidden; }
textarea { resize: none; }
/* 滚动条样式 */
-::-webkit-scrollbar { width: 5px; background-color: white; }
+// ::-webkit-scrollbar:horizontal { width: 5px; background-color: white; }
::-webkit-scrollbar-thumb { background-color: #999; }
app-root { height: 100%; }