wvp-pro.git - Gitblit

			@@ -2,9 +2,11 @@
			<div id="devicePlayer" v-loading="isLoging">

			<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> -->
			<div style="width: 100%; height: 100%">
			<el-tabs type="border-card" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
			<el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
			<!-- <el-tab-pane label="LivePlayer" name="livePlayer">-->
			<!-- <LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer>-->
			<!-- </el-tab-pane>-->
			<el-tab-pane label="Jessibuca" name="jessibuca">
			<jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
			</el-tab-pane>
			@@ -118,6 +120,10 @@
			<el-dropdown-item :command="streamInfo.rtc">
			<el-tag >RTC:</el-tag>
			<span>{{ streamInfo.rtc }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtcs">
			<el-tag >RTCS:</el-tag>
			<span>{{ streamInfo.rtcs }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtmp">
			<el-tag >RTMP:</el-tag>
			@@ -286,7 +292,7 @@

			<script>
			import rtcPlayer from '../dialog/rtcPlayer.vue'
			// import LivePlayer from '@liveqing/liveplayer'
			import LivePlayer from '@liveqing/liveplayer'
			// import player from '../dialog/easyPlayer.vue'
			import jessibucaPlayer from '../common/jessibuca.vue'
			import recordDownload from '../dialog/recordDownload.vue'
			@@ -294,7 +300,7 @@
			name: 'devicePlayer',
			props: {},
			components: {
			jessibucaPlayer, rtcPlayer, recordDownload,
			LivePlayer, jessibucaPlayer, rtcPlayer, recordDownload,
			},
			computed: {
			getPlayerShared: function () {
			@@ -319,7 +325,8 @@
			// 如何你只是用一种播放器，直接注释掉不用的部分即可
			player: {
			jessibuca : ["ws_flv", "wss_flv"],
			webRTC: ["rtc", "rtc"],
			livePlayer : ["ws_flv", "wss_flv"],
			webRTC: ["rtc", "rtcs"],
			},
			videoHistory: {
			date: '',
			@@ -371,10 +378,10 @@
			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
			url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&app='+ this.app +'&stream='+ this.streamId
			}).then(function (res) {
			that.tracksLoading = false;
			if (res.data.code == 0 && res.data.online) {
			if (res.data.code == 0 && res.data.tracks) {
			that.tracks = res.data.tracks;
			}else{
			that.tracksNotLoaded = true;
			@@ -390,10 +397,13 @@
			changePlayer: function (tab) {
			console.log(this.player[tab.name][0])
			this.activePlayer = tab.name;
			this.videoUrl = this.streamInfo[this.player[tab.name][0]]
			this.videoUrl = this.getUrlByStreamInfo()
			console.log(this.videoUrl)
			},
			openDialog: function (tab, deviceId, channelId, param) {
			if (this.showVideoDialog) {
			return;
			}
			this.tabActiveName = tab;
			this.channelId = channelId;
			this.deviceId = deviceId;
			@@ -438,6 +448,7 @@
			this.playFromStreamInfo(false, streamInfo)
			},
			getUrlByStreamInfo(){
			console.log(this.streamInfo)
			if (location.protocol === "https:") {
			this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
			}else {
			@@ -452,9 +463,9 @@
			this.$refs[this.activePlayer].pause()
			that.$axios({
			method: 'post',
			url: '/api/gb_record/convert/' + that.streamId
			url: '/api/play/convert/' + that.streamId
			}).then(function (res) {
			if (res.data.code == 0) {
			if (res.data.code === 0) {
			that.convertKey = res.data.key;
			setTimeout(()=>{
			that.isLoging = false;
			@@ -563,10 +574,10 @@
			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;
			that.recordsLoading = false;
			}else {
			this.$message({
			showClose: true,
			@@ -605,13 +616,21 @@
			url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
			row.endTime
			}).then(function (res) {
			var streamInfo = res.data;
			that.app = streamInfo.app;
			that.streamId = streamInfo.stream;
			that.mediaServerId = streamInfo.mediaServerId;
			that.ssrc = streamInfo.ssrc;
			that.videoUrl = that.getUrlByStreamInfo(streamInfo);
			that.recordPlay = true;
			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;
			});
			}
			},