From ccee429d379e0108b7445f72ade8d97c110a6fb3 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 18:01:59 +0800
Subject: [PATCH] 问题修复
---
src/components/player/index.vue | 128 +++++++++++++++---------------------------
1 files changed, 47 insertions(+), 81 deletions(-)
diff --git a/src/components/player/index.vue b/src/components/player/index.vue
index 7cffb92..a1757a3 100644
--- a/src/components/player/index.vue
+++ b/src/components/player/index.vue
@@ -47,9 +47,8 @@
default: false
}
},
-
- computed: {
+ computed: {
poster() {
return "/images/player/player_poster.gif?t=" + Math.random()
}
@@ -76,35 +75,37 @@
ctx: null,
canvasWidth: 0,
canvasHeight: 0,
+ algoDataSocket: null
};
},
watch: {
- // "TreeDataPool.selectedNode": async function(node){
- // if(node){
- // console.log('TreeDataPool.selectedNode')
- // console.log(node)
- // //this.Camera.cameraId = node.id;
- // const res = await getAllPolygon({cameraId: node.id});
-
- // this.canvasData.line = res.data.line;
- // this.canvasData.rect = res.data.rect;
- // this.canvasData.arrow = res.data.arrow;
- // this.canvasData.polygon = res.data.polygon;
- // console.log(this.canvasData)
- // this.clickSelect(this.canvasData);
- // }
- // },
-
rtspUrl: function (newVal, oldVal) {
if (newVal !== oldVal) {
if (this.wfs.config) {
this.wfs.destroy();
+ !!this.algoDataSocket && this.algoDataSocket.close()
}
this.$nextTick(() => {
this.clickStart();
});
}
}
+ },
+ mounted() {
+ this.clickStart();
+ this.$nextTick(() => {
+ this.canvas = this.$refs.areaCanvas;
+ this.ctx = this.canvas.getContext("2d");
+ this.ctx.lineWidth = 1;
+ this.initArea();
+
+ })
+ },
+ beforeDestroy() {
+ this.wfs.destroy();
+ this.wfsId = "";
+
+ !!this.algoDataSocket && this.algoDataSocket.close()
},
methods: {
checkConnect(id) {
@@ -135,7 +136,6 @@
if (cameraId == "") {
cameraId = this.getUuid();
}
-
if (Wfs.isSupported()) {
let wsAddr = this.wsAddr;
let cameraInfo = {
@@ -181,11 +181,6 @@
_this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
_this.ctx.lineTo(v.location[1].x / _this.showProportion, v.location[1].y / _this.showProportion);
_this.ctx.stroke();
- // _this.showRemarks(
- // v.location[0].x / _this.showProportion,
- // v.location[0].y / _this.showProportion,
- // v.name
- // );
_this.canvas.style.cursor = "default";
});
_this.canvasData.rect.forEach(function (v, i) {
@@ -197,13 +192,8 @@
_this.ctx.lineTo(v.location[3].x / _this.showProportion, v.location[3].y / _this.showProportion);
_this.ctx.lineTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
_this.ctx.stroke();
- // _this.showRemarks(
- // v.location[0].x / _this.showProportion,
- // v.location[0].y / _this.showProportion,
- // v.name
- // );
_this.canvas.style.cursor = "default";
-
+
});
_this.canvasData.arrow.forEach(function (v, i) {
_this.ctx.strokeStyle = "yellow";
@@ -216,15 +206,9 @@
20,
30,
"yellow"
- );
- // 缁樺埗鏂规硶
- // _this.showRemarks(
- // v.location[0].x / _this.showProportion,
- // v.location[0].y / _this.showProportion,
- // v.name
- // );
+ );
_this.canvas.style.cursor = "default";
-
+
});
_this.canvasData.polygon.forEach(function (v, i) {
if (v.location.length === 0) {
@@ -238,18 +222,13 @@
}
_this.ctx.closePath();
_this.ctx.stroke();
- // _this.showRemarks(
- // v.location[v.location.length - 1].x / _this.showProportion,
- // v.location[v.location.length - 1].y / _this.showProportionY,
- // v.name
- // );
_this.canvas.style.cursor = "default";
-
+
});
},
-
+
// 绠ご缁樺埗鍑芥暟
- drawArrow(ctx, fromX, fromY, toX, toY, theta=30, headlen=10, width=1, color="yellow") {
+ drawArrow(ctx, fromX, fromY, toX, toY, theta = 30, headlen = 10, width = 1, color = "yellow") {
// ctx锛欳anvas缁樺浘鐜
// fromX, fromY锛氳捣鐐瑰潗鏍囷紙涔熷彲浠ユ崲鎴恜1锛屽彧涓嶈繃瀹冩槸涓�涓暟缁勶級
// toX, toY锛氱粓鐐瑰潗鏍� (涔熷彲浠ユ崲鎴恜2锛屽彧涓嶈繃瀹冩槸涓�涓暟缁�)
@@ -289,7 +268,7 @@
ctx.stroke();
ctx.restore();
},
-
+
// 鍥炴樉鍥惧舰澶囨敞
showRemarks(x, y, remarks) {
this.ctx.moveTo(x, y - 10); // 鍥犱负鏀惧ぇ涔嬪悗鏄痽-20锛屾墍浠ョ缉灏忕増鐨勪负y-10
@@ -307,56 +286,43 @@
this.Camera.getCameraTask();
});
},
- setWidthHeight(){
+ setWidthHeight() {
this.canvasWidth = this.$refs.videoPlayer.offsetWidth;
this.canvasHeight = this.$refs.videoPlayer.offsetHeight;
- console.log(this.canvasWidth,this.canvasHeight)
+ console.log(this.canvasWidth, this.canvasHeight)
},
- async initArea(){
+ async initArea() {
console.log('init')
- const res = await getAllPolygon({cameraId: this.TreeDataPool.selectedNode.id});
+ const res = await getAllPolygon({ cameraId: this.TreeDataPool.selectedNode.id });
this.canvasData.line = res.data.line;
this.canvasData.rect = res.data.rect;
this.canvasData.arrow = res.data.arrow;
this.canvasData.polygon = res.data.polygon;
console.log(this.canvasData)
- // this.canvasData = {
- // line: [],
- // arrow: [],
- // polygon: [{id:'uuid', name: '澶氳竟褰�1', location: [{ x: 735, y: 155 }, { x: 830, y: 156 }, { x: 809, y: 351 }, { x: 809, y: 364 }, { x: 753, y: 396 }, { x: 755, y: 520 },{ x: 706, y: 524 },{ x: 722, y: 392 },{x:758,y:280},{ x: 735, y: 155 }] }],
- // //rect: rsp.data.rect
- // rect: []
- // };
this.clickSelect(this.canvasData);
+ },
+ initAlgoDataWebScoket() {
+ if (typeof (WebSocket) === "undefined") {
+ console.log("error,鎮ㄧ殑娴忚鍣ㄤ笉鏀寔socket")
+ } else {
+ this.algoDataSocket = new WebSocket()
+ this.algoDataSocket.onopen = () => {
+ console.log("socket杩炴帴鎴愬姛")
+ }
+ this.algoDataSocket.onerror = () => {
+ console.log("杩炴帴閿欒")
+ }
+ this.algoDataSocket.onmessage = msg => {
+ console.log(msg)
+ }
+ }
}
- },
- mounted() {
- //鑾峰彇video瀹介珮骞剁粰鍖哄煙canvas璧嬪��
- //this.setWidthHeight();
- this.clickStart();
-
- window.addEventListener('resize',()=>{
- //this.setWidthHeight();
- //this.initArea();
- });
- this.$nextTick(()=>{
- this.canvas = this.$refs.areaCanvas;
- this.ctx = this.canvas.getContext("2d");
- this.ctx.lineWidth = 1;
-
- this.initArea();
-
- })
- },
- beforeDestroy() {
- this.wfs.destroy();
- this.wfsId = "";
}
};
</script>
<style lang="scss">
-#area-canvas{
+#area-canvas {
background: transparent;
position: absolute;
top: 0;
--
Gitblit v1.8.0