shaojiahao
/
Edge-host-maintenance
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Edge-host-maintenance

非煤矿业企业安全风险监测预警系统
邵佳豪 2 years ago
parent
eed847ff44 755394764f
commit
241f9917de
3 changed files with 30 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      proxy.config.json
  2. 39
      src/app/system-management/condition-monitoring/model/model.component.html
  3. 16
      src/app/system-management/host-config/host-config.component.ts

4
proxy.config.json
Unescape View File

@ -1,11 +1,11 @@
{
"/api": {
"target": "http://10.156.134.54:8080",
"target": "http://121.36.37.70:8080/",
"secure": false,
"changeOrigin": true
},
"/signalr": {
"target": "http://10.156.134.54:8080",
"target": "http://121.36.37.70:8080/",
"secure": false,
"ws": true,
"logLevel": "debug"

39
src/app/system-management/condition-monitoring/model/model.component.html
Unescape View File

@ -1,20 +1,21 @@
<div class="box">
<form nz-form [formGroup]="validateForm">
<nz-form-item>
<nz-form-control>
<nz-select nzMode="multiple" formControlName="type" nzPlaceHolder="请选择类型">
<nz-option [nzValue]="'peoplenet'" nzLabel="peoplenet"></nz-option>
<nz-option [nzValue]="'trafficcam'" nzLabel="trafficcam"></nz-option>
<nz-option [nzValue]="'actionnet'" nzLabel="actionnet"></nz-option>
<nz-option [nzValue]="'idnet'" nzLabel="idnet"></nz-option>
<nz-option [nzValue]="'oilnet'" nzLabel="oilnet"></nz-option>
<nz-option [nzValue]="'smoking_calling_net'" nzLabel="smoking_calling_net"></nz-option>
<!-- <nz-option [nzValue]="'connet'" nzLabel="connet"></nz-option> -->
<nz-option [nzValue]="'connet_oil'" nzLabel="connet_oil"></nz-option>
<nz-option [nzValue]="'connet_grounder'" nzLabel="connet_grounder"></nz-option>
<nz-option [nzValue]="'fire_smoke_net'" nzLabel="fire_smoke_net"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</form>
</div>
<form nz-form [formGroup]="validateForm">
<nz-form-item>
<nz-form-control>
<nz-select nzMode="multiple" formControlName="type" nzPlaceHolder="请选择类型">
<nz-option [nzValue]="'peoplenet'" nzLabel="peoplenet"></nz-option>
<nz-option [nzValue]="'trafficcam'" nzLabel="trafficcam"></nz-option>
<nz-option [nzValue]="'actionnet'" nzLabel="actionnet"></nz-option>
<nz-option [nzValue]="'idnet'" nzLabel="idnet"></nz-option>
<nz-option [nzValue]="'oilnet'" nzLabel="oilnet"></nz-option>
<nz-option [nzValue]="'smoking_calling_net'" nzLabel="smoking_calling_net"></nz-option>
<!-- <nz-option [nzValue]="'connet'" nzLabel="connet"></nz-option> -->
<nz-option [nzValue]="'connet_oil'" nzLabel="connet_oil"></nz-option>
<nz-option [nzValue]="'connet_grounder'" nzLabel="connet_grounder"></nz-option>
<nz-option [nzValue]="'fire_smoke_net'" nzLabel="fire_smoke_net"></nz-option>
<nz-option [nzValue]="'bulk_oil_net'" nzLabel="bulk_oil_net"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</form>
</div>

16
src/app/system-management/host-config/host-config.component.ts
Unescape View File

@ -554,7 +554,7 @@ ${newstr}class-id=0
config2 = `# The all in one config file.
debug: false #when the debug is on, osd.
video_record: 15 #time to record into the .ts video
video_record: 10 #time to record into the .ts video
sources:
config: 'config/source.yaml'
@ -616,7 +616,7 @@ fire_smoke_net:
apply_on: -1
interval: 1
batch_size: 16
model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/fire_smoke_net/weights/yolov4_cspdarknet_tiny_fp16.etlt_b2_gpu0_fp16.engine'
model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/fire_smoke_net/weights/yolov4_cspdarknet_tiny_fp16.etlt_b16_gpu0_fp16.engine'
threshold: 0.95
# 5:抽烟打电话检测
@ -674,12 +674,12 @@ connet_grounder:
# 5:散装桶加油
bulk_oil_net:
enable: true
enable: False
apply_on: 2
interval: 1
batch_size: 2
model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/bulk_oil_net/weights/yolov4_cspdarknet_tiny_fp16.etlt_b2_gpu0_fp16.engine'
threshold: 0.3
threshold: 0.2
# 模型阈值通用设定
rule_threshold:
@ -701,7 +701,7 @@ rule_threshold:
config3 = `# The all in one config file.
debug: false #when the debug is on, osd.
video_record: 15 #time to record into the .ts video
video_record: 10 #time to record into the .ts video
sources:
config: 'config/source.yaml'
@ -726,7 +726,7 @@ peoplenet:
detected-min-w: 20
detected-min-h: 200
model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/peoplenet/weights/resnet34_peoplenet_int8.etlt_b16_gpu0_int8.engine'
threshold: 0.8
threshold: 0.3
# 2:车辆检测
trafficcam:
@ -763,7 +763,7 @@ fire_smoke_net:
apply_on: -1
interval: 1
batch_size: 16
model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/fire_smoke_net/weights/yolov4_cspdarknet_tiny_fp16.etlt_b2_gpu0_fp32.engine'
model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/fire_smoke_net/weights/yolov4_cspdarknet_tiny_fp16.etlt_b16_gpu0_fp32.engine'
threshold: 0.95
# 5:抽烟打电话检测
@ -821,7 +821,7 @@ connet_grounder:
# 5:散装桶加油
bulk_oil_net:
enable: true
enable: False
apply_on: 2
interval: 1
batch_size: 2

Write Preview
Loading…
Cancel
Save