From 639d0bc26ca8390285eb1c5bec31ffea32eb96db Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 17 六月 2021 16:27:07 +0800
Subject: [PATCH] 朔黄app, 修复视频切换功能
---
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index 90ab683..a8a282d 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -17,7 +17,7 @@
v-for="(item, index) in popDownArr"
:key="index"
:command="item"
- >{{ item.Camera }}</el-dropdown-item>
+ >{{ item.CameraPosition }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -97,7 +97,7 @@
<!-- -->
<template v-if="index <= videoArrs.length - 1">
<div class="video-box-top">
- <b>{{ videoArrs[index].Camera }}</b>
+ <b>{{ videoArrs[index].CameraPosition }}</b>
</div>
<div
:class="{
@@ -387,7 +387,7 @@
this.renderLabelOpts();
this.setGuid(1);
this.getCurVideos(this.videoDetails);
- this.getRelatedVideos(this.videoDetails);
+ // this.getRelatedVideos(this.videoDetails);
},
destroyed() {
this.videoArrs.length = 0;
@@ -517,24 +517,30 @@
},
handleCommand(cmd) {
let _this = this;
+ _this.curVideo = cmd;
- getCarVideos({
- TrainNumber: cmd.TrainNumber,
- CarNumber: cmd.CarNumber,
- Driver1: cmd.Driver1,
- }).then((res) => {
- _this.allCurVideos = res.data;
- _this.curCamera = cmd.Camera;
- _this.curRoomVideos = _this.allCurVideos.filter((item) => {
- return item.Camera == cmd.Camera;
- });
- _this.curVideo = _this.curRoomVideos.find((item) => {
- return item.ID == cmd.ID;
- });
- _this.$nextTick(() => {
- _this.$refs[`player_${_this.curVideo.ID}`][0].init();
- });
+ _this.$nextTick(() => {
+ _this.$refs[`player_${_this.curVideo.ID}`][0].init();
});
+ // let _this = this;
+ // console.log(cmd)
+ // getCarVideos({
+ // TrainNumber: cmd.TrainNumber,
+ // CarNumber: cmd.CarNumber,
+ // Driver1: cmd.Driver1,
+ // }).then((res) => {
+ // _this.allCurVideos = res.data;
+ // _this.curCamera = cmd.CameraPosition;
+ // _this.curRoomVideos = _this.allCurVideos.filter((item) => {
+ // return item.CameraPosition == cmd.CameraPosition;
+ // });
+ // _this.curVideo = _this.curRoomVideos.find((item) => {
+ // return item.ID == cmd.ID;
+ // });
+ // _this.$nextTick(() => {
+ // _this.$refs[`player_${_this.curVideo.ID}`][0].init();
+ // });
+ // });
},
pad0(val) {
@@ -553,9 +559,18 @@
CarNumber: v.CarNumber,
Driver1: v.Driver1,
}).then((res) => {
+ // 濉厖鍗曠獥鍙ｇ殑涓嬫媺鑿滃崟
+ res.data.forEach((item) => {
+ _this.popDownArr.push(item);
+ });
+ 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.marks.forEach((item) => {
if (item.type == 0) {
@@ -564,6 +579,7 @@
_this.labelMarks.push(item);
}
});
+
if (_this.guid == 1) {
_this.maxVideoTime = _this.curVideo.VideoTime;
}
@@ -571,14 +587,13 @@
_this.videoArrs = res.data.filter((item) => v.GroupID == item.GroupID);
_this.allCurVideos = res.data;
_this.curRoomVideos = _this.allCurVideos.filter((item) => {
- return item.Camera == "鍙告満瀹�";
+ return item.CameraPosition.indexOf("鍙告満瀹�") >= 0;
});
_this.$nextTick(() => {
_this.$refs[`player_${_this.curVideo.ID}`][0].init();
let arr = _this.maxVideoTime.split(":");
- let min = +arr[0],
- sec = +arr[1];
+ let min = +arr[1], sec = +arr[2];
_this.maxSecond = min * 60 + sec;
});
});
@@ -592,7 +607,7 @@
_this.popDownArr.push(item);
});
if (_this.popDownArr.length) {
- _this.curCamera = _this.popDownArr[0].Camera;
+ _this.curCamera = _this.popDownArr[0].CameraPosition;
}
});
},
--
Gitblit v1.8.0