From 5c239e2491da67614a39e4085c6062254a7e84f1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 27 Jun 2025 10:03:34 +0800
Subject: [PATCH] Merge branch 'all_setting_styles' of http://139.196.74.78:10010/r/drone/drone-web-manage into all_setting_styles

---
 src/views/wel/components/calendarBox.vue |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index 20ce47e..44c8ceb 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -105,9 +105,10 @@
 </script>
 <style lang="scss">
 .calenBox {
- height: 630px;
+//  height: 630px;
+height: pxToVh(610);
   .el-calendar {
-    height: 100%; // 日历填充容器
+    // height: 80%; // 日历填充容器
     // 标题样式
     &__title {
       font-weight: bold;
@@ -116,14 +117,15 @@
     }
 
     // 日历主体
-    &__body {
-      height: 98%; // 关键:继承父高度
+    // &__body {
+    //   height: 98%; // 关键:继承父高度
       
-      .el-calendar-table {
-        height: 90% !important; // 百分比生效
-      }
-    }
-
+    //   .el-calendar-table {
+    //     height: 90% !important; // 百分比生效
+    //   }
+    // }
+.el-calendar-table .el-calendar-day{
+height: 78px !important;}
     // 选中日期样式
     .el-calendar-table td.is-selected {
       background-color: #f0f7ff;
@@ -145,18 +147,18 @@
 </style>
 <style lang="scss" scoped>
 .calenBox {
-  margin-top: 17px;
-  height: 630px;
+  margin-top: 10px;
+  // height: 630px;
+  height: pxToVh(610);
+  border-radius: 10px;
   overflow: hidden;
+  background-color: #fff;
   .event-item {
     font-size: 12px;
     // padding: 2px;
 
     border-radius: 3px;
     white-space: nowrap;
-    // overflow: hidden;
-    // text-overflow: ellipsis;
-
     &.work-order {
       font-weight: 400;
       font-size: 12px;

--
Gitblit v1.9.3