From ccee429d379e0108b7445f72ade8d97c110a6fb3 Mon Sep 17 00:00:00 2001 From: ZZJ <zzjdsg2300@163.com> Date: 星期二, 09 十一月 2021 18:01:59 +0800 Subject: [PATCH] 问题修复 --- src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 1395 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 1,021 insertions(+), 374 deletions(-) diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue index 37885b5..0f4e0e7 100644 --- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue +++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue @@ -1,85 +1,28 @@ <template> <div class="video-analyze-content"> <div class="content-top"> - <div class="grid-check"> - <el-dropdown - trigger="click" - :popper-append-to-body="false" - @command="handleCommand" - v-show="showLocChoise" - > - <span class="el-dropdown-link"> - {{ 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 - > - </el-dropdown-menu> - </el-dropdown> + <!-- 椤堕儴鏍� --> - <span - :class=" - guid === 1 - ? 'iconfont icongongge1 activegongge' - : 'iconfont icongongge1' - " - @click="setGuid(1)" - ></span> - <span - :class=" - guid === 2 - ? 'iconfont icongongge activegongge' - : 'iconfont icongongge' - " - @click="setGuid(2)" - ></span> - <span - :class=" - guid === 3 - ? 'iconfont icongongge2 activegongge' - : 'iconfont icongongge2' - " - @click="setGuid(3)" - ></span> - </div> <div class="video-area"> - <div class="info-list block"> - <p class="title-partment">鐩稿叧瑙嗛</p> - <div class="v-name-block"> - <div - class="video-name" - :class="{ current: curVideo.ID == video.ID }" - @click="checkVideo(video, index)" - v-for="(video, index) in curRoomVideos" - :key="video.ID" - > - <i class="el-icon-film"></i> - <span>{{ video.VideoDate }}</span> - </div> - </div> - </div> + <!-- 鎾斁鍣ㄥ尯鍩� --> <div class="players" ref="playerWrap"> + <div class="single"></div> <template v-if="guid == 1"> <div - class="video-item" + class="video-item single" :ref="`gridVideoItem_${index}`" v-for="(item, index) in videoWrapArr" - :key="index" + :key="item.id" > <div style="display: none"></div> <div class="currentPlayer"> <ali-player - @playing="getPlayStatus" - @pause="isStop = true" - @play="isStop = false" + @pause="singlePause" + @play="singlePlay" @timeupdate="timeUpdate" - :source="curVideo.VideoPath" - :markers="curVideo.marks" - :ref="`player_${curVideo.ID}`" + :source="curVideo.VideoPath | fixPath" + :markers="marks_filter" + :ref="`player_${curVideo.id}`" /> </div> </div> @@ -89,7 +32,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)" @@ -98,7 +41,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,29 +50,55 @@ > <ali-player @timeupdate="timeUpdate(e, index)" - :source="videoArrs[index].VideoPath" - :markers="videoArrs[index].marks" + :source="videoArrs[index].VideoPath | fixPath" + :markers="marks_filter_arr[index].marks" @pause="isStop = true" @play="isStop = false" - :ref="`player_${videoArrs[index].ID}`" - @ready="videoReady" + :ref="`player_${videoArrs[index].id}`" /> </div> </template> </div> </template> + + <!-- 鎬讳綋鎾斁鎺у埗 --> <div class="player-control"> <div class="progress-bar"> <el-tooltip placement="top" - v-for="(item, index) in eventMarks" - :key="index" + v-for="(item, index) in eventMarks_filter" + :key="item.offset + index" > - <div slot="content"> - {{ getTimeStr(item.offset) }}<br />{{ item.text }} + <div slot="content"> + {{ getTimeStr(item.offset) }} + <br /> + {{ item.text }} </div> <div + v-if="checkType === 1" class="self-dot" + :class=" + curVideo.IsOperate == '1' && + item.state == 0 && + !item.text.includes('鎵嬫瘮') + ? 'red' + : getColor(item.text) + " + :style="{ + left: (item.offset / maxSecond) * 100 + '%', + }" + @click="dotJump(item.offset)" + ></div> + <div + v-if="checkType === 2" + class="self-dot" + :class=" + curVideo.IsOperate == '11' && + item.state == 0 && + !item.text.includes('鎵嬫瘮') + ? 'red' + : getColor(item.text) + " :style="{ left: (item.offset / maxSecond) * 100 + '%', }" @@ -142,123 +111,264 @@ :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="time">{{ curPlayTime }} / {{ maxVideoTime }}</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> - + <el-dropdown + trigger="click" + :popper-append-to-body="false" + @command="handleCommand" + v-show="showLocChoise" + placement="top-end" + > + <span class="el-dropdown-link"> + {{ curCamera }} + <i class="icon iconfont"></i> + </span> + <el-dropdown-menu slot="dropdown"> + <el-dropdown-item + v-for="(item, index) in videoArrs" + :key="index" + :command="item" + >{{ item.CameraPosition }}</el-dropdown-item + > + </el-dropdown-menu> + </el-dropdown> + <div v-if="!showLocChoise"></div> + <div class="play-btn"> + <div class="group"> + <span + class="back" + @click="moveBar(-10)" + style="cursor: pointer" + >蹇��10绉�</span + > + <i class="icon iconfont" @click="moveBar(-10)"></i> + <i + class="icon iconfont" + style="font-size: 18px; cursor: pointer; margin: 0 40px" + @click="playAll" + v-if="showPlayBtn" + ></i + > + <i + class="icon iconfont" + style="font-size: 18px; cursor: pointer; margin: 0 40px" + @click="pauseAll" + v-else + ></i + > + <i class="icon iconfont" @click="moveBar(10)"></i> + <span + class="forward" + @click="moveBar(10)" + style="cursor: pointer" + >蹇繘10绉�</span + > + </div> + <!-- <span class="icon iconfont"></span> --> </div> - <div class="stop-btn" @click="pauseAll" v-else> + <div class="spanList"> + <span + :class=" + guid === 1 + ? 'icon-rt iconfont icongongge1 activegongge' + : 'icon-rt iconfont icongongge1' + " + @click="setGuid(1)" + ></span> + <span + :class=" + guid === 2 + ? 'icon-rt iconfont icongongge activegongge' + : 'icon-rt iconfont icongongge' + " + @click="setGuid(2)" + ></span> + <span + :class=" + guid === 3 + ? 'icon-rt iconfont icongongge2 activegongge' + : 'icon-rt iconfont icongongge2' + " + @click="setGuid(3)" + ></span> + <img + src="/images/shuohuang/缁� 801.png" + alt="" + v-if="showHand == false" + @click="openHand" + /> + <img + src="/images/shuohuang/缁� 800.png" + alt="" + v-else + @click="closeHand" + /> + </div> + </div> + </div> + </div> - <span class="icon iconfont"></span> + <!-- 鍙充晶淇℃伅鏍� --> + <div class="info-list"> + <div class="info"> + <div class="base-info"> + <div class="info-item"> + <span class="CarNumber">{{ videoDetails.CarNumber }}</span> + <label>杞︽:</label> + <span>{{ videoDetails.TrainNumber }}</span> + </div> + <div class="info-item"> + <label>鏃堕棿:</label> + <span>{{ videoDetails.StartTime }}</span> + </div> + <div class="info-item"> + <label>鍙告満 | 鍓徃鏈�:</label> + <span + >{{ videoDetails.Driver1 }} | {{ videoDetails.Driver2 }}</span + > + </div> + </div> + </div> + <div class="info-video"> + <p class="title-partment">鐩稿叧瑙嗛</p> + <div class="v-name-block"> + <div + class="video-name" + :class="{ current: curVideo.GroupID == video.GroupID }" + @click="checkVideo(video)" + v-for="(video, index) in curRoomVideos" + :key="index" + > + <i class="icon iconfont"></i> + <span>{{ video.StartTime }}</span> </div> </div> </div> </div> </div> </div> + + <!-- 涓嬩晶淇℃伅 --> <div class="content-bottom"> <div class="bot-left"> <!-- <p class="title-partment">蹇�熸爣娉�</p> --> <el-tabs v-model="activeName" @tab-click="handleClick"> - <el-tab-pane label="蹇�熸爣娉�" name="first"> - <div class="flex-box" style="height: 28px"> - <label style="padding-right: 10px">闅愭偅闂:</label> - <el-radio-group v-model="isUnusual"> - <el-radio :label="0">鏃犲紓甯�</el-radio> - <el-radio :label="1">鏈夊紓甯�</el-radio> - </el-radio-group> - <el-button - icon="el-icon-plus" - size="mini" - v-show="isUnusual == 1" - type="primary" - @click="addLabel(curVideo)" - >娣诲姞鏍囨敞</el-button - > - </div> - <div class="flex-box fixed-height-box"> - <label v-if="!showTable">鏍囨敞淇℃伅:</label> - <div class="mark-list" v-if="!showTable"> + <el-tab-pane label="闅愭偅浜嬩欢" name="first"> + <div class="yinhuan-wrap"> + <div class="wrap-title"> + {{ + yinhuanArr.length + ? "璇嗗埆鍑虹殑寮傚父鎯呭喌锛�" + : "鏆傛棤璇嗗埆鍑哄紓甯告儏鍐�" + }} + </div> + <div class="list"> <div - class="mark" - v-for="mark in curVideo.LableLst" - :key="mark.ID" + class="list-item" + v-for="(item, index) in yinhuanArr" + :key="index" + @click="dotJump(item.offset)" > - <div class="time"> - <span - >{{ zeroize(Math.floor(mark.Time / 60)) }}:{{ - zeroize(mark.Time % 60) + <span style="margin-right: 20px">{{ + getTimeStr(item.offset) + }}</span> + <span + style=" + display: block; + min-width: 135px; + margin-right: 20px; + min-widht: 140px; + " + >{{ item.text }} + </span> + + <span class="list-warn" v-if="checkType === 1">鏈墜姣� </span> + </div> + </div> + </div> + </el-tab-pane> + + <el-tab-pane label="蹇�熸爣娉�" name="mid"> + <div class="mark"> + <div class="flex-box" style="height: 28px"> + <label>闅愭偅闂:</label> + <el-radio-group v-model="isUnusual"> + <el-radio :label="0">鏃犲紓甯�</el-radio> + <el-radio :label="1">鏈夊紓甯�</el-radio> + </el-radio-group> + + <i + class="icon iconfont" + v-show="isUnusual == 1" + @click="addLabel(curVideo)" + ></i + > + </div> + <div class="fixed-height-box"> + <label v-if="!showTable">鏍囨敞淇℃伅:</label> + <div class="mark-list" v-if="!showTable"> + <div + class="mark-item" + v-for="mark in curVideo.LableLst" + :key="mark.ID" + > + <i class="icon iconfont edit" @click="editCurLabel(mark)" + ></i + > + <i + class="icon iconfont remove" + @click="removeCurLabel(mark)" + ></i + > + <span class="mark-time" + >{{ 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> - <div class="label-content"> - <span>{{ mark.Desc }}</span> + <span + class="mark-desc" + v-for="(item, index) in mark.Desc.split(',')" + :key="index" + >{{ item }}</span + > </div> </div> </div> - </div></el-tab-pane - > - <!-- <div class="flex-box fixed-height-box2"></div> --> + </div> + </el-tab-pane> <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"> - <p class="title-partment">瑙嗛璇︽儏</p> - <div class="base-info"> - <div> - <label>杞﹀彿:</label> - <span>{{ videoDetails.CarNumber }}</span> - </div> - <div> - <label>杞︽:</label> - <span>{{ videoDetails.TrainNumber }}</span> - </div> - <div> - <label>鏃堕棿:</label> - <span>{{ videoDetails.VideoDate }}</span> - </div> - <div> - <label>鍙告満 | 鍓徃鏈�:</label> - <span>{{ videoDetails.Driver1 }} | {{ videoDetails.Driver2 }}</span> - </div> - </div> </div> </div> + <!-- 寮圭獥 --> <el-dialog class="label-dialog" :visible="labelDialogVisible" @@ -272,7 +382,7 @@ <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"> @@ -285,8 +395,8 @@ </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 @click="cancelLabelChecked" size="mini ">鍙栨秷</el-button> + <el-button @click="submitLabelChecked" size="mini " type="primary" >纭畾</el-button > </div> @@ -296,9 +406,6 @@ <script> import { - getlstInit, - updateVideoAnalyze, - getlst, getRelatedVideoInfo, getCarVideos, getLabelMap, @@ -307,6 +414,27 @@ } from "@/api/shuohuang"; 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", @@ -322,8 +450,19 @@ type: Object, }, }, + filters: { + fixPath(str) { + if (!str || str == undefined) { + return ""; + } + + return str.replace("/opt/vasystem", ""); + }, + }, data() { return { + checkType: 1, + showHand: true, guid: 1, labelDialogVisible: false, curVideo: {}, @@ -338,7 +477,6 @@ setLabelTime: 0, isCheckAllVideo: 1, curRoomVideos: [], - popDownArr: [], curCamera: "", showTable: false, showLocChoise: true, @@ -353,8 +491,6 @@ curPlayTime: "00:00", maxSecond: 0, isStop: false, - hoverTime:"", - hoverOffset:0, }; }, watch: { @@ -369,89 +505,115 @@ deep: true, }, videoDetails: { - handler(newVal, oldVal) { + handler(newVal) { this.getCurVideos(newVal); }, deep: true, }, + curTime(newVal) { + this.curPlayTime = this.getTimeStr(newVal); + }, + /* showHand() { + let arr = this.videoArrs.map((item) => { + item.marks = item.marks.filter((mark) => { + console.log(mark.text); + return mark.text != "鎵嬫瘮: 鎵嬫瘮"; + }); + }); + console.log(arr); + }, */ }, - mounted() { + async mounted() { this.renderLabelOpts(); + this.setGuid(1); - this.getCurVideos(this.videoDetails); - this.getRelatedVideos(this.videoDetails); + + await this.getCurVideos(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) { - this.$refs[`player_${this.curVideo.ID}`][0].play(); - this.maxDuration = this.$refs[ - `player_${this.curVideo.ID}` - ][0].getDuration(); + this.$refs[`player_${this.curVideo.id}`][0].play(); + this.maxDuration = + this.$refs[`player_${this.curVideo.id}`][0].getDuration(); } else { this.videoArrs.forEach((v) => { - this.$refs[`player_${v.ID}`][0].play(); + this.$refs[`player_${v.id}`][0].play(); }); } }, pauseAll() { this.showPlayBtn = true; if (this.guid == 1) { - this.$refs[`player_${this.curVideo.ID}`][0].pause(); + this.$refs[`player_${this.curVideo.id}`][0].pause(); } else { this.videoArrs.forEach((v) => { - this.$refs[`player_${v.ID}`][0].pause(); + this.$refs[`player_${v.id}`][0].pause(); }); } }, - inTimeChange(val) {}, + moveBar(val) { + this.curTime += val; + this.progressChange(this.curTime); + }, progressChange(val) { - console.log(val); - this.showPlayBtn = false; - this.curPlayTime = this.getTimeStr(val); + this.showPlayBtn = true; 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].pause(); + this.$refs[`player_${this.curVideo.id}`][0].seek(val); + // this.$refs[`player_${this.curVideo.ID}`][0].play(); setTimeout(() => { - let curT = that.$refs[ - `player_${that.curVideo.ID}` - ][0].getCurrentTime(); - that.barRolling(curT); + let curT = + that.$refs[`player_${that.curVideo.ID}`][0].getCurrentTime(); }, 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].seek(val); + this.$refs[`player_${v.id}`][0].pause(); if (i == 0) { - let curT = this.$refs[`player_${v.ID}`][0].getCurrentTime(); - this.barRolling(curT); + let curT = this.$refs[`player_${v.id}`][0].getCurrentTime(); } }); } }, 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; @@ -459,11 +621,11 @@ let curT; if (this.guid == 1) { curT = Math.floor( - this.$refs[`player_${this.curVideo.ID}`][0].getCurrentTime() + this.$refs[`player_${this.curVideo.id}`][0].getCurrentTime() ); } else { curT = Math.floor( - this.$refs[`player_${this.videoArrs[index].ID}`][0].getCurrentTime() + this.$refs[`player_${this.videoArrs[index].id}`][0].getCurrentTime() ); } if (curT <= this.curTime) { @@ -471,10 +633,6 @@ } else { this.curTime = curT; } - this.curPlayTime = this.getTimeStr(this.curTime); - }, - formatTooltip(val) { - return this.curPlayTime; }, videoMouseEnter(e) { let target = e.target; @@ -499,19 +657,18 @@ } }, handleCommand(cmd) { + console.log(cmd); + console.log(this.$refs); + 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.$refs[`player_${_this.curVideo.ID}`][0].init(); + _this.curVideo = cmd; + _this.curCamera = _this.curVideo.CameraPosition; + _this.$nextTick(() => { + console.log(_this.$refs); + _this.$refs[`player_${_this.curVideo.id}`][0].init(); }); }, - zeroize(val) { + pad0(val) { return val < 10 ? "0" + val : val; }, checkCurVideo(index) { @@ -530,43 +687,50 @@ 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.allCurVideos = res.data; + + _this.curVideo = res.data.find((item) => item.id == v.id); + + _this.refreshCurVideoLabel(_this.curVideo); + + // 璁剧疆涓嬫媺鑿滃崟閫変腑椤� + _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.allCurVideos = res.data; - _this.curRoomVideos = _this.allCurVideos.filter((item) => { - return item.Camera == "鍙告満瀹�"; - }); + _this.curRoomVideos = _this.allCurVideos.filter((item) => { + return item.IsCab == "0"; + }); _this.$nextTick(() => { - _this.$refs[`player_${_this.curVideo.ID}`][0].init(); + _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) => { - let arr = []; - let map = {}; - res.data.forEach((item) => { - this.popDownArr.push(item); + + this.eventMarks.forEach((item) => { + if ( + item.text.indexOf("鐜╂墜鏈�") > -1 || + item.text.indexOf("瓒翠紡") > -1 || + item.text.indexOf("浠板崸") > -1 + ) { + this.checkType = 2; + } else { + this.checkType = 1; + } }); - if (this.popDownArr.length) { - this.curCamera = this.popDownArr[0].Camera; - } }); }, renderLabelOpts() { @@ -575,25 +739,54 @@ _this.labelOptions = res.data; }); }, - refreshCurVideoLabel(video) { - getRelatedVideoInfo({ UniqeID: video.UniqeID }).then((res) => { - res.data.forEach((d) => { - if (d.ID === video.ID) { - video.LableLst = d.LableLst; - } - }); - }); + getColor(text) { + if (text.indexOf("杩涘嚭绔�") > -1) { + return "yellow"; + } + if (text.indexOf("淇″彿鏈�") > -1) { + return "purple"; + } + if (text.indexOf("杩囧垎鐩�") > -1) { + return "blue"; + } + if ( + text.indexOf("鐜╂墜鏈�") > -1 || + text.indexOf("瓒翠紡") > -1 || + text.indexOf("浠板崸") > -1 + ) { + return "red"; + } + return ""; }, - checkVideo(video, index) { + refreshCurVideoLabel(video) { + let arr = [video]; + this.videoArrs = arr.concat( + this.allCurVideos.filter((v) => { + return v.GroupID == video.GroupID && v.id != video.id; + }) + ); + }, + checkVideo(video) { + console.log(video); this.refreshCurVideoLabel(video); this.curVideo = video; - this.videoArrs = this.allCurVideos.filter( - (item) => video.UniqeID == item.UniqeID - ); + this.eventMarks = []; + this.labelMarks = []; + video.marks.forEach((item) => { + if (item.type == 0) { + this.eventMarks.push(item); + } else { + this.labelMarks.push(item); + } + }); + this.$nextTick(() => { - this.$refs[`player_${this.curVideo.ID}`][0].init(); + this.$refs[`player_${this.curVideo.id}`][0].init(); + console.log(this.$refs); }); }, + + // 鍒嗙獥鍙� setGuid(guid) { let _this = this; this.guid = guid; @@ -601,36 +794,37 @@ this.showLocChoise = true; } else { this.showLocChoise = false; - this.$refs[`player_${this.curVideo.ID}`][0].pause(); - this.$refs[`player_${this.curVideo.ID}`][0].seek(0); + console.log(this.$refs[`player_${this.curVideo.id}`]); + this.$refs[`player_${this.curVideo.id}`][0].pause(); + this.$refs[`player_${this.curVideo.id}`][0].seek(0); } 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["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}`]); }); }, 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); + let isAdd = false; + tempArr = this.videoArrs.map((video) => video.id); let desc = this.labelCheckedList.map((lableId) => { for (let label of this.labelOptions) { + if (label.Name == "鏈墜姣�") { + isAdd = true; + } if (label.ID == lableId) { return label.Name; } @@ -639,29 +833,40 @@ 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) => { + console.log(query); 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) { + console.log(label); _this.curVideo.LableLst.push(label); } }); - - this.$message.success("娣诲姞鎴愬姛"); + console.log(query.Desc.split(",")); + _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(); + + if (isAdd) { + let num = sessionStorage.getItem("shoubiNum"); + sessionStorage.setItem("shoubiNum", num ? +num + 1 : 1); + } } else { - this.$message.warning(rsp.msg); + _this.$message.warning(rsp.msg); } }); }, @@ -669,51 +874,147 @@ this.labelCheckedList = []; this.selectedLabelId = ""; this.labelDialogVisible = true; - // 淇濆瓨鐐瑰嚮鏍囨敞鐨勬椂闂� - this.setLabelTime = this.$refs[`player_${video.ID}`][0].getCurrentTime(); + this.setLabelTime = this.$refs[`player_${video.id}`][0].getCurrentTime(); }, editCurLabel(mark) { this.selectedLabelId = mark.ID; - this.labelCheckedList = mark.Codes.split(" ,"); + this.labelCheckedList = mark.Codes.split(","); this.labelDialogVisible = true; }, removeCurLabel(mark) { let _this = this; - delLabel({ ID: mark.ID, ParentID: this.curVideo.ID }).then((rsp) => { + let obj = { + ID: mark.ID, + VideoIds: mark.VideoIds, + }; + 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) { + return; + } const eMarks = videoInfo.EventLst.map((item) => { - let obj = { + return { offset: item.SecondsInVideo, text: item.Event + (item.Desc == "" ? "" : ": " + item.Desc), type: 0, + state: item.state, }; - 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); }, setMarks(video) { let marks = this.mergeMarks(video); - this.$refs[`player_${video.ID}`][0].setProgressMarkers(marks); + this.$refs[`player_${video.id}`][0].setProgressMarkers(marks); + }, + openHand() { + this.showHand = true; + }, + closeHand() { + this.showHand = false; + }, + singlePause() { + this.isStop = true; + this.showPlayBtn = true; + }, + singlePlay() { + this.isStop = false; + this.showPlayBtn = false; + }, + }, + computed: { + yinhuanArr() { + if (this.curVideo.IsOperate == 0) { + return []; + } + + if (this.checkType === 1) { + return this.eventMarks.filter((x) => { + return ( + (x.text.indexOf("杩涘嚭绔�") > -1 || + x.text.indexOf("杩囧垎鐩�") > -1 || + x.text.indexOf("淇″彿鏈�") > -1) && + x.state == 0 + ); + }); + } else if (this.checkType === 2) { + return this.eventMarks.filter((x) => { + return ( + x.text.indexOf("鐜╂墜鏈�") > -1 || + x.text.indexOf("瓒翠紡") > -1 || + x.text.indexOf("浠板崸") > -1 + ); + }); + } + + return []; + }, + marks_filter() { + if (this.showHand) { + return this.curVideo.marks; + } else + return this.curVideo.marks.map((item) => { + if (item.text != "鎵嬫瘮: 鎵嬫瘮") { + return item; + } + }); + }, + marks_filter_arr() { + if (this.showHand) { + return this.videoArrs; + } else { + let arr = this.videoArrs.map((item) => { + let obj = { ...item }; + let temp = []; + obj.marks.forEach((mark) => { + if (mark.text != "鎵嬫瘮: 鎵嬫瘮") { + temp.push(mark); + } + }); + obj.marks = temp; + return obj; + }); + return arr; + } + }, + eventMarks_filter() { + if (this.showHand) { + return this.eventMarks; + } else { + let arr = []; + this.eventMarks.map((item) => { + if (item.text != "鎵嬫瘮: 鎵嬫瘮") { + arr.push(item); + } + }); + return arr; + } }, }, }; @@ -722,15 +1023,12 @@ <style lang="scss" > .video-analyze-content { margin: 0; - padding: 6px 15px 15px 15px; height: 100%; text-align: left; .content-top { - margin-bottom: 15px; - + height: 581px; // height: calc(60% + -16px); - .grid-check { text-align: right; margin-bottom: 3px; @@ -749,29 +1047,83 @@ } span { font-size: 17px; - color: #cacaca; padding-left: 12px; - cursor: pointer; - &.activegongge { - color: #3d68e1; - } } } .video-area { display: flex; height: 100%; - .info-list { - width: 180px; - min-width: 180px; - margin-right: 10px; - .v-name-block { - height: 484px; + .info { + margin-right: 18px; + height: 73px; + border-bottom: 1px solid #2d52d7; + } - overflow: auto; + .info-list { + width: 265px; + height: 582px; + min-width: 265px; + padding: 20px 0px 0 18px; + background-color: #000000; + + .info-item { + margin-bottom: 3px; } + + span { + color: #a4a4a6; + font-size: 12px; + } + + label { + color: #a1b1d5; + font-size: 12px; + } + + .info-video { + margin-top: 10px; + + .v-name-block { + height: 400px; + overflow-y: scroll; + &::-webkit-scrollbar-track { + background-color: #000000 !important; + } + + &::-webkit-scrollbar { + background-color: #000000 !important; + } + } + + p { + height: 30px; + line-height: 30px; + color: #fff; + font-size: 12px; + } + + i { + font-size: 14px; + color: #a4a4a6; + } + + span { + font-size: 12px; + color: #a4a4a6; + } + } + + .CarNumber { + color: #ffffff; + font-size: 14px; + font-weight: bold; + margin-right: 40px; + } + .video-name { + height: 28px; cursor: pointer; color: #777; margin-bottom: 10px; @@ -787,10 +1139,14 @@ width: 100%; display: flex; flex-wrap: wrap; - height: 455px; + height: 512px; + .single { + .prism-controlbar { + display: none !important; + } + } .video-item { background: black; - border: 1px solid #fff; box-sizing: border-box; & > div { height: 100%; @@ -814,11 +1170,8 @@ float: left; } } - // .prism-controlbar{ - // display: none; - // } .currentPlayer { - border: 2px solid aqua; + border: 1px dashed rgb(136, 136, 136); height: 100%; box-sizing: border-box; & > div { @@ -827,29 +1180,21 @@ } } .player-control { - background-color: #fff; - height: 75px; + background-color: #222328; + height: 70px; width: 100%; + padding-bottom: 10px; + .time { + text-align: right; + color: #a4a4a6; + font-size: 12px; + } .progress-bar { - margin: 0px 30px; + margin: 0 5px 0 5px; position: relative; .self-dot { - // top: 16px; position: absolute; - height: 6px; - 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; - position: absolute; - height: 6px; + height: 8px; width: 6px; z-index: 1; background-color: yellowgreen; @@ -857,11 +1202,42 @@ -webkit-transform: translateX(-50%); transform: translateX(-50%); } - .el-slider{ - margin: 16px 0; - .el-slider__runway{ - margin: 0; - } + .yellow { + background-color: yellow; + } + .purple { + background-color: skyblue; + } + .red { + background-color: red; + } + .blue { + background-color: blue; + } + .label-dot { + position: absolute; + height: 8px; + width: 6px; + z-index: 1; + background-color: lightcoral; + cursor: pointer; + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + } + .el-slider { + margin-bottom: 5px; + + .el-slider__runway { + margin: 0; + height: 8px; + background-color: rgb(90, 90, 94); + .el-slider__bar { + height: 8px; + } + .el-slider__button-wrapper { + width: 16px; + } + } } .el-slider__button { width: 12px; @@ -870,34 +1246,95 @@ .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; - } + display: flex; + justify-content: space-between; + align-items: center; + height: 30px; .play-btn { - width: 24px; - height: 24px; - cursor: pointer; - // background: url(/apps/shuohuangMonitorAnalyze/img/smallplay.png) - - margin: 0 auto; - .iconfont{ - font-size: 25px; + width: 300px; + height: 27px; + border-radius: 4px; + .group { + text-align: center; + line-height: 27px; + i { + cursor: pointer; + color: white; + } + + .back { + font-size: 12px; + color: #a4a4a6; + margin-right: 10px; + } + + .forward { + font-size: 12px; + color: #a4a4a6; + margin-left: 10px; + } } } - .stop-btn { - width: 24px; - height: 24px; - cursor: pointer; - // background: url(/apps/shuohuangMonitorAnalyze/img/smallpause.png) - .iconfont{ - font-size: 25px; + + .el-dropdown { + width: 104px; + height: 30px; + background: rgb(76, 77, 81); + border: 1px solid #1a377a; + border-radius: 5px; + margin-left: 20px; + + .el-dropdown-link { + padding: 0 10px; + display: block; + height: 100%; + color: #a1bdff; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 12px; + cursor: pointer; + i { + color: #a1bdff; + font-size: 12px; + } } - margin: 0 auto; } + + .spanList { + display: flex; + justify-content: space-between; + align-items: center; + } + } + .icon-rt { + margin-right: 20px; + color: #9299b0; + font-size: 20px; + cursor: pointer; + &.activegongge { + color: #3d68e1; + } + } + img { + width: 20px; + vertical-align: middle; } } } @@ -905,25 +1342,42 @@ } .content-bottom { display: flex; + height: 422px; .bot-left { flex: 1; - padding: 0px 15px 8px 15px; + padding: 0px 15px 8px 0px; background: #fff; border-radius: 3px; min-width: 400px; - height: 343px; .el-tabs__header { padding: 0; position: relative; margin: 0 0 10px; } .flex-box { - align-items: baseline; + align-items: center; label { - padding-right: 10px; + font-weight: bold; + color: #4f618a; + padding-right: 15px; } + .el-radio-group { + margin-top: 5px; + } + } + .fixed-height-box { + display: flex; + margin-top: 30px; + + label { + font-weight: bold; + color: #4f618a; + padding-right: 15px; + } + .mark-list { + flex: 1; .time { cursor: pointer; font-size: 15px; @@ -941,15 +1395,73 @@ padding: 4px 0; color: #888; } + + .mark-item { + margin-bottom: 15px; + .icon { + color: #c7d0e5; + } + + .edit { + margin-right: 7px; + + &:hover { + color: #2d52d7; + } + } + + .remove { + margin-right: 14px; + &:hover { + color: #bf3a3a; + } + } + + .mark-time { + color: #192a51; + margin-right: 27px; + } + + .mark-desc { + display: inline-block; + box-sizing: content-box; + padding: 3px 6px; + text-align: center; + background: #bf3a3a; + color: #fff; + border-radius: 2px; + margin-right: 24px; + } + } } } - .fixed-height-box { - height: 200px; - overflow-y: auto; - } - .fixed-height-box2 { - height: 228px; - overflow-y: auto; + + .mark { + padding: 25px 40px; + * { + font-size: 12px; + } + + .icon { + color: #bf3a3a; + cursor: pointer; + } + + .el-radio__input.is-checked { + .el-radio__inner { + border-color: #bf3a3a; + background: #bf3a3a; + } + } + .el-radio__inner:hover { + border-color: #bf3a3a; + } + + label.is-checked { + .el-radio__label { + color: #bf3a3a; + } + } } } .bot-right { @@ -962,33 +1474,116 @@ padding-right: 8px; } } + + .el-tabs__header { + height: 55px; + background: #f4f6f9; + .el-tabs__nav-wrap { + height: 100%; + .el-tabs__nav-scroll { + height: 100%; + + .el-tabs__nav { + height: 100%; + margin-left: 50px; + + .el-tabs__item { + line-height: 62px; + } + } + } + + &::after { + display: none; + } + } + } + + .yinhuan-wrap { + display: flex; + padding: 25px 40px; + .wrap-title { + margin-right: 10px; + min-width: 160px; + line-height: 24px; + font-size: 16px; + color: #4f618a; + font-weight: 700; + } + .list { + width: 100%; + height: 300px; + overflow: auto; + } + .list-item { + display: flex; + align-items: center; + height: 23px; + width: 280px; + cursor: pointer; + color: #192a51; + font-size: 12px; + margin-bottom: 18px; + + span { + color: #192a51; + } + + .list-warn { + display: block; + width: 57px; + height: 20px; + background: #bf3a3a; + border-radius: 2px; + color: #fff; + text-align: center; + line-height: 20px; + } + } + } } .label-dialog { .el-dialog { - width: 700px !important; - height: 558px !important; + width: 736px !important; + height: 502px !important; + overflow: hidden; .el-dialog__header { height: 20px; + .el-dialog__headerbtn .el-dialog__close::before { + color: #8d96a4; + } + } + .el-dialog__body { + background-color: #fff !important; } p.label { line-height: 36px; - } - .label-radio { - padding: 20px; + font-weight: bold; + color: #2d52d7; + font-size: 14px; + margin-bottom: 30px; } .label-check { - padding: 20px; - min-height: 400px; + padding: 10px 40px; + height: 350px; margin-bottom: 20px; .el-checkbox-group { display: flex; flex-wrap: wrap; > label { - width: 50%; + width: 25%; text-align: left; margin: 0; - margin-bottom: 4px; + margin-bottom: 14px; + + .el-checkbox__label { + font-size: 12px; + } + + .el-checkbox__inner { + border-radius: 9px; + } } } } @@ -996,8 +1591,60 @@ display: flex; justify-content: center; padding: 20px; + .el-button:first-child { + margin-right: 30px; + } + .el-button:last-child span { + color: #fff; + } + .el-button { + padding: 9px 32px; + } + } + .el-checkbox.is-checked { + .el-checkbox__label { + color: #bf3a3a; + } + + .el-checkbox__inner { + background-color: #bf3a3a; + border-color: #bf3a3a; + } + } + .el-checkbox .el-checkbox__inner:hover { + border-color: #bf3a3a; + } + .el-checkbox__input.is-focus .el-checkbox__inner { + border-color: #bf3a3a; } } } } +.el-tooltip__popper { + * { + color: #fff; + } +} + +.prism-marker-text { + p { + color: #fff; + } +} + +.video-box-top b { + color: #fff; +} + +.currentPlayer .prism-player .prism-big-play-btn { + left: 46% !important; + bottom: 39% !important; + background-size: cover; + width: 11%; + height: 23%; + .outter { + width: 100%; + height: 100%; + } +} </style> \ No newline at end of file -- Gitblit v1.8.0