From 60ecb88f3846ce8119cd4e7084cf1ca9be79df78 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 5 Dec 2024 09:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AF=8F=E4=B8=AA=E7=BB=84=E4=BB=B6=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E6=A0=B7=E5=BC=8F=E5=90=8D,=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E6=A0=B7=E5=BC=8F=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/hynr/hyinfo/index.vue   |  6 +++---
 src/views/Home/rcnr/rcglInfo/index.vue |  6 +++---
 src/views/system/calendar/index.vue    | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/Home/hynr/hyinfo/index.vue b/src/views/Home/hynr/hyinfo/index.vue
index 0ba11f3..65871ba 100644
--- a/src/views/Home/hynr/hyinfo/index.vue
+++ b/src/views/Home/hynr/hyinfo/index.vue
@@ -28,7 +28,7 @@
         </template>
 <!--        自定义展示内容 根据需要自定义就好了-->
         <template #date-cell="{ data }">
-          <div class='holiday'>
+          <div class='holidayHy'>
             <span style="font-size: 14px">
               {{ formatDate2(data.date) === current? data.date.getDate()+'(今天)':data.date.getDate() }}
             </span>
@@ -205,7 +205,7 @@ onMounted(()=> {
 </script>
 <style>
 /* 隐藏滚动条 */
-.holiday::-webkit-scrollbar {
+.holidayHy::-webkit-scrollbar {
   display: none;
 }
 /*今天显示为其他颜色*/
@@ -234,7 +234,7 @@ onMounted(()=> {
   font-weight: bold;
 }
 /*设置日历格子内 超出内容不换行 超出内容显示为省略 内容超出大小是可以滚动*/
-.holiday {
+.holidayHy {
   overflow-x: scroll;
   text-overflow: ellipsis;
   white-space: nowrap;
diff --git a/src/views/Home/rcnr/rcglInfo/index.vue b/src/views/Home/rcnr/rcglInfo/index.vue
index 52edeeb..5b93de0 100644
--- a/src/views/Home/rcnr/rcglInfo/index.vue
+++ b/src/views/Home/rcnr/rcglInfo/index.vue
@@ -27,7 +27,7 @@
 
       <template #date-cell="{ data }">
         <div
-          class='holiday'
+          class='holidayRc'
         >
           <span style="font-size: 14px">
             {{ formatDate2(data.date) === current? data.date.getDate()+'(今天)':data.date.getDate() }}
@@ -171,7 +171,7 @@ onMounted(()=> {
 </script>
 <style>
 /* 隐藏滚动条 */
-.holiday::-webkit-scrollbar {
+.holidayRc::-webkit-scrollbar {
   display: none;
 }
 /*今天显示为其他颜色*/
@@ -199,7 +199,7 @@ onMounted(()=> {
   font-weight: bold;
 }
 //每个各自展示的内容
-.holiday {
+.holidayRc {
   overflow-x: scroll;
   text-overflow: ellipsis;
   white-space: nowrap;
diff --git a/src/views/system/calendar/index.vue b/src/views/system/calendar/index.vue
index 92ebbc4..7b549cc 100644
--- a/src/views/system/calendar/index.vue
+++ b/src/views/system/calendar/index.vue
@@ -2,10 +2,10 @@
   <ContentWrap>
 
     <el-button-group style="display: flex; justify-content: space-between;">
-      <el-button size="small" @click="selectDate(-1)">上年</el-button>
-      <el-button size="small" @click="toYear()">今年</el-button>
-      <el-button size="small" @click="selectDate(1)">下年</el-button>
-      <el-button size="small" @click="getListDate()">刷新</el-button>
+      <el-button size="large" @click="selectDate(-1)">上年</el-button>
+      <el-button size="large" @click="toYear()">今年</el-button>
+      <el-button size="large" @click="selectDate(1)">下年</el-button>
+      <el-button size="large" @click="getListDate()">刷新</el-button>
 <!--      <el-button size="small" @click="createDate()">创建</el-button>-->
     </el-button-group>
 
@@ -29,7 +29,7 @@
           </template>
 
           <template #date-cell="{ data }">
-            <div @click="handleSelect(data)" :class="{ 'holiday': holidayDate[data.day]?.isWorkday }">
+            <div @click="handleSelect(data)" :class="{ 'holidayWork': holidayDate[data.day]?.isWorkday }">
               <span style="font-size: 14px">
                 {{ formatDate2(data.date) === current? data.date.getDate()+'(今天)':data.date.getDate() }}
               </span>
@@ -173,7 +173,7 @@ onMounted( async ()=> {
 .custom-calendar .el-calendar-day {
   width: 100%;
   height: 100%;
-  padding: 0 !important;
+  padding: 0;
 }
 
 .custom-calendar .is-today {
@@ -182,7 +182,7 @@ onMounted( async ()=> {
   background-color: #f56c6c;
   font-size: 16px;
 }
-.holiday {
+.holidayWork {
   width: 100%;
   height: 100%;
   background-color: #15bc83;