From 35516400578bc7572940edd556a8426c59e40963 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 26 Dec 2024 10:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/calendar/index.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/system/calendar/index.vue b/src/views/system/calendar/index.vue
index eb17242..04df04d 100644
--- a/src/views/system/calendar/index.vue
+++ b/src/views/system/calendar/index.vue
@@ -37,7 +37,7 @@
 
           <template #date-cell="{ data }">
             <el-popover
-              v-if="isCurrentMonth(data,index)"
+              v-if="isCurrentMonth(data,index,holidayDate[data.day])"
               :visible="holidayDate[data.day]?.visible"
               placement="right"
               :width="240"
@@ -155,15 +155,20 @@ const formDataCaln = ref({
 // }
 
 //判断是否渲染当前日期更改组件
-const isCurrentMonth = (date:any,index:number) => {
-  const SelectDate = date.date;
-  return SelectDate.getMonth() === index;
+const isCurrentMonth = (date:any,index:number,holidayDate:any) => {
+  if (!holidayDate) {
+    return false;
+  }else {
+    const SelectDate = date.date;
+    return SelectDate.getMonth() === index;
+  }
 };
 
 /** 查询列表 */
 const getListDate = async () => {
   loading.value = false;
   try {
+    queryParamsDate.date = [currentYear.value+"-01-01",currentYear.value+"-12-31"];
     const data = await CalendarApi.getCalendarPage(queryParamsDate);
     list.value = data.list;
     mapDate();
@@ -274,11 +279,13 @@ const selectDate = (val:number) => {
     return
   }
   currentYear.value += val
+  getListDate();
 }
 
 //toYear Button change data go to year
 const toYear = () => {
   currentYear.value = new Date().getFullYear()
+  getListDate();
 }
 
 //字典数据