From 87293d07243033fbf62a4292c248a3b7a67e9f6a Mon Sep 17 00:00:00 2001
From: leson <314087278@qq.com>
Date: Sat, 2 Apr 2022 11:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E5=B1=8F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E3=80=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/src/components/control.vue          | 2 +-
 web_src/src/components/dialog/jessibuca.vue | 6 +++---
 web_src/src/components/live.vue             | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue
index 9a0a97e08..742b09174 100644
--- a/web_src/src/components/control.vue
+++ b/web_src/src/components/control.vue
@@ -41,7 +41,7 @@
                             <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>
                             </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">
                                 {{ getNameFromKey(key) }}
                               </template>
diff --git a/web_src/src/components/dialog/jessibuca.vue b/web_src/src/components/dialog/jessibuca.vue
index e719c2b0f..5803f5415 100644
--- a/web_src/src/components/dialog/jessibuca.vue
+++ b/web_src/src/components/dialog/jessibuca.vue
@@ -1,6 +1,6 @@
 <template>
-  <div id="jessibuca" style="width: auto; height: auto">
-    <div id="container" ref="container" style="width: 100%; height: 10rem; background-color: #000" @dblclick="fullscreenSwich">
+  <div id="jessibuca" style="width: 100%; height: 100%">
+    <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-left">
           <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)
        this.$nextTick(() =>{
          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") {
             this.videoUrl = paramUrl;
           }
diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue
index 3c9105838..45f25bab6 100644
--- a/web_src/src/components/live.vue
+++ b/web_src/src/components/live.vue
@@ -32,7 +32,7 @@
                     @click="playerIdx = (i-1)"
                 >
                   <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>
                   <!-- <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>
@@ -96,9 +96,9 @@
         if(this.spilt==1){
           return {width:'100%',height:'100%'}
         }else if(this.spilt==4){
-          return {width:'49%',height:'49%'}
+          return {width:'50%',height:'50%'}
         }else if(this.spilt==9){
-          return {width:'32%',height:'32%'}
+          return {width:'33.33%',height:'33.33%'}
         }
       }
     },
@@ -280,9 +280,8 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    box-sizing: border-box;
   }
-</style>
-<style>
   .videoList {
     display: flex;
     flex-wrap: wrap;