From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/wel/components/calendarBox.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index a7720c3..899c4fa 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -212,9 +212,9 @@
const days = date.daysInMonth();
// 强制 2025 年 6 月显示六行
- if (date.year() === 2025 && date.month() === 5) {
- return 6;
- }
+ //if (date.year() === 2025 && date.month() === 5) {
+ // return 6;
+ // }
// 其他月份按原逻辑计算
return Math.ceil((firstDay + days) / 7);
@@ -331,11 +331,9 @@
font-size: 14px;
color: #363636;
}
- // .el-calendar-table .el-calendar-day {
- // height: pxToVh(88) !important;
- // }
+
&.five-rows .el-calendar-table .el-calendar-day {
- height: pxToVh(88) !important;
+ height: pxToVh(92) !important;
}
&.six-rows .el-calendar-table .el-calendar-day {
--
Gitblit v1.9.3