From 1d753b48c023090430c2931fd8e3a45a382eddf8 Mon Sep 17 00:00:00 2001
From: hotcoffie <35990065+hotcoffie@users.noreply.github.com>
Date: 星期二, 17 五月 2022 11:53:42 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/devicePlayer.vue | 274 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 210 insertions(+), 64 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index feba081..43a929c 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -3,7 +3,9 @@
<el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
<!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
- <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :height="false" :hasAudio="hasAudio" fluent autoplay live ></player>
+ <div style="width: 100%; height: 100%">
+ <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></player>
+ </div>
<div id="shared" style="text-align: right; margin-top: 1rem;">
<el-tabs v-model="tabActiveName" @tab-click="tabHandleClick">
<el-tab-pane label="瀹炴椂瑙嗛" name="media">
@@ -31,38 +33,132 @@
<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.sharedRtmp" :disabled="true" >
- <template slot="append">
- <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
- </template>
+ <el-button slot="append" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
+ <el-dropdown slot="prepend" v-if="streamInfo" trigger="click" @command="copyUrl">
+ <el-button >
+ 鏇村鍦板潃<i class="el-icon-arrow-down el-icon--right"></i>
+ </el-button>
+ <el-dropdown-menu slot="dropdown" >
+ <el-dropdown-item :command="streamInfo.flv">
+ <el-tag >FLV:</el-tag>
+ <span>{{ streamInfo.flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_flv">
+ <el-tag >FLV(https):</el-tag>
+ <span>{{ streamInfo.https_flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_flv">
+ <el-tag >FLV(ws):</el-tag>
+ <span >{{ streamInfo.ws_flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_flv">
+ <el-tag >FLV(wss):</el-tag>
+ <span>{{ streamInfo.wss_flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.fmp4">
+ <el-tag >FMP4:</el-tag>
+ <span>{{ streamInfo.fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_fmp4">
+ <el-tag >FMP4(https):</el-tag>
+ <span>{{ streamInfo.https_fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_fmp4">
+ <el-tag >FMP4(ws):</el-tag>
+ <span>{{ streamInfo.ws_fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_fmp4">
+ <el-tag >FMP4(wss):</el-tag>
+ <span>{{ streamInfo.wss_fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.hls">
+ <el-tag>HLS:</el-tag>
+ <span>{{ streamInfo.hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_hls">
+ <el-tag >HLS(https):</el-tag>
+ <span>{{ streamInfo.https_hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_hls">
+ <el-tag >HLS(ws):</el-tag>
+ <span>{{ streamInfo.ws_hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_hls">
+ <el-tag >HLS(wss):</el-tag>
+ <span>{{ streamInfo.wss_hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ts">
+ <el-tag>TS:</el-tag>
+ <span>{{ streamInfo.ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_ts">
+ <el-tag>TS(https):</el-tag>
+ <span>{{ streamInfo.https_ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_ts">
+ <el-tag>TS(ws):</el-tag>
+ <span>{{ streamInfo.ws_ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_ts">
+ <el-tag>TS(wss):</el-tag>
+ <span>{{ streamInfo.wss_ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtc">
+ <el-tag >RTC:</el-tag>
+ <span>{{ streamInfo.rtc }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtmp">
+ <el-tag >RTMP:</el-tag>
+ <span>{{ streamInfo.rtmp }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtmps">
+ <el-tag >RTMPS:</el-tag>
+ <span>{{ streamInfo.rtmps }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtsp">
+ <el-tag >RTSP:</el-tag>
+ <span>{{ streamInfo.rtsp }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtsps">
+ <el-tag >RTSPS:</el-tag>
+ <span>{{ streamInfo.rtsps }}</span>
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
</el-input>
+
</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="float: 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="鎾斁鍊嶉��" @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>
- </div>
- <el-date-picker size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="queryRecords()"></el-date-picker>
- <div class="block" >
- <span class="demonstration" style="padding: 12px 36px 12px 0;float: left;">{{Math.floor(seekTime * sliderTime / 100000)}}绉�</span>
- <el-slider style="width: 80%; float:left;" v-model="sliderTime" @change="gbSeek" :show-tooltip="false"></el-slider>
- </div>
+ <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>
@@ -111,27 +207,27 @@
<div class="control-panel">
<el-button-group>
- <el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">棰勭疆浣嶇紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium">棰勭疆浣嶇紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 0rem; width: 6rem" size="mini" v-model="presetPos" controls-position="right" :precision="0" :step="1" :min="1" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="presetPosition(129, presetPos)">璁剧疆</el-button>
<el-button style="position: absolute; left: 27rem; top: 0rem; width: 5rem" size="mini" type="primary" icon="el-icon-place" @click="presetPosition(130, presetPos)">璋冪敤</el-button>
<el-button style="position: absolute; left: 16rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="presetPosition(131, presetPos)">鍒犻櫎</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">宸¤埅閫熷害</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 2.5rem; width: 5rem; text-align: center" size="medium">宸¤埅閫熷害</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(134, cruisingGroup, cruisingSpeed)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 16rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">鍋滅暀鏃堕棿</el-tag>
+ <el-tag style="position :absolute; left: 16rem; top: 2.5rem; width: 5rem; text-align: center" size="medium">鍋滅暀鏃堕棿</el-tag>
<el-input-number style="position: absolute; left: 21rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingTime" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 27rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-timer" @click="setSpeedOrTime(135, cruisingGroup, cruisingTime)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 4.5rem; width: 5rem; text-align: center" size="medium" type="info">宸¤埅缁勭紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 4.5rem; width: 5rem; text-align: center" size="medium">宸¤埅缁勭紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 4.5rem; width: 6rem" size="mini" v-model="cruisingGroup" controls-position="right" :precision="0" :min="0" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="setCommand(132, cruisingGroup, presetPos)">娣诲姞鐐�</el-button>
<el-button style="position: absolute; left: 16rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="setCommand(133, cruisingGroup, presetPos)">鍒犻櫎鐐�</el-button>
<el-button style="position: absolute; left: 21rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete" @click="setCommand(133, cruisingGroup, 0)">鍒犻櫎缁�</el-button>
<el-button style="position: absolute; left: 27rem; top: 5rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(136, cruisingGroup, 0)">宸¤埅</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 7rem; width: 5rem; text-align: center" size="medium" type="info">鎵弿閫熷害</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 7rem; width: 5rem; text-align: center" size="medium">鎵弿閫熷害</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 7rem; width: 6rem" size="mini" v-model="scanSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 7rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(138, scanGroup, scanSpeed)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 9rem; width: 5rem; text-align: center" size="medium" type="info">鎵弿缁勭紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 9rem; width: 5rem; text-align: center" size="medium">鎵弿缁勭紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 9rem; width: 6rem" size="mini" v-model="scanGroup" controls-position="right" :precision="0" :step="1" :min="0" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-left" @click="setCommand(137, scanGroup, 1)">宸﹁竟鐣�</el-button>
<el-button style="position: absolute; left: 16rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-right" @click="setCommand(137, scanGroup, 2)">鍙宠竟鐣�</el-button>
@@ -168,9 +264,11 @@
</div>
</el-tab-pane>
+
</el-tabs>
</div>
</el-dialog>
+ <recordDownload ref="recordDownload"></recordDownload>
</div>
</template>
@@ -178,16 +276,16 @@
// import player from '../dialog/rtcPlayer.vue'
// import LivePlayer from '@liveqing/liveplayer'
// import player from '../dialog/easyPlayer.vue'
-import player from '../dialog/jessibuca.vue'
+import player from '../common/jessibuca.vue'
+import recordDownload from '../dialog/recordDownload.vue'
export default {
name: 'devicePlayer',
props: {},
components: {
- player,
+ player,recordDownload,
},
computed: {
getPlayerShared: function () {
-
return {
sharedUrl: window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl),
sharedIframe: '<iframe src="' + window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl) + '"></iframe>',
@@ -235,6 +333,9 @@
tracksNotLoaded: false,
sliderTime: 0,
seekTime: 0,
+ recordStartTime: 0,
+ showTimeText: "00:00:00",
+ streamInfo: null,
};
},
methods: {
@@ -244,7 +345,7 @@
that.tracks = [];
that.tracksLoading = true;
that.tracksNotLoaded = false;
- if (tab.name == "codec") {
+ if (tab.name === "codec") {
this.$axios({
method: 'get',
url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
@@ -297,11 +398,12 @@
console.log(val)
},
play: function (streamInfo, hasAudio) {
+ this.streamInfo = streamInfo;
this.hasAudio = hasAudio;
this.isLoging = false;
// this.videoUrl = streamInfo.rtc;
this.videoUrl = this.getUrlByStreamInfo(streamInfo);
- this.streamId = streamInfo.streamId;
+ this.streamId = streamInfo.stream;
this.app = streamInfo.app;
this.mediaServerId = streamInfo.mediaServerId;
this.playFromStreamInfo(false, streamInfo)
@@ -334,7 +436,7 @@
this.$refs.videoPlayer.pause()
that.$axios({
method: 'post',
- url: '/api/play/convert/' + that.streamId
+ url: '/api/gb_record/convert/' + that.streamId
}).then(function (res) {
if (res.data.code == 0) {
that.convertKey = res.data.key;
@@ -444,9 +546,19 @@
method: 'get',
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
- // 澶勭悊鏃堕棿淇℃伅
- that.videoHistory.searchHistoryResult = res.data.recordList;
- that.recordsLoading = false;
+ console.log(res)
+ if(res.data.code === 0) {
+ // 澶勭悊鏃堕棿淇℃伅
+ that.videoHistory.searchHistoryResult = res.data.data.recordList;
+ that.recordsLoading = false;
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+
}).catch(function (e) {
console.log(e.message);
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
@@ -460,13 +572,16 @@
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);
+ that.streamId = "";
+ that.playRecord(row);
})
} else {
this.$axios({
@@ -476,8 +591,9 @@
}).then(function (res) {
var streamInfo = res.data;
that.app = streamInfo.app;
- that.streamId = streamInfo.streamId;
+ that.streamId = streamInfo.stream;
that.mediaServerId = streamInfo.mediaServerId;
+ that.ssrc = streamInfo.ssrc;
that.videoUrl = that.getUrlByStreamInfo(streamInfo);
that.recordPlay = true;
});
@@ -488,7 +604,7 @@
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId
+ url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
}).then(function (res) {
if (callback) callback()
});
@@ -496,22 +612,36 @@
downloadRecord: function (row) {
let that = this;
if (that.streamId != "") {
- that.stopDownloadRecord(function () {
- that.streamId = "",
- that.downloadRecord(row);
+ 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/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ url: '/api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime + '&downloadSpeed=4'
}).then(function (res) {
- var streamInfo = res.data;
- that.app = streamInfo.app;
- that.streamId = streamInfo.streamId;
- that.mediaServerId = streamInfo.mediaServerId;
- that.videoUrl = that.getUrlByStreamInfo(streamInfo);
- that.recordPlay = true;
+ 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",
+ });
+ }
});
}
},
@@ -520,9 +650,9 @@
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/download/stop/' + this.deviceId + "/" + this.channelId
- }).then(function (res) {
- if (callback) callback()
+ url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
+ }).then((res)=> {
+ if (callback) callback(res)
});
},
ptzCamera: function (command) {
@@ -530,8 +660,6 @@
let that = this;
this.$axios({
method: 'post',
- // url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
- // '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
url: '/api/ptz/control/' + this.deviceId + '/' + this.channelId + '?command=' + command + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
}).then(function (res) {});
},
@@ -611,6 +739,14 @@
console.log(resultArray)
return resultArray;
},
+ copyUrl: function (dropdownItem){
+ console.log(dropdownItem)
+ this.$copyText(dropdownItem).then((e)=> {
+ this.$message.success("鎴愬姛鎷疯礉鍒扮矘璐存澘");
+ }, (e)=> {
+
+ })
+ },
gbPlay(){
console.log('鍓嶇鎺у埗锛氭挱鏀�');
this.$axios({
@@ -638,11 +774,21 @@
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(function (res) {});
- }
+ }).then( (res)=> {
+ setTimeout(()=>{
+ this.$refs.videoPlayer.play(this.videoUrl)
+ }, 600)
+ });
+ },
+
}
};
--
Gitblit v1.8.0