From 196f223575c64aaf0b1b5c5f7dfdee391a6e122a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 24 六月 2021 17:31:18 +0800
Subject: [PATCH] 修复关联视频切换的bug
---
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 102 ++++++++++++++++----------------------------------
1 files changed, 33 insertions(+), 69 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index c72279d..841869c 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -14,11 +14,10 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
- v-for="(item, index) in popDownArr"
+ v-for="(item, index) in videoArrs"
:key="index"
:command="item"
- >{{ item.CameraPosition }}</el-dropdown-item
- >
+ >{{ item.CameraPosition }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -54,9 +53,9 @@
<div
class="video-name"
:class="{ current: curVideo.GroupID == video.GroupID }"
- @click="checkVideo(video, index)"
+ @click="checkVideo(video)"
v-for="(video, index) in curRoomVideos"
- :key="video.id"
+ :key="index"
>
<i class="el-icon-film"></i>
<span>{{ video.VideoDate }}</span>
@@ -69,7 +68,7 @@
class="video-item"
:ref="`gridVideoItem_${index}`"
v-for="(item, index) in videoWrapArr"
- :key="index"
+ :key="item.id"
>
<div style="display: none"></div>
<div class="currentPlayer">
@@ -89,7 +88,7 @@
class="video-item"
:ref="`gridVideoItem_${index}`"
v-for="(item, index) in videoWrapArr"
- :key="index"
+ :key="item.id"
@click="checkCurVideo(index)"
style="position: relative"
@mouseenter.stop.prevent="videoMouseEnter($event)"
@@ -122,7 +121,7 @@
<el-tooltip
placement="top"
v-for="(item, index) in eventMarks"
- :key="index"
+ :key="item.offset + index"
>
<div slot="content">
{{ getTimeStr(item.offset) }}
@@ -137,11 +136,7 @@
@click="dotJump(item.offset)"
></div>
</el-tooltip>
- <el-tooltip
- placement="top"
- v-for="(item, index) in labelMarks"
- :key="index"
- >
+ <el-tooltip placement="top" v-for="(item, index) in labelMarks" :key="index">
<div slot="content">
{{ getTimeStr(item.offset) }}
<br />
@@ -210,23 +205,14 @@
v-show="isUnusual == 1"
type="primary"
@click="addLabel(curVideo)"
- >娣诲姞鏍囨敞</el-button
- >
+ >娣诲姞鏍囨敞</el-button>
</div>
<div class="flex-box fixed-height-box">
<label v-if="!showTable">鏍囨敞淇℃伅:</label>
<div class="mark-list" v-if="!showTable">
- <div
- class="mark"
- v-for="mark in curVideo.LableLst"
- :key="mark.ID"
- >
+ <div class="mark" v-for="mark in curVideo.LableLst" :key="mark.ID">
<div class="time">
- <span>
- {{ pad0(Math.floor(mark.Time / 60)) }}:{{
- pad0(mark.Time % 60)
- }}
- </span>
+ <span>{{ pad0(Math.floor(mark.Time / 60)) }}:{{ pad0(mark.Time % 60) }}</span>
<i class="el-icon-edit" @click="editCurLabel(mark)"></i>
<i class="el-icon-delete" @click="removeCurLabel(mark)"></i>
</div>
@@ -283,19 +269,12 @@
<div class="label-check">
<p class="label">闅愭偅闂:</p>
<el-checkbox-group v-model="labelCheckedList">
- <el-checkbox
- v-for="item in labelOptions"
- :key="item.ID"
- :label="item.ID"
- >{{ item.Name }}</el-checkbox
- >
+ <el-checkbox v-for="item in labelOptions" :key="item.ID" :label="item.ID">{{ item.Name }}</el-checkbox>
</el-checkbox-group>
</div>
<div class="btns">
<el-button @click="cancelLabelChecked" size="small">鍙栨秷</el-button>
- <el-button @click="submitLabelChecked" size="small" type="primary"
- >纭畾</el-button
- >
+ <el-button @click="submitLabelChecked" size="small" type="primary">纭畾</el-button>
</div>
</el-dialog>
</div>
@@ -375,7 +354,6 @@
setLabelTime: 0,
isCheckAllVideo: 1,
curRoomVideos: [],
- popDownArr: [],
curCamera: "",
showTable: false,
showLocChoise: true,
@@ -414,9 +392,13 @@
},
},
mounted() {
+
this.renderLabelOpts();
+
this.setGuid(1);
+
this.getCurVideos(this.videoDetails);
+
this.getRelatedVideos(this.videoDetails);
},
destroyed() {
@@ -545,12 +527,14 @@
}
},
handleCommand(cmd) {
+ console.log(cmd)
+ console.log(this.$refs)
+
let _this = this;
_this.curVideo = cmd;
_this.curCamera = _this.curVideo.CameraPosition;
_this.$nextTick(() => {
- const a = _this.$refs[`player_${_this.curVideo.id}`]
- const b = _this.$refs[`player_${_this.curVideo.id}`][0]
+ console.log(_this.$refs)
_this.$refs[`player_${_this.curVideo.id}`][0].init();
});
},
@@ -574,7 +558,11 @@
item.marks = _this.mergeMarks(item);
});
+ _this.allCurVideos = res.data;
+
_this.curVideo = res.data.find((item) => item.id == v.id);
+
+ _this.refreshCurVideoLabel(_this.curVideo)
// 璁剧疆涓嬫媺鑿滃崟閫変腑椤�
_this.curCamera = _this.curVideo.CameraPosition;
@@ -591,9 +579,6 @@
_this.maxVideoTime = _this.curVideo.VideoTime;
}
- _this.videoArrs = res.data.filter((item) => v.GroupID == item.GroupID);
- _this.allCurVideos = res.data;
- console.log(_this.allCurVideos);
_this.curRoomVideos = _this.allCurVideos.filter((item) => {
return item.IsCab == "0";
});
@@ -606,18 +591,6 @@
});
});
},
- getRelatedVideos(video) {
- let _this = this;
- getRelatedVideoInfo({ GroupID: video.GroupID }).then((res) => {
- res.data.forEach((item) => {
- _this.popDownArr.push(item);
- });
- // _this.popDownArr = res.data
- if (_this.popDownArr.length) {
- _this.curCamera = _this.popDownArr[0].CameraPosition;
- }
- });
- },
renderLabelOpts() {
let _this = this;
getLabelMap().then((res) => {
@@ -625,36 +598,28 @@
});
},
refreshCurVideoLabel(video) {
- let _this = this;
- _this.popDownArr = [];
- getRelatedVideoInfo({ GroupID: video.GroupID }).then((res) => {
- res.data.forEach((item) => {
- _this.popDownArr.push(item);
- if (item.ID === video.ID) {
- video.LableLst = item.LableLst;
- }
- });
- });
+ let arr = [video]
+ this.videoArrs = arr.concat(this.allCurVideos.filter(v => {
+ return v.GroupID == video.GroupID && v.id != video.id
+ }))
},
- checkVideo(video, index) {
+ checkVideo(video) {
+ console.log(video)
this.refreshCurVideoLabel(video);
this.curVideo = video;
this.eventMarks = []
this.labelMarks = []
video.marks.forEach((item) => {
- if (item.type == 0) {
+ if (item.type == 0) {
this.eventMarks.push(item);
} else {
this.labelMarks.push(item);
}
})
- this.videoArrs = this.allCurVideos.filter(
- (item) => video.GroupID == item.GroupID
- );
this.$nextTick(() => {
- const a = this.$refs[`player_${this.curVideo.id}`]
this.$refs[`player_${this.curVideo.id}`][0].init();
+ console.log(this.$refs)
});
},
setGuid(guid) {
@@ -670,7 +635,6 @@
this.videoWrapArr = Math.pow(guid, 2);
this.$nextTick(() => {
for (var i = 0; i < Math.pow(guid, 2); i++) {
- console.log(`calc(` + 100 / guid + `% -10px)`);
this.$refs[`gridVideoItem_${i}`][0].style.width =
`calc(` + 100 / guid + `%)`;
this.$refs[`gridVideoItem_${i}`][0].style.height =
--
Gitblit v1.8.0