From 05a497c40ab8f8cda4723056d79753b0d4bf4dd0 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86-=E5=B7=A6=E4=B8=8A=E8=A7=92?=
 =?UTF-8?q?=E5=B9=B4=E4=BB=BD,=E5=BC=B9=E7=AA=97=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92x,=E4=BC=98=E5=8C=96=E6=89=93=E5=BC=80=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=BC=B9=E7=AA=97=E5=8F=AF=E5=88=86=E5=88=AB=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=AF=B9=E5=BA=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/system/calendar/index.vue b/src/views/system/calendar/index.vue
index 6b22052..3b9bea2 100644
--- a/src/views/system/calendar/index.vue
+++ b/src/views/system/calendar/index.vue
@@ -1,13 +1,21 @@
 <template>
   <ContentWrap>
-
-    <el-button-group style="display: flex; justify-content: space-between;">
-      <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>
+    <el-row>
+      <el-col :span="4">
+        <span style="font-size: 24px">
+        {{currentYear}}&nbsp;年
+        </span>
+      </el-col>
+      <el-col :span="20">
+        <el-button-group style="display: flex; justify-content: space-between;">
+          <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>
+      </el-col>
+    </el-row>
 
     <el-row v-if="loading" :gutter="10">
       <el-col v-for="(month, index) in months" :key="index" :span="6" >
@@ -40,9 +48,18 @@
                   </span>
                 </div>
               </template>
+              <!-- 右上角关闭按钮 -->
+              <el-button
+                type="text"
+                style="position: absolute; top: 2px; right: 10px; padding: 0;"
+                @click="closePopover(data)"
+              >
+                <el-icon class="el-icon--right"><Close /></el-icon>
+              </el-button>
               <el-form
                 ref="formRef"
                 :model="formDataCaln"
+                style="margin-top: 20px"
                 label-width="70px"
               >
                 <el-form-item label="状态" >
@@ -67,7 +84,7 @@
                   </el-select>
                 </el-form-item>
               </el-form>
-              <el-button size="small" @click="submitForm();" type="primary">确定</el-button>
+              <el-button size="small" @click="submitForm(data);" type="primary">确定</el-button>
             </el-popover>
           </template>
 
@@ -83,6 +100,7 @@
 import {CalendarInstance} from "element-plus";
 import {CalendarApi, CalendarVO} from "@/api/home/calendar";
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import {Close} from "@element-plus/icons-vue";
 
 defineOptions({ name: 'CalendarAgendaIndex' })
 
@@ -201,7 +219,9 @@ const handleSelect = async (date:any) => {
 };
 
 //提交更改
-const submitForm = async ()=> {
+const submitForm = async (date:any)=> {
+  // 判断更改是否符合
+  await getDate(date);
   const dataClan = formDataCaln.value as unknown as CalendarVO
   // 更新后台数据
   try {
@@ -219,7 +239,14 @@ const submitForm = async ()=> {
   // 关闭弹窗
   updatedHoliday.visible = false;
 }
-
+const closePopover = async (date:any)=> {
+  // 判断更改是否符合
+  await getDate(date);
+  //获取选择日期
+  const updatedHoliday = holidayDate.value[sDate.value];
+  // 关闭弹窗
+  updatedHoliday.visible = false;
+}
 // 获取日期时间 年月日
 function formatDate2(dat: number|Date) {
   const date = new Date(dat)