From 9b9a13ab36fe93153148a489436e04b12aabcdd6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 09 一月 2023 16:31:51 +0800
Subject: [PATCH] 国标录像UI重构
---
web_src/src/components/dialog/devicePlayer.vue | 291 ---------------------------------------------------------
1 files changed, 2 insertions(+), 289 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 9ecbb9b..e83a29c 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -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 @@
livePlayer : ["ws_flv", "wss_flv"],
webRTC: ["rtc", "rtcs"],
},
- videoHistory: {
- date: '',
- searchHistoryResult: [] //濯掍綋娴佸巻鍙茶褰曟悳绱㈢粨鏋�
- },
showVideoDialog: false,
streamId: '',
app : '',
@@ -357,7 +300,6 @@
tracks: [],
coverPlaying:false,
tracksLoading: false,
- recordPlay: "",
showPtz: true,
showRrecord: true,
tracksNotLoaded: false,
@@ -418,11 +360,6 @@
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;
@@ -432,9 +369,6 @@
case "control":
break;
}
- },
- timeAxisSelTime: function (val) {
- console.log(val)
},
play: function (streamInfo, hasAudio) {
this.streamInfo = streamInfo;
@@ -531,10 +465,6 @@
this.convertStop();
}
this.convertKey = ''
- if (this.recordPlay != '') {
- this.stopPlayRecord();
- }
- this.recordPlay = ''
},
copySharedInfo: function (data) {
@@ -558,137 +488,6 @@
});
}
);
- },
-
- 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);
@@ -728,52 +527,6 @@
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 @@
})
},
- 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('鍓嶇鎺у埗锛歴eek ');
- 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)
- });
- },
+
}
--
Gitblit v1.8.0