Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
haozq 2024-06-18 17:20:42 +08:00
commit a3e353a2c9
3 changed files with 12 additions and 3 deletions

View File

@ -418,6 +418,7 @@ body {
border: 1px solid #2eccbd; border: 1px solid #2eccbd;
background-color: #2eccbd !important; background-color: #2eccbd !important;
} }
.toggle-btn button { .toggle-btn button {
width: 40px; width: 40px;
height: 30px; height: 30px;
@ -426,3 +427,9 @@ body {
font-size: 15px; font-size: 15px;
margin: 0 10px; margin: 0 10px;
} }
#videoBox {
width: 100%;
height: 92%;
flex-wrap: wrap;
}

View File

@ -64,6 +64,7 @@ function loadVideoTree() {
} }
function oneVideo(that){ function oneVideo(that){
$('#videoBox').removeAttr('style');
$('.toggle-btn button').each(function (index, item) { $('.toggle-btn button').each(function (index, item) {
$(this).removeClass(); $(this).removeClass();
$(this).addClass('nocheckBtn') $(this).addClass('nocheckBtn')
@ -97,14 +98,15 @@ function oneVideo(that){
} }
function fourVideo(that){ function fourVideo(that){
$('#videoBox').css({"padding-top":"0.4%","box-sizing":"border-box"});
$('.toggle-btn button').each(function (index, item) { $('.toggle-btn button').each(function (index, item) {
$(this).removeClass(); $(this).removeClass();
$(this).addClass('nocheckBtn') $(this).addClass('nocheckBtn')
}) })
$(that).addClass('checkBtn'); $(that).addClass('checkBtn');
for (let i = 1; i < 5; i++) { for (let i = 1; i < 5; i++) {
document.getElementById("windowbox" + i).style.cssText = "width: 49.5%;height: 49.5%;"; document.getElementById("windowbox" + i).style.cssText = "width: 49.5%;height: 49.2%;";
document.getElementById("videoPlayer"+i).style.cssText = "width: 100%;height: 100%;"; document.getElementById("videoPlayer"+i).style.cssText = "width: 98%;height: 100%;";
$('.video'+i+'-dimensions').css("width", "100%"); $('.video'+i+'-dimensions').css("width", "100%");
$('.video'+i+'-dimensions').css("height", "100%"); $('.video'+i+'-dimensions').css("height", "100%");
document.getElementById("windowbox" + i).style.display = "block"; document.getElementById("windowbox" + i).style.display = "block";

View File

@ -112,7 +112,7 @@
<div id="video-box"> <div id="video-box">
<div id="balla" class="split split-horizontal"> <div id="balla" class="split split-horizontal">
<div class="layout" style="width: 100%;height: 92%;flex-wrap: wrap;"> <div class="layout" id="videoBox">
<div id="windowbox1" class="ballsplit " ondblclick="ballScreenBig('1')" <div id="windowbox1" class="ballsplit " ondblclick="ballScreenBig('1')"
style="width: 100%;height: 100%; position: relative;z-index: 9999999999;pointer-events:auto;"> style="width: 100%;height: 100%; position: relative;z-index: 9999999999;pointer-events:auto;">
<video id="videoPlayer1" class="ball-content" autoplay="autoplay" loop="loop" muted <video id="videoPlayer1" class="ball-content" autoplay="autoplay" loop="loop" muted