From 3a2c4f13d1554d4e97463abebf085117b3f1e28f Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 28 四月 2021 10:24:56 +0800
Subject: [PATCH] 调整应用图标
---
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 369 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 224 insertions(+), 145 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index de1e4f0..c1a6ea0 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -73,7 +73,6 @@
<div style="display: none"></div>
<div class="currentPlayer">
<ali-player
- @playing="getPlayStatus"
@pause="isStop = true"
@play="isStop = false"
@timeupdate="timeUpdate"
@@ -112,17 +111,12 @@
@pause="isStop = true"
@play="isStop = false"
:ref="`player_${videoArrs[index].ID}`"
- @ready="videoReady"
/>
</div>
</template>
</div>
</template>
<div class="player-control">
- <!-- <div class="progress-bar"></div> -->
- <!--
-
- -->
<div class="progress-bar">
<el-tooltip
placement="top"
@@ -140,19 +134,55 @@
@click="dotJump(item.offset)"
></div>
</el-tooltip>
- <!-- :marks="marks" -->
+ <el-tooltip
+ placement="top"
+ v-for="(item, index) in labelMarks"
+ :key="index"
+ >
+ <div slot="content">
+ {{ getTimeStr(item.offset) }}<br />{{ item.text }}
+ </div>
+ <div
+ class="label-dot"
+ :style="{
+ left: (item.offset / maxSecond) * 100 + '%',
+ }"
+ @click="dotJump(item.offset)"
+ ></div>
+ </el-tooltip>
+ <div ref="time-clip" class="time-clip"></div>
+
<el-slider
v-model="curTime"
- :format-tooltip="formatTooltip"
+ :show-tooltip="false"
:max="maxSecond"
+ @mousemove.native.stop="triggerHover"
+ @mouseleave.native="leaveBar"
+ @mouseover.native="intoBar"
@change="progressChange"
- @input="inTimeChange"
></el-slider>
- </div>
+ </div>
<div class="control-zone">
<span class="time">{{ curPlayTime }} / {{ maxVideoTime }}</span>
- <div class="play-btn" @click="playAll" v-if="showPlayBtn"></div>
- <div class="stop-btn" @click="pauseAll" v-else></div>
+ <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>
</div>
@@ -188,8 +218,8 @@
>
<div class="time">
<span
- >{{ zeroize(Math.floor(mark.Time / 60)) }}:{{
- zeroize(mark.Time % 60)
+ >{{ pad0(Math.floor(mark.Time / 60)) }}:{{
+ pad0(mark.Time % 60)
}}</span
>
<i class="el-icon-edit" @click="editCurLabel(mark)"></i>
@@ -205,7 +235,7 @@
<!-- <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">
@@ -258,7 +288,7 @@
</div>
<div class="btns">
<el-button @click="cancelLabelChecked" size="small">鍙栨秷</el-button>
- <el-button @click="submitLabelChecked()" size="small" type="primary"
+ <el-button @click="submitLabelChecked" size="small" type="primary"
>纭畾</el-button
>
</div>
@@ -279,6 +309,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",
@@ -318,10 +369,7 @@
curTime: 0,
showPlayBtn: true,
eventMarks: [],
- marks: {
- 45: {},
- 373: {},
- },
+ marks: {},
labelMarks: [],
maxDuration: 0,
maxVideoTime: "",
@@ -342,10 +390,13 @@
deep: true,
},
videoDetails: {
- handler(newVal, oldVal) {
+ handler(newVal) {
this.getCurVideos(newVal);
},
deep: true,
+ },
+ curTime(newVal) {
+ this.curPlayTime = this.getTimeStr(newVal);
},
},
mounted() {
@@ -354,11 +405,36 @@
this.getCurVideos(this.videoDetails);
this.getRelatedVideos(this.videoDetails);
},
+ destroyed() {
+ this.videoArrs.length = 0;
+ },
methods: {
- getPlayStatus(e) {
- console.log(e, 1111);
+ triggerHover(e) {
+ let fn = throttle(this.hoverAction, 2000);
+ fn(e);
},
- videoReady(a, b) {},
+ 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
+ );
+ },
+ 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) {
@@ -382,45 +458,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;
@@ -440,10 +508,6 @@
} else {
this.curTime = curT;
}
- this.curPlayTime = this.getTimeStr(this.curTime);
- },
- formatTooltip(val) {
- return this.curPlayTime;
},
videoMouseEnter(e) {
let target = e.target;
@@ -469,18 +533,27 @@
},
handleCommand(cmd) {
let _this = this;
- this.curCamera = cmd.Camera;
- this.curRoomVideos = this.allCurVideos.filter((item) => {
+
+ 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.UniqeID == this.curVideo.UniqeID;
+ _this.curVideo = _this.curRoomVideos.find((item) => {
+ return item.ID == cmd.ID;
});
- this.$nextTick(() => {
+ _this.$nextTick(() => {
_this.$refs[`player_${_this.curVideo.ID}`][0].init();
});
+ });
+
},
- zeroize(val) {
+ pad0(val) {
return val < 10 ? "0" + val : val;
},
checkCurVideo(index) {
@@ -500,42 +573,15 @@
item.marks = _this.mergeMarks(item);
});
_this.curVideo = res.data.find((item) => item.ID == v.ID);
- console.log(_this.curVideo);
- let map = {},
- map2 = {};
- let arr1 = [],
- arr2 = [];
_this.curVideo.marks.forEach((item) => {
if (item.type == 0) {
- map[item.offset] = {
- style: {
- color: "white",
- },
- label: item.text,
- };
+ _this.eventMarks.push(item);
} else {
- map[+item.offset] = {
- style: {
- color: "yellow",
- },
- label: item.text,
- };
+ _this.labelMarks.push(item);
}
});
- // _this.eventMarks = map
- _this.labelMarks = map2;
-
- // videoInfo.EventLst.forEach((item) => {
- // map[item.SecondsInVideo] = {
- // style:{
- // color: 'black'
- // },
- // label: item.Event + (item.Desc == "" ? "" : ": " + item.Desc)
- // }
- // });
-
- if (this.guid == 1) {
- this.maxVideoTime = this.curVideo.VideoTime;
+ if (_this.guid == 1) {
+ _this.maxVideoTime = _this.curVideo.VideoTime;
}
_this.videoArrs = res.data.filter((item) => v.UniqeID == item.UniqeID);
_this.allCurVideos = res.data;
@@ -543,12 +589,12 @@
return item.Camera == "鍙告満瀹�";
});
- this.$nextTick(() => {
+ _this.$nextTick(() => {
_this.$refs[`player_${_this.curVideo.ID}`][0].init();
- let arr = this.maxVideoTime.split(":");
+ let arr = _this.maxVideoTime.split(":");
let min = +arr[0],
sec = +arr[1];
- this.maxSecond = min * 60 + sec;
+ _this.maxSecond = min * 60 + sec;
});
});
},
@@ -558,10 +604,10 @@
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].Camera;
}
});
},
@@ -606,7 +652,6 @@
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";
@@ -617,9 +662,9 @@
cancelLabelChecked() {
this.labelDialogVisible = false;
},
- dotJump(offset){
- this.curTime = offset
- this.progressChange(offset)
+ dotJump(offset) {
+ this.curTime = offset;
+ this.progressChange(offset);
},
submitLabelChecked() {
let _this = this;
@@ -641,29 +686,27 @@
Codes: this.labelCheckedList.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);
}
});
- // getRelatedVideoInfo({ UniqeID: _this.videoDetails.UniqeID }).then(res => {
- // res.data.forEach(d => {
- // let someVideo = _this.videoArrs.find(video => video.ID === d.ID);
- // someVideo.LableLst = d.LableLst
- // })
- // })
-
- 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);
}
});
},
@@ -671,7 +714,6 @@
this.labelCheckedList = [];
this.selectedLabelId = "";
this.labelDialogVisible = true;
-
// 淇濆瓨鐐瑰嚮鏍囨敞鐨勬椂闂�
this.setLabelTime = this.$refs[`player_${video.ID}`][0].getCurrentTime();
},
@@ -682,36 +724,46 @@
},
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) {
const eMarks = videoInfo.EventLst.map((item) => {
- let obj = {
+ return {
offset: item.SecondsInVideo,
text: item.Event + (item.Desc == "" ? "" : ": " + item.Desc),
type: 0,
};
- this.eventMarks.push(obj);
- return obj;
});
const labMarks = videoInfo.LableLst.map((lable) => {
- let obj = {
- offset: lable.Time,
+ return {
+ offset: +lable.Time,
text: lable.Desc,
type: 1,
};
- this.labelMarks.push(obj);
- return obj;
});
return eMarks.concat(labMarks);
},
@@ -732,9 +784,7 @@
text-align: left;
.content-top {
margin-bottom: 15px;
-
// height: calc(60% + -16px);
-
.grid-check {
text-align: right;
margin-bottom: 3px;
@@ -753,7 +803,6 @@
}
span {
font-size: 17px;
-
color: #cacaca;
padding-left: 12px;
cursor: pointer;
@@ -765,14 +814,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 {
@@ -828,24 +875,45 @@
}
}
.player-control {
- background-color: black;
+ background-color: #fff;
height: 75px;
width: 100%;
.progress-bar {
margin: 0px 30px;
position: relative;
.self-dot {
- top: 16px;
position: absolute;
- height: 6px;
- width: 3px;
+ height: 8px;
+ width: 6px;
z-index: 1;
background-color: lightcoral;
- border-radius: 60%;
- // pointer-events: none;
cursor: pointer;
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
+ }
+ .label-dot {
+ position: absolute;
+ height: 8px;
+ width: 6px;
+ z-index: 1;
+ background-color: yellowgreen;
+ cursor: pointer;
+ -webkit-transform: translateX(-50%);
+ transform: translateX(-50%);
+ }
+ .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;
@@ -854,30 +922,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/bigplay.png)
- no-repeat;
- background-size: contain;
+ width: 200px;
+ height: 27px;
+ border-radius: 4px;
margin: 0 auto;
- }
- .stop-btn {
- width: 24px;
- height: 24px;
- cursor: pointer;
- background: url(/apps/shuohuangMonitorAnalyze/img/smallpause.png)
- no-repeat;
- background-size: contain;
- margin: 0 auto;
+ .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;
+ }
+ }
}
}
}
@@ -954,9 +1036,6 @@
}
p.label {
line-height: 36px;
- }
- .label-radio {
- padding: 20px;
}
.label-check {
padding: 20px;
--
Gitblit v1.8.0