[新增]增加标绘

src/app/system-management/condition-monitoring/condition-monitoring.component.ts

@@ -176,7 +176,7 @@ export class ConditionMonitoringComponent implements OnInit {
               str += element.detail + '<br>'
             });
             this.message.create('info', str, {
-              nzDuration: 2000
+              nzDuration: 3000
             });
           }
 
@@ -214,7 +214,7 @@ export class ConditionMonitoringComponent implements OnInit {
                       str += element.detail + '<br>'
                     });
                     this.message.create('info', str, {
-                      nzDuration: 2000
+                      nzDuration: 3000
                     });
                   }
 
@@ -289,7 +289,7 @@ export class ConditionMonitoringComponent implements OnInit {
                     str += element.detail + '<br>'
                   });
                   this.message.create('info', str, {
-                    nzDuration: 2000
+                    nzDuration: 3000
                   });
                 }
                 this.setOfCheckedId.clear();

src/app/system-management/host-config/host-config.component.html

@@ -29,23 +29,24 @@
             <td>{{ item.uri }}</td>
             <td>{{ item.type | cameraType}}</td>
             <td>
-              <ng-container *ngIf="item.type == 1; else elseTemplate">
+              <!-- <ng-container *ngIf="item.type == 1; else elseTemplate">
                 不需要标注
               </ng-container>
               <ng-template #elseTemplate>
                 {{item.dimensionedPoints ? '已标注' : '未标注'}}
-              </ng-template>
+              </ng-template> -->
+              {{item.dimensionedPoints ? '已标注' : '未标注'}}
             </td>
             <td>{{ item.isEnabled ? '已启用' : '已禁用'}}</td>
             <td>
               <span class="blue" style="margin-right: 12px;" (click)="editCamera(item)">编辑</span>
-              <span class="blue" style="margin-right: 12px;" [ngClass]="{'forbid': item.type == 1}"
-                (click)="label(item)">标注</span>
+              <span class="blue" style="margin-right: 12px;" (click)=" label(item)">标注</span>
               <ng-container *ngIf="item.isEnabled; else elseTemplate2">
                 <span class="red" style="margin-right: 12px;" (click)="forbidden(item)">禁用</span>
               </ng-container>
               <ng-template #elseTemplate2>
-                <span class="blue" style="margin-right: 12px;color: rgb(26, 173, 26);" (click)="forbidden(item)">启用</span>
+                <span class="blue" style="margin-right: 12px;color: rgb(26, 173, 26);"
+                  (click)="forbidden(item)">启用</span>
               </ng-template>
               <span class="red" (click)="deleteCamera(item)">删除</span>
             </td>

src/app/system-management/host-config/host-config.component.ts

@@ -403,7 +403,6 @@ sources:`
 
     // return
 
-
     let config1 = `[property]
 enable=1
 #Width height used for configuration to which below configs are configured
@@ -440,7 +439,6 @@ logging_interval : 600
         config1 += `
 ## Per stream configuration
 [roi-filtering-stream-${item.order}]
-#shoushiyuan-out202
 #enable or disable following feature
 enable=1
 #ROI to filter select objects, and remove from meta data

src/app/system-management/image-label2/image-label2.component.html

@@ -2,38 +2,61 @@
   <!-- <nz-page-header class="site-page-header" (nzBack)="goback()" nzBackIcon nzSubtitle="返回上一页"></nz-page-header> -->
   <div class="btnbox">
     <label class="leftTitle" *ngIf="markType === 0">进出口</label>
+    <label class="leftTitle" *ngIf="markType === 1">加油区</label>
     <label class="leftTitle" *ngIf="markType === 2">卸油区</label>
     <label class="leftTitle" *ngIf="markType === 3">便利店</label>
-    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: isDrawArrow && !arrowDirection}"
-      (click)="isDrawArrow = true;arrowDirection=null">
+
+    <!-- <button nz-button *ngIf="markType === 0" [ngClass]="{selectBtn: isPolygon}"
+      (click)="isPolygon = true;isAllMonitoring = false">
+      进出口监控区域
+      <span class="deleteItem" (click)="clearCanvasItem($event,'polygon')">删除</span>
+    </button> -->
+
+    <button nz-button *ngIf="markType === 3" [ngClass]="{selectBtn: isConvenienceStore && isDrawArrow}"
+      (click)="isConvenienceStore = true;isAllMonitoring = false">
+      便利店箭头标绘
+      <span class="deleteItem" (click)="clearCanvasItem($event,'arrow')">删除</span>
+    </button>
+
+
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: isDrawArrow && !arrowDirection && !isAllMonitoring}"
+      (click)="isDrawArrow = true;arrowDirection=null;isAllMonitoring = false">
       箭头方向标绘1
       <span class="deleteItem" (click)="clearCanvasItem($event,'arrow')">删除</span>
     </button>
-    <!-- <button nz-button *ngIf="markType === 2"
-      [ngClass]="{selectBtn:(isDrawArrow && arrowDirection=='South')}"
-      (click)="isDrawArrow = true;arrowDirection='South'">South</button> -->
-    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: (isDrawArrow && arrowDirection=='West')}"
-      (click)="isDrawArrow = true;arrowDirection='West'">箭头方向标绘2
-      <span class="deleteItem" (click)="clearCanvasItem($event,'arrowOfWest')">删除</span></button>
-    <!-- <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: (isDrawArrow && arrowDirection=='East')}"
-      (click)="isDrawArrow = true;arrowDirection='East'">East</button>
-    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: (isDrawArrow && arrowDirection=='North')}"
-      (click)="isDrawArrow = true;arrowDirection='North'">North</button> -->
-    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: !isDrawArrow && oilUnloadingArea}"
-      (click)="isDrawArrow = false; oilUnloadingArea = true;">泄油管区域
-      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaTrue')">删除</span></button>
-    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: !isDrawArrow && !oilUnloadingArea}"
-      (click)="isDrawArrow = false; oilUnloadingArea = false;">静电接地仪
-      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaFalse')">删除</span></button>
+    <button nz-button *ngIf="markType === 2"
+      [ngClass]="{selectBtn: isDrawArrow && arrowDirection=='West'  && !isAllMonitoring}"
+      (click)="isDrawArrow = true;arrowDirection='West';isAllMonitoring = false">箭头方向标绘2
+      <span class="deleteItem" (click)="clearCanvasItem($event,'arrowOfWest')">删除</span>
+    </button>
+    <button nz-button *ngIf="markType === 2"
+      [ngClass]="{selectBtn: !isDrawArrow && oilUnloadingArea && !isAllMonitoring}"
+      (click)="isDrawArrow = false; oilUnloadingArea = true;isAllMonitoring = false">泄油管区域
+      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaTrue')">删除</span>
+    </button>
+    <button nz-button *ngIf="markType === 2"
+      [ngClass]="{selectBtn: !isDrawArrow && !oilUnloadingArea && !isAllMonitoring}"
+      (click)="isDrawArrow = false; oilUnloadingArea = false;isAllMonitoring = false">静电接地仪
+      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaFalse')">删除</span>
+    </button>
+
+
+    <button *ngIf="markType !== 0" nz-button [ngClass]="{selectBtn: isAllMonitoring}"
+      (click)="isAllMonitoring = true;isPolygon = false;isConvenienceStore = false;">全局监控区域
+      <span class="deleteItem" (click)="clearCanvasItem($event,'isAllMonitoring')">删除</span>
+    </button>
+
+
     <button nz-button nzType="primary" (click)="anewgetImg()">重新捕获摄像头图片</button>
     <button nz-button nzType="primary" (click)="save()">保存</button>
     <button nz-button nzType="primary" nzDanger nz-popconfirm nzPopconfirmTitle="您确定要清空吗?"
       (nzOnConfirm)="clearCanvas()">清空</button>
     <label *ngIf="camerasData" class="rightTitle">原始分辨率： {{camerasData.originalWeight}} ×
-      {{camerasData.originalHeight}}</label>
-
-    <!-- <label *ngIf="markType === 2 && !isDrawArrow" class="rightTitle">当前矩形框高度为:{{rectangleHeight}}px,请确保低于420px</label> -->
+      {{camerasData.originalHeight}}
+    </label>
   </div>
+
+
   <div class="imgbox">
     <div class="content">
       <div class="center" id="canvasCenter"><canvas id="canvas" [width]="canvasWidth" [height]="canvasHeight"></canvas>