From c7eebdfc2fb2de3f81aab9d14c1190e20e70ea9f Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@iotlink.com> Date: 星期五, 18 六月 2021 17:16:06 +0800 Subject: [PATCH] 修复朔黄视频底图路径 --- src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 448 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 263 insertions(+), 185 deletions(-) diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue index 37885b5..3bca753 100644 --- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue +++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue @@ -9,15 +9,15 @@ v-show="showLocChoise" > <span class="el-dropdown-link"> - {{ curCamera }}<i class="el-icon-arrow-down el-icon--right"></i> + {{ curCamera }} + <i class="el-icon-arrow-down el-icon--right"></i> </span> <el-dropdown-menu slot="dropdown"> <el-dropdown-item 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> @@ -73,11 +73,10 @@ <div style="display: none"></div> <div class="currentPlayer"> <ali-player - @playing="getPlayStatus" @pause="isStop = true" @play="isStop = false" @timeupdate="timeUpdate" - :source="curVideo.VideoPath" + :source="curVideo.VideoPath | fixPath" :markers="curVideo.marks" :ref="`player_${curVideo.ID}`" /> @@ -98,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="{ @@ -107,12 +106,11 @@ > <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" :ref="`player_${videoArrs[index].ID}`" - @ready="videoReady" /> </div> </template> @@ -120,13 +118,11 @@ </template> <div class="player-control"> <div class="progress-bar"> - <el-tooltip - placement="top" - v-for="(item, index) in eventMarks" - :key="index" - > - <div slot="content"> - {{ getTimeStr(item.offset) }}<br />{{ item.text }} + <el-tooltip placement="top" v-for="(item, index) in eventMarks" :key="index"> + <div slot="content"> + {{ getTimeStr(item.offset) }} + <br /> + {{ item.text }} </div> <div class="self-dot" @@ -136,50 +132,52 @@ @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 />{{ item.text }} + {{ getTimeStr(item.offset) }} + <br /> + {{ item.text }} </div> <div class="label-dot" :style="{ - left: (item.offset/maxSecond)*100 + '%', + left: (item.offset / maxSecond) * 100 + '%', }" @click="dotJump(item.offset)" ></div> </el-tooltip> + <div ref="time-clip" class="time-clip"></div> - <el-tooltip placement="top" :offset="440-hoverOffset" - :hide-after="0" :visible-arrow="false" - > - <div slot="content" >{{hoverTime}}</div> <el-slider v-model="curTime" - :format-tooltip="formatTooltip" + :show-tooltip="false" :max="maxSecond" - @mousemove.native="triggerHover" + @mousemove.native.stop="triggerHover" + @mouseleave.native="leaveBar" + @mouseover.native="intoBar" @change="progressChange" - @input="inTimeChange" ></el-slider> -</el-tooltip> - </div> <div class="control-zone"> <span class="time">{{ curPlayTime }} / {{ maxVideoTime }}</span> - - - <div class="play-btn" @click="playAll" v-if="showPlayBtn"> - - <span class="icon iconfont"></span> - - </div> - <div class="stop-btn" @click="pauseAll" v-else> - - <span class="icon iconfont"></span> + <div class="play-btn"> + <div class="group"> + <i class="el-icon-d-arrow-left" @click="moveBar(-10)"></i> + <i + class="el-icon-video-play" + style="font-size: 29px; cursor: pointer" + @click="playAll" + v-if="showPlayBtn" + ></i> + <i + class="el-icon-video-pause" + style="font-size: 29px; cursor: pointer" + @click="pauseAll" + v-else + ></i> + <i class="el-icon-d-arrow-right" @click="moveBar(10)"></i> + </div> + <!-- <span class="icon iconfont"></span> --> </div> </div> </div> @@ -203,23 +201,18 @@ 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 - >{{ zeroize(Math.floor(mark.Time / 60)) }}:{{ - zeroize(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> @@ -228,12 +221,12 @@ </div> </div> </div> - </div></el-tab-pane - > + </div> + </el-tab-pane> <!-- <div class="flex-box fixed-height-box2"></div> --> <dataset-chart style="width: 100%" v-if="showTable"></dataset-chart> - <el-tab-pane label="鍏噷鏍�" name="second"> </el-tab-pane> + <el-tab-pane label="鍏噷鏍�" name="second"></el-tab-pane> </el-tabs> </div> <div class="bot-right block"> @@ -272,23 +265,16 @@ <el-radio :label="1">鏍囨敞鍦ㄥ叏閮ㄤ綅缃殑瑙嗛娈�</el-radio> <el-radio :label="0">浠呮爣娉ㄩ�変腑鐨勮棰戞</el-radio> </el-radio-group> - </div> --> + </div>--> <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> @@ -308,6 +294,27 @@ import DatasetChart from "./charts/datasetForVideo"; import AliPlayer from "./aliPlayer/index"; +function throttle(fn, delay) { + // 璁板綍涓婁竴娆″嚱鏁拌Е鍙戠殑鏃堕棿浠ュ強瀹氫箟涓�涓畾鏃跺櫒 + var lastTime, timer; + var delay = delay || 500; + return function (e) { + var nowTime = Date.now(); + if (lastTime && nowTime - lastTime < delay) { + clearTimeout(timer); + timer = setTimeout(function () { + // 璁板綍涓婁竴娆″嚱鏁拌Е鍙戠殑鏃堕棿 + lastTime = nowTime; + // 淇this鎸囧悜闂 + fn.call(this, e); + }, delay); + } else { + lastTime = nowTime; + fn.call(this, e); + } + }; +} + export default { name: "VideoAnalyze", components: { @@ -321,6 +328,15 @@ }, type: Object, }, + }, + filters: { + fixPath(str) { + if (!str || str == undefined) { + return "" + } + + return str.replace("/opt/vasystem", "") + } }, data() { return { @@ -353,8 +369,6 @@ curPlayTime: "00:00", maxSecond: 0, isStop: false, - hoverTime:"", - hoverOffset:0, }; }, watch: { @@ -369,27 +383,51 @@ deep: true, }, videoDetails: { - handler(newVal, oldVal) { + handler(newVal) { this.getCurVideos(newVal); }, deep: true, + }, + curTime(newVal) { + this.curPlayTime = this.getTimeStr(newVal); }, }, mounted() { this.renderLabelOpts(); this.setGuid(1); this.getCurVideos(this.videoDetails); - this.getRelatedVideos(this.videoDetails); + // this.getRelatedVideos(this.videoDetails); + }, + destroyed() { + this.videoArrs.length = 0; }, methods: { - triggerHover(e){ - this.hoverOffset=e.offsetX - this.hoverTime=this.getTimeStr((e.offsetX/880)*this.maxSecond) + triggerHover(e) { + let fn = throttle(this.hoverAction, 2000); + fn(e); }, - getPlayStatus(e) { - console.log(e, 1111); + hoverAction(e) { + console.log(e.target.className); + if ( + e.target.className == "el-slider__button-wrapper hover" || + e.target.className == "el-tooltip el-slider__button hover" + ) { + this.$refs["time-clip"].style["left"] = + (this.curTime / this.maxSecond) * 880 - 20 + "px"; + this.$refs["time-clip"].innerHTML = this.curPlayTime; + return; + } + this.$refs["time-clip"].style["left"] = e.offsetX - 20 + "px"; + this.$refs["time-clip"].innerHTML = this.getTimeStr( + (e.offsetX / 880) * this.maxSecond + ); }, - videoReady(a, b) {}, + intoBar(e) { + this.$refs["time-clip"].style["display"] = "block"; + }, + leaveBar(e) { + this.$refs["time-clip"].style["display"] = "none"; + }, playAll() { this.showPlayBtn = false; if (this.guid == 1) { @@ -413,45 +451,37 @@ }); } }, - inTimeChange(val) {}, + moveBar(val) { + this.curTime += val; + this.progressChange(this.curTime); + }, progressChange(val) { - console.log(val); this.showPlayBtn = false; - this.curPlayTime = this.getTimeStr(val); let that = this; if (this.guid == 1) { this.$refs[`player_${this.curVideo.ID}`][0].pause(); this.$refs[`player_${this.curVideo.ID}`][0].seek(val); - this.$refs[`player_${this.curVideo.ID}`][0].play(); + // this.$refs[`player_${this.curVideo.ID}`][0].play(); setTimeout(() => { let curT = that.$refs[ `player_${that.curVideo.ID}` ][0].getCurrentTime(); - that.barRolling(curT); }, 600); } else { this.videoArrs.forEach((v, i) => { this.$refs[`player_${v.ID}`][0].seek(val); - this.$refs[`player_${v.ID}`][0].play(); + // this.$refs[`player_${v.ID}`][0].play(); if (i == 0) { let curT = this.$refs[`player_${v.ID}`][0].getCurrentTime(); - this.barRolling(curT); } }); } }, getTimeStr(sec) { - return `${ - Math.floor(sec / 60) < 10 - ? "0" + Math.floor(sec / 60) - : Math.floor(sec / 60) - }:${ - Math.floor(sec % 60) < 10 - ? "0" + Math.floor(sec % 60) - : Math.floor(sec % 60) - }`; + return `${this.pad0(Math.floor(sec / 60))}:${this.pad0( + Math.floor(sec % 60) + )}`; }, - barRolling(curT) {}, timeUpdate(e, index) { if (this.isStop) { return; @@ -471,10 +501,6 @@ } else { this.curTime = curT; } - this.curPlayTime = this.getTimeStr(this.curTime); - }, - formatTooltip(val) { - return this.curPlayTime; }, videoMouseEnter(e) { let target = e.target; @@ -500,18 +526,34 @@ }, handleCommand(cmd) { let _this = this; - this.curCamera = cmd.Camera; - this.curRoomVideos = this.allCurVideos.filter((item) => { - return item.Camera == cmd.Camera; - }); - this.curVideo = this.curRoomVideos.find((item) => { - return item.UniqeID == this.curVideo.UniqeID; - }); - this.$nextTick(() => { + _this.curVideo = cmd; + _this.curCamera = _this.curVideo.CameraPosition; + + _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(); + // }); + // }); + }, - zeroize(val) { + pad0(val) { return val < 10 ? "0" + val : val; }, checkCurVideo(index) { @@ -527,45 +569,59 @@ CarNumber: v.CarNumber, Driver1: v.Driver1, }).then((res) => { + // 濉厖鍗曠獥鍙g殑涓嬫媺鑿滃崟 + 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=>{ + + _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) + _this.eventMarks.push(item); } else { - _this.labelMarks.push(item) + _this.labelMarks.push(item); } - }) + }); + if (_this.guid == 1) { _this.maxVideoTime = _this.curVideo.VideoTime; } - _this.videoArrs = res.data.filter((item) => v.UniqeID == item.UniqeID); + + _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; }); }); }, getRelatedVideos(video) { let _this = this; - getRelatedVideoInfo({ UniqeID: video.UniqeID }).then((res) => { + getRelatedVideoInfo({ GroupID: video.GroupID }).then((res) => { let arr = []; let map = {}; res.data.forEach((item) => { - this.popDownArr.push(item); + _this.popDownArr.push(item); }); - if (this.popDownArr.length) { - this.curCamera = this.popDownArr[0].Camera; + if (_this.popDownArr.length) { + _this.curCamera = _this.popDownArr[0].CameraPosition; } }); }, @@ -576,7 +632,7 @@ }); }, refreshCurVideoLabel(video) { - getRelatedVideoInfo({ UniqeID: video.UniqeID }).then((res) => { + getRelatedVideoInfo({ GroupID: video.GroupID }).then((res) => { res.data.forEach((d) => { if (d.ID === video.ID) { video.LableLst = d.LableLst; @@ -588,7 +644,7 @@ this.refreshCurVideoLabel(video); this.curVideo = video; this.videoArrs = this.allCurVideos.filter( - (item) => video.UniqeID == item.UniqeID + (item) => video.GroupID == item.GroupID ); this.$nextTick(() => { this.$refs[`player_${this.curVideo.ID}`][0].init(); @@ -610,25 +666,24 @@ console.log(`calc(` + 100 / guid + `% -10px)`); this.$refs[`gridVideoItem_${i}`][0].style.width = `calc(` + 100 / guid + `%)`; - // this.$refs["playerWrap"].offsetWidth / guid + "px"; this.$refs[`gridVideoItem_${i}`][0].style.height = `calc(` + 100 / guid + `%)`; // this.$refs["playerWrap"].offsetHeight / guid + "px"; } - console.log(this.$refs[`player_${this.videoArrs[index].ID}`]); + // console.log(this.$refs[`player_${this.videoArrs[index].ID}`]); }); }, cancelLabelChecked() { this.labelDialogVisible = false; }, - dotJump(offset){ - this.curTime = offset - this.progressChange(offset) + dotJump(offset) { + this.curTime = offset; + this.progressChange(offset); }, 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) { @@ -639,29 +694,32 @@ let query = { ID: this.selectedLabelId, - ParentID: tempArr.join(","), - ParentUniqID: this.curVideo.UniqeID + "", + VideoIds: tempArr.join(","), Time: Math.round(this.setLabelTime) + "", Codes: this.labelCheckedList.join(","), - Desc: desc.join("锛�"), + Desc: desc.join(","), }; + editLabel(query).then((rsp) => { if (rsp && rsp.success) { _this.labelDialogVisible = false; - this.$set(_this.curVideo, "LableLst", []); - //_this.curVideo.LableLst = []; + _this.$set(_this.curVideo, "LableLst", []); rsp.data.forEach((label) => { if (label.ParentID == _this.curVideo.ID) { _this.curVideo.LableLst.push(label); } }); - - this.$message.success("娣诲姞鎴愬姛"); + _this.labelMarks.push({ + type: 1, + offset: +query.Time, + text: query.Desc, + }); + _this.$message.success("娣诲姞鎴愬姛"); // 鏍囨敞 - _this.setMarks(this.curVideo); + _this.setMarks(_this.curVideo); _this.$parent.$parent.filterSearchData(); } else { - this.$message.warning(rsp.msg); + _this.$message.warning(rsp.msg); } }); }, @@ -669,7 +727,6 @@ this.labelCheckedList = []; this.selectedLabelId = ""; this.labelDialogVisible = true; - // 淇濆瓨鐐瑰嚮鏍囨敞鐨勬椂闂� this.setLabelTime = this.$refs[`player_${video.ID}`][0].getCurrentTime(); }, @@ -680,34 +737,51 @@ }, removeCurLabel(mark) { let _this = this; - delLabel({ ID: mark.ID, ParentID: this.curVideo.ID }).then((rsp) => { + let obj = { + Desc: mark.Desc, + ParentUniqID: mark.ParentUniqID, + Time: mark.Time, + ParentID: mark.ParentID + }; + delLabel(obj).then((rsp) => { if (rsp && rsp.success) { _this.curVideo.LableLst = rsp.data; - this.$message.success("鍒犻櫎鎴愬姛"); + _this.$message.success("鍒犻櫎鎴愬姛"); // 鏍囨敞 + _this.labelMarks.length = 0; + _this.curVideo.LableLst.forEach((x) => { + _this.labelMarks.push({ + type: 1, + offset: +x.Time, + text: x.Desc, + }); + }); _this.setMarks(_this.curVideo); _this.$parent.$parent.filterSearchData(); } else { - this.$message.warning(rsp.msg); + _this.$message.warning(rsp.msg); } }); }, mergeMarks(videoInfo) { + if (!videoInfo.EventLst || !videoInfo.LableLst) { + console.log("mergeMarks data null") + return; + } + const eMarks = videoInfo.EventLst.map((item) => { - let obj = { + return { offset: item.SecondsInVideo, text: item.Event + (item.Desc == "" ? "" : ": " + item.Desc), type: 0, }; - return obj; }); const labMarks = videoInfo.LableLst.map((lable) => { - let obj = { + return { offset: +lable.Time, text: lable.Desc, type: 1, }; - return obj; }); return eMarks.concat(labMarks); }, @@ -728,9 +802,7 @@ text-align: left; .content-top { margin-bottom: 15px; - // height: calc(60% + -16px); - .grid-check { text-align: right; margin-bottom: 3px; @@ -749,7 +821,6 @@ } span { font-size: 17px; - color: #cacaca; padding-left: 12px; cursor: pointer; @@ -761,14 +832,12 @@ .video-area { display: flex; height: 100%; - .info-list { width: 180px; min-width: 180px; margin-right: 10px; .v-name-block { height: 484px; - overflow: auto; } .video-name { @@ -814,9 +883,6 @@ float: left; } } - // .prism-controlbar{ - // display: none; - // } .currentPlayer { border: 2px solid aqua; height: 100%; @@ -834,22 +900,18 @@ margin: 0px 30px; position: relative; .self-dot { - // top: 16px; position: absolute; - height: 6px; + height: 8px; width: 6px; z-index: 1; background-color: lightcoral; - // border-radius: 30%; - // pointer-events: none; cursor: pointer; -webkit-transform: translateX(-50%); transform: translateX(-50%); } - .label-dot{ - // top: 16px; + .label-dot { position: absolute; - height: 6px; + height: 8px; width: 6px; z-index: 1; background-color: yellowgreen; @@ -857,11 +919,19 @@ -webkit-transform: translateX(-50%); transform: translateX(-50%); } - .el-slider{ - margin: 16px 0; - .el-slider__runway{ - margin: 0; - } + .el-slider { + margin: 15px 0; + + .el-slider__runway { + margin: 0; + height: 8px; + .el-slider__bar { + height: 8px; + } + .el-slider__button-wrapper { + width: 16px; + } + } } .el-slider__button { width: 12px; @@ -870,33 +940,44 @@ .el-slider__stop { background-color: lightcoral; } + .time-clip { + width: 40px; + background-color: dimgray; + color: white; + display: none; + font-size: 12px; + top: -26px; + border-radius: 3px; + left: -20px; + height: 19px; + text-align: center; + line-height: 19px; + position: absolute; + } } .control-zone { .time { float: left; margin-left: 23px; - // color: #fff; } .play-btn { - width: 24px; - height: 24px; - cursor: pointer; - // background: url(/apps/shuohuangMonitorAnalyze/img/smallplay.png) - + width: 200px; + height: 27px; + border-radius: 4px; margin: 0 auto; - .iconfont{ - font-size: 25px; + .group { + text-align: center; + .el-icon-d-arrow-left { + cursor: pointer; + margin-right: 20px; + font-size: 27px; + } + .el-icon-d-arrow-right { + cursor: pointer; + font-size: 27px; + margin-left: 20px; + } } - } - .stop-btn { - width: 24px; - height: 24px; - cursor: pointer; - // background: url(/apps/shuohuangMonitorAnalyze/img/smallpause.png) - .iconfont{ - font-size: 25px; - } - margin: 0 auto; } } } @@ -973,9 +1054,6 @@ } p.label { line-height: 36px; - } - .label-radio { - padding: 20px; } .label-check { padding: 20px; -- Gitblit v1.8.0