From d71fd5702c0dca993742cb421e7203eafefd2d97 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 17 六月 2021 19:22:26 +0800
Subject: [PATCH] 修复朔黄视频标注
---
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index a8a282d..3bca753 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -76,7 +76,7 @@
@pause="isStop = true"
@play="isStop = false"
@timeupdate="timeUpdate"
- :source="curVideo.VideoPath"
+ :source="curVideo.VideoPath | fixPath"
:markers="curVideo.marks"
:ref="`player_${curVideo.ID}`"
/>
@@ -106,7 +106,7 @@
>
<ali-player
@timeupdate="timeUpdate(e, index)"
- :source="videoArrs[index].VideoPath"
+ :source="videoArrs[index].VideoPath | fixPath"
:markers="videoArrs[index].marks"
@pause="isStop = true"
@play="isStop = false"
@@ -329,6 +329,15 @@
type: Object,
},
},
+ filters: {
+ fixPath(str) {
+ if (!str || str == undefined) {
+ return ""
+ }
+
+ return str.replace("/opt/vasystem", "")
+ }
+ },
data() {
return {
guid: 1,
@@ -518,6 +527,7 @@
handleCommand(cmd) {
let _this = this;
_this.curVideo = cmd;
+ _this.curCamera = _this.curVideo.CameraPosition;
_this.$nextTick(() => {
_this.$refs[`player_${_this.curVideo.ID}`][0].init();
@@ -563,15 +573,19 @@
res.data.forEach((item) => {
_this.popDownArr.push(item);
});
- if (_this.popDownArr.length) {
- _this.curCamera = _this.popDownArr[0].CameraPosition;
- }
+ // if (_this.popDownArr.length) {
+ // _this.curCamera = _this.popDownArr[0].CameraPosition;
+ // }
res.data.forEach((item) => {
item.marks = _this.mergeMarks(item);
});
- _this.curVideo = res.data.find((item) => item.ID == v.ID);
+ _this.curVideo = res.data.find((item) => item.id == v.id);
+
+ // 璁剧疆涓嬫媺鑿滃崟閫変腑椤�
+ _this.curCamera = _this.curVideo.CameraPosition;
+
_this.curVideo.marks.forEach((item) => {
if (item.type == 0) {
_this.eventMarks.push(item);
@@ -669,7 +683,7 @@
submitLabelChecked() {
let _this = this;
let tempArr = [];
- tempArr = this.videoArrs.map((video) => video.ID);
+ tempArr = this.videoArrs.map((video) => video.id);
let desc = this.labelCheckedList.map((lableId) => {
for (let label of this.labelOptions) {
if (label.ID == lableId) {
@@ -680,11 +694,10 @@
let query = {
ID: this.selectedLabelId,
- ParentID: tempArr.join(","),
- ParentUniqID: this.curVideo.GroupID + "",
+ VideoIds: tempArr.join(","),
Time: Math.round(this.setLabelTime) + "",
Codes: this.labelCheckedList.join(","),
- Desc: desc.join("锛�"),
+ Desc: desc.join(","),
};
editLabel(query).then((rsp) => {
--
Gitblit v1.8.0