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 4f4933e..11c7b69 100644 --- a/src/app/system-management/host-config/host-config.component.ts +++ b/src/app/system-management/host-config/host-config.component.ts @@ -74,8 +74,8 @@ export class HostConfigComponent implements OnInit { let params = { ContainsChildren: true, EdgeDeviceId: this.hostId, - pageNumber:1, - pageSize:99 + pageNumber: 1, + pageSize: 99 } this.isLoading = true this.http.get('/api/Cameras', { params: params }).subscribe((data: any) => { @@ -292,13 +292,53 @@ export class HostConfigComponent implements OnInit { inference_buffer_second: 6 sources:` copyListOfData.forEach((item: any, index) => { - config4 += ` + if (item.type == 3 && item.dimensionedPointsObj && item.dimensionedPointsObj.arrow.length != 0) { + let arrowArr = item.dimensionedPointsObj.arrow + let str = arrowArr[1].startX + ';' + arrowArr[1].startY + ';' + arrowArr[1].endX + ';' + arrowArr[1].endY + ';' + arrowArr[0].startX + ';' + arrowArr[0].startY + ';' + arrowArr[0].endX + ';' + arrowArr[0].endY + config4 += ` + - name: '${item.name}' + user: '${item.user}' + password: '${item.password}' + uri: '${item.uri}' + type: ${item.type} + line-crossing-Entry: ${str} + ` + } else if (item.type == 2 && item.dimensionedPointsObj && item.dimensionedPointsObj.arrow.length != 0 && item.dimensionedPointsObj.arrowOfWest && item.dimensionedPointsObj.arrowOfWest.length == 0) { + let arrowArr = item.dimensionedPointsObj.arrow + let str = arrowArr[1].startX + ';' + arrowArr[1].startY + ';' + arrowArr[1].endX + ';' + arrowArr[1].endY + ';' + arrowArr[0].startX + ';' + arrowArr[0].startY + ';' + arrowArr[0].endX + ';' + arrowArr[0].endY + config4 += ` + - name: '${item.name}' + user: '${item.user}' + password: '${item.password}' + uri: '${item.uri}' + type: ${item.type} + line-crossing-Entry: ${str} + ` + } else if (item.type == 2 && item.dimensionedPointsObj && item.dimensionedPointsObj.arrow.length != 0 && item.dimensionedPointsObj.arrowOfWest && item.dimensionedPointsObj.arrowOfWest.length != 0) { + let arrowArr = item.dimensionedPointsObj.arrow + let str = arrowArr[1].startX + ';' + arrowArr[1].startY + ';' + arrowArr[1].endX + ';' + arrowArr[1].endY + ';' + arrowArr[0].startX + ';' + arrowArr[0].startY + ';' + arrowArr[0].endX + ';' + arrowArr[0].endY + let arrowArr2 = item.dimensionedPointsObj.arrowOfWest + let str2 = arrowArr2[1].startX + ';' + arrowArr2[1].startY + ';' + arrowArr2[1].endX + ';' + arrowArr2[1].endY + ';' + arrowArr2[0].startX + ';' + arrowArr2[0].startY + ';' + arrowArr2[0].endX + ';' + arrowArr2[0].endY + let str3 = str + ';' + str2 + config4 += ` - name: '${item.name}' user: '${item.user}' password: '${item.password}' uri: '${item.uri}' type: ${item.type} + line-crossing-Entry: ${str3} ` + } else { + config4 += ` + - name: '${item.name}' + user: '${item.user}' + password: '${item.password}' + uri: '${item.uri}' + type: ${item.type} + ` + } + + }) const modal = this.modal.create({ nzTitle: '下发source.yaml配置', @@ -359,7 +399,7 @@ sources:` return item.isEnabled; }) - console.log('摄像头列表',copyListOfData) + console.log('摄像头列表', copyListOfData) // return