From 1178f84422e9b1fe52494af40e9538831565cd87 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BC=98=E5=8C=96=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/system/calendar/index.vue b/src/views/system/calendar/index.vue
index effe857..53f69b8 100644
--- a/src/views/system/calendar/index.vue
+++ b/src/views/system/calendar/index.vue
@@ -46,13 +46,13 @@
               <template #reference>
                 <div @click="handleSelect(data)" :class="{ 'holidayWork': holidayDate[data.day]?.isWorkday }">
                   <span style="font-size: 12px">
-                    {{ formatDate2(data.date) === current? data.date.getDate()+'(今天)':data.date.getDate() }}
+                    {{ formatDate2(data.date) === current? `${data.date.getDate()}(今天)`:data.date.getDate() }}
                   </span>
                   <span
                     v-if="holidayDate[data.day]?.content !== ''&&holidayDate[data.day]?.content !== null&&holidayDate[data.day]?.content !== undefined"
                     style="font-size: 12px"
                   >
-                    {{'('+getIntDictOptions(DICT_TYPE.CALENDAR_CONTENT)[holidayDate[data.day]?.content].label+')'}}
+                    ({{dictData[holidayDate[data.day]?.content].label}})
                   </span>
                 </div>
               </template>
@@ -107,7 +107,7 @@
 <script setup lang="ts">
 import {CalendarInstance} from "element-plus";
 import {CalendarApi, CalendarVO} from "@/api/home/calendar";
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import {getIntDictOptions, DICT_TYPE, NumberDictDataType} from '@/utils/dict'
 import {Close} from "@element-plus/icons-vue";
 
 defineOptions({ name: 'CalendarAgendaIndex' })
@@ -285,8 +285,16 @@ const toYear = () => {
   currentYear.value = new Date().getFullYear()
 }
 
+//字典数据
+let dictData:NumberDictDataType[] = [];
+//获取字典数据
+const getDict = async ()=> {
+  dictData = getIntDictOptions(DICT_TYPE.CALENDAR_CONTENT);
+}
+
 //打开获取数据处理数据来渲染
 onMounted( async ()=> {
+  await getDict()
   await getListDate()
 })