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 7527c56..40dc688 100644
--- a/src/app/system-management/host-config/host-config.component.html
+++ b/src/app/system-management/host-config/host-config.component.html
@@ -29,13 +29,15 @@
{{ item.uri }} |
{{ item.type | cameraType}} |
-
+
{{item.dimensionedPoints ? '已标注' : '未标注'}}
-
-
+
+
{{item.dimensionedPointsHuanghai ? '已标注' : '未标注'}}
-
-
+
+
+ {{item.dimensionedPointsAnxin ? '已标注' : '未标注'}}
+
|
{{ item.isEnabled ? '已启用' : '已禁用'}} |
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 887304a..a684a7b 100644
--- a/src/app/system-management/host-config/host-config.component.ts
+++ b/src/app/system-management/host-config/host-config.component.ts
@@ -32,6 +32,7 @@ interface Camera {
dimensionedPoints: string;
dimensionedPointsHuanghai: string;
dimensionedPointsHuanghaiObj: any;
+ dimensionedPointsAnxin: string;
isEnabled: boolean;
}
@@ -1555,10 +1556,13 @@ ${newstr}class-id=0
configJsonToAx() {
let data = {
+ server: 'http://121.36.37.70:8208',
+ obs: 'http://121.36.37.70:8906',
userInfo: {
user: '',
password: '',
},
+ ip: this.hostData.hostIPAddress,
caps: [],
};
console.log(this.listOfData);
@@ -1587,6 +1591,8 @@ ${newstr}class-id=0
type: type,
url: item.uri,
name: item.name,
+ user: item.user,
+ password: item.password,
};
if (areas.length !== 0) {
obj.areas = areas;
diff --git a/src/app/system-management/image-label-anxin/image-label-anxin.component.html b/src/app/system-management/image-label-anxin/image-label-anxin.component.html
index 9afa834..1d6f389 100644
--- a/src/app/system-management/image-label-anxin/image-label-anxin.component.html
+++ b/src/app/system-management/image-label-anxin/image-label-anxin.component.html
@@ -34,6 +34,11 @@
+
+
+
+
+
diff --git a/src/app/system-management/image-label-anxin/image-label-anxin.component.scss b/src/app/system-management/image-label-anxin/image-label-anxin.component.scss
index 20315bd..3822f8f 100644
--- a/src/app/system-management/image-label-anxin/image-label-anxin.component.scss
+++ b/src/app/system-management/image-label-anxin/image-label-anxin.component.scss
@@ -39,13 +39,14 @@
display: flex;
align-items: center;
}
- .colorBlock{
+
+ .colorBlock {
display: inline-block;
width: 12px;
height: 12px;
margin-left: 3px;
}
-
+
.deleteItem {
@@ -84,3 +85,16 @@
background-color: #1890ff;
color: #fff;
}
+
+.changeImg {
+ position: relative;
+
+ .inputfile {
+ width: 88px;
+ height: 32px;
+ position: absolute;
+ left: 0;
+ top: 0;
+ opacity: 0;
+ }
+}
diff --git a/src/app/system-management/image-label-anxin/image-label-anxin.component.ts b/src/app/system-management/image-label-anxin/image-label-anxin.component.ts
index 0664111..6604676 100644
--- a/src/app/system-management/image-label-anxin/image-label-anxin.component.ts
+++ b/src/app/system-management/image-label-anxin/image-label-anxin.component.ts
@@ -513,6 +513,29 @@ export class ImageLabelAnxinComponent implements OnInit {
this.modal.closeAll();
});
}
+ //更换底图
+ changeImg(e) {
+ this.clearCanvas();
+ let file = e.target.files[0] || null; //获取上传的文件
+ let fileUrl = URL.createObjectURL(file);
+ console.log(fileUrl);
+ var img = new Image();
+ img.src = fileUrl;
+ img.onload = () => {
+ this.canvasWidth = img.width;
+ this.canvasHeight = img.height;
+ window.setTimeout(() => {
+ // 加载图片
+ this.ctx.drawImage(img, 0, 0, this.canvasWidth, this.canvasHeight);
+ this.copyCanvas = this.ctx.getImageData(
+ 0,
+ 0,
+ this.canvasWidth,
+ this.canvasHeight
+ );
+ }, 0);
+ };
+ }
}
enum enum_area {
|