aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-27 15:37:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !12 from leson/fix_bug_leson_20220402

Browse Source
This commit is contained in:
leson 2022-04-02 09:09:48 +00:00 committed by Gitee
commit a90e745ae5
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_src/src/components/control.vue
View File

@ -41,7 +41,7 @@
<template slot="extra"> <template slot="extra">
<el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="点击拷贝" v-clipboard="JSON.stringify(wvpServerConfig.sip)|| ''" @success="$message({type:'success', message:'成功拷贝到粘贴板'})"></el-button> <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="点击拷贝" v-clipboard="JSON.stringify(wvpServerConfig.sip)|| ''" @success="$message({type:'success', message:'成功拷贝到粘贴板'})"></el-button>
</template> </template>
<el-descriptions-item v-for="(value, key, index) in wvpServerConfig.sip"> <el-descriptions-item v-for="(value, key, index) in wvpServerConfig.sip" :key="key">
<template slot="label"> <template slot="label">
{{ getNameFromKey(key) }} {{ getNameFromKey(key) }}
</template> </template>

6
web_src/src/components/dialog/jessibuca.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div id="jessibuca" style="width: auto; height: auto"> <div id="jessibuca" style="width: 100%; height: 100%">
<div id="container" ref="container" style="width: 100%; height: 10rem; background-color: #000" @dblclick="fullscreenSwich"> <div id="container" ref="container" style="width: 100%; height: 100%; background-color: #000" :style="{height:height?height:'50vh'}" @dblclick="fullscreenSwich">
<div class="buttons-box" id="buttonsBox"> <div class="buttons-box" id="buttonsBox">
<div class="buttons-box-left"> <div class="buttons-box-left">
<i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i> <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
@ -54,7 +54,7 @@ export default {
let paramUrl = decodeURIComponent(this.$route.params.url) let paramUrl = decodeURIComponent(this.$route.params.url)
this.$nextTick(() =>{ this.$nextTick(() =>{
let dom = document.getElementById("container"); let dom = document.getElementById("container");
dom.style.height = (9/16 ) * dom.clientWidth + "px" //dom.style.height = (9/16 ) * dom.clientWidth + "px"
if (typeof (this.videoUrl) == "undefined") { if (typeof (this.videoUrl) == "undefined") {
this.videoUrl = paramUrl; this.videoUrl = paramUrl;
} }

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

@ -32,7 +32,7 @@
@click="playerIdx = (i-1)" @click="playerIdx = (i-1)"
> >
<div v-if="!videoUrl[i-1]" style="color: #ffffff;font-size: 30px;font-weight: bold;">{{i}}</div> <div v-if="!videoUrl[i-1]" style="color: #ffffff;font-size: 30px;font-weight: bold;">{{i}}</div>
<player v-else :ref="'player'+i" :videoUrl="videoUrl[i-1]" fluent autoplay :height="true" <player v-else :ref="'player'+i" :videoUrl="videoUrl[i-1]" fluent autoplay height="100%"
:idx="'player'+i" @screenshot="shot" @destroy="destroy"></player> :idx="'player'+i" @screenshot="shot" @destroy="destroy"></player>
<!-- <player v-else ref="'player'+i" :idx="'player'+i" :visible.sync="showVideoDialog" :videoUrl="videoUrl[i-1]" :height="true" :hasAudio="hasAudio" fluent autoplay live ></player> --> <!-- <player v-else ref="'player'+i" :idx="'player'+i" :visible.sync="showVideoDialog" :videoUrl="videoUrl[i-1]" :height="true" :hasAudio="hasAudio" fluent autoplay live ></player> -->
</div> </div>
@ -96,9 +96,9 @@
if(this.spilt==1){ if(this.spilt==1){
return {width:'100%',height:'100%'} return {width:'100%',height:'100%'}
}else if(this.spilt==4){ }else if(this.spilt==4){
return {width:'49%',height:'49%'} return {width:'50%',height:'50%'}
}else if(this.spilt==9){ }else if(this.spilt==9){
return {width:'32%',height:'32%'} return {width:'33.33%',height:'33.33%'}
} }
} }
}, },
@ -280,9 +280,8 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-sizing: border-box;
} }
</style>
<style>
.videoList { .videoList {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;