fajiao
/
wvp-GB28181-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

录像查询更换日期后先清空原先的查询列表

pull/1/head
Lawrence 4 years ago
parent
37e97a782c
commit
9b18c33dd8
1 changed files with 421 additions and 423 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 216
      web_src/src/components/gb28181/devicePlayer.vue

216
web_src/src/components/gb28181/devicePlayer.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<div id="devicePlayer"> <div id="devicePlayer">
<el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()"> <el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
<LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :hasaudio="hasaudio" fluent autoplay live ></LivePlayer> <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer>
<div id="shared" style="text-align: right; margin-top: 1rem;"> <div id="shared" style="text-align: right; margin-top: 1rem;">
<el-tabs v-model="tabActiveName"> <el-tabs v-model="tabActiveName">
<el-tab-pane label="实时视频" name="media"> <el-tab-pane label="实时视频" name="media">
<div style="margin-bottom: 0.5rem;"> <div style="margin-bottom: 0.5rem;">
<!-- <el-button type="primary" size="small" @click="playRecord(true, '')">播放</el-button>--> <!-- <el-button type="primary" size="small" @click="playRecord(true, '')">播放</el-button>-->
<!-- <el-button type="primary" size="small" @click="startRecord()">录制</el-button>--> <!-- <el-button type="primary" size="small" @click="startRecord()">录制</el-button>-->
<!-- <el-button type="primary" size="small" @click="stopRecord()">停止录制</el-button>--> <!-- <el-button type="primary" size="small" @click="stopRecord()">停止录制</el-button>-->
</div> </div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;"> <div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">播放地址：</span> <span style="width: 5rem; line-height: 2.5rem; text-align: right;">播放地址：</span>
@ -25,29 +25,28 @@
</el-tab-pane> </el-tab-pane>
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}--> <!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
<el-tab-pane label="录像查询" name="record"> <el-tab-pane label="录像查询" name="record">
<el-date-picker size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="日期" <el-date-picker size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="queryRecords()"></el-date-picker>
@change="queryRecords()"></el-date-picker> <!-- <el-slider style="margin: 0 1rem 1rem 1rem;"-->
<!-- <el-slider style="margin: 0 1rem 1rem 1rem;"--> <!-- v-model="timeVal"-->
<!-- v-model="timeVal"--> <!-- :min="timeMin"-->
<!-- :min="timeMin"--> <!-- :max="timeMax"-->
<!-- :max="timeMax"--> <!-- :step="5"-->
<!-- :step="5"--> <!-- :marks="getTimeMakrs()"-->
<!-- :marks="getTimeMakrs()"--> <!-- :format-tooltip="formatTooltip">-->
<!-- :format-tooltip="formatTooltip">--> <!-- </el-slider>-->
<!-- </el-slider>--> <!-- <range-slider :min="timeMin"-->
<!-- <range-slider :min="timeMin"--> <!-- :max="timeMax"-->
<!-- :max="timeMax"--> <!-- :step="5"></range-slider>-->
<!-- :step="5"></range-slider>-->
<!-- <el-date-picker v-model="videoHistory.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间"--> <!-- <el-date-picker v-model="videoHistory.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间"-->
<!-- @change="recordList()"></el-date-picker>--> <!-- @change="recordList()"></el-date-picker>-->
<el-table :data="videoHistory.searchHistoryResult" height="150" v-load="recordsLoading"> <el-table :data="videoHistory.searchHistoryResult" height="150" v-load="recordsLoading">
<el-table-column label="名称" prop="name"></el-table-column> <el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="文件" prop="filePath"></el-table-column> <el-table-column label="文件" prop="filePath"></el-table-column>
<el-table-column label="开始时间" prop="startTime" :formatter="timeFormatter"></el-table-column> <el-table-column label="开始时间" prop="startTime" :formatter="timeFormatter"></el-table-column>
<el-table-column label="结束时间" prop="endTime" :formatter="timeFormatter"></el-table-column> <el-table-column label="结束时间" prop="endTime" :formatter="timeFormatter"></el-table-column>
<el-table-column label="操作" > <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">播放</el-button> <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">播放</el-button>
</template> </template>
@ -77,10 +76,8 @@
<div class="control-round"> <div class="control-round">
<div class="control-round-inner"><i class="fa fa-pause-circle"></i></div> <div class="control-round-inner"><i class="fa fa-pause-circle"></i></div>
</div> </div>
<div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in" style="font-size: 1.875rem;"></i></div>
class="el-icon-zoom-in" style="font-size: 1.875rem;"></i></div> <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out"></i></div>
<div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 1)"
@mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out"></i></div>
</div> </div>
</div> </div>
@ -88,19 +85,19 @@
</el-tabs> </el-tabs>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import LivePlayer from '@liveqing/liveplayer' import LivePlayer from '@liveqing/liveplayer'
export default { export default {
name: 'devicePlayer', name: 'devicePlayer',
props: {}, props: {},
components: { components: {
LivePlayer LivePlayer
}, },
computed: { computed: {
getPlayerShared: function() { getPlayerShared: function () {
return { return {
sharedUrl: window.location.host + '/' + this.videoUrl, sharedUrl: window.location.host + '/' + this.videoUrl,
sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>', sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
@ -108,17 +105,16 @@
}; };
} }
}, },
created() { created() {},
},
data() { data() {
return { return {
video:'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4', video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
videoUrl: '', videoUrl: '',
videoHistory: { videoHistory: {
date: '', date: '',
searchHistoryResult: [] //媒体流历史记录搜索结果 searchHistoryResult: [] //媒体流历史记录搜索结果
}, },
timeMakrs:{ timeMakrs: {
// 0 : "0:00", // 0 : "0:00",
// // 60 : "1:00", // // 60 : "1:00",
// 120 : "2:00", // 120 : "2:00",
@ -131,13 +127,13 @@
// 540 : "9:00", // 540 : "9:00",
600: "10:00", 600: "10:00",
// 660 : "11:00", // 660 : "11:00",
720 : "12:00", 720: "12:00",
// 780 : "13:00", // 780 : "13:00",
840 : "14:00", 840: "14:00",
// 900 : "15:00", // 900 : "15:00",
960 : "16:00", 960: "16:00",
// 1020 : "17:00", // 1020 : "17:00",
1080 : "18:00", 1080: "18:00",
// 1140 : "19:00", // 1140 : "19:00",
// 1200 : "20:00", // 1200 : "20:00",
// // 1260 : "21:00", // // 1260 : "21:00",
@ -170,7 +166,7 @@
this.$refs.videoPlayer.pause(); this.$refs.videoPlayer.pause();
} }
switch(tab) { switch (tab) {
case "media": case "media":
this.play(param.streamInfo, param.hasAudio) this.play(param.streamInfo, param.hasAudio)
break; break;
@ -184,10 +180,10 @@
break; break;
} }
}, },
timeAxisSelTime:function (val) { timeAxisSelTime: function (val) {
console.log(val) console.log(val)
}, },
getTimeMakrs(){ getTimeMakrs() {
return this.timeMakrs; return this.timeMakrs;
}, },
play: function (streamInfo, hasAudio) { play: function (streamInfo, hasAudio) {
@ -236,22 +232,24 @@
); );
}, },
queryRecords: function() { queryRecords: function () {
if (!this.videoHistory.date) { if (!this.videoHistory.date) {
return; return;
} }
this.recordsLoading = true; this.recordsLoading = true;
this.videoHistory.searchHistoryResult = [];
let that = this; let that = this;
var startTime = this.videoHistory.date + " 00:00:00"; var startTime = this.videoHistory.date + " 00:00:00";
var endTime = this.videoHistory.date + " 23:59:59"; var endTime = this.videoHistory.date + " 23:59:59";
this.$axios({ this.$axios({
method: 'get', method: 'get',
url: '/api/record/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime url: '/api/record/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function(res) { }).then(function (res) {
// 处理时间信息 // 处理时间信息
that.videoHistory.searchHistoryResult = res.data.recordList; that.videoHistory.searchHistoryResult = res.data.recordList;
that.recordsLoading = false; that.recordsLoading = false;
}).catch(function(e) { }).catch(function (e) {
console.log(e.message);
// that.videoHistory.searchHistoryResult = falsificationData.recordData; // that.videoHistory.searchHistoryResult = falsificationData.recordData;
}); });
@ -259,19 +257,19 @@
onTimeChange: function (video) { onTimeChange: function (video) {
// this.queryRecords() // this.queryRecords()
}, },
playRecord: function(row) { playRecord: function (row) {
let that = this; let that = this;
if (that.ssrc != "") { if (that.ssrc != "") {
that.stopPlayRecord(function (){ that.stopPlayRecord(function () {
that.ssrc = "", that.ssrc = "",
that.playRecord(row); that.playRecord(row);
}) })
}else { } else {
this.$axios({ this.$axios({
method: 'get', method: 'get',
url: '/api/playback/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' + url: '/api/playback/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime row.endTime
}).then(function(res) { }).then(function (res) {
var streamInfo = res.data; var streamInfo = res.data;
that.ssrc = streamInfo.ssrc; that.ssrc = streamInfo.ssrc;
that.videoUrl = streamInfo.ws_flv; that.videoUrl = streamInfo.ws_flv;
@ -284,58 +282,58 @@
this.$axios({ this.$axios({
method: 'get', method: 'get',
url: '/api/playback/' + this.ssrc + '/stop' url: '/api/playback/' + this.ssrc + '/stop'
}).then(function(res) { }).then(function (res) {
if (callback) callback() if (callback) callback()
}); });
}, },
ptzCamera: function(leftRight, upDown, zoom) { ptzCamera: function (leftRight, upDown, zoom) {
console.log('云台控制：' + leftRight + ' : ' + upDown + " : " + zoom); console.log('云台控制：' + leftRight + ' : ' + upDown + " : " + zoom);
let that = this; let that = this;
this.$axios({ this.$axios({
method: 'post', method: 'post',
url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown + url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
'&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50' '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
}).then(function(res) {}); }).then(function (res) {});
}, },
//////////////////////播放器事件处理////////////////////////// //////////////////////播放器事件处理//////////////////////////
videoError:function(e){ videoError: function (e) {
console.log("播放器错误："+JSON.stringify(e)); console.log("播放器错误：" + JSON.stringify(e));
}, },
formatTooltip:function(val) { formatTooltip: function (val) {
var h = parseInt(val/60); var h = parseInt(val / 60);
var hStr = h< 10 ? ("0" + h):h; var hStr = h < 10 ? ("0" + h) : h;
var s = val%60; var s = val % 60;
var sStr = s< 10 ? ("0" + s):s; var sStr = s < 10 ? ("0" + s) : s;
return h + ":" + sStr; return h + ":" + sStr;
}, },
timeFormatter: function (row, column, cellValue, index) { timeFormatter: function (row, column, cellValue, index) {
return cellValue.split( " ")[1]; return cellValue.split(" ")[1];
}, },
mergeTime: function (timeArray) { mergeTime: function (timeArray) {
var resultArray = []; var resultArray = [];
for (let i = 0; i < timeArray.length; i++) { for (let i = 0; i < timeArray.length; i++) {
var startTime = new Date(timeArray[i].startTime); var startTime = new Date(timeArray[i].startTime);
var endTime = new Date(timeArray[i].endTime); var endTime = new Date(timeArray[i].endTime);
if (i ==0) { if (i == 0) {
resultArray[0] = { resultArray[0] = {
startTime: startTime, startTime: startTime,
endTime: endTime endTime: endTime
} }
} }
for (let j = 0; j < resultArray.length; j++) { for (let j = 0; j < resultArray.length; j++) {
if (startTime > resultArray[j].endTime ) { // 合并 if (startTime > resultArray[j].endTime) { // 合并
if (startTime - resultArray[j].endTime <= 1000){ if (startTime - resultArray[j].endTime <= 1000) {
resultArray[j].endTime = endTime; resultArray[j].endTime = endTime;
}else { } else {
resultArray[resultArray.length] = { resultArray[resultArray.length] = {
startTime: startTime, startTime: startTime,
endTime: endTime endTime: endTime
} }
} }
}else if(resultArray[j].startTime > endTime ) { // 合并 } else if (resultArray[j].startTime > endTime) { // 合并
if (resultArray[j].startTime - endTime <= 1000) { if (resultArray[j].startTime - endTime <= 1000) {
resultArray[j].startTime = startTime; resultArray[j].startTime = startTime;
}else { } else {
resultArray[resultArray.length] = { resultArray[resultArray.length] = {
startTime: startTime, startTime: startTime,
endTime: endTime endTime: endTime
@ -348,11 +346,11 @@
return resultArray; return resultArray;
} }
} }
}; };
</script> </script>
<style> <style>
.control-wrapper { .control-wrapper {
position: relative; position: relative;
width: 6.25rem; width: 6.25rem;
height: 6.25rem; height: 6.25rem;
@ -361,9 +359,9 @@
margin: 0 auto; margin: 0 auto;
border-radius: 100%; border-radius: 100%;
float: left; float: left;
} }
.control-btn { .control-btn {
display: flex; display: flex;
justify-content: center; justify-content: center;
position: absolute; position: absolute;
@ -373,17 +371,17 @@
border: 1px solid #78aee4; border: 1px solid #78aee4;
box-sizing: border-box; box-sizing: border-box;
transition: all 0.3s linear; transition: all 0.3s linear;
} }
.control-btn i { .control-btn i {
font-size: 20px; font-size: 20px;
color: #78aee4; color: #78aee4;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.control-round { .control-round {
position: absolute; position: absolute;
top: 21%; top: 21%;
left: 21%; left: 21%;
@ -391,9 +389,9 @@
height: 58%; height: 58%;
background: #fff; background: #fff;
border-radius: 100%; border-radius: 100%;
} }
.control-round-inner { .control-round-inner {
position: absolute; position: absolute;
left: 15%; left: 15%;
top: 15%; top: 15%;
@ -407,105 +405,105 @@
border: 1px solid #78aee4; border: 1px solid #78aee4;
border-radius: 100%; border-radius: 100%;
transition: all 0.3s linear; transition: all 0.3s linear;
} }
.control-inner-btn { .control-inner-btn {
position: absolute; position: absolute;
width: 60%; width: 60%;
height: 60%; height: 60%;
background: #fafafa; background: #fafafa;
} }
.control-top { .control-top {
top: -8%; top: -8%;
left: 27%; left: 27%;
transform: rotate(-45deg); transform: rotate(-45deg);
border-radius: 5px 100% 5px 0; border-radius: 5px 100% 5px 0;
} }
.control-top i { .control-top i {
transform: rotate(45deg); transform: rotate(45deg);
border-radius: 5px 100% 5px 0; border-radius: 5px 100% 5px 0;
} }
.control-top .control-inner { .control-top .control-inner {
left: -1px; left: -1px;
bottom: 0; bottom: 0;
border-top: 1px solid #78aee4; border-top: 1px solid #78aee4;
border-right: 1px solid #78aee4; border-right: 1px solid #78aee4;
border-radius: 0 100% 0 0; border-radius: 0 100% 0 0;
} }
.control-top .fa { .control-top .fa {
transform: rotate(45deg) translateY(-7px); transform: rotate(45deg) translateY(-7px);
} }
.control-left { .control-left {
top: 27%; top: 27%;
left: -8%; left: -8%;
transform: rotate(45deg); transform: rotate(45deg);
border-radius: 5px 0 5px 100%; border-radius: 5px 0 5px 100%;
} }
.control-left i { .control-left i {
transform: rotate(-45deg); transform: rotate(-45deg);
} }
.control-left .control-inner { .control-left .control-inner {
right: -1px; right: -1px;
top: -1px; top: -1px;
border-bottom: 1px solid #78aee4; border-bottom: 1px solid #78aee4;
border-left: 1px solid #78aee4; border-left: 1px solid #78aee4;
border-radius: 0 0 0 100%; border-radius: 0 0 0 100%;
} }
.control-left .fa { .control-left .fa {
transform: rotate(-45deg) translateX(-7px); transform: rotate(-45deg) translateX(-7px);
} }
.control-right { .control-right {
top: 27%; top: 27%;
right: -8%; right: -8%;
transform: rotate(45deg); transform: rotate(45deg);
border-radius: 5px 100% 5px 0; border-radius: 5px 100% 5px 0;
} }
.control-right i { .control-right i {
transform: rotate(-45deg); transform: rotate(-45deg);
} }
.control-right .control-inner { .control-right .control-inner {
left: -1px; left: -1px;
bottom: -1px; bottom: -1px;
border-top: 1px solid #78aee4; border-top: 1px solid #78aee4;
border-right: 1px solid #78aee4; border-right: 1px solid #78aee4;
border-radius: 0 100% 0 0; border-radius: 0 100% 0 0;
} }
.control-right .fa { .control-right .fa {
transform: rotate(-45deg) translateX(7px); transform: rotate(-45deg) translateX(7px);
} }
.control-bottom { .control-bottom {
left: 27%; left: 27%;
bottom: -8%; bottom: -8%;
transform: rotate(45deg); transform: rotate(45deg);
border-radius: 0 5px 100% 5px; border-radius: 0 5px 100% 5px;
} }
.control-bottom i { .control-bottom i {
transform: rotate(-45deg); transform: rotate(-45deg);
} }
.control-bottom .control-inner { .control-bottom .control-inner {
top: -1px; top: -1px;
left: -1px; left: -1px;
border-bottom: 1px solid #78aee4; border-bottom: 1px solid #78aee4;
border-right: 1px solid #78aee4; border-right: 1px solid #78aee4;
border-radius: 0 0 100% 0; border-radius: 0 0 100% 0;
} }
.control-bottom .fa { .control-bottom .fa {
transform: rotate(-45deg) translateY(7px); transform: rotate(-45deg) translateY(7px);
} }
</style> </style>

Write Preview
Loading…
Cancel
Save