Merge branch 'master' of http://39.106.78.171:3000/13562321995/Edge-host-maintenance

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

@@ -10,6 +10,7 @@
     <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>
   </div>
   <div class="imgbox">
     <div class="content">

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

@@ -27,6 +27,7 @@
     margin-right: 6px;
   }
   .leftTitle{ line-height: 32px; margin-right: 10px; color: #fff; }
+  .rightTitle{ line-height: 32px; margin-left: 10px; color: #fff; }
 }
 
 .imgbox,