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 bc9e6fe..0d178b2 100644 --- a/src/app/system-management/host-config/host-config.component.ts +++ b/src/app/system-management/host-config/host-config.component.ts @@ -404,7 +404,7 @@ inverse-roi=0 class-id=-1 ` } - if ((item.type == 2 || item.type == 3) && item.dimensionedPointsObj && item.dimensionedPointsObj.arrow.length != 0) { + if ((item.type == 2 || item.type == 3) && 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 config1 += ` @@ -412,18 +412,33 @@ class-id=-1 enable=1 #Label;direction;lc line-crossing-Entry=${str} -# line-crossing-Exit=789;672;1084;900;851;773;1203;732 class-id=0 -#extended when 0- only counts crossing on the configured Line -# 1- assumes extended Line crossing counts all the crossing extended=0 -#LC modes supported: -#loose : counts all crossing without strong adherence to direction -#balanced: Strict direction adherence expected compared to mode=loose -#strict : Strict direction adherence expected compared to mode=balanced mode=strict ` } + if ((item.type == 2 || item.type == 3) && 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 + + config1 += ` +[line-crossing-stream-${item.order}] +enable=1 +#Label;direction;lc +line-crossing-Entry1=${str} +class-id=0 +extended=0 +mode=strict +line-crossing-Entry2=${str2} +class-id=0 +extended=0 +mode=strict + ` + } + + }) //新增东南西北参数 copyListOfData.forEach(element => { diff --git a/src/app/system-management/image-label2/image-label2.component.html b/src/app/system-management/image-label2/image-label2.component.html index e09e3b4..c694636 100644 --- a/src/app/system-management/image-label2/image-label2.component.html +++ b/src/app/system-management/image-label2/image-label2.component.html @@ -5,20 +5,26 @@ + (click)="isDrawArrow = true;arrowDirection=null"> + 箭头方向标绘1 + 删除 + + (click)="isDrawArrow = true;arrowDirection='West'">箭头方向标绘2 + 删除 + (click)="isDrawArrow = false; oilUnloadingArea = true;">泄油管区域 + 删除 + (click)="isDrawArrow = false; oilUnloadingArea = false;">静电接地仪 + 删除