国标录像UI重构
648540858
parent
fd3a4ef472
commit
9b9a13ab36
|
|
@ -10,6 +10,7 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
import org.springframework.web.filter.OncePerRequestFilter;
|
||||
|
||||
import javax.servlet.*;
|
||||
|
|
@ -51,6 +52,9 @@ public class ApiAccessFilter extends OncePerRequestFilter {
|
|||
|
||||
LogDto logDto = new LogDto();
|
||||
logDto.setName(uriName);
|
||||
if (ObjectUtils.isEmpty(username)) {
|
||||
username = "";
|
||||
}
|
||||
logDto.setUsername(username);
|
||||
logDto.setAddress(servletRequest.getRemoteAddr());
|
||||
logDto.setResult(HttpStatus.valueOf(servletResponse.getStatus()).toString());
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
</el-aside>
|
||||
<el-main style="padding: 22px">
|
||||
<div class="playBox" :style="playerStyle">
|
||||
<player ref="recordVideoPlayer" :videoUrl="videoUrl" fluent autoplay :height="true" ></player>
|
||||
<player ref="recordVideoPlayer" :videoUrl="videoUrl" :height="true" style="width: 100%" ></player>
|
||||
</div>
|
||||
<div class="player-option-box" >
|
||||
<el-slider
|
||||
|
|
@ -310,7 +310,20 @@
|
|||
let h = parseInt(val/3600);
|
||||
let m = parseInt((val - h*3600)/60);
|
||||
let s = parseInt(val - h*3600 - m*60);
|
||||
return h + ":" + m + ":" + s
|
||||
|
||||
let hStr = h;
|
||||
let mStr = m;
|
||||
let sStr = s;
|
||||
if (h < 10) {
|
||||
hStr = "0" + hStr;
|
||||
}
|
||||
if (m < 10) {
|
||||
mStr = "0" + mStr;s
|
||||
}
|
||||
if (s < 10) {
|
||||
sStr = "0" + sStr;
|
||||
}
|
||||
return hStr + ":" + mStr + ":" + sStr
|
||||
},
|
||||
deleteRecord(){
|
||||
// TODO
|
||||
|
|
|
|||
|
|
@ -0,0 +1,495 @@
|
|||
<template>
|
||||
<div style="width: 100%">
|
||||
<div class="page-header" >
|
||||
<div class="page-title">
|
||||
<el-page-header @back="goBack" content="国标录像"></el-page-header>
|
||||
</div>
|
||||
</div>
|
||||
<el-container>
|
||||
<el-aside width="300px">
|
||||
<div class="record-list-box-box">
|
||||
<el-date-picker size="mini" v-model="chooseDate" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()"></el-date-picker>
|
||||
<div class="record-list-box" v-loading="recordsLoading" :style="recordListStyle">
|
||||
<ul v-if="detailFiles.length >0" class="infinite-list record-list" >
|
||||
<li v-for="item in detailFiles" class="infinite-list-item record-list-item" >
|
||||
|
||||
<el-tag v-if="chooseFile != item" @click="checkedFile(item)">
|
||||
<i class="el-icon-video-camera" ></i>
|
||||
{{ moment(item.startTime).format('HH:mm:ss')}}-{{ moment(item.endTime).format('HH:mm:ss')}}
|
||||
</el-tag>
|
||||
<el-tag v-if="chooseFile == item" type="danger" >
|
||||
<i class="el-icon-video-camera" ></i>
|
||||
{{ moment(item.startTime).format('HH:mm:ss')}}-{{ moment(item.endTime).format('HH:mm:ss')}}
|
||||
</el-tag>
|
||||
<i style="color: #409EFF;margin-left: 5px;" class="el-icon-download" @click="downloadRecord(item)" ></i>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div size="mini" v-if="detailFiles.length ==0" class="record-list-no-val" >暂无数据</div>
|
||||
</div>
|
||||
|
||||
</el-aside>
|
||||
<el-main style="padding-bottom: 10px;">
|
||||
<div class="playBox" :style="playerStyle">
|
||||
<player ref="recordVideoPlayer"
|
||||
:videoUrl="videoUrl"
|
||||
:error="videoError"
|
||||
:message="videoError"
|
||||
:hasAudio="hasAudio"
|
||||
style="max-height: 100%"
|
||||
fluent autoplay live ></player>
|
||||
</div>
|
||||
<div class="player-option-box">
|
||||
<div>
|
||||
<el-button-group >
|
||||
<el-button size="mini" class="iconfont icon-zanting" title="开始" @click="gbPause()"></el-button>
|
||||
<el-button size="mini" class="iconfont icon-kaishi" title="暂停" @click="gbPlay()"></el-button>
|
||||
<el-dropdown size="mini" title="播放倍速" style="margin-left: 1px;" @command="gbScale">
|
||||
<el-button size="mini">
|
||||
倍速 <i class="el-icon-arrow-down el-icon--right"></i>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item command="0.25">0.25倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="0.5">0.5倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="1.0">1倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="2.0">2倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="4.0">4倍速</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
<el-button size="mini" class="iconfont icon-xiazai1" title="下载选定录像" @click="downloadRecord()"></el-button>
|
||||
<el-button v-if="sliderMIn === 0 && sliderMax === 86400" size="mini" class="iconfont icon-slider" title="放大滑块" @click="setSliderFit()"></el-button>
|
||||
<el-button v-if="sliderMIn !== 0 || sliderMax !== 86400" size="mini" class="iconfont icon-slider-right" title="恢复滑块" @click="setSliderFit()"></el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<el-slider
|
||||
class="playtime-slider"
|
||||
v-model="playTime"
|
||||
id="playtimeSlider"
|
||||
:disabled="detailFiles.length === 0"
|
||||
:min="sliderMIn"
|
||||
:max="sliderMax"
|
||||
:range="true"
|
||||
:format-tooltip="playTimeFormat"
|
||||
@change="playTimeChange"
|
||||
:marks="playTimeSliderMarks">
|
||||
</el-slider>
|
||||
<div class="slider-val-box">
|
||||
<div class="slider-val" v-for="item of detailFiles" :style="'width:' + getDataWidth(item) + '%; left:' + getDataLeft(item) + '%'"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</el-main>
|
||||
</el-container>
|
||||
<recordDownload ref="recordDownload"></recordDownload>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
<script>
|
||||
import uiHeader from '../layout/UiHeader.vue'
|
||||
import player from './common/jessibuca.vue'
|
||||
import moment from 'moment'
|
||||
import recordDownload from './dialog/recordDownload.vue'
|
||||
export default {
|
||||
name: 'app',
|
||||
components: {
|
||||
uiHeader, player,recordDownload
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
deviceId: this.$route.params.deviceId,
|
||||
channelId: this.$route.params.channelId,
|
||||
recordsLoading: false,
|
||||
sliderTime: 0,
|
||||
seekTime: 0,
|
||||
recordStartTime: 0,
|
||||
streamId: "",
|
||||
hasAudio: false,
|
||||
detailFiles: [],
|
||||
chooseDate: null,
|
||||
videoUrl: null,
|
||||
chooseFile: null,
|
||||
streamInfo: null,
|
||||
app: null,
|
||||
mediaServerId: null,
|
||||
ssrc: null,
|
||||
|
||||
sliderMIn: 0,
|
||||
sliderMax: 86400,
|
||||
autoPlay: true,
|
||||
taskUpdate: null,
|
||||
tabVal: "running",
|
||||
recordListStyle: {
|
||||
height: this.winHeight + "px",
|
||||
overflow: "auto",
|
||||
margin: "10px auto 10px auto"
|
||||
},
|
||||
playerStyle: {
|
||||
"margin": "0 auto 20px auto",
|
||||
"height": this.winHeight + "px",
|
||||
},
|
||||
winHeight: window.innerHeight - 240,
|
||||
playTime: 0,
|
||||
playTimeSliderMarks: {
|
||||
0: "00:00",
|
||||
3600: "01:00",
|
||||
7200: "02:00",
|
||||
10800: "03:00",
|
||||
14400: "04:00",
|
||||
18000: "05:00",
|
||||
21600: "06:00",
|
||||
25200: "07:00",
|
||||
28800: "08:00",
|
||||
32400: "09:00",
|
||||
36000: "10:00",
|
||||
39600: "11:00",
|
||||
43200: "12:00",
|
||||
46800: "13:00",
|
||||
50400: "14:00",
|
||||
54000: "15:00",
|
||||
57600: "16:00",
|
||||
61200: "17:00",
|
||||
64800: "18:00",
|
||||
68400: "19:00",
|
||||
72000: "20:00",
|
||||
75600: "21:00",
|
||||
79200: "22:00",
|
||||
82800: "23:00",
|
||||
86400: "24:00",
|
||||
},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
||||
},
|
||||
mounted() {
|
||||
this.recordListStyle.height = this.winHeight + "px";
|
||||
this.playerStyle["height"] = this.winHeight + "px";
|
||||
this.chooseDate = moment().format('YYYY-MM-DD')
|
||||
this.dateChange();
|
||||
},
|
||||
destroyed() {
|
||||
this.$destroy('recordVideoPlayer');
|
||||
},
|
||||
methods: {
|
||||
dateChange(){
|
||||
if (!this.chooseDate) {
|
||||
return;
|
||||
}
|
||||
this.recordsLoading = true;
|
||||
this.detailFiles = [];
|
||||
let startTime = this.chooseDate + " 00:00:00";
|
||||
let endTime = this.chooseDate + " 23:59:59";
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
|
||||
}).then((res)=>{
|
||||
this.recordsLoading = false;
|
||||
if(res.data.code === 0) {
|
||||
// 处理时间信息
|
||||
this.detailFiles = res.data.data.recordList;
|
||||
|
||||
}else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.data.msg,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
|
||||
}).catch((e)=> {
|
||||
this.recordsLoading = false;
|
||||
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
|
||||
});
|
||||
},
|
||||
moment: function (v) {
|
||||
return moment(v)
|
||||
},
|
||||
videoError: function (e) {
|
||||
console.log("播放器错误：" + JSON.stringify(e));
|
||||
},
|
||||
checkedFile(file){
|
||||
this.chooseFile = file;
|
||||
// 开始回放
|
||||
this.playRecord(file)
|
||||
|
||||
},
|
||||
playRecord: function (row) {
|
||||
|
||||
let startTime = row.startTime
|
||||
this.recordStartTime = row.startTime
|
||||
this.showTimeText = row.startTime.split(" ")[1]
|
||||
let endTime = row.endTime
|
||||
this.sliderTime = 0;
|
||||
this.seekTime = new Date(endTime).getTime() - new Date(startTime).getTime();
|
||||
if (this.streamId !== "") {
|
||||
this.stopPlayRecord(()=> {
|
||||
this.streamId = "";
|
||||
this.playRecord(row);
|
||||
})
|
||||
} else {
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' +
|
||||
endTime
|
||||
}).then((res)=> {
|
||||
if (res.data.code === 0) {
|
||||
this.streamInfo = res.data.data;
|
||||
this.app = this.streamInfo.app;
|
||||
this.streamId = this.streamInfo.stream;
|
||||
this.mediaServerId = this.streamInfo.mediaServerId;
|
||||
this.ssrc = this.streamInfo.ssrc;
|
||||
this.videoUrl = this.getUrlByStreamInfo();
|
||||
}else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.data.msg,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
gbPlay(){
|
||||
console.log('前端控制：播放');
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/resume/' + this.streamId
|
||||
}).then((res)=> {
|
||||
this.$refs[this.activePlayer].play(this.videoUrl)
|
||||
});
|
||||
},
|
||||
gbPause(){
|
||||
console.log('前端控制：暂停');
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/pause/' + this.streamId
|
||||
}).then(function (res) {});
|
||||
},
|
||||
gbScale(command){
|
||||
console.log('前端控制：倍速 ' + command);
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: `/api/playback/speed/${this.streamId }/${command}`
|
||||
}).then(function (res) {});
|
||||
},
|
||||
downloadRecord: function (row) {
|
||||
if (!row) {
|
||||
let startTimeStr = moment(new Date(this.chooseDate + " 00:00:00").getTime() + this.playTime[0]*1000).format("YYYY-MM-DD HH:mm:ss");
|
||||
let endTimeStr = moment(new Date(this.chooseDate + " 00:00:00").getTime() + this.playTime[1]*1000).format("YYYY-MM-DD HH:mm:ss");
|
||||
console.log(startTimeStr);
|
||||
console.log(endTimeStr);
|
||||
row = {
|
||||
startTime: startTimeStr,
|
||||
endTime: endTimeStr
|
||||
}
|
||||
}
|
||||
if (this.streamId !== "") {
|
||||
this.stopPlayRecord(()=> {
|
||||
this.streamId = "";
|
||||
this.downloadRecord(row);
|
||||
})
|
||||
}else {
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
|
||||
row.endTime + '&downloadSpeed=4'
|
||||
}).then( (res)=> {
|
||||
if (res.data.code === 0) {
|
||||
let streamInfo = res.data.data;
|
||||
this.$refs.recordDownload.openDialog(this.deviceId, this.channelId, streamInfo.app, streamInfo.stream, streamInfo.mediaServerId);
|
||||
}else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.data.msg,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
stopDownloadRecord: function (callback) {
|
||||
this.$refs["recordVideoPlayer"].pause();
|
||||
this.videoUrl = '';
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
|
||||
}).then((res)=> {
|
||||
if (callback) callback(res)
|
||||
});
|
||||
},
|
||||
stopPlayRecord: function (callback) {
|
||||
this.$refs["recordVideoPlayer"].pause();
|
||||
this.videoUrl = '';
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
|
||||
}).then(function (res) {
|
||||
if (callback) callback()
|
||||
});
|
||||
},
|
||||
getDataWidth(item){
|
||||
let timeForFile = this.getTimeForFile(item);
|
||||
let result = (timeForFile[2])/((this.sliderMax - this.sliderMIn)*1000)
|
||||
return result*100
|
||||
},
|
||||
getDataLeft(item){
|
||||
let timeForFile = this.getTimeForFile(item);
|
||||
let differenceTime = timeForFile[0].getTime() - new Date(this.chooseDate + " 00:00:00").getTime()
|
||||
return parseFloat((differenceTime - this.sliderMIn * 1000)/((this.sliderMax - this.sliderMIn)*1000))*100 ;
|
||||
},
|
||||
getUrlByStreamInfo(){
|
||||
if (location.protocol === "https:") {
|
||||
this.videoUrl = this.streamInfo["wss_flv"]
|
||||
}else {
|
||||
this.videoUrl = this.streamInfo["ws_flv"]
|
||||
}
|
||||
return this.videoUrl;
|
||||
|
||||
},
|
||||
playTimeChange(val){
|
||||
console.log(val)
|
||||
let maxTime = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1])[1];
|
||||
|
||||
let startTimeStr = moment(new Date(this.chooseDate + " 00:00:00").getTime() + val[0]*1000).format("YYYY-MM-DD HH:mm:ss");
|
||||
let endTimeStr = moment(new Date(this.chooseDate + " 00:00:00").getTime() + val[1]*1000).format("YYYY-MM-DD HH:mm:ss");
|
||||
console.log(startTimeStr);
|
||||
console.log(endTimeStr);
|
||||
|
||||
this.checkedFile({
|
||||
startTime: startTimeStr,
|
||||
endTime: endTimeStr,
|
||||
});
|
||||
},
|
||||
setSliderFit() {
|
||||
if (this.sliderMIn === 0 && this.sliderMax === 86400) {
|
||||
if (this.detailFiles.length > 0){
|
||||
let timeForFile = this.getTimeForFile(this.detailFiles[0]);
|
||||
let lastTimeForFile = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1]);
|
||||
let timeNum = timeForFile[0].getTime() - new Date(this.chooseDate + " " + "00:00:00").getTime()
|
||||
let lastTimeNum = lastTimeForFile[1].getTime() - new Date(this.chooseDate + " " + "00:00:00").getTime()
|
||||
|
||||
this.playTime = parseInt(timeNum/1000)
|
||||
this.sliderMIn = parseInt(timeNum/1000 - timeNum/1000%(60*60))
|
||||
this.sliderMax = parseInt(lastTimeNum/1000 - lastTimeNum/1000%(60*60)) + 60*60
|
||||
|
||||
this.playTime = [this.sliderMIn, this.sliderMax];
|
||||
}
|
||||
}else {
|
||||
this.sliderMIn = 0;
|
||||
this.sliderMax = 86400;
|
||||
}
|
||||
},
|
||||
getTimeForFile(file){
|
||||
let startTime = new Date(file.startTime);
|
||||
let endTime = new Date(file.endTime);
|
||||
return [startTime, endTime, endTime.getTime() - startTime.getTime()];
|
||||
},
|
||||
playTimeFormat(val){
|
||||
let h = parseInt(val/3600);
|
||||
let m = parseInt((val - h*3600)/60);
|
||||
let s = parseInt(val - h*3600 - m*60);
|
||||
|
||||
let hStr = h;
|
||||
let mStr = m;
|
||||
let sStr = s;
|
||||
if (h < 10) {
|
||||
hStr = "0" + hStr;
|
||||
}
|
||||
if (m < 10) {
|
||||
mStr = "0" + mStr;s
|
||||
}
|
||||
if (s < 10) {
|
||||
sStr = "0" + sStr;
|
||||
}
|
||||
return hStr + ":" + mStr + ":" + sStr
|
||||
},
|
||||
goBack(){
|
||||
window.history.go(-1);
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.el-slider__runway {
|
||||
background-color:rgba(206, 206, 206, 0.47) !important;
|
||||
}
|
||||
.el-slider__bar {
|
||||
background-color: rgba(153, 153, 153, 0) !important;
|
||||
}
|
||||
.playtime-slider {
|
||||
position: relative;
|
||||
z-index: 100;
|
||||
}
|
||||
.data-picker-true{
|
||||
|
||||
}
|
||||
.data-picker-true:after{
|
||||
content: "";
|
||||
position: absolute;
|
||||
width: 4px;
|
||||
height: 4px;
|
||||
background-color: #606060;
|
||||
border-radius: 4px;
|
||||
left: 45%;
|
||||
top: 74%;
|
||||
|
||||
}
|
||||
.data-picker-false{
|
||||
|
||||
}
|
||||
.slider-val-box{
|
||||
height: 6px;
|
||||
position: relative;
|
||||
top: -22px;
|
||||
}
|
||||
.slider-val{
|
||||
height: 6px;
|
||||
background-color: #007CFF;
|
||||
position: absolute;
|
||||
}
|
||||
.record-list-box-box{
|
||||
width: 250px;
|
||||
float: left;
|
||||
}
|
||||
.record-list-box{
|
||||
overflow: auto;
|
||||
width: 220px;
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
margin-top: 0px;
|
||||
padding: 1rem 0;
|
||||
background-color: #FFF;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.record-list{
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
background-color: #FFF;
|
||||
|
||||
}
|
||||
.record-list-no-val {
|
||||
position: absolute;
|
||||
color: #9f9f9f;
|
||||
top: 50%;
|
||||
left: 110px;
|
||||
}
|
||||
.record-list-item{
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
margin: 0.5rem 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
.record-list-option {
|
||||
width: 10px;
|
||||
float: left;
|
||||
margin-top: 39px;
|
||||
|
||||
}
|
||||
.player-option-box{
|
||||
padding: 0 20px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -269,10 +269,10 @@ export default {
|
|||
});
|
||||
},
|
||||
queryRecords: function (itemData) {
|
||||
var format = moment().format("yyyy-MM-DD");
|
||||
let deviceId = this.deviceId;
|
||||
let channelId = itemData.channelId;
|
||||
this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
|
||||
|
||||
this.$router.push(`/gbRecordDetail/${deviceId}/${channelId}`)
|
||||
},
|
||||
stopDevicePush: function (itemData) {
|
||||
var that = this;
|
||||
|
|
|
|||
|
|
@ -101,11 +101,14 @@ export default {
|
|||
window.clearTimeout(this.timer);
|
||||
}
|
||||
this.timer = setTimeout(()=>{
|
||||
this.getSystemInfo();
|
||||
this.getLoad();
|
||||
this.timer = null;
|
||||
this.loopForSystemInfo()
|
||||
this.getResourceInfo()
|
||||
if (this.$route.path === "/console") {
|
||||
this.getSystemInfo();
|
||||
this.getLoad();
|
||||
this.timer = null;
|
||||
this.loopForSystemInfo()
|
||||
this.getResourceInfo()
|
||||
}
|
||||
|
||||
}, 2000)
|
||||
},
|
||||
getSystemInfo: function (){
|
||||
|
|
|
|||
|
|
@ -1,28 +1,32 @@
|
|||
<template >
|
||||
<div id="consoleResource" style="width: 100%; height: 100%; background: #FFFFFF; text-align: center">
|
||||
<div style="width: 50%;height: 50%; float:left; ">
|
||||
<el-progress :width="100" :stroke-width="8" type="circle" :percentage="Math.floor(deviceInfo.online/deviceInfo.total*100)" style="margin-top: 20px; font-size: 18px"></el-progress>
|
||||
<el-progress v-if="deviceInfo.total > 0" :width="100" :stroke-width="8" type="circle" :percentage="Math.floor(deviceInfo.online/deviceInfo.total*100)" style="margin-top: 20px; font-size: 18px"></el-progress>
|
||||
<el-progress v-if="deviceInfo.total === 0" :width="100" :stroke-width="8" type="circle" :percentage="0" style="margin-top: 20px; font-size: 18px"></el-progress>
|
||||
<div class="resourceInfo">
|
||||
设备总数:{{deviceInfo.total}}<br/>
|
||||
在线数:{{deviceInfo.online}}
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 50%;height: 50%; float:left; ">
|
||||
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(channelInfo.online/channelInfo.total*100)" style="margin-top: 20px"></el-progress>
|
||||
<el-progress v-if="channelInfo.total > 0" :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(channelInfo.online/channelInfo.total*100)" style="margin-top: 20px"></el-progress>
|
||||
<el-progress v-if="channelInfo.total === 0" :width="100" :stroke-width="10" type="circle" :percentage="0" style="margin-top: 20px"></el-progress>
|
||||
<div class="resourceInfo">
|
||||
通道总数:{{channelInfo.total}}<br/>
|
||||
在线数:{{channelInfo.online}}
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 50%;height: 50%; float:left; ">
|
||||
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(pushInfo.online/pushInfo.total*100)" style="margin-top: 20px"></el-progress>
|
||||
<el-progress v-if="pushInfo.total > 0" :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(pushInfo.online/pushInfo.total*100)" style="margin-top: 20px"></el-progress>
|
||||
<el-progress v-if="pushInfo.total === 0" :width="100" :stroke-width="10" type="circle" :percentage="0" style="margin-top: 20px"></el-progress>
|
||||
<div class="resourceInfo">
|
||||
推流总数:{{pushInfo.total}}<br/>
|
||||
在线数:{{pushInfo.online}}
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 50%;height: 50%; float:left; ">
|
||||
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(proxyInfo.online/proxyInfo.total*100)" style="margin-top: 20px"></el-progress>
|
||||
<el-progress v-if="proxyInfo.total > 0" :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(proxyInfo.online/proxyInfo.total*100)" style="margin-top: 20px"></el-progress>
|
||||
<el-progress v-if="proxyInfo.total === 0" :width="100" :stroke-width="10" type="circle" :percentage="0" style="margin-top: 20px"></el-progress>
|
||||
<div class="resourceInfo">
|
||||
拉流代理总数:{{proxyInfo.total}}<br/>
|
||||
在线数:{{proxyInfo.online}}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,6 @@
|
|||
<div id="shared" style="text-align: right; margin-top: 1rem;">
|
||||
<el-tabs v-model="tabActiveName" @tab-click="tabHandleClick" >
|
||||
<el-tab-pane label="实时视频" name="media">
|
||||
<div style="margin-bottom: 0.5rem;">
|
||||
<!-- <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="stopRecord()">停止录制</el-button>-->
|
||||
</div>
|
||||
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
|
||||
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">播放地址：</span>
|
||||
<el-input v-model="getPlayerShared.sharedUrl" :disabled="true" >
|
||||
|
|
@ -148,51 +143,6 @@
|
|||
</div>
|
||||
</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/"}}-->
|
||||
<el-tab-pane label="录像查询" name="record" v-if="showRrecord">
|
||||
<div style="width: 100%;">
|
||||
<div style="width: 100%; text-align: left">
|
||||
<span>录像控制</span>
|
||||
<el-button-group style="margin-left: 1rem;">
|
||||
<el-button size="mini" class="iconfont icon-zanting" title="开始" @click="gbPause()"></el-button>
|
||||
<el-button size="mini" class="iconfont icon-kaishi" title="暂停" @click="gbPlay()"></el-button>
|
||||
<el-dropdown size="mini" title="播放倍速" style="margin-left: 1px;" @command="gbScale">
|
||||
<el-button size="mini">
|
||||
倍速 <i class="el-icon-arrow-down el-icon--right"></i>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item command="0.25">0.25倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="0.5">0.5倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="1.0">1倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="2.0">2倍速</el-dropdown-item>
|
||||
<el-dropdown-item command="4.0">4倍速</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</el-button-group>
|
||||
<el-date-picker style="float: right;" size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="queryRecords()"></el-date-picker>
|
||||
</div>
|
||||
<div style="width: 100%; text-align: left">
|
||||
<span class="demonstration" style="padding: 12px 36px 12px 0;float: left;">{{showTimeText}}</span>
|
||||
<el-slider style="width: 80%; float:left;" v-model="sliderTime" @change="gbSeek" :show-tooltip="false"></el-slider>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<el-table :data="videoHistory.searchHistoryResult" height="150" v-loading="recordsLoading">
|
||||
<el-table-column label="名称" prop="name"></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="endTime" :formatter="timeFormatter"></el-table-column>
|
||||
|
||||
<el-table-column label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button-group>
|
||||
<el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">播放</el-button>
|
||||
<el-button icon="el-icon-download" size="mini" @click="downloadRecord(scope.row)">下载</el-button>
|
||||
</el-button-group>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
<!--遥控界面-->
|
||||
<el-tab-pane label="云台控制" name="control" v-if="showPtz">
|
||||
<div style="display: flex; justify-content: left;">
|
||||
|
|
@ -286,21 +236,18 @@
|
|||
</el-tabs>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<recordDownload ref="recordDownload"></recordDownload>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import rtcPlayer from '../dialog/rtcPlayer.vue'
|
||||
import LivePlayer from '@liveqing/liveplayer'
|
||||
// import player from '../dialog/easyPlayer.vue'
|
||||
import jessibucaPlayer from '../common/jessibuca.vue'
|
||||
import recordDownload from '../dialog/recordDownload.vue'
|
||||
export default {
|
||||
name: 'devicePlayer',
|
||||
props: {},
|
||||
components: {
|
||||
LivePlayer, jessibucaPlayer, rtcPlayer, recordDownload,
|
||||
LivePlayer, jessibucaPlayer, rtcPlayer,
|
||||
},
|
||||
computed: {
|
||||
getPlayerShared: function () {
|
||||
|
|
@ -328,10 +275,6 @@ export default {
|
|||
livePlayer : ["ws_flv", "wss_flv"],
|
||||
webRTC: ["rtc", "rtcs"],
|
||||
},
|
||||
videoHistory: {
|
||||
date: '',
|
||||
searchHistoryResult: [] //媒体流历史记录搜索结果
|
||||
},
|
||||
showVideoDialog: false,
|
||||
streamId: '',
|
||||
app : '',
|
||||
|
|
@ -357,7 +300,6 @@ export default {
|
|||
tracks: [],
|
||||
coverPlaying:false,
|
||||
tracksLoading: false,
|
||||
recordPlay: "",
|
||||
showPtz: true,
|
||||
showRrecord: true,
|
||||
tracksNotLoaded: false,
|
||||
|
|
@ -418,11 +360,6 @@ export default {
|
|||
case "media":
|
||||
this.play(param.streamInfo, param.hasAudio)
|
||||
break;
|
||||
case "record":
|
||||
this.showVideoDialog = true;
|
||||
this.videoHistory.date = param.date;
|
||||
this.queryRecords()
|
||||
break;
|
||||
case "streamPlay":
|
||||
this.tabActiveName = "media";
|
||||
this.showRrecord = false;
|
||||
|
|
@ -433,9 +370,6 @@ export default {
|
|||
break;
|
||||
}
|
||||
},
|
||||
timeAxisSelTime: function (val) {
|
||||
console.log(val)
|
||||
},
|
||||
play: function (streamInfo, hasAudio) {
|
||||
this.streamInfo = streamInfo;
|
||||
this.hasAudio = hasAudio;
|
||||
|
|
@ -531,10 +465,6 @@ export default {
|
|||
this.convertStop();
|
||||
}
|
||||
this.convertKey = ''
|
||||
if (this.recordPlay != '') {
|
||||
this.stopPlayRecord();
|
||||
}
|
||||
this.recordPlay = ''
|
||||
},
|
||||
|
||||
copySharedInfo: function (data) {
|
||||
|
|
@ -559,137 +489,6 @@ export default {
|
|||
}
|
||||
);
|
||||
},
|
||||
|
||||
queryRecords: function () {
|
||||
if (!this.videoHistory.date) {
|
||||
return;
|
||||
}
|
||||
this.recordsLoading = true;
|
||||
this.videoHistory.searchHistoryResult = [];
|
||||
let that = this;
|
||||
var startTime = this.videoHistory.date + " 00:00:00";
|
||||
var endTime = this.videoHistory.date + " 23:59:59";
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
|
||||
}).then(function (res) {
|
||||
console.log(res)
|
||||
that.recordsLoading = false;
|
||||
if(res.data.code === 0) {
|
||||
// 处理时间信息
|
||||
that.videoHistory.searchHistoryResult = res.data.data.recordList;
|
||||
}else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.data.msg,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
|
||||
}).catch(function (e) {
|
||||
console.log(e.message);
|
||||
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
|
||||
});
|
||||
|
||||
},
|
||||
onTimeChange: function (video) {
|
||||
// this.queryRecords()
|
||||
},
|
||||
playRecord: function (row) {
|
||||
let that = this;
|
||||
|
||||
let startTime = row.startTime
|
||||
this.recordStartTime = row.startTime
|
||||
this.showTimeText = row.startTime.split(" ")[1]
|
||||
let endtime = row.endTime
|
||||
this.sliderTime = 0;
|
||||
this.seekTime = new Date(endtime).getTime() - new Date(startTime).getTime();
|
||||
console.log(this.seekTime)
|
||||
if (that.streamId != "") {
|
||||
that.stopPlayRecord(function () {
|
||||
that.streamId = "";
|
||||
that.playRecord(row);
|
||||
})
|
||||
} else {
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
|
||||
row.endTime
|
||||
}).then(function (res) {
|
||||
if (res.data.code === 0) {
|
||||
that.streamInfo = res.data.data;
|
||||
that.app = that.streamInfo.app;
|
||||
that.streamId = that.streamInfo.stream;
|
||||
that.mediaServerId = that.streamInfo.mediaServerId;
|
||||
that.ssrc = that.streamInfo.ssrc;
|
||||
that.videoUrl = that.getUrlByStreamInfo();
|
||||
}else {
|
||||
that.$message({
|
||||
showClose: true,
|
||||
message: res.data.msg,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
that.recordPlay = true;
|
||||
});
|
||||
}
|
||||
},
|
||||
stopPlayRecord: function (callback) {
|
||||
this.$refs[this.activePlayer].pause();
|
||||
this.videoUrl = '';
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
|
||||
}).then(function (res) {
|
||||
if (callback) callback()
|
||||
});
|
||||
},
|
||||
downloadRecord: function (row) {
|
||||
let that = this;
|
||||
if (that.streamId != "") {
|
||||
that.stopDownloadRecord(function (res) {
|
||||
if (res.code == 0) {
|
||||
that.streamId = "";
|
||||
that.downloadRecord(row);
|
||||
}else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.data.msg,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
|
||||
})
|
||||
} else {
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
|
||||
row.endTime + '&downloadSpeed=4'
|
||||
}).then(function (res) {
|
||||
if (res.data.code == 0) {
|
||||
let streamInfo = res.data.data;
|
||||
that.recordPlay = false;
|
||||
that.$refs.recordDownload.openDialog(that.deviceId, that.channelId, streamInfo.app, streamInfo.stream, streamInfo.mediaServerId);
|
||||
}else {
|
||||
that.$message({
|
||||
showClose: true,
|
||||
message: res.data.msg,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
stopDownloadRecord: function (callback) {
|
||||
this.$refs[this.activePlayer].pause();
|
||||
this.videoUrl = '';
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
|
||||
}).then((res)=> {
|
||||
if (callback) callback(res)
|
||||
});
|
||||
},
|
||||
ptzCamera: function (command) {
|
||||
console.log('云台控制：' + command);
|
||||
let that = this;
|
||||
|
|
@ -728,52 +527,6 @@ export default {
|
|||
url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter + '&combindCode2=0'
|
||||
}).then(function (res) {});
|
||||
},
|
||||
formatTooltip: function (val) {
|
||||
var h = parseInt(val / 60);
|
||||
var hStr = h < 10 ? ("0" + h) : h;
|
||||
var s = val % 60;
|
||||
var sStr = s < 10 ? ("0" + s) : s;
|
||||
return h + ":" + sStr;
|
||||
},
|
||||
timeFormatter: function (row, column, cellValue, index) {
|
||||
return cellValue.split(" ")[1];
|
||||
},
|
||||
mergeTime: function (timeArray) {
|
||||
var resultArray = [];
|
||||
for (let i = 0; i < timeArray.length; i++) {
|
||||
var startTime = new Date(timeArray[i].startTime);
|
||||
var endTime = new Date(timeArray[i].endTime);
|
||||
if (i == 0) {
|
||||
resultArray[0] = {
|
||||
startTime: startTime,
|
||||
endTime: endTime
|
||||
}
|
||||
}
|
||||
for (let j = 0; j < resultArray.length; j++) {
|
||||
if (startTime > resultArray[j].endTime) { // 合并
|
||||
if (startTime - resultArray[j].endTime <= 1000) {
|
||||
resultArray[j].endTime = endTime;
|
||||
} else {
|
||||
resultArray[resultArray.length] = {
|
||||
startTime: startTime,
|
||||
endTime: endTime
|
||||
}
|
||||
}
|
||||
} else if (resultArray[j].startTime > endTime) { // 合并
|
||||
if (resultArray[j].startTime - endTime <= 1000) {
|
||||
resultArray[j].startTime = startTime;
|
||||
} else {
|
||||
resultArray[resultArray.length] = {
|
||||
startTime: startTime,
|
||||
endTime: endTime
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(resultArray)
|
||||
return resultArray;
|
||||
},
|
||||
copyUrl: function (dropdownItem){
|
||||
console.log(dropdownItem)
|
||||
this.$copyText(dropdownItem).then((e)=> {
|
||||
|
|
@ -782,47 +535,7 @@ export default {
|
|||
|
||||
})
|
||||
},
|
||||
gbPlay(){
|
||||
console.log('前端控制：播放');
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/resume/' + this.streamId
|
||||
}).then((res)=> {
|
||||
this.$refs[this.activePlayer].play(this.videoUrl)
|
||||
});
|
||||
},
|
||||
gbPause(){
|
||||
console.log('前端控制：暂停');
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: '/api/playback/pause/' + this.streamId
|
||||
}).then(function (res) {});
|
||||
},
|
||||
gbScale(command){
|
||||
console.log('前端控制：倍速 ' + command);
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: `/api/playback/speed/${this.streamId }/${command}`
|
||||
}).then(function (res) {});
|
||||
},
|
||||
gbSeek(val){
|
||||
console.log('前端控制：seek ');
|
||||
console.log(this.seekTime);
|
||||
console.log(this.sliderTime);
|
||||
let showTime = new Date(new Date(this.recordStartTime).getTime() + this.seekTime * val / 100)
|
||||
let hour = showTime.getHours();
|
||||
let minutes = showTime.getMinutes();
|
||||
let seconds = showTime.getSeconds();
|
||||
this.showTimeText = (hour < 10?("0" + hour):hour) + ":" + (minutes<10?("0" + minutes):minutes) + ":" + (seconds<10?("0" + seconds):seconds)
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url: `/api/playback/seek/${this.streamId }/` + Math.floor(this.seekTime * val / 100000)
|
||||
}).then( (res)=> {
|
||||
setTimeout(()=>{
|
||||
this.$refs[this.activePlayer].play(this.videoUrl)
|
||||
}, 600)
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import Layout from "../layout/index.vue"
|
|||
import console from '../components/console.vue'
|
||||
import deviceList from '../components/DeviceList.vue'
|
||||
import channelList from '../components/channelList.vue'
|
||||
import gbRecordDetail from '../components/GBRecordDetail.vue'
|
||||
import pushVideoList from '../components/PushVideoList.vue'
|
||||
import streamProxyList from '../components/StreamProxyList.vue'
|
||||
import map from '../components/map.vue'
|
||||
|
|
@ -64,6 +65,11 @@ export default new VueRouter({
|
|||
name: 'channelList',
|
||||
component: channelList,
|
||||
},
|
||||
{
|
||||
path: '/gbRecordDetail/:deviceId/:channelId/',
|
||||
name: 'gbRecordDetail',
|
||||
component: gbRecordDetail,
|
||||
},
|
||||
{
|
||||
path: '/parentPlatformList/:count/:page',
|
||||
name: 'parentPlatformList',
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
@font-face {
|
||||
font-family: "iconfont"; /* Project id 1291092 */
|
||||
src: url('iconfont.woff2?t=1655453611360') format('woff2'),
|
||||
url('iconfont.woff?t=1655453611360') format('woff'),
|
||||
url('iconfont.ttf?t=1655453611360') format('truetype');
|
||||
src: url('iconfont.woff2?t=1673251105600') format('woff2'),
|
||||
url('iconfont.woff?t=1673251105600') format('woff'),
|
||||
url('iconfont.ttf?t=1673251105600') format('truetype');
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
|
|
@ -13,6 +13,14 @@
|
|||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.icon-slider:before {
|
||||
content: "\e7e0";
|
||||
}
|
||||
|
||||
.icon-slider-right:before {
|
||||
content: "\ea19";
|
||||
}
|
||||
|
||||
.icon-list:before {
|
||||
content: "\e7de";
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue