From 17bf58ac59f5cb3e01ac028cdbc37a3c7c6737ed Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期五, 25 七月 2025 15:37:53 +0800
Subject: [PATCH] Merge branch 'ID1825-床旁副屏改版' into test
---
src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
index 5d26fa9..6faafca 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
@@ -1,18 +1,18 @@
<template>
- <el-scrollbar
+ <div
class="bedside-auxiliary-screen-card"
:style="{
'--bg-color': props.backgroundColor,
}"
>
- <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>
- <el-scrollbar class="card-main">
+ <div class="card-main">
<slot />
- </el-scrollbar>
- </el-scrollbar>
+ </div>
+ </div>
</template>
<script lang="ts" setup name="Card">
@@ -21,6 +21,7 @@
title: string; // 标题
icon: string;
height?: number;
+ headerClassName?: string; // 头部类名
}
const props = defineProps<Props>();
</script>
@@ -38,6 +39,7 @@
background-color: var(--bg-color, #70a3dd);
overflow: hidden;
overflow-y: auto;
+ height: 100%;
.card-header {
flex: 0 0 6px;
@@ -76,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