| {{data.hostIPAddress}} |
!配置状态! |
- {{data.deviceProvider === 0 ? '警旗1' : data.deviceProvider === 1 ? '警旗2' :'警旗3'}} |
+ {{data.deviceProvider === 0 ? '警旗1' : data.deviceProvider === 1 ? '警旗2' : data.deviceProvider === 2
+ ?'警旗3' :'北京展厅'}} |
编辑
配置
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 fa44f43..789f3a4 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
@@ -323,4 +323,5 @@ enum DeviceProvider {
'警旗1' = 0,
'警旗2' = 1,
'警旗3' = 2,
+ '北京展厅' = 3,
}
diff --git a/src/app/system-management/analysis-of-the-host/edithost/edithost.component.html b/src/app/system-management/analysis-of-the-host/edithost/edithost.component.html
index fc119fc..d56ecd9 100644
--- a/src/app/system-management/analysis-of-the-host/edithost/edithost.component.html
+++ b/src/app/system-management/analysis-of-the-host/edithost/edithost.component.html
@@ -12,9 +12,10 @@
类型
-
+
+
+
diff --git a/src/app/system-management/host-config/addcamera/addcamera.component.html b/src/app/system-management/host-config/addcamera/addcamera.component.html
index 5a3d6a3..06d23cd 100644
--- a/src/app/system-management/host-config/addcamera/addcamera.component.html
+++ b/src/app/system-management/host-config/addcamera/addcamera.component.html
@@ -40,6 +40,7 @@
+
diff --git a/src/app/system-management/host-config/editcamera/editcamera.component.html b/src/app/system-management/host-config/editcamera/editcamera.component.html
index aa313d5..7f9f559 100644
--- a/src/app/system-management/host-config/editcamera/editcamera.component.html
+++ b/src/app/system-management/host-config/editcamera/editcamera.component.html
@@ -40,6 +40,7 @@
+
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 09ac7b8..c9ea97c 100644
--- a/src/app/system-management/host-config/host-config.component.html
+++ b/src/app/system-management/host-config/host-config.component.html
@@ -35,7 +35,7 @@
{{item.dimensionedPointsHuanghai ? '已标注' : '未标注'}}
-
+
{{item.dimensionedPointsAnxin ? '已标注' : '未标注'}}
|
@@ -67,6 +67,9 @@
+
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 be31c5f..9fee3a2 100644
--- a/src/app/system-management/host-config/host-config.component.ts
+++ b/src/app/system-management/host-config/host-config.component.ts
@@ -307,7 +307,7 @@ export class HostConfigComponent implements OnInit {
modal.afterClose.subscribe((result) => {
this.ngOnInit();
});
- } else if (this.hostType == '警旗3') {
+ } else if (this.hostType == '警旗3' || this.hostType == '北京展厅') {
const element = document.documentElement;
if (element.requestFullscreen) {
//进入全屏
@@ -1516,8 +1516,12 @@ rule_threshold:
let data = this.configJsonToAx();
console.log(data);
// return;
+ let title =
+ this.hostType === '北京展厅'
+ ? '下发北京展厅配置'
+ : '下发安信config.json配置';
const modal = this.modal.create({
- nzTitle: '下发安信config.json配置',
+ nzTitle: title,
nzContent: AnxinConfigComponent,
nzViewContainerRef: this.viewContainerRef,
nzWidth: 1000,
@@ -1565,39 +1569,86 @@ rule_threshold:
}
configJsonToAx() {
- let data = {
- server: null,
- obs: null,
- userInfo: {
- user: '',
- password: '',
- },
- ip: this.hostData.hostIPAddress,
- imgScale: 1.5,
- cpuRtsp: false,
- pipline: '',
- workerTag: ['worker'],
- caps: [],
- params: {
- smoke_sleep_m: 5,
- smoke_continue_s: 3,
- call_sleep_m: 5,
- call_continue_s: 3,
- pay_sleep_m: 5,
- pay_continue_s: 3,
- oilin_sleep_m: 5,
- oilin_continue_s: 1,
- stop_step_s: 60,
- stop_continue_m: 30,
- sameCarThreshold: 5,
- smog_sleep_m: 5,
- smog_continue_s: 3,
- fire_sleep_m: 5,
- fire_continue_s: 3,
- lossScore: 40, //没检测到物体的惩罚分数
- },
- };
- console.log(this.hostData);
+ let data;
+ if (this.hostType === '北京展厅') {
+ data = {
+ server: null,
+ obs: null,
+ userInfo: {
+ user: '',
+ password: '',
+ },
+ ip: this.hostData.hostIPAddress,
+ imgScale: 1.5,
+ cpuRtsp: false,
+ pipline: '',
+ workerTag: ['worker'],
+ caps: [],
+ params: {
+ smoke_sleep_m: 1,
+ smoke_continue_s: 1,
+ call_sleep_m: 1,
+ call_continue_s: 1,
+ pay_sleep_m: 5,
+ pay_continue_s: 3,
+ oilin_sleep_m: 5,
+ oilin_continue_s: 1,
+ stop_step_s: 60,
+ stop_continue_m: 30,
+ sameCarThreshold: 5,
+ smog_sleep_m: 5,
+ smog_continue_s: 3,
+ fire_sleep_m: 5,
+ fire_continue_s: 3,
+ geli_continue_s: 1,
+ miehuo_continue_s: 1,
+ gather_dis_min: 0.15,
+ gather_err_num: 3,
+ gather_continue_s: 0.5,
+ gather_sleep: 1,
+ helmeted_continue_s: 3,
+ workerIn_continue_s: 3,
+ workerOut_continue_s: 5,
+ workerSleep_continue_s: 3,
+ lossScore: 40, //没检测到物体的惩罚分数
+ },
+ };
+ } else {
+ data = {
+ server: null,
+ obs: null,
+ userInfo: {
+ user: '',
+ password: '',
+ },
+ ip: this.hostData.hostIPAddress,
+ imgScale: 1.5,
+ cpuRtsp: false,
+ pipline: '',
+ workerTag: ['worker'],
+ caps: [],
+ params: {
+ smoke_sleep_m: 5,
+ smoke_continue_s: 3,
+ call_sleep_m: 5,
+ call_continue_s: 3,
+ pay_sleep_m: 5,
+ pay_continue_s: 3,
+ oilin_sleep_m: 5,
+ oilin_continue_s: 1,
+ stop_step_s: 60,
+ stop_continue_m: 30,
+ sameCarThreshold: 5,
+ smog_sleep_m: 5,
+ smog_continue_s: 3,
+ fire_sleep_m: 5,
+ fire_continue_s: 3,
+ lossScore: 40, //没检测到物体的惩罚分数
+ },
+ };
+ }
+
+ // console.log(this.hostData);
//如果保存过安信的配置文件
if (
this.hostData.configFiles &&
@@ -1626,9 +1677,14 @@ rule_threshold:
} else {
let server;
let obs;
+ console.log('location.origin', location.origin);
if (location.origin.indexOf('121') !== -1) {
+ if (location.origin.indexOf('8225') !== -1) {
+ obs = 'http://121.36.37.70:8226';
+ } else {
+ obs = 'http://121.36.37.70:8906';
+ }
server = 'http://121.36.37.70:8208';
- obs = 'http://121.36.37.70:8906';
} else {
server = 'http://10.156.134.53:8208';
obs = 'https://znaq.sinochemoilmarketing.com';
@@ -1641,13 +1697,15 @@ rule_threshold:
if (item.isEnabled) {
let type = null;
item.type === 0
- ? (type = 2)
+ ? (type = 2)//进出口
: item.type === 1
- ? (type = 1)
+ ? (type = 1)//加油区
: item.type === 2
- ? (type = 0)
+ ? (type = 0)//卸油区
: item.type === 3
- ? (type = 4)
+ ? (type = 4)//收银区
+ : item.type === 4
+ ? (type = 5)//办公区
: null;
let areas = [];
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 e8baf3c..c40fe04 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
@@ -1,5 +1,6 @@
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
import { Component, Input, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
@@ -12,7 +13,8 @@ export class ImageLabelAnxinComponent implements OnInit {
constructor(
private http: HttpClient,
private message: NzMessageService,
- private modal: NzModalService
+ private modal: NzModalService,
+ private route: ActivatedRoute
) {}
@Input() cameraId: any; //传递id
@@ -297,7 +299,7 @@ export class ImageLabelAnxinComponent implements OnInit {
IsDragging: false, //是否可拖拽
IsInOut: false, //是否在绘制区域内
Color: 'purple',
- }
+ },
};
//绘制多边形的方法
@@ -507,6 +509,8 @@ export class ImageLabelAnxinComponent implements OnInit {
console.log(this.camerasData.dimensionedPointsAnxin);
console.log('标点数据', this.PolygonData);
+ // console.log(999, this.route.snapshot.queryParams.type);
+ // return;
for (const key in this.PolygonData) {
const element = this.PolygonData[key];
if (element.Points.length !== 0 && element.Points.length <= 2) {