XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化多网卡

Browse Source
This commit is contained in:
648540858
2022-10-28 16:40:12 +08:00
parent 1ab73f69eb
commit aed45e0f0d
17 changed files with 429 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
web_src/src/components/dialog/devicePlayer.vue
View File

@@ -53,89 +53,89 @@
更多地址<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item :command="streamInfo.flv">
<el-dropdown-item :command="streamInfo.flv.url">
<el-tag >FLV:</el-tag>
<span>{{ streamInfo.flv }}</span>
<span>{{ streamInfo.flv.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.https_flv">
<el-dropdown-item :command="streamInfo.https_flv.url">
<el-tag >FLV(https):</el-tag>
<span>{{ streamInfo.https_flv }}</span>
<span>{{ streamInfo.https_flv.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.ws_flv">
<el-dropdown-item :command="streamInfo.ws_flv.url">
<el-tag >FLV(ws):</el-tag>
<span >{{ streamInfo.ws_flv }}</span>
<span >{{ streamInfo.ws_flv.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.wss_flv">
<el-dropdown-item :command="streamInfo.wss_flv.url">
<el-tag >FLV(wss):</el-tag>
<span>{{ streamInfo.wss_flv }}</span>
<span>{{ streamInfo.wss_flv.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.fmp4">
<el-dropdown-item :command="streamInfo.fmp4.url">
<el-tag >FMP4:</el-tag>
<span>{{ streamInfo.fmp4 }}</span>
<span>{{ streamInfo.fmp4.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.https_fmp4">
<el-dropdown-item :command="streamInfo.https_fmp4.url">
<el-tag >FMP4(https):</el-tag>
<span>{{ streamInfo.https_fmp4 }}</span>
<span>{{ streamInfo.https_fmp4.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.ws_fmp4">
<el-dropdown-item :command="streamInfo.ws_fmp4.url">
<el-tag >FMP4(ws):</el-tag>
<span>{{ streamInfo.ws_fmp4 }}</span>
<span>{{ streamInfo.ws_fmp4.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.wss_fmp4">
<el-dropdown-item :command="streamInfo.wss_fmp4.url">
<el-tag >FMP4(wss):</el-tag>
<span>{{ streamInfo.wss_fmp4 }}</span>
<span>{{ streamInfo.wss_fmp4.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.hls">
<el-dropdown-item :command="streamInfo.hls.url">
<el-tag>HLS:</el-tag>
<span>{{ streamInfo.hls }}</span>
<span>{{ streamInfo.hls.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.https_hls">
<el-dropdown-item :command="streamInfo.https_hls.url">
<el-tag >HLS(https):</el-tag>
<span>{{ streamInfo.https_hls }}</span>
<span>{{ streamInfo.https_hls.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.ws_hls">
<el-dropdown-item :command="streamInfo.ws_hls.url">
<el-tag >HLS(ws):</el-tag>
<span>{{ streamInfo.ws_hls }}</span>
<span>{{ streamInfo.ws_hls.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.wss_hls">
<el-dropdown-item :command="streamInfo.wss_hls.url">
<el-tag >HLS(wss):</el-tag>
<span>{{ streamInfo.wss_hls }}</span>
<span>{{ streamInfo.wss_hls.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.ts">
<el-dropdown-item :command="streamInfo.ts.url">
<el-tag>TS:</el-tag>
<span>{{ streamInfo.ts }}</span>
<span>{{ streamInfo.ts.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.https_ts">
<el-dropdown-item :command="streamInfo.https_ts.url">
<el-tag>TS(https):</el-tag>
<span>{{ streamInfo.https_ts }}</span>
<span>{{ streamInfo.https_ts.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.ws_ts">
<el-dropdown-item :command="streamInfo.ws_ts.url">
<el-tag>TS(ws):</el-tag>
<span>{{ streamInfo.ws_ts }}</span>
<span>{{ streamInfo.ws_ts.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.wss_ts">
<el-dropdown-item :command="streamInfo.wss_ts.url">
<el-tag>TS(wss):</el-tag>
<span>{{ streamInfo.wss_ts }}</span>
<span>{{ streamInfo.wss_ts.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtc">
<el-dropdown-item :command="streamInfo.rtc.url">
<el-tag >RTC:</el-tag>
<span>{{ streamInfo.rtc }}</span>
<span>{{ streamInfo.rtc.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtmp">
<el-dropdown-item :command="streamInfo.rtmp.url">
<el-tag >RTMP:</el-tag>
<span>{{ streamInfo.rtmp }}</span>
<span>{{ streamInfo.rtmp.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtmps">
<el-dropdown-item :command="streamInfo.rtmps.url">
<el-tag >RTMPS:</el-tag>
<span>{{ streamInfo.rtmps }}</span>
<span>{{ streamInfo.rtmps.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtsp">
<el-dropdown-item :command="streamInfo.rtsp.url">
<el-tag >RTSP:</el-tag>
<span>{{ streamInfo.rtsp }}</span>
<span>{{ streamInfo.rtsp.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtsps">
<el-dropdown-item :command="streamInfo.rtsps.url">
<el-tag >RTSPS:</el-tag>
<span>{{ streamInfo.rtsps }}</span>
<span>{{ streamInfo.rtsps.url }}</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -393,7 +393,7 @@ export default {
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.streamInfo[this.player[tab.name][0]].url
console.log(this.videoUrl)
},
openDialog: function (tab, deviceId, channelId, param) {
@@ -446,9 +446,9 @@ export default {
getUrlByStreamInfo(){
console.log(this.streamInfo)
if (location.protocol === "https:") {
this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]].url
}else {
this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]].url
}
return this.videoUrl;

4
web_src/src/components/live.vue
View File

@@ -138,8 +138,8 @@ export default {
url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
if (res.data.code === 0 && res.data.data) {
itemData.playUrl = res.data.data.httpsFlv
that.setPlayUrl(res.data.data.ws_flv, idxTmp)
itemData.playUrl = res.data.data.https_flv.url
that.setPlayUrl(res.data.data.ws_flv.url, idxTmp)
} else {
that.$message.error(res.data.msg);
}