From dc6f59663137b6483ca98d5a27a76bcbaa9eb38c Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 31 May 2023 08:28:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9=E7=9B=92?= =?UTF-8?q?=E5=AD=90=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 2 + .../analysis-of-the-host.component.html | 6 +-- .../analysis-of-the-host.component.ts | 15 ++------ .../host-config/host-config.component.html | 14 +++---- .../host-config/host-config.component.ts | 15 +++++--- .../image-label-anxin.component.ts | 37 +++++++++++-------- 6 files changed, 47 insertions(+), 42 deletions(-) diff --git a/proxy.config.json b/proxy.config.json index 11d61cc..1d372f9 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,8 @@ { "/api": { "target": "http://121.36.37.70:8080/", + "测试":"http://121.36.37.70:8080/", + "s":"http://121.36.37.70:8080/", "secure": false, "changeOrigin": true }, diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html index 63531c4..e3b135d 100644 --- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html +++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html @@ -54,9 +54,9 @@ (nzOnOk)="handleOk()"> - - - + + + diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts index 68d1ef3..80c8a83 100644 --- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts +++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts @@ -215,18 +215,11 @@ export class AnalysisOfTheHostComponent implements OnInit { } isVisible = false; - radioValue = '交大'; + radioValue = '警旗1'; configdata; config(data) { this.isVisible = true; this.configdata = data; - // this.router.navigate([`/system/host/camera`], { - // queryParams: { - // hostId: this.configdata.id, - // orId: this.selectedOilStation.id, - // type: '交大', - // }, - // }); } handleOk(): void { @@ -287,7 +280,7 @@ export class AnalysisOfTheHostComponent implements OnInit { } enum DeviceProvider { - '交大' = 0, - '黄海' = 1, - '安信' = 2, + '警旗1' = 0, + '警旗2' = 1, + '警旗3' = 2, } 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 40dc688..09ac7b8 100644 --- a/src/app/system-management/host-config/host-config.component.html +++ b/src/app/system-management/host-config/host-config.component.html @@ -29,13 +29,13 @@ {{ item.uri }} {{ item.type | cameraType}} - + {{item.dimensionedPoints ? '已标注' : '未标注'}} - + {{item.dimensionedPointsHuanghai ? '已标注' : '未标注'}} - + {{item.dimensionedPointsAnxin ? '已标注' : '未标注'}} @@ -55,16 +55,16 @@ -
+
-
+
-
+
-
+
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 e1b76fa..7c9fd58 100644 --- a/src/app/system-management/host-config/host-config.component.ts +++ b/src/app/system-management/host-config/host-config.component.ts @@ -251,7 +251,7 @@ export class HostConfigComponent implements OnInit { label(item) { this.http.get(`/api/EdgeDevices/${this.hostId}`).subscribe({ next: (data: any) => { - if (this.hostType == '交大') { + if (this.hostType == '警旗1') { if (data.configFiles) { this.isSourceYaml = true; const element = document.documentElement; @@ -283,7 +283,7 @@ export class HostConfigComponent implements OnInit { this.isSourceYaml = false; this.message.create('error', '请先下发source.yaml配置'); } - } else if (this.hostType == '黄海') { + } else if (this.hostType == '警旗2') { const element = document.documentElement; if (element.requestFullscreen) { //进入全屏 @@ -309,7 +309,7 @@ export class HostConfigComponent implements OnInit { modal.afterClose.subscribe((result) => { this.ngOnInit(); }); - } else if (this.hostType == '安信') { + } else if (this.hostType == '警旗3') { const element = document.documentElement; if (element.requestFullscreen) { //进入全屏 @@ -1566,9 +1566,14 @@ rule_threshold: } configJsonToAx() { + // server: 'http://121.36.37.70:8208', + // obs: 'http://121.36.37.70:8906', + + // server: 'http://10.156.134.53:8208', + // obs: 'https://znaq.sinochemoilmarketing.com', let data = { - server: 'http://121.36.37.70:8208', - obs: 'http://121.36.37.70:8906', + server: 'http://10.156.134.53:8208', + obs: 'https://znaq.sinochemoilmarketing.com', userInfo: { user: '', password: '', diff --git a/src/app/system-management/image-label-anxin/image-label-anxin.component.ts b/src/app/system-management/image-label-anxin/image-label-anxin.component.ts index 6604676..0e75b8a 100644 --- a/src/app/system-management/image-label-anxin/image-label-anxin.component.ts +++ b/src/app/system-management/image-label-anxin/image-label-anxin.component.ts @@ -32,24 +32,29 @@ export class ImageLabelAnxinComponent implements OnInit { //获取 摄像头图片/标注点位 getImgMarkData() { + console.log('获取照片', new Date().getTime()); return new Promise((resolve, reject) => { - this.http.get(`/api/Cameras/${this.cameraId}`).subscribe((data: any) => { - this.camerasData = data; - // this.camerasData.dimensionedPointsAnxin = null - this.markType = data.type; - const httpOptions = { - responseType: 'blob' as 'json', - params: { cameraId: this.cameraId }, - }; - this.http.get(`/api/Cameras/Images`, httpOptions).subscribe({ - next: (data) => { - resolve(data); - }, - error: (err) => { - reject('error'); - }, + + this.http + .get(`/api/Cameras/${this.cameraId}`) + .subscribe((data: any) => { + this.camerasData = data; + // this.camerasData.dimensionedPointsAnxin = null + this.markType = data.type; + const httpOptions = { + responseType: 'blob' as 'json', + params: { cameraId: this.cameraId }, + }; + let date = new Date().getTime(); + this.http.get(`/api/Cameras/Images?v=${date}`, httpOptions).subscribe({ + next: (data) => { + resolve(data); + }, + error: (err) => { + reject('error'); + }, + }); }); - }); }); }