diff --git a/src/app/system-management/config-form/config-form.component.ts b/src/app/system-management/config-form/config-form.component.ts index ebce0bd..e7ed8d3 100644 --- a/src/app/system-management/config-form/config-form.component.ts +++ b/src/app/system-management/config-form/config-form.component.ts @@ -15,7 +15,7 @@ export class ConfigFormComponent implements OnInit { config1: string config2: string config3: string - config4: string + // config4: string hostId//主机id orId//加油站id ngOnInit(): void { @@ -24,7 +24,7 @@ export class ConfigFormComponent implements OnInit { this.config1 = sessionStorage.getItem('config1') this.config2 = sessionStorage.getItem('config2') this.config3 = sessionStorage.getItem('config3') - this.config4 = sessionStorage.getItem('config4') + // this.config4 = sessionStorage.getItem('config4') } goback() { history.go(-1) 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 adb576c..aa313d5 100644 --- a/src/app/system-management/host-config/addcamera/addcamera.component.html +++ b/src/app/system-management/host-config/addcamera/addcamera.component.html @@ -55,8 +55,21 @@ + + + + + + + + + + + + + - + \ No newline at end of file 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 adb576c..aa313d5 100644 --- a/src/app/system-management/host-config/editcamera/editcamera.component.html +++ b/src/app/system-management/host-config/editcamera/editcamera.component.html @@ -55,8 +55,21 @@ + + + + + + + + + + + + + - + \ No newline at end of file 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 cae561a..f138b67 100644 --- a/src/app/system-management/host-config/host-config.component.ts +++ b/src/app/system-management/host-config/host-config.component.ts @@ -355,6 +355,7 @@ logging_interval : 600 this.listOfData.forEach((item: any, index) => { if (item.type == 2) { xieyouqu.push(item) + console.log('xxxxxxxxx',item.order) order = item.order } @@ -404,13 +405,20 @@ mode=strict let xieyouguan = ''; let jingdian = ''; - (xieyouqu.length != 0 && xieyouqu[0].dimensionedPointsObj && xieyouqu[0].dimensionedPointsObj.rectangle.length != 0) ? xieyouqu[0].dimensionedPointsObj.rectangle.forEach(element => { - if (element.oilUnloadingArea) { - xieyouguan = element.x + ',' + element.y + ',' + element.width + ',' + element.height - } else { - jingdian = element.x + ',' + element.y + ',' + element.width + ',' + element.height - } - }) : ''; + if (xieyouqu.length != 0 && xieyouqu[0].dimensionedPointsObj && xieyouqu[0].dimensionedPointsObj.rectangle.length != 0) { + xieyouqu[0].dimensionedPointsObj.rectangle.forEach(element => { + if (element.oilUnloadingArea) { + xieyouguan = element.x + ',' + element.y + ',' + element.width + ',' + element.height + } else { + jingdian = element.x + ',' + element.y + ',' + element.width + ',' + element.height + } + }) + } else { + xieyouguan = '0,0,0,0' + jingdian = '0,0,0,0' + } + + (order != undefined) ? null : order = this.listOfData[this.listOfData.length - 1].order + 1 console.log('泄油管区域', xieyouguan) console.log('静电接地', jingdian) config2 = `# The all in one config file.