From 81b39a2f9b00ab6be4b2075a28ef5f1f8e497da8 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 08 九月 2020 14:48:50 +0800
Subject: [PATCH] 取消摄像机树的锁定按钮, 修复检索便签选择请求两次的bug
---
src/components/player/index.vue | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 288 insertions(+), 2 deletions(-)
diff --git a/src/components/player/index.vue b/src/components/player/index.vue
index 0f30b78..1e5fa58 100644
--- a/src/components/player/index.vue
+++ b/src/components/player/index.vue
@@ -1,5 +1,6 @@
<template>
<div class="video-player">
+ <canvas id="area-canvas" ref="areaCanvas" ></canvas>
<video ref="videoPlayer" :poster="poster" preload="auto" muted></video>
<div class="controls">
<!-- 鍏ㄥ睆 -->
@@ -9,7 +10,10 @@
</template>
<script>
import Wfs from "./wfs";
-
+import VideoRuleData from "@/Pool/VideoRuleData";
+import TreeDataPool from "@/Pool/TreeData";
+import { getAllPolygon } from "@/api/polygon";
+import polygonCanvas from "@/components/canvas";
export default {
name: "CameraPlayer",
props: {
@@ -39,7 +43,9 @@
default: false
}
},
+
computed: {
+
poster() {
return "/images/player/player_poster.gif?t=" + Math.random()
}
@@ -47,10 +53,37 @@
data() {
return {
wfs: {},
- wfsId: 0
+ wfsId: 0,
+ Camera: new VideoRuleData(),
+ showCanvas: true,
+ canvasData: {
+ line: [],
+ rect: [], // {id:'uuid', name: '鐭╁舰1', location: [{ x: 20, y: 30 }, { x: 20, y: 60 }, { x: 100, y: 60 }, { x: 100, y: 30 }] }
+ arrow: [],
+ polygon: []
+ },
+ showProportion: 3.65,
+ canvas: null,
+ ctx: 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) {
@@ -125,10 +158,245 @@
},
fullScreen() {
this.$refs.videoPlayer.webkitRequestFullScreen();
+ },
+ // 鍥炴樉cavas鏁版嵁
+ // 鐐瑰嚮閫変腑鍙樿壊 灏嗗綋鍓嶉〉闈㈡墍鏈夎矾寰勯噸缁樺垽鏂綋鍓嶉紶鏍囩殑鍧愭爣鍦ㄥ摢涓浘褰㈠唴 濡傛灉涓嶄紶鍧愭爣鍙傛暟灏辨槸鍥炴樉鐨勬柟娉�
+ clickSelect(e) {
+ this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+ let _this = this; // 闆嗗悎涓亶鍘嗛渶瑕佸皢this杞瓨涓�涓嬩娇鐢�
+ _this.canvasData.line.forEach(function (v, i) {
+ _this.ctx.strokeStyle = "yellow";
+ _this.ctx.beginPath();
+ _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";
+ if (e && _this.ctx.isPointInStroke(e.offsetX, e.offsetY)) {
+ // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
+ // 濡傛灉褰撳墠鐜瑕嗙洊浜嗚鍧愭爣锛屽氨灏嗗浘褰㈢殑index鏀惧埌鏁扮粍閲�
+ // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
+ _this.type = "0";
+ _this.delCursor.type = "1";
+ _this.delCursor.index = i;
+ // 灏嗗綋鍓嶅厓绱犳爣绾�
+ _this.ctx.strokeStyle = "red";
+ _this.ctx.beginPath();
+ _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 = "pointer";
+ }
+ });
+ _this.canvasData.rect.forEach(function (v, i) {
+ _this.ctx.strokeStyle = "yellow";
+ _this.ctx.beginPath();
+ _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.lineTo(v.location[2].x / _this.showProportion, v.location[2].y / _this.showProportion);
+ _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";
+ if (e && _this.ctx.isPointInPath(e.offsetX, e.offsetY)) {
+ // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
+ // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
+ _this.type = "0";
+ _this.delCursor.type = "2";
+ _this.delCursor.index = i;
+ // 灏嗗綋鍓嶅厓绱犳爣绾�
+ _this.ctx.strokeStyle = "red";
+ _this.ctx.beginPath();
+ _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.lineTo(v.location[2].x / _this.showProportion, v.location[2].y / _this.showProportion);
+ _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 = "pointer";
+ }
+ });
+ _this.canvasData.arrow.forEach(function (v, i) {
+ _this.ctx.strokeStyle = "yellow";
+ // _this.ctx.beginPath()
+ // _this.ctx.moveTo(v.location[0].x / 2, v.location[0].y / 2)
+ // _this.ctx.lineTo(v.location[1].x / 2, v.location[1].y / 2)
+ // _this.ctx.stroke()
+ _this.drawArrow(
+ _this.ctx,
+ v.location[0].x / _this.showProportion,
+ v.location[0].y / _this.showProportion,
+ v.location[1].x / _this.showProportion,
+ v.location[1].y / _this.showProportion,
+ 20,
+ 30,
+ "yellow"
+ ); // 缁樺埗鏂规硶
+ _this.showRemarks(
+ v.location[0].x / _this.showProportion,
+ v.location[0].y / _this.showProportion,
+ v.name
+ );
+ _this.canvas.style.cursor = "default";
+ if (e && _this.ctx.isPointInStroke(e.offsetX, e.offsetY)) {
+ // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
+ // 濡傛灉褰撳墠鐜瑕嗙洊浜嗚鍧愭爣锛屽氨灏嗗浘褰㈢殑index鏀惧埌鏁扮粍閲�
+ // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
+ _this.type = "0";
+ _this.delCursor.type = "4";
+ _this.delCursor.index = i;
+ // 灏嗗綋鍓嶅厓绱犳爣绾�
+ _this.ctx.strokeStyle = "red";
+ // _this.ctx.beginPath()
+ // _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.drawArrow(
+ _this.ctx,
+ v.location[0].x / _this.showProportion,
+ v.location[0].y / _this.showProportion,
+ v.location[1].x / _this.showProportion,
+ v.location[1].y / _this.showProportion,
+ 20,
+ 30,
+ "red"
+ ); // 缁樺埗鏂规硶
+ _this.showRemarks(
+ v.location[0].x / _this.showProportion,
+ v.location[0].y / _this.showProportion,
+ v.name
+ );
+ _this.canvas.style.cursor = "pointer";
+ }
+ });
+ _this.canvasData.polygon.forEach(function (v, i) {
+ if (v.location.length === 0) {
+ return;
+ }
+ _this.ctx.strokeStyle = "yellow";
+ _this.ctx.beginPath();
+ _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
+ for (let i = 1; i < v.location.length; i++) {
+ _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportion);
+ }
+ _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.showProportion,
+ v.name
+ );
+ _this.canvas.style.cursor = "default";
+ if (e && _this.ctx.isPointInPath(e.offsetX, e.offsetY)) {
+ // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
+ // 濡傛灉褰撳墠鐜瑕嗙洊浜嗚鍧愭爣锛屽氨灏嗗浘褰㈢殑index鏀惧埌鏁扮粍閲�
+ // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
+ _this.type = "0";
+ _this.delCursor.type = "5";
+ _this.delCursor.index = i;
+ // 灏嗗綋鍓嶅厓绱犳爣绾�
+ _this.ctx.strokeStyle = "red";
+ _this.ctx.beginPath();
+ _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
+ for (let i = 1; i < v.location.length; i++) {
+ _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportion);
+ }
+ _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.showProportion,
+ v.name
+ );
+ _this.canvas.style.cursor = "pointer";
+ }
+ });
+ },
+ // 鍥炴樉鍥惧舰澶囨敞
+ showRemarks(x, y, remarks) {
+ this.ctx.moveTo(x, y - 10); // 鍥犱负鏀惧ぇ涔嬪悗鏄痽-20锛屾墍浠ョ缉灏忕増鐨勪负y-10
+ this.ctx.fillStyle = "green"; // 璁剧疆濉厖棰滆壊涓虹豢鑹�
+ this.ctx.font = '10px "寰蒋闆呴粦"'; // 璁剧疆瀛椾綋
+ this.ctx.textBaseline = "bottom"; // 璁剧疆瀛椾綋搴曠嚎瀵归綈缁樺埗鍩虹嚎
+ this.ctx.textAlign = "left"; // 璁剧疆瀛椾綋瀵归綈鐨勬柟寮�
+ this.ctx.fillText(remarks, x, y - 10); // 濉厖鏂囧瓧
+ },
+ getCanvasData(data) {
+ let polyon = { ...data };
+ polyon.camera_id = this.Camera.cameraId;
+ savePolygon(polyon).then(rsp => {
+ this.Camera.getPolygon();
+ this.Camera.getCameraTask();
+ });
+ },
+ async initCanvas(id){
+
+ //this.canvas = document.querySelector("#area-canvas");
+ this.canvas = this.$refs.areaCanvas;
+ this.ctx = this.canvas.getContext("2d");
+
+ // this.Camera.getPolygon();x:758,y:280
+ // console.log(this.Camera.canvasData);
+ const rsp = await getAllPolygon({ cameraId: id });
+ debugger
+ if (rsp && rsp.success) {
+ this.canvasData = {
+ line: rsp.data.line,
+ arrow: rsp.data.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: [{id:'uuid', name: '鐭╁舰1', location: [{ x: 20, y: 30 }, { x: 20, y: 60 }, { x: 100, y: 60 }, { x: 100, y: 30 }] }]
+ };
+ }
+ debugger
+ this.clickSelect(this.canvasData);
+ },
+ async initArea(){
+ console.log('init')
+ 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);
}
},
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();
@@ -138,6 +406,24 @@
</script>
<style lang="scss">
+#area-canvas{
+ width: 100%;
+ height: 100%;
+ background: transparent;
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+// .cavas{
+// width: 100%;
+// height: 100%;
+// position: absolute;
+// top: 0;
+// left: 0;
+// canvas{
+// background: transparent!important;
+// }
+// }
video {
object-fit: fill;
width: 100%;
--
Gitblit v1.8.0