Commit 2482606b04dc22d386739a83cc620b625399d2a1
Merge branch 'fix/DEFECT-1977' into 'main_dev'
fix: 修复视频配置分屏模式全屏的时候界面下方白色框没铺满 See merge request yunteng/thingskit-front!1284
Showing
1 changed file
with
7 additions
and
5 deletions
| @@ -238,7 +238,7 @@ | @@ -238,7 +238,7 @@ | ||
| 238 | ref="listEl" | 238 | ref="listEl" |
| 239 | :loading="loading" | 239 | :loading="loading" |
| 240 | :data-source="cameraList" | 240 | :data-source="cameraList" |
| 241 | - class="bg-light-50 w-full !h-full dark:bg-dark-900 split-mode-list" | 241 | + class="bg-light-50 w-full !h-full dark:bg-dark-900 split-mode-list full" |
| 242 | :grid="(gridLayout as any)" | 242 | :grid="(gridLayout as any)" |
| 243 | :style="{ '--height': `${100 / pagination.colNumber}%` }" | 243 | :style="{ '--height': `${100 / pagination.colNumber}%` }" |
| 244 | > | 244 | > |
| @@ -270,7 +270,7 @@ | @@ -270,7 +270,7 @@ | ||
| 270 | class="video-container-mask absolute top-0 left-0 z-50 text-lg w-full text-light-50 flex justify-center" | 270 | class="video-container-mask absolute top-0 left-0 z-50 text-lg w-full text-light-50 flex justify-center" |
| 271 | style="height: 100%; background-color: rgba(0, 0, 0, 0.5)" | 271 | style="height: 100%; background-color: rgba(0, 0, 0, 0.5)" |
| 272 | > | 272 | > |
| 273 | - <span>{{ item.name }}</span> | 273 | + <span>{{ item.name }}{{ pagination.colNumber }}</span> |
| 274 | </div> | 274 | </div> |
| 275 | </div> | 275 | </div> |
| 276 | </div> | 276 | </div> |
| @@ -294,9 +294,11 @@ | @@ -294,9 +294,11 @@ | ||
| 294 | height: 100%; | 294 | height: 100%; |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | - // .split-screen-mode:deep(.ant-spin-container) { | ||
| 298 | - //height: 100% !important; | ||
| 299 | - // } | 297 | + .full { |
| 298 | + :deep(.ant-spin-container) { | ||
| 299 | + height: 100% !important; | ||
| 300 | + } | ||
| 301 | + } | ||
| 300 | 302 | ||
| 301 | .video-container { | 303 | .video-container { |
| 302 | .video-container-mask { | 304 | .video-container-mask { |