From eac5d05a36dd2c1b388bc401166af53716f11771 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 08 九月 2020 16:25:31 +0800
Subject: [PATCH] 底库查看详情默认时间修改,实时监控区域比例调整
---
src/components/canvas/index.vue | 2 +-
src/pages/library/components/personList.vue | 2 +-
src/components/player/index.vue | 18 ++++++++++--------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/components/canvas/index.vue b/src/components/canvas/index.vue
index b8ac906..ea4715e 100644
--- a/src/components/canvas/index.vue
+++ b/src/components/canvas/index.vue
@@ -103,7 +103,7 @@
ctx: null,
visible: false,
baseImg: undefined,
- showProportion: 1.71
+ showProportion: 1.666
};
},
watch: {
diff --git a/src/components/player/index.vue b/src/components/player/index.vue
index 1e5fa58..1d8e80b 100644
--- a/src/components/player/index.vue
+++ b/src/components/player/index.vue
@@ -62,7 +62,8 @@
arrow: [],
polygon: []
},
- showProportion: 3.65,
+ showProportion: 3.2,
+ showProportionY: 3.58,
canvas: null,
ctx: null
};
@@ -294,15 +295,15 @@
}
_this.ctx.strokeStyle = "yellow";
_this.ctx.beginPath();
- _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
+ _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
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.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportionY);
}
_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.location[v.location.length - 1].y / _this.showProportionY,
v.name
);
_this.canvas.style.cursor = "default";
@@ -316,15 +317,15 @@
// 灏嗗綋鍓嶅厓绱犳爣绾�
_this.ctx.strokeStyle = "red";
_this.ctx.beginPath();
- _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
+ _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
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.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportionY);
}
_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.location[v.location.length - 1].y / _this.showProportionY,
v.name
);
_this.canvas.style.cursor = "pointer";
@@ -393,7 +394,8 @@
this.$nextTick(()=>{
this.canvas = this.$refs.areaCanvas;
this.ctx = this.canvas.getContext("2d");
- this.ctx.lineWidth = '1'
+ this.ctx.lineWidth = 1;
+
this.initArea()
})
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index b4e92ce..4c72a70 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -543,7 +543,7 @@
export default {
data() {
return {
- timeRange: [new Date(2020, 7, 25, 8), new Date()],
+ timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23,59,59))],
memberInfo: {
personName: '',
sex: '',
--
Gitblit v1.8.0