|
|
|
|
@ -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 = []; |
|
|
|
|
|
