From f1c3131872fc49e58db3e7ef6bbc0ba124f9d93c Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 21 Jun 2025 11:04:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
src/views/wel/components/calendarBox.vue | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index 9f43825..20ce47e 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -75,7 +75,6 @@
};
const monthRange = getCurrentMonthRange();
params.value = monthRange;
-console.log('params.value', params.value);
const getJobEventBar = () => {
getCalen(params.value).then(res => {
@@ -106,36 +105,48 @@
</script>
<style lang="scss">
.calenBox {
+ height: 630px;
+ .el-calendar {
+ height: 100%; // 日历填充容器
+ // 标题样式
+ &__title {
+ font-weight: bold;
+ font-size: 14px;
+ color: #363636;
+ }
- .el-button-group>.el-button:not(:first-child):not(:last-child) {
- border-radius: 0;
+ // 日历主体
+ &__body {
+ height: 98%; // 关键：继承父高度
+
+ .el-calendar-table {
+ height: 90% !important; // 百分比生效
+ }
+ }
+
+ // 选中日期样式
+ .el-calendar-table td.is-selected {
+ background-color: #f0f7ff;
+ border: 2px solid #409eff;
+ border-radius: 4px;
+
+ .date-number {
+ font-weight: bold;
+ color: #409eff;
+ }
+ }
+ }
+
+ // 隐藏按钮组中间按钮
+ .el-button-group > .el-button:not(:first-child):not(:last-child) {
display: none;
-}
- .el-calendar__title {
- font-weight: bold;
- font-size: 14px;
- color: #363636;
- }
-
- .el-calendar-table td.is-selected {
- background-color: #f0f7ff;
- border: 2px solid #409eff;
- border-radius: 4px;
- }
- .el-calendar-table td.is-selected .date-number {
- font-weight: bold;
- color: #409eff;
- }
-
- .el-calendar-table td.is-selected .events {
- // padding: 2px;
}
}
</style>
<style lang="scss" scoped>
.calenBox {
margin-top: 17px;
- height: 567px;
+ height: 630px;
overflow: hidden;
.event-item {
font-size: 12px;
--
Gitblit v1.9.3