From 7998f56025eac6be7dc1cf9c694ab0fc18b68bca Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期五, 25 七月 2025 14:55:54 +0800
Subject: [PATCH] Merge branch 'ID1825-床旁副屏改版' into test
---
src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
index 70405ee..6faafca 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
@@ -3,10 +3,9 @@
class="bedside-auxiliary-screen-card"
:style="{
'--bg-color': props.backgroundColor,
- '--height': props.height + 'px',
}"
>
- <div class="card-header">
+ <div class="card-header" :class="props.headerClassName">
<img :src="props.icon" class="card-icon" alt="" srcset="" />
<span class="card-title">{{ props.title }}</span>
</div>
@@ -22,6 +21,7 @@
title: string; // 标题
icon: string;
height?: number;
+ headerClassName?: string; // 头部类名
}
const props = defineProps<Props>();
</script>
@@ -33,10 +33,13 @@
.bedside-auxiliary-screen-card {
display: flex;
flex-direction: column;
- height: 100%;
+ // height: 100%;
padding: 3px 4px;
border-radius: 2px;
background-color: var(--bg-color, #70a3dd);
+ overflow: hidden;
+ overflow-y: auto;
+ height: 100%;
.card-header {
flex: 0 0 6px;
@@ -75,4 +78,10 @@
overflow: hidden;
}
}
+:deep(.el-scrollbar__view) {
+ min-height: 0;
+ height: 100%;
+ overflow: hidden;
+ overflow-y: auto;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0