From d085d0504041e29e82b51a6ade1a183149fc9ffa Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期二, 09 九月 2025 16:44:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dh.leon056.com:7499/r/data2/Single_application into ID1956-已签到页面改版

---
 src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
index 5d26fa9..f7f3f13 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
@@ -1,18 +1,21 @@
 <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>
+      <span class="card-right-text" v-if="$slots.right">
+        <slot name="right" />
+      </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 +24,7 @@
   title: string; // 标题
   icon: string;
   height?: number;
+  headerClassName?: string; // 头部类名
 }
 const props = defineProps<Props>();
 </script>
@@ -38,8 +42,10 @@
   background-color: var(--bg-color, #70a3dd);
   overflow: hidden;
   overflow-y: auto;
+  height: 100%;
 
   .card-header {
+    position: relative;
     flex: 0 0 6px;
     display: flex;
     align-items: center;
@@ -63,6 +69,19 @@
       overflow: hidden;
       text-overflow: ellipsis;
     }
+    .card-right-text {
+      position: absolute;
+      right: 0;
+      top: 50%;
+      transform: translateY(-50%);
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 500;
+      font-size: 4px;
+      color: #333333;
+      line-height: 5px;
+      text-align: right;
+      font-style: normal;
+    }
   }
 
   .card-main {
@@ -76,4 +95,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