From c463ea3a215e89d0369ad26102bb8fca3fffdfd7 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sun, 8 May 2022 09:11:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../condition-monitoring.component.html | 60 +++++++++++++++---- .../host-config/host-config.component.html | 2 +- .../host-config/host-config.component.ts | 59 +++++++++--------- 3 files changed, 76 insertions(+), 45 deletions(-) diff --git a/src/app/system-management/condition-monitoring/condition-monitoring.component.html b/src/app/system-management/condition-monitoring/condition-monitoring.component.html index 87e59ad..afb5bf1 100644 --- a/src/app/system-management/condition-monitoring/condition-monitoring.component.html +++ b/src/app/system-management/condition-monitoring/condition-monitoring.component.html @@ -32,10 +32,10 @@ [nzType]="'sync'">重置 - + --> + @@ -59,10 +63,16 @@ ip地址 所属油站 设备状态 - 识别程序服务状态 - 识别程序状态 - 镜像状态 - + + 识别程序更新状态 + 识别程序更新状态开始时间 + 识别程序更新状态结束时间 + 镜像更新状态 + 镜像更新状态开始时间 + 镜像更新状态结束时间 + 监控程序更新状态 + 监控程序更新状态开始时间 + 监控程序更新状态结束时间 @@ -72,27 +82,51 @@ {{ data.hostIPAddress }} {{ data.gasStationName }} {{ data.hubConnectionState == 'Disconnected' ? '未连接' : '已连接' }} - + 未更新 更新中 已更新 + + {{data.appUpdatingStartedTime ? (data.appUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") : + '/'}} + + + {{data.appUpdatingFinishedTime ? (data.appUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") : + '/'}} + 未更新 更新中 已更新 - + + {{data.imageUpdatingStartedTime ? (data.imageUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") : + '/'}} + + + {{data.imageUpdatingFinishedTime ? (data.imageUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") : + '/'}} + + + 未更新 + 更新中 + 已更新 + + + {{data.monitorUpdatingStartedTime ? (data.monitorUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") : + '/'}} + + + {{data.monitorUpdatingFinishedTime ? (data.monitorUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") : + '/'}} + 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 4452fe2..1fd7a1d 100644 --- a/src/app/system-management/host-config/host-config.component.html +++ b/src/app/system-management/host-config/host-config.component.html @@ -44,7 +44,7 @@
- +
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 f21f8d0..46e96c6 100644 --- a/src/app/system-management/host-config/host-config.component.ts +++ b/src/app/system-management/host-config/host-config.component.ts @@ -48,7 +48,7 @@ export class HostConfigComponent implements OnInit { // return item // } // }) - if (data.configFiles) { + if (data.configFiles && data.configFiles.length != 0) { this.isSourceYaml = true } else { this.isSourceYaml = false @@ -74,7 +74,7 @@ export class HostConfigComponent implements OnInit { EdgeDeviceId: this.hostId } this.isLoading = true - this.http.get('/api/Cameras',{ params: params }).subscribe((data: any) => { + this.http.get('/api/Cameras', { params: params }).subscribe((data: any) => { data.items.forEach(element => { element.dimensionedPointsObj = JSON.parse(element.dimensionedPoints) }); @@ -213,16 +213,16 @@ export class HostConfigComponent implements OnInit { connect() { - let isAllLabel = this.listOfData.find((item: any) => { - if (item.type != 1 && !item.dimensionedPoints) { - console.log('存在摄像头未标注的情况') - return item - } - }) - if (isAllLabel) { - this.message.create('error', '存在摄像头未标注的情况'); - return - } + // let isAllLabel = this.listOfData.find((item: any) => { + // if (item.type != 1 && !item.dimensionedPoints) { + // console.log('存在摄像头未标注的情况') + // return item + // } + // }) + // if (isAllLabel) { + // this.message.create('error', '存在摄像头未标注的情况'); + // return + // } let ids = [] this.listOfData.forEach((item: any) => { ids.push(item.id) @@ -334,10 +334,10 @@ logging_interval : 600 if (item.type == 0) { let str = '' - item.dimensionedPointsObj.polygon.forEach(element => { + item.dimensionedPointsObj ? item.dimensionedPointsObj.polygon.forEach(element => { str += element.x + ',' str += element.y + ',' - }); + }) : 0; str = str.substring(0, str.lastIndexOf(',')) console.log('进出口多边形', str) config1 += ` @@ -375,22 +375,19 @@ mode=strict ` } }) - if (xieyouqu.length != 1) { - this.message.create('warning', '有且只能有一个卸油区！'); - return - } else { - let xieyouguan = '' - let jingdian = '' - 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 - } - }); - console.log('泄油管区域', xieyouguan) - console.log('静电接地', jingdian) - config2 = `# The all in one config file. + + let xieyouguan = '' + let jingdian = '' + xieyouqu.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 + } + }) : ''; + console.log('泄油管区域', xieyouguan) + console.log('静电接地', jingdian) + config2 = `# The all in one config file. # RTSP sources # type # 0 ViolateArea.ENTRANCE, @@ -497,7 +494,7 @@ rule_threshold: threshold_connecting: 0.667 #rolling mean confidence threshold_identity: 0.1 #only to filter out people net error ` - } + sessionStorage.setItem('config1', config1) sessionStorage.setItem('config2', config2) sessionStorage.setItem('config3', config3)