diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarController.java
index 7d6dc53..886183a 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarController.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -28,14 +29,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 日历Controller
- * 
+ *
  * @author pqz
  * @date 2025-10-31
  */
 @RestController
 @RequestMapping("/base/calendar")
-public class BaseCalendarController extends BaseController
-{
+public class BaseCalendarController extends BaseController {
     @Autowired
     private IBaseCalendarService baseCalendarService;
 
@@ -45,22 +45,35 @@ public class BaseCalendarController extends BaseController
     @PreAuthorize("@ss.hasPermi('base:calendar:list')")
     @GetMapping("/list")
     public AjaxResult list(BaseCalendar baseCalendar,
-                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
-                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
-    {
+                           @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         Page<BaseCalendar> page = new Page<>(pageNum, pageSize);
-        IPage<BaseCalendar> list = baseCalendarService.queryListPage(baseCalendar,page);
+        IPage<BaseCalendar> list = baseCalendarService.queryListPage(baseCalendar, page);
         return success(list);
     }
 
+
+    /**
+     * 通过当前日期生成近5年的日历
+     *
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     * @author PQZ
+     * @date 10:46 2025/11/3
+     **/
+    @GetMapping("/generateCalendar")
+    public AjaxResult generateCalendar() {
+        baseCalendarService.generateCalendar();
+        return success();
+    }
+
+
     /**
      * 导出日历列表
      */
     @PreAuthorize("@ss.hasPermi('base:calendar:export')")
     @Log(title = "日历", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BaseCalendar baseCalendar)
-    {
+    public void export(HttpServletResponse response, BaseCalendar baseCalendar) {
         List<BaseCalendar> list = baseCalendarService.list();
         ExcelUtil<BaseCalendar> util = new ExcelUtil<BaseCalendar>(BaseCalendar.class);
         util.exportExcel(response, list, "日历数据");
@@ -71,8 +84,7 @@ public class BaseCalendarController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('base:calendar:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(baseCalendarService.getById(id));
     }
 
@@ -82,8 +94,7 @@ public class BaseCalendarController extends BaseController
     @PreAuthorize("@ss.hasPermi('base:calendar:add')")
     @Log(title = "日历", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BaseCalendar baseCalendar)
-    {
+    public AjaxResult add(@RequestBody BaseCalendar baseCalendar) {
         return toAjax(baseCalendarService.save(baseCalendar));
     }
 
@@ -93,8 +104,7 @@ public class BaseCalendarController extends BaseController
     @PreAuthorize("@ss.hasPermi('base:calendar:edit')")
     @Log(title = "日历", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BaseCalendar baseCalendar)
-    {
+    public AjaxResult edit(@RequestBody BaseCalendar baseCalendar) {
         return toAjax(baseCalendarService.updateById(baseCalendar));
     }
 
@@ -103,9 +113,8 @@ public class BaseCalendarController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('base:calendar:remove')")
     @Log(title = "日历", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
         List<String> list = new ArrayList<>(Arrays.asList(ids));
         return toAjax(baseCalendarService.removeByIds(list));
     }
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseCalendar.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseCalendar.java
index 410eafd..bd77451 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseCalendar.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseCalendar.java
@@ -15,12 +15,11 @@ import com.ruoyi.common.core.domain.DlBaseEntity;
  */
 @TableName("base_calendar")
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class BaseCalendar extends DlBaseEntity
+public class BaseCalendar
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java
index f2f132b..05e250b 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.base.service;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -8,11 +9,19 @@ import com.ruoyi.base.domain.BaseCalendar;
 
 /**
  * 日历Service接口
- * 
+ *
  * @author pqz
  * @date 2025-10-31
  */
-public interface IBaseCalendarService extends IService<BaseCalendar>
-{
+public interface IBaseCalendarService extends IService<BaseCalendar> {
     IPage<BaseCalendar> queryListPage(BaseCalendar pageReqVO, Page<BaseCalendar> page);
+
+    /**
+     * 通过当前时间生成近5年的日历
+     *
+     * @return void
+     * @author PQZ
+     * @date 10:47 2025/11/3
+     **/
+    void generateCalendar();
 }
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java
index 92eae8c..f3f6b4e 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java
@@ -1,6 +1,15 @@
 package com.ruoyi.base.service.impl;
 
+import cn.hutool.core.date.ChineseDate;
+
+import java.time.LocalDate;
+
+import java.time.ZoneId;
+import java.time.temporal.IsoFields;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,13 +21,12 @@ import com.ruoyi.base.service.IBaseCalendarService;
 
 /**
  * 日历Service业务层处理
- * 
+ *
  * @author pqz
  * @date 2025-10-31
  */
 @Service
-public class BaseCalendarServiceImpl extends ServiceImpl<BaseCalendarMapper,BaseCalendar>  implements IBaseCalendarService
-{
+public class BaseCalendarServiceImpl extends ServiceImpl<BaseCalendarMapper, BaseCalendar> implements IBaseCalendarService {
     @Autowired
     private BaseCalendarMapper baseCalendarMapper;
 
@@ -26,4 +34,69 @@ public class BaseCalendarServiceImpl extends ServiceImpl<BaseCalendarMapper,Base
     public IPage<BaseCalendar> queryListPage(BaseCalendar pageReqVO, Page<BaseCalendar> page) {
         return baseCalendarMapper.queryListPage(pageReqVO, page);
     }
+
+    /**
+     * 通过当前时间生成近5年的日历
+     *
+     * @return void
+     * @author PQZ
+     * @date 10:47 2025/11/3
+     **/
+    @Override
+    public void generateCalendar() {
+
+        // 获取当前年份
+        int currentYear = LocalDate.now().getYear();
+        // 从当前年份的1月1日开始计算
+        LocalDate startDate = LocalDate.of(currentYear, 1, 1);
+        // 结束日期为当前年的12月31日
+        LocalDate endDate = LocalDate.of(currentYear, 12, 31);
+
+        List<BaseCalendar> calendarList = new ArrayList<>();
+
+        // 遍历从开始日期到结束日期的每一天
+        for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) {
+            BaseCalendar calendar = new BaseCalendar();
+            calendar.setYear((long) date.getYear());
+            calendar.setMonth((long) date.getMonthValue());
+            calendar.setDay((long) date.getDayOfMonth());
+            calendar.setWeek((long) date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR));
+            calendar.setWeekday((long) date.getDayOfWeek().getValue());
+
+            // 使用Hutool计算农历日期
+            calendar.setLunarDate(calculateLunarDate(date));
+
+            // 默认工作状态为空（正常工作日）
+            calendar.setWorkStatus("");
+
+            calendarList.add(calendar);
+        }
+        //批量保存到数据库
+        this.saveBatch(calendarList);
+
+    }
+
+    /**
+     * 使用Hutool计算农历日期
+     *
+     * @param date 公历日期
+     * @return 农历日期字符串
+     */
+    private String calculateLunarDate(LocalDate date) {
+        try {
+            // 使用Hutool将LocalDate转换为Date
+            Date utilDate = Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant());
+            ChineseDate chineseDate = new ChineseDate(utilDate);
+
+            // 如果是农历初一，返回月份名称；否则返回日期名称
+            if (chineseDate.getDay() == 1) {
+                return chineseDate.getChineseMonth();
+            } else {
+                return chineseDate.getChineseDay();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "未知";
+        }
+    }
 }
diff --git a/dl_vue/src/api/base/calendar.js b/dl_vue/src/api/base/calendar.js
index 57df003..a080346 100644
--- a/dl_vue/src/api/base/calendar.js
+++ b/dl_vue/src/api/base/calendar.js
@@ -9,6 +9,14 @@ export function listCalendar(query) {
   })
 }
 
+// 生成日历
+export function generateCalendar() {
+  return request({
+    url: '/base/calendar/generateCalendar',
+    method: 'get',
+  })
+}
+
 // 查询日历详细
 export function getCalendar(id) {
   return request({
diff --git a/dl_vue/src/views/base/calendar/index.vue b/dl_vue/src/views/base/calendar/index.vue
index fa25f0e..1081441 100644
--- a/dl_vue/src/views/base/calendar/index.vue
+++ b/dl_vue/src/views/base/calendar/index.vue
@@ -1,318 +1,97 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公历年份(如2025)" prop="year">
-        <el-input
-          v-model="queryParams.year"
-          placeholder="请输入公历年份(如2025)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公历月份(1-12)" prop="month">
-        <el-input
-          v-model="queryParams.month"
-          placeholder="请输入公历月份(1-12)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公历日期(1-31)" prop="day">
-        <el-input
-          v-model="queryParams.day"
-          placeholder="请输入公历日期(1-31)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="农历日期" prop="lunarDate">
-        <el-input
-          v-model="queryParams.lunarDate"
-          placeholder="请输入农历日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="星期" prop="weekday">
-        <el-input
-          v-model="queryParams.weekday"
-          placeholder="请输入星期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="第几周" prop="week">
-        <el-input
-          v-model="queryParams.week"
-          placeholder="请输入第几周"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['base:calendar:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['base:calendar:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['base:calendar:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['base:calendar:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="calendarList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="公历年份(如2025)" align="center" prop="year" />
-      <el-table-column label="公历月份(1-12)" align="center" prop="month" />
-      <el-table-column label="公历日期(1-31)" align="center" prop="day" />
-      <el-table-column label="农历日期" align="center" prop="lunarDate" />
-      <el-table-column label="星期" align="center" prop="weekday" />
-      <el-table-column label="第几周" align="center" prop="week" />
-      <el-table-column label="法定作息状态" align="center" prop="workStatus" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['base:calendar:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:calendar:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改日历对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="公历年份(如2025)" prop="year">
-          <el-input v-model="form.year" placeholder="请输入公历年份(如2025)" />
-        </el-form-item>
-        <el-form-item label="公历月份(1-12)" prop="month">
-          <el-input v-model="form.month" placeholder="请输入公历月份(1-12)" />
-        </el-form-item>
-        <el-form-item label="公历日期(1-31)" prop="day">
-          <el-input v-model="form.day" placeholder="请输入公历日期(1-31)" />
-        </el-form-item>
-        <el-form-item label="农历日期" prop="lunarDate">
-          <el-input v-model="form.lunarDate" placeholder="请输入农历日期" />
-        </el-form-item>
-        <el-form-item label="星期" prop="weekday">
-          <el-input v-model="form.weekday" placeholder="请输入星期" />
-        </el-form-item>
-        <el-form-item label="第几周" prop="week">
-          <el-input v-model="form.week" placeholder="请输入第几周" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <el-calendar v-model="currentDate" ref="calendar">
+      <template slot="dateCell" slot-scope="{ date, data }">
+        <div class="calendar-cell">
+          <div class="calendar-date">{{ data.day.split('-')[2] }}</div>
+          <div class="lunar-date">{{ getLunarDate(data.day) }}</div>
+        </div>
+      </template>
+    </el-calendar>
   </div>
 </template>
 
 <script>
-import { listCalendar, getCalendar, delCalendar, addCalendar, updateCalendar } from "@/api/base/calendar";
+import { listCalendar } from '@/api/base/calendar'
 
 export default {
-  name: "Calendar",
+  name: "CalendarView",
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 日历表格数据
-      calendarList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        year: null,
-        month: null,
-        day: null,
-        lunarDate: null,
-        weekday: null,
-        week: null,
-        workStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
+      currentDate: new Date(),
+      calendarData: []
     };
   },
   created() {
-    this.getList();
+    this.fetchCalendarData();
   },
   methods: {
-    /** 查询日历列表 */
-    getList() {
-      this.loading = true;
-      listCalendar(this.queryParams).then(response => {
-        this.calendarList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
+    fetchCalendarData() {
+      const year = this.currentDate.getFullYear();
+      const month = this.currentDate.getMonth() + 1;
+      // 根据当前年月查询数据
+      listCalendar({
+        pageNum: 1,
+        pageSize: 31, // 一个月最多31天
+        year: year,
+        month: month
+      }).then(response => {
+        this.calendarData = response.data.records;
+        console.log(this.calendarData)
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        year: null,
-        month: null,
-        day: null,
-        lunarDate: null,
-        weekday: null,
-        week: null,
-        workStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加日历";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getCalendar(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改日历";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateCalendar(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCalendar(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除日历编号为"' + ids + '"的数据项？').then(function() {
-        return delCalendar(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('base/calendar/export', {
-        ...this.queryParams
-      }, `calendar_${new Date().getTime()}.xlsx`)
+
+    getLunarDate(dateStr) {
+      // 查找对应日期的农历信息
+      const date = new Date(dateStr);
+      const year = date.getFullYear();
+      const month = date.getMonth() + 1;
+      const day = date.getDate();
+
+      // 添加防御性检查
+      if (!this.calendarData || this.calendarData.length === 0) {
+        return null;
+      }
+      const record = this.calendarData.find(item =>
+        item.year === year &&
+        item.month === month &&
+        item.day === day
+      )
+      return record ? record.lunarDate : null;
     }
+
   }
 };
 </script>
+
+<style scoped>
+.calendar-cell {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.calendar-date {
+  font-size: 16px;
+}
+
+.lunar-date {
+  font-size: 12px;
+  color: #999;
+}
+
+.el-calendar-table .el-calendar-day:hover {
+  background-color: #f2f8ff;
+}
+
+.el-calendar-table:not(.is-range) .el-calendar-day.is-selected {
+  background-color: #d9e9ff;
+}
+
+.el-calendar-table:not(.is-range) .el-calendar-day.is-today {
+  background-color: #e6f3ff;
+  color: #409eff;
+}
+</style>