From c06cb61f67a4d8d6d4a42bb1dcf72198ace0f8a7 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 01 Sep 2025 19:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v5.0/5.0.5' into feature/v5.0/5.0.5
---
src/views/wel/components/calendarBox.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index 899c4fa..c2ed96c 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -74,14 +74,14 @@
const handleMonthChange = val => {
const selectedMonth = new Date(val);
currentMonth.value = selectedMonth;
-
+
// 如果是当前月份，则选中当天；否则不选中
if (isCurrentMonth(selectedMonth)) {
selectedDate.value = new Date();
} else {
selectedDate.value = null;
}
-
+
// 强制更新日历视图
nextTick(() => {
updateCalendarSelection();
@@ -145,7 +145,7 @@
if (isCurrentMonth(currentMonth.value) && selectedDate.value) {
const currentDay = dayjs(selectedDate.value).date();
const calendarCells = document.querySelectorAll('.el-calendar-table td');
-
+
calendarCells.forEach(cell => {
const day = parseInt(cell.querySelector('.date-number').textContent);
if (day === currentDay) {
@@ -173,7 +173,7 @@
nextTick(() => {
updateCalendarSelection();
});
-
+
getJobEventBar();
},
{ deep: true, immediate: true }
@@ -227,11 +227,11 @@
} else {
selectedDate.value = null;
}
-
+
nextTick(() => {
updateCalendarSelection();
});
-
+
getJobEventBar();
});
</script>
@@ -331,16 +331,16 @@
font-size: 14px;
color: #363636;
}
-
+
&.five-rows .el-calendar-table .el-calendar-day {
height: pxToVh(92) !important;
}
-
+
&.six-rows .el-calendar-table .el-calendar-day {
height: pxToVh(78) !important;
}
// 选中日期样式
- .el-calendar-table td.is-selected {
+ .el-calendar-table td.is-selected.is-today {
.el-calendar-day {
outline: 2px solid #409eff;
outline-offset: -2px;
@@ -354,7 +354,7 @@
.el-calendar-table td.is-selected {
background-color: transparent;
}
-
+
}
.event-item {
--
Gitblit v1.9.3