From cb363c93a0b670cb93e463078217416a692ed3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Thu, 30 Apr 2026 21:44:22 +0800
Subject: [PATCH 01/21] =?UTF-8?q?Signed-off-by:=20=E5=90=B4=E6=96=87?=
 =?UTF-8?q?=E5=B3=B0=20<kevin@lmve.net>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/my_work/main.go                       |   1 +
 backend/my_work/routers/api.go                |   1 +
 backend/my_work/routers/apiCalendar.go        | 434 +++++++++++++++
 frontend/ops_vue_js/src/api/calendar.js       |  43 ++
 .../ops_vue_js/src/components/AppHeader.vue   |   1 +
 frontend/ops_vue_js/src/i18n/en.json          |  39 +-
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  39 +-
 frontend/ops_vue_js/src/router/index.js       |  10 +
 .../src/views/calendar/CalendarDetail.vue     | 492 ++++++++++++++++++
 .../src/views/calendar/CalendarList.vue       | 376 +++++++++++++
 10 files changed, 1434 insertions(+), 2 deletions(-)
 create mode 100644 backend/my_work/routers/apiCalendar.go
 create mode 100644 frontend/ops_vue_js/src/api/calendar.js
 create mode 100644 frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
 create mode 100644 frontend/ops_vue_js/src/views/calendar/CalendarList.vue

diff --git a/backend/my_work/main.go b/backend/my_work/main.go
index a8e0393..62d3124 100644
--- a/backend/my_work/main.go
+++ b/backend/my_work/main.go
@@ -81,6 +81,7 @@ func main() {
 	routers.ApiWorkOrderInit()
 	routers.ApiWarehouseInit()
 	routers.ApiCustomerInit()
+	routers.ApiCalendarInit()
 
 	routers.BindsInit() //最后初始化绑定数据表
 
diff --git a/backend/my_work/routers/api.go b/backend/my_work/routers/api.go
index 4a202df..922c63c 100644
--- a/backend/my_work/routers/api.go
+++ b/backend/my_work/routers/api.go
@@ -45,6 +45,7 @@ func ApiRoot(r *gin.RouterGroup) {
 	ApiWarehouse(r.Group("/warehouse"))
 	ApiSysAdmin(r.Group("/admin"))
 	ApiCustomer(r.Group("/customer"))
+	ApiCalendar(r.Group("/calendar"))
 	r.GET("/", func(ctx *gin.Context) {
 		ReturnJson(ctx, "apiOK", gin.H{
 			"isOpsApiRoot": true,
diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
new file mode 100644
index 0000000..59a3479
--- /dev/null
+++ b/backend/my_work/routers/apiCalendar.go
@@ -0,0 +1,434 @@
+package routers
+
+import (
+	"encoding/json"
+	"ops/models"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/mitchellh/mapstructure"
+	"gorm.io/gorm"
+)
+
+// TabCalendar 日历表
+type TabCalendar struct {
+	ID          uint   `gorm:"primarykey"`
+	UserID      uint   `gorm:"not null;comment:创建人ID"`
+	Name        string `gorm:"size:100;not null;comment:日历名称"`
+	Description string `gorm:"size:500;comment:日历描述"`
+	Color       string `gorm:"size:50;default:#3788d9;comment:日历颜色"`
+	IsPublic    bool   `gorm:"default:false;comment:是否公开"`
+
+	CreatedAt *time.Time     `gorm:"type:datetime;autoCreateTime;comment:创建时间"`
+	UpdatedAt *time.Time     `gorm:"type:datetime;autoUpdateTime;comment:最后修改时间"`
+	DeletedAt gorm.DeletedAt `gorm:"index"`
+}
+
+// TabCalendarEvent 日历事件表
+type TabCalendarEvent struct {
+	ID         uint   `gorm:"primarykey"`
+	CalendarID uint   `gorm:"not null;index;comment:关联日历ID"`
+	UserID     uint   `gorm:"not null;comment:创建人ID"`
+	Title      string `gorm:"size:200;not null;comment:事件标题"`
+	StartDate  string `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
+	EndDate    string `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
+	BgColor    string `gorm:"size:50;default:#3788d9;comment:背景颜色"`
+	Remark     string `gorm:"type:text;comment:备注"`
+
+	CreatedAt *time.Time     `gorm:"type:datetime;autoCreateTime;comment:创建时间"`
+	UpdatedAt *time.Time     `gorm:"type:datetime;autoUpdateTime;comment:最后修改时间"`
+	DeletedAt gorm.DeletedAt `gorm:"index"`
+}
+
+// TabCalendarLog 日历操作日志表
+type TabCalendarLog struct {
+	ID         uint   `gorm:"primarykey"`
+	CalendarID uint   `gorm:"not null;index;comment:关联日历ID"`
+	EventID    uint   `gorm:"not null;index;comment:关联事件ID（可选）"`
+	UserID     uint   `gorm:"not null;comment:操作人ID"`
+	ActionType string `gorm:"size:50;not null;comment:操作类型: create-创建 update-修改 delete-删除"`
+	OldContent string `gorm:"type:text;comment:修改前内容(JSON)"`
+	NewContent string `gorm:"type:text;comment:修改后内容(JSON)"`
+	IP         string `gorm:"size:50;comment:操作IP"`
+	Remark     string `gorm:"size:500;comment:备注/操作描述"`
+
+	CreatedAt *time.Time `gorm:"type:datetime;autoCreateTime;comment:操作时间"`
+}
+
+// 请求结构体
+type fromCreateCalendar struct {
+	Name        string `json:"name" binding:"required"`
+	Description string `json:"description"`
+	Color       string `json:"color"`
+	IsPublic    bool   `json:"is_public"`
+}
+
+type fromUpdateCalendar struct {
+	ID          uint   `json:"id" binding:"required"`
+	Name        string `json:"name" binding:"required"`
+	Description string `json:"description"`
+	Color       string `json:"color"`
+	IsPublic    bool   `json:"is_public"`
+}
+
+type fromDeleteCalendar struct {
+	ID uint `json:"id" binding:"required"`
+}
+
+type fromGetCalendarEvents struct {
+	CalendarID uint   `json:"calendar_id" binding:"required"`
+	Start      string `json:"start" binding:"required"`
+	End        string `json:"end" binding:"required"`
+}
+
+type fromAddCalendarEvent struct {
+	CalendarID uint   `json:"calendar_id" binding:"required"`
+	Title      string `json:"title" binding:"required"`
+	Start      string `json:"start" binding:"required"`
+	End        string `json:"end" binding:"required"`
+	Color      string `json:"color"`
+	Remark     string `json:"remark"`
+}
+
+type fromUpdateCalendarEvent struct {
+	ID         uint   `json:"id" binding:"required"`
+	Title      string `json:"title" binding:"required"`
+	Start      string `json:"start" binding:"required"`
+	End        string `json:"end" binding:"required"`
+	Color      string `json:"color"`
+	Remark     string `json:"remark"`
+}
+
+type fromDeleteCalendarEvent struct {
+	ID uint `json:"id" binding:"required"`
+}
+
+func ApiCalendarInit() {
+	// 初始化数据表
+	models.DB.AutoMigrate(&TabCalendar{})
+	models.DB.AutoMigrate(&TabCalendarEvent{})
+	models.DB.AutoMigrate(&TabCalendarLog{})
+}
+
+func ApiCalendar(r *gin.RouterGroup) {
+	// 创建日历
+	r.POST("/calendar/create", func(ctx *gin.Context) {
+		isAuth, user, data := AuthenticationAuthority(ctx)
+		if isAuth {
+			var from fromCreateCalendar
+			if err := mapstructure.Decode(data, &from); err == nil {
+				calendar := TabCalendar{
+					UserID:      user.ID,
+					Name:        from.Name,
+					Description: from.Description,
+					Color:       from.Color,
+					IsPublic:    from.IsPublic,
+				}
+				if calendar.Color == "" {
+					calendar.Color = "#3788d9"
+				}
+				if models.DB.Create(&calendar).Error == nil {
+					// 记录日志
+					newContent, _ := json.Marshal(calendar)
+					log := TabCalendarLog{
+						CalendarID: calendar.ID,
+						UserID:     user.ID,
+						ActionType: "create",
+						NewContent: string(newContent),
+						IP:         ctx.ClientIP(),
+					}
+					models.DB.Create(&log)
+					ReturnJson(ctx, "apiOK", gin.H{"id": calendar.ID})
+				} else {
+					ReturnJson(ctx, "apiErr", nil)
+				}
+			} else {
+				ReturnJson(ctx, "jsonErr", nil)
+			}
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+
+	// 获取日历列表
+	r.POST("/calendar/list", func(ctx *gin.Context) {
+		isAuth, _, _ := AuthenticationAuthority(ctx)
+		if isAuth {
+			var calendars []TabCalendar
+			models.DB.Where("deleted_at IS NULL").Order("created_at DESC").Find(&calendars)
+			ReturnJson(ctx, "apiOK", gin.H{"list": calendars})
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+
+	// 更新日历
+	r.POST("/calendar/update", func(ctx *gin.Context) {
+		isAuth, user, data := AuthenticationAuthority(ctx)
+		if isAuth {
+			var from fromUpdateCalendar
+			if err := mapstructure.Decode(data, &from); err == nil {
+				oldCalendar := TabCalendar{}
+				if models.DB.Where("id = ?", from.ID).First(&oldCalendar).Error == nil {
+					// 检查权限（只有创建人可以修改）
+					if oldCalendar.UserID != user.ID {
+						ReturnJson(ctx, "permission_denied", nil)
+						return
+					}
+
+					newCalendar := TabCalendar{
+						Name:        from.Name,
+						Description: from.Description,
+						Color:       from.Color,
+						IsPublic:    from.IsPublic,
+					}
+					if newCalendar.Color == "" {
+						newCalendar.Color = "#3788d9"
+					}
+
+					if models.DB.Model(&oldCalendar).Updates(&newCalendar).Error == nil {
+						// 记录日志
+						newContent, _ := json.Marshal(newCalendar)
+						oldContent, _ := json.Marshal(oldCalendar)
+						log := TabCalendarLog{
+							CalendarID: oldCalendar.ID,
+							UserID:     user.ID,
+							ActionType: "update",
+							OldContent: string(oldContent),
+							NewContent: string(newContent),
+							IP:         ctx.ClientIP(),
+						}
+						models.DB.Create(&log)
+						ReturnJson(ctx, "apiOK", nil)
+					} else {
+						ReturnJson(ctx, "apiErr", nil)
+					}
+				} else {
+					ReturnJson(ctx, "calendar_not_find", nil)
+				}
+			} else {
+				ReturnJson(ctx, "jsonErr", nil)
+			}
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+
+	// 删除日历
+	r.POST("/calendar/delete", func(ctx *gin.Context) {
+		isAuth, user, data := AuthenticationAuthority(ctx)
+		if isAuth {
+			var from fromDeleteCalendar
+			if err := mapstructure.Decode(data, &from); err == nil {
+				oldCalendar := TabCalendar{}
+				if models.DB.Where("id = ?", from.ID).First(&oldCalendar).Error == nil {
+					// 检查权限（只有创建人可以删除）
+					if oldCalendar.UserID != user.ID {
+						ReturnJson(ctx, "permission_denied", nil)
+						return
+					}
+
+					// 软删除日历
+					if models.DB.Delete(&oldCalendar).Error == nil {
+						// 记录日志
+						oldContent, _ := json.Marshal(oldCalendar)
+						log := TabCalendarLog{
+							CalendarID: oldCalendar.ID,
+							UserID:     user.ID,
+							ActionType: "delete",
+							OldContent: string(oldContent),
+							IP:         ctx.ClientIP(),
+						}
+						models.DB.Create(&log)
+						ReturnJson(ctx, "apiOK", nil)
+					} else {
+						ReturnJson(ctx, "apiErr", nil)
+					}
+				} else {
+					ReturnJson(ctx, "calendar_not_find", nil)
+				}
+			} else {
+				ReturnJson(ctx, "jsonErr", nil)
+			}
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+
+	// 获取日历事件
+	r.POST("/calendar/events", func(ctx *gin.Context) {
+		isAuth, _, data := AuthenticationAuthority(ctx)
+		if isAuth {
+			var from fromGetCalendarEvents
+			if err := mapstructure.Decode(data, &from); err == nil {
+				var events []TabCalendarEvent
+				models.DB.Where("calendar_id = ? AND start_date <= ? AND end_date >= ? AND deleted_at IS NULL",
+					from.CalendarID, from.End, from.Start).Find(&events)
+
+				// 为事件添加编辑权限标识
+				var relist []map[string]interface{}
+				for _, event := range events {
+					data, _ := json.Marshal(event)
+					var temp map[string]interface{}
+					json.Unmarshal(data, &temp)
+					// 这里可以根据需要添加 edit 字段
+					relist = append(relist, temp)
+				}
+
+				ReturnJson(ctx, "apiOK", gin.H{"list": relist})
+			} else {
+				ReturnJson(ctx, "jsonErr", nil)
+			}
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+
+	// 添加日历事件
+	r.POST("/calendar/addevent", func(ctx *gin.Context) {
+		isAuth, user, data := AuthenticationAuthority(ctx)
+		if isAuth {
+			var from fromAddCalendarEvent
+			if err := mapstructure.Decode(data, &from); err == nil {
+				// 检查日历是否存在
+				var calendar TabCalendar
+				if models.DB.Where("id = ? AND deleted_at IS NULL", from.CalendarID).First(&calendar).Error != nil {
+					ReturnJson(ctx, "calendar_not_find", nil)
+					return
+				}
+
+				event := TabCalendarEvent{
+					CalendarID: from.CalendarID,
+					UserID:     user.ID,
+					Title:      from.Title,
+					StartDate:  from.Start,
+					EndDate:    from.End,
+					BgColor:    from.Color,
+					Remark:     from.Remark,
+				}
+				if event.BgColor == "" {
+					event.BgColor = calendar.Color
+				}
+
+				if models.DB.Create(&event).Error == nil {
+					// 记录日志
+					newContent, _ := json.Marshal(event)
+					log := TabCalendarLog{
+						CalendarID: event.CalendarID,
+						EventID:    event.ID,
+						UserID:     user.ID,
+						ActionType: "create_event",
+						NewContent: string(newContent),
+						IP:         ctx.ClientIP(),
+					}
+					models.DB.Create(&log)
+					ReturnJson(ctx, "apiOK", gin.H{"id": event.ID})
+				} else {
+					ReturnJson(ctx, "apiErr", nil)
+				}
+			} else {
+				ReturnJson(ctx, "jsonErr", nil)
+			}
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+
+	// 更新日历事件
+	r.POST("/calendar/updateevent", func(ctx *gin.Context) {
+		isAuth, user, data := AuthenticationAuthority(ctx)
+		if isAuth {
+			var from fromUpdateCalendarEvent
+			if err := mapstructure.Decode(data, &from); err == nil {
+				oldEvent := TabCalendarEvent{}
+				if models.DB.Where("id = ?", from.ID).First(&oldEvent).Error == nil {
+					// 检查权限（只有创建人可以修改）
+					if oldEvent.UserID != user.ID {
+						ReturnJson(ctx, "permission_denied", nil)
+						return
+					}
+
+					newEvent := TabCalendarEvent{
+						Title:   from.Title,
+						StartDate: from.Start,
+						EndDate: from.End,
+						BgColor: from.Color,
+						Remark:  from.Remark,
+					}
+					if newEvent.BgColor == "" {
+						// 获取日历颜色
+						var calendar TabCalendar
+						models.DB.Where("id = ?", oldEvent.CalendarID).First(&calendar)
+						newEvent.BgColor = calendar.Color
+					}
+
+					if models.DB.Model(&oldEvent).Updates(&newEvent).Error == nil {
+						// 记录日志
+						newContent, _ := json.Marshal(newEvent)
+						oldContent, _ := json.Marshal(oldEvent)
+						log := TabCalendarLog{
+							CalendarID: oldEvent.CalendarID,
+							EventID:    oldEvent.ID,
+							UserID:     user.ID,
+							ActionType: "update_event",
+							OldContent: string(oldContent),
+							NewContent: string(newContent),
+							IP:         ctx.ClientIP(),
+						}
+						models.DB.Create(&log)
+						ReturnJson(ctx, "apiOK", nil)
+					} else {
+						ReturnJson(ctx, "apiErr", nil)
+					}
+				} else {
+					ReturnJson(ctx, "event_not_find", nil)
+				}
+			} else {
+				ReturnJson(ctx, "jsonErr", nil)
+			}
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+
+	// 删除日历事件
+	r.POST("/calendar/deleteevent", func(ctx *gin.Context) {
+		isAuth, user, data := AuthenticationAuthority(ctx)
+		if isAuth {
+			var from fromDeleteCalendarEvent
+			if err := mapstructure.Decode(data, &from); err == nil {
+				oldEvent := TabCalendarEvent{}
+				if models.DB.Where("id = ?", from.ID).First(&oldEvent).Error == nil {
+					// 检查权限（只有创建人可以删除）
+					if oldEvent.UserID != user.ID {
+						ReturnJson(ctx, "permission_denied", nil)
+						return
+					}
+
+					if models.DB.Delete(&oldEvent).Error == nil {
+						// 记录日志
+						oldContent, _ := json.Marshal(oldEvent)
+						log := TabCalendarLog{
+							CalendarID: oldEvent.CalendarID,
+							EventID:    oldEvent.ID,
+							UserID:     user.ID,
+							ActionType: "delete_event",
+							OldContent: string(oldContent),
+							IP:         ctx.ClientIP(),
+						}
+						models.DB.Create(&log)
+						ReturnJson(ctx, "apiOK", nil)
+					} else {
+						ReturnJson(ctx, "apiErr", nil)
+					}
+				} else {
+					ReturnJson(ctx, "event_not_find", nil)
+				}
+			} else {
+				ReturnJson(ctx, "jsonErr", nil)
+			}
+		} else {
+			ReturnJson(ctx, "userCookieError", nil)
+		}
+	})
+}
diff --git a/frontend/ops_vue_js/src/api/calendar.js b/frontend/ops_vue_js/src/api/calendar.js
new file mode 100644
index 0000000..26fb8fb
--- /dev/null
+++ b/frontend/ops_vue_js/src/api/calendar.js
@@ -0,0 +1,43 @@
+import { api } from './index'
+
+export const calendarApi = {
+  // 创建日历
+  createCalendar(data) {
+    return api.post('/calendar/calendar/create', { data })
+  },
+
+  // 获取日历列表
+  getCalendars() {
+    return api.post('/calendar/calendar/list', { data: {} })
+  },
+
+  // 更新日历
+  updateCalendar(data) {
+    return api.post('/calendar/calendar/update', { data })
+  },
+
+  // 删除日历
+  deleteCalendar(id) {
+    return api.post('/calendar/calendar/delete', { data: { id } })
+  },
+
+  // 获取日历事件
+  getEvents(data) {
+    return api.post('/calendar/calendar/events', { data })
+  },
+
+  // 添加日历事件
+  addEvent(data) {
+    return api.post('/calendar/calendar/addevent', { data })
+  },
+
+  // 更新日历事件
+  updateEvent(data) {
+    return api.post('/calendar/calendar/updateevent', { data })
+  },
+
+  // 删除日历事件
+  deleteEvent(id) {
+    return api.post('/calendar/calendar/deleteevent', { data: { id } })
+  }
+}
diff --git a/frontend/ops_vue_js/src/components/AppHeader.vue b/frontend/ops_vue_js/src/components/AppHeader.vue
index 504a485..e1d632c 100644
--- a/frontend/ops_vue_js/src/components/AppHeader.vue
+++ b/frontend/ops_vue_js/src/components/AppHeader.vue
@@ -54,6 +54,7 @@ const normalClass = "rounded-md px-3 py-2 text-sm font-medium text-gray-600 tran
 const navItems = computed(() => [
   { label: t("appname.home"), to: "/" },
   { label: t("appname.schedule"), to: "/schedule" },
+  { label: t("appname.calendar"), to: "/calendars" },
   { label: t("appname.purchase"), to: "/purchase" },
   { label: t("appname.work_order"), to: "/work_order" },
   { label: t("appname.warehouse"), to: "/warehouse" },
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index ef99ab5..ec6d7f7 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -33,7 +33,8 @@
     "purchase": "Purchase",
     "warehouse": "Warehouse",
     "warehouse_items": "Items Overview",
-    "work_order": "Work Order"
+    "work_order": "Work Order",
+    "calendar": "Calendar"
   },
   "tagadder": {
     "not_fund_item": "No matching items found",
@@ -601,5 +602,41 @@
     "created_by": "Created By",
     "not_found": "Customer not found",
     "related_customers": "Related Customers"
+  },
+  "calendar": {
+    "calendars": "Calendar List",
+    "calendar_detail": "Calendar Detail",
+    "create_calendar": "Create Calendar",
+    "edit_calendar": "Edit Calendar",
+    "delete_calendar": "Delete Calendar",
+    "calendar_not_found": "Calendar not found",
+    "no_calendars": "No calendars yet",
+    "name": "Name",
+    "name_required": "Calendar name is required",
+    "name_placeholder": "Enter calendar name",
+    "description": "Description",
+    "description_placeholder": "Enter calendar description",
+    "color": "Color",
+    "is_public": "Public Calendar",
+    "public": "Public",
+    "private": "Private",
+    "create_success": "Calendar created successfully",
+    "update_success": "Calendar updated successfully",
+    "delete_success": "Calendar deleted successfully",
+    "confirm_delete": "Are you sure you want to delete this calendar?",
+    "loading": "Loading...",
+    "add_event": "Add Event",
+    "edit_event": "Edit Event",
+    "delete_event": "Delete Event",
+    "event_title": "Event Title",
+    "event_title_required": "Event title is required",
+    "event_title_placeholder": "Enter event title",
+    "start_date": "Start Date",
+    "end_date": "End Date",
+    "remark": "Remark",
+    "remark_placeholder": "Enter remark",
+    "event_save_success": "Event saved successfully",
+    "event_delete_success": "Event deleted successfully",
+    "confirm_delete_event": "Are you sure you want to delete this event?"
   }
 }
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index 4e27e17..e14f6f3 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -33,7 +33,8 @@
     "purchase": "采购",
     "warehouse": "仓库",
     "warehouse_items": "物品总览",
-    "work_order": "工单"
+    "work_order": "工单",
+    "calendar": "日历"
   },
   "tagadder": {
     "not_fund_item": "没有找到匹配项",
@@ -601,5 +602,41 @@
     "created_by": "创建者",
     "not_found": "客户不存在",
     "related_customers": "关联客户"
+  },
+  "calendar": {
+    "calendars": "日历列表",
+    "calendar_detail": "日历详情",
+    "create_calendar": "新建日历",
+    "edit_calendar": "编辑日历",
+    "delete_calendar": "删除日历",
+    "calendar_not_found": "日历未找到",
+    "no_calendars": "暂无日历",
+    "name": "名称",
+    "name_required": "请输入日历名称",
+    "name_placeholder": "请输入日历名称",
+    "description": "描述",
+    "description_placeholder": "请输入日历描述",
+    "color": "颜色",
+    "is_public": "公开日历",
+    "public": "公开",
+    "private": "私有",
+    "create_success": "创建成功",
+    "update_success": "更新成功",
+    "delete_success": "删除成功",
+    "confirm_delete": "确定要删除此日历吗？",
+    "loading": "加载中...",
+    "add_event": "添加事件",
+    "edit_event": "编辑事件",
+    "delete_event": "删除事件",
+    "event_title": "事件标题",
+    "event_title_required": "请输入事件标题",
+    "event_title_placeholder": "请输入事件标题",
+    "start_date": "开始日期",
+    "end_date": "结束日期",
+    "remark": "备注",
+    "remark_placeholder": "请输入备注",
+    "event_save_success": "事件保存成功",
+    "event_delete_success": "事件删除成功",
+    "confirm_delete_event": "确定要删除此事件吗？"
   }
 }
diff --git a/frontend/ops_vue_js/src/router/index.js b/frontend/ops_vue_js/src/router/index.js
index 52c21f2..f30419b 100644
--- a/frontend/ops_vue_js/src/router/index.js
+++ b/frontend/ops_vue_js/src/router/index.js
@@ -129,6 +129,16 @@ const router = createRouter({
           name: 'customer-edit',
           component: () => import('@/views/customer/CustomerFormPage.vue'),
         },
+        {
+          path: 'calendars',
+          name: 'calendars',
+          component: () => import('@/views/calendar/CalendarList.vue'),
+        },
+        {
+          path: 'calendar/:id',
+          name: 'calendar-detail',
+          component: () => import('@/views/calendar/CalendarDetail.vue'),
+        },
       ],
     },
 
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
new file mode 100644
index 0000000..0657f2c
--- /dev/null
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -0,0 +1,492 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount, nextTick } from "vue"
+import { useRoute, useRouter } from "vue-router"
+import FullCalendar from "@fullcalendar/vue3"
+import dayGridPlugin from "@fullcalendar/daygrid"
+import timeGridPlugin from "@fullcalendar/timegrid"
+import interactionPlugin from "@fullcalendar/interaction"
+import listPlugin from "@fullcalendar/list"
+import { useI18n } from "vue-i18n"
+import { usePageTitle } from "@/composables/usePageTitle"
+import { useToastStore } from "@/stores/toast"
+import { useUserStore } from "@/stores/user"
+import { calendarApi } from "@/api/calendar"
+import { useDateUtils } from "@/composables/useDateUtils"
+import { IconPlus, IconTrash, IconEdit, IconCalendar } from "@tabler/icons-vue"
+
+const route = useRoute()
+const router = useRouter()
+const { t, locale } = useI18n()
+const toast = useToastStore()
+const userStore = useUserStore()
+const DateUtils = useDateUtils()
+
+const calendarId = ref(parseInt(route.params.id))
+const calendarInfo = ref({})
+const loading = ref(false)
+
+usePageTitle('appname.calendar_detail')
+
+const calendarRef = ref(null)
+const calendarNowShow = ref()
+
+const showModal = ref(false)
+const eventData = ref({
+  id: 0,
+  title: "",
+  startDate: "",
+  endDate: "",
+  color: "#3788d9",
+  remark: "",
+  isEditing: false,
+  isEditable: false
+})
+
+const colorOptions = ref([
+  { value: "#3788d9", label: t("schedule.work") },
+  { value: "#06d6a0", label: t("schedule.duty") },
+  { value: "#ff595e", label: t("schedule.exam") },
+  { value: "#ffca3a", label: t("schedule.standby") },
+])
+
+const pageData = ref({
+  seleEventID: 0,
+  lastClickTime: 0,
+  lastClickTimeStr: "",
+  lastEventClickTime: 0,
+  lastEventClickID: 0,
+  submitChecked: false
+})
+
+function openEventModal(startDate, endDate) {
+  eventData.value = {
+    id: 0,
+    title: "",
+    startDate: startDate || "",
+    endDate: endDate || "",
+    color: calendarInfo.value.Color || "#3788d9",
+    remark: "",
+    isEditing: false,
+    isEditable: true
+  }
+  showModal.value = true
+}
+
+function editEvent(event) {
+  eventData.value = {
+    id: event.id,
+    title: event.title,
+    startDate: event.start,
+    endDate: event.end || event.start,
+    color: event.backgroundColor,
+    remark: event.extendedProps?.remark || "",
+    isEditing: true,
+    isEditable: true
+  }
+  showModal.value = true
+}
+
+async function saveEvent() {
+  if (!eventData.value.title.trim()) {
+    toast.error(t('calendar.event_title_required'))
+    return
+  }
+
+  pageData.value.submitChecked = true
+
+  try {
+    let result
+    if (eventData.value.isEditing) {
+      result = await calendarApi.updateEvent({
+        id: eventData.value.id,
+        title: eventData.value.title,
+        start: eventData.value.startDate,
+        end: eventData.value.endDate,
+        color: eventData.value.color,
+        remark: eventData.value.remark
+      })
+    } else {
+      result = await calendarApi.addEvent({
+        calendar_id: calendarId.value,
+        title: eventData.value.title,
+        start: eventData.value.startDate,
+        end: eventData.value.endDate,
+        color: eventData.value.color,
+        remark: eventData.value.remark
+      })
+    }
+
+    if (result.errCode === 0) {
+      toast.success(t('calendar.event_save_success'))
+      showModal.value = false
+      getEvents()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  } finally {
+    pageData.value.submitChecked = false
+  }
+}
+
+async function deleteEvent() {
+  if (!confirm(t('calendar.confirm_delete_event'))) {
+    return
+  }
+
+  try {
+    const result = await calendarApi.deleteEvent(eventData.value.id)
+    if (result.errCode === 0) {
+      toast.success(t('calendar.event_delete_success'))
+      showModal.value = false
+      getEvents()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  }
+}
+
+async function getEvents() {
+  if (!calendarRef.value) return
+
+  const calendarApi2 = calendarRef.value.getApi()
+  const view = calendarApi2.view
+  const start = DateUtils.formatDate(view.activeStart)
+  const end = DateUtils.formatDate(view.activeEnd)
+
+  try {
+    const { errCode, data } = await calendarApi.getEvents({
+      calendar_id: calendarId.value,
+      start: start,
+      end: end
+    })
+
+    if (errCode === 0) {
+      const events = (data.list || []).map(event => ({
+        id: event.ID,
+        title: event.Title,
+        start: event.StartDate,
+        end: event.EndDate,
+        backgroundColor: event.BgColor,
+        borderColor: event.BgColor,
+        extendedProps: {
+          remark: event.Remark
+        }
+      }))
+      calendarOptions.value.events = events
+    }
+  } catch {
+    // 拦截器已处理
+  }
+}
+
+async function fetchCalendarInfo() {
+  loading.value = true
+  try {
+    const { errCode, data } = await calendarApi.getCalendars()
+    if (errCode === 0) {
+      const calendar = (data.list || []).find(c => c.ID === calendarId.value)
+      if (calendar) {
+        calendarInfo.value = calendar
+      } else {
+        toast.error(t('calendar.calendar_not_found'))
+        router.push('/calendars')
+      }
+    }
+  } catch {
+    // 拦截器已处理
+  } finally {
+    loading.value = false
+  }
+}
+
+function unseleEvent(eventID) {
+  const target = calendarOptions.value.events.find(item => item.id === eventID)
+  if (target) {
+    target.borderColor = target.backgroundColor
+  }
+}
+
+function unseleEventAll() {
+  unseleEvent(pageData.value.seleEventID)
+  pageData.value.seleEventID = 0
+}
+
+const calendarOptions = ref({
+  height: "100%",
+  contentHeight: "auto",
+  locale: locale.value,
+  plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin, listPlugin],
+  nowIndicator: true,
+  weekends: true,
+  initialView: "dayGridMonth",
+  selectable: true,
+  editable: true,
+  dayMaxEvents: true,
+  firstDay: 1,
+  expandRows: true,
+  stickyHeaderDates: true,
+
+  headerToolbar: {
+    left: "prevYear,prev,today,next,nextYear",
+    center: "title",
+    right: ""
+  },
+
+  customButtons: {
+    prevYear: {
+      text: t("schedule.previous_year"),
+      click() {
+        calendarRef.value.getApi().prevYear()
+        getEvents()
+      }
+    },
+    nextYear: {
+      text: t("schedule.next_year"),
+      click() {
+        calendarRef.value.getApi().nextYear()
+        getEvents()
+      }
+    },
+    prev: {
+      text: t("schedule.previous_month"),
+      click() {
+        calendarRef.value.getApi().prev()
+        getEvents()
+      }
+    },
+    next: {
+      text: t("schedule.next_month"),
+      click() {
+        calendarRef.value.getApi().next()
+        getEvents()
+      }
+    },
+    today: {
+      text: t("schedule.today"),
+      click() {
+        calendarRef.value.getApi().today()
+        getEvents()
+      }
+    }
+  },
+
+  events: [],
+
+  datesSet(info) {
+    calendarNowShow.value = info
+    getEvents()
+  },
+
+  dateClick(info) {
+    const nowTime = new Date().getTime()
+    const timeDifference = nowTime - pageData.value.lastClickTime
+
+    unseleEventAll()
+
+    if (info.dateStr === pageData.value.lastClickTimeStr) {
+      if (timeDifference < 400 && timeDifference > 0) {
+        if (userStore.isLoggedIn) {
+          openEventModal(info.dateStr, info.dateStr)
+        } else {
+          toast.warning(t("message.login_to_your_account"))
+          router.replace("/login?redirect=/calendar/" + calendarId.value)
+        }
+      }
+    }
+    pageData.value.lastClickTimeStr = info.dateStr
+    pageData.value.lastClickTime = nowTime
+  },
+
+  select(info) {
+    if (info.end - info.start > 86400000) {
+      if (userStore.isLoggedIn) {
+        openEventModal(info.startStr, info.endStr)
+      } else {
+        toast.warning(t("message.login_to_your_account"))
+      }
+    }
+  },
+
+  eventClick(info) {
+    const nowTime = new Date().getTime()
+    const timeDifference = nowTime - pageData.value.lastEventClickTime
+
+    if (info.event.id === pageData.value.lastEventClickID) {
+      if (timeDifference < 400 && timeDifference > 0) {
+        editEvent({
+          id: info.event.id,
+          title: info.event.title,
+          start: info.event.startStr?.split('T')[0] || info.event.start?.toISOString().split('T')[0],
+          end: info.event.endStr?.split('T')[0] || info.event.end?.toISOString().split('T')[0],
+          backgroundColor: info.event.backgroundColor
+        })
+      }
+    }
+    pageData.value.lastEventClickID = info.event.id
+    pageData.value.lastEventClickTime = nowTime
+
+    // 选中效果
+    unseleEventAll()
+    const target = calendarOptions.value.events.find(item => String(item.id) === String(info.event.id))
+    if (target) {
+      target.borderColor = "#000000"
+      pageData.value.seleEventID = target.id
+    }
+  }
+})
+
+onMounted(() => {
+  fetchCalendarInfo()
+})
+</script>
+
+<template>
+  <div class="flex flex-col gap-6 px-6 py-6">
+    <div class="flex items-center justify-between">
+      <div class="flex items-center gap-3">
+        <button
+          @click="router.push('/calendars')"
+          class="rounded-lg p-2 text-gray-600 transition-colors hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-dk-muted"
+        >
+          ←
+        </button>
+        <div>
+          <h3 class="text-lg font-semibold text-gray-900 dark:text-white">
+            {{ calendarInfo.Name || t('calendar.loading') }}
+          </h3>
+          <p v-if="calendarInfo.Description" class="text-sm text-gray-500 dark:text-gray-400">
+            {{ calendarInfo.Description }}
+          </p>
+        </div>
+      </div>
+      <div
+        v-if="userStore.isLoggedIn"
+        class="flex items-center gap-2"
+      >
+        <button
+          @click="openEventModal()"
+          class="inline-flex items-center gap-1.5 rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+        >
+          <IconPlus :size="16" />
+          {{ t('calendar.add_event') }}
+        </button>
+      </div>
+    </div>
+
+    <div class="rounded-xl border border-gray-200 bg-white shadow-lg dark:border-dk-muted dark:bg-dk-card">
+      <FullCalendar
+        ref="calendarRef"
+        :options="calendarOptions"
+      />
+    </div>
+
+    <!-- Event Modal -->
+    <div
+      v-if="showModal"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
+      @click.self="showModal = false"
+    >
+      <div class="w-full max-w-md rounded-xl bg-white p-6 shadow-xl dark:bg-dk-card">
+        <h3 class="mb-4 text-lg font-semibold text-gray-900 dark:text-white">
+          {{ eventData.isEditing ? t('calendar.edit_event') : t('calendar.add_event') }}
+        </h3>
+
+        <div class="mb-4">
+          <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+            {{ t('calendar.event_title') }} *
+          </label>
+          <input
+            v-model="eventData.title"
+            type="text"
+            class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+            :placeholder="t('calendar.event_title_placeholder')"
+          />
+        </div>
+
+        <div class="mb-4 grid grid-cols-2 gap-3">
+          <div>
+            <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+              {{ t('calendar.start_date') }} *
+            </label>
+            <input
+              v-model="eventData.startDate"
+              type="date"
+              class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+            />
+          </div>
+          <div>
+            <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+              {{ t('calendar.end_date') }} *
+            </label>
+            <input
+              v-model="eventData.endDate"
+              type="date"
+              class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+            />
+          </div>
+        </div>
+
+        <div class="mb-4">
+          <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+            {{ t('calendar.color') }}
+          </label>
+          <div class="flex gap-2">
+            <button
+              v-for="color in colorOptions"
+              :key="color.value"
+              @click="eventData.color = color.value"
+              class="h-8 w-8 rounded-full transition-transform hover:scale-110"
+              :class="{ 'ring-2 ring-blue-500 ring-offset-2': eventData.color === color.value }"
+              :style="{ backgroundColor: color.value }"
+              :title="color.label"
+            ></button>
+          </div>
+        </div>
+
+        <div class="mb-4">
+          <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+            {{ t('calendar.remark') }}
+          </label>
+          <textarea
+            v-model="eventData.remark"
+            rows="3"
+            class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+            :placeholder="t('calendar.remark_placeholder')"
+          ></textarea>
+        </div>
+
+        <div class="flex justify-between">
+          <button
+            v-if="eventData.isEditing"
+            @click="deleteEvent"
+            class="inline-flex items-center gap-1 rounded-lg bg-red-600 px-3 py-2 text-sm font-medium text-white transition-colors hover:bg-red-700"
+          >
+            <IconTrash :size="16" />
+            {{ t('delete') }}
+          </button>
+          <div v-else></div>
+
+          <div class="flex gap-2">
+            <button
+              @click="showModal = false"
+              class="rounded-lg border border-gray-300 px-4 py-2 text-sm text-gray-600 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:text-gray-300 dark:hover:bg-dk-muted"
+            >
+              {{ t('cancel') }}
+            </button>
+            <button
+              @click="saveEvent"
+              :disabled="pageData.submitChecked"
+              class="rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-blue-700 disabled:opacity-50"
+            >
+              {{ t('save') }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarList.vue b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
new file mode 100644
index 0000000..a0374fe
--- /dev/null
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
@@ -0,0 +1,376 @@
+<script setup>
+import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { useI18n } from 'vue-i18n'
+import { useToastStore } from '@/stores/toast'
+import { usePageTitle } from '@/composables/usePageTitle'
+import { calendarApi } from '@/api/calendar'
+import { useUserStore } from '@/stores/user'
+import { IconPlus, IconCalendar, IconTrash, IconEdit } from '@tabler/icons-vue'
+
+usePageTitle('appname.calendar')
+const { t } = useI18n()
+const router = useRouter()
+const toast = useToastStore()
+const userStore = useUserStore()
+
+const calendars = ref([])
+const loading = ref(false)
+const showCreateModal = ref(false)
+const showEditModal = ref(false)
+const editingCalendar = ref(null)
+
+const form = ref({
+  name: '',
+  description: '',
+  color: '#3788d9',
+  is_public: false
+})
+
+const colorOptions = [
+  '#3788d9',
+  '#06d6a0',
+  '#ff595e',
+  '#ffca3a',
+  '#8b5cf6',
+  '#ec4899'
+]
+
+async function fetchCalendars() {
+  loading.value = true
+  try {
+    const { errCode, data } = await calendarApi.getCalendars()
+    if (errCode === 0) {
+      calendars.value = data.list || []
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  } finally {
+    loading.value = false
+  }
+}
+
+function openCreateModal() {
+  form.value = { name: '', description: '', color: '#3788d9', is_public: false }
+  showCreateModal.value = true
+}
+
+function openEditModal(calendar) {
+  editingCalendar.value = calendar
+  form.value = {
+    name: calendar.Name,
+    description: calendar.Description || '',
+    color: calendar.Color,
+    is_public: calendar.IsPublic
+  }
+  showEditModal.value = true
+}
+
+async function createCalendar() {
+  if (!form.value.name.trim()) {
+    toast.error(t('calendar.name_required'))
+    return
+  }
+
+  try {
+    const { errCode, data } = await calendarApi.createCalendar(form.value)
+    if (errCode === 0) {
+      toast.success(t('calendar.create_success'))
+      showCreateModal.value = false
+      fetchCalendars()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  }
+}
+
+async function updateCalendar() {
+  if (!form.value.name.trim()) {
+    toast.error(t('calendar.name_required'))
+    return
+  }
+
+  try {
+    const { errCode } = await calendarApi.updateCalendar({
+      id: editingCalendar.value.ID,
+      ...form.value
+    })
+    if (errCode === 0) {
+      toast.success(t('calendar.update_success'))
+      showEditModal.value = false
+      fetchCalendars()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  }
+}
+
+async function deleteCalendar(calendar) {
+  if (!confirm(t('calendar.confirm_delete'))) {
+    return
+  }
+
+  try {
+    const { errCode } = await calendarApi.deleteCalendar(calendar.ID)
+    if (errCode === 0) {
+      toast.success(t('calendar.delete_success'))
+      fetchCalendars()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  }
+}
+
+function goToCalendar(id) {
+  router.push(`/calendar/${id}`)
+}
+
+onMounted(fetchCalendars)
+</script>
+
+<template>
+  <div class="mx-auto max-w-6xl px-6 py-6">
+    <div class="flex flex-col gap-6 rounded-xl border border-gray-200 bg-white shadow-lg dark:border-dk-muted dark:bg-dk-card">
+      <!-- Header -->
+      <div class="flex items-center justify-between border-b border-gray-100 px-6 py-4 dark:border-dk-muted">
+        <h3 class="text-lg font-semibold text-gray-900 dark:text-white">{{ t('calendar.calendars') }}</h3>
+        <button
+          @click="openCreateModal"
+          class="inline-flex items-center gap-1.5 rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+        >
+          <IconPlus :size="16" />
+          {{ t('calendar.create_calendar') }}
+        </button>
+      </div>
+
+      <!-- Calendar List -->
+      <div class="px-6 py-3">
+        <div v-if="loading" class="py-8 text-center text-gray-400">
+          <svg class="mx-auto mb-2 h-5 w-5 animate-spin text-gray-400" viewBox="0 0 24 24" fill="none">
+            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
+            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z" />
+          </svg>
+          Loading...
+        </div>
+
+        <div v-else-if="calendars.length === 0" class="py-8 text-center text-gray-400">
+          {{ t('calendar.no_calendars') }}
+        </div>
+
+        <div v-else class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+          <div
+            v-for="calendar in calendars"
+            :key="calendar.ID"
+            class="cursor-pointer rounded-lg border border-gray-200 p-4 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:hover:bg-dk-base"
+            @click="goToCalendar(calendar.ID)"
+          >
+            <div class="flex items-start justify-between">
+              <div class="flex items-center gap-3">
+                <div
+                  class="h-4 w-4 rounded-full"
+                  :style="{ backgroundColor: calendar.Color }"
+                ></div>
+                <div>
+                  <h4 class="font-medium text-gray-900 dark:text-white">{{ calendar.Name }}</h4>
+                  <p v-if="calendar.Description" class="mt-1 text-sm text-gray-500 dark:text-gray-400">
+                    {{ calendar.Description }}
+                  </p>
+                </div>
+              </div>
+
+              <div class="flex items-center gap-1" @click.stop>
+                <button
+                  v-if="calendar.UserID === userStore.userInfo.ID"
+                  @click="openEditModal(calendar)"
+                  class="rounded p-1 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-dk-muted"
+                >
+                  <IconEdit :size="16" />
+                </button>
+                <button
+                  v-if="calendar.UserID === userStore.userInfo.ID"
+                  @click="deleteCalendar(calendar)"
+                  class="rounded p-1 text-gray-400 transition-colors hover:bg-red-50 hover:text-red-600 dark:hover:bg-dk-muted"
+                >
+                  <IconTrash :size="16" />
+                </button>
+              </div>
+            </div>
+
+            <div class="mt-3 flex items-center gap-2 text-xs text-gray-400">
+              <IconCalendar :size="14" />
+              <span>{{ calendar.IsPublic ? t('calendar.public') : t('calendar.private') }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Create Calendar Modal -->
+  <div
+    v-if="showCreateModal"
+    class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
+    @click.self="showCreateModal = false"
+  >
+    <div class="w-full max-w-md rounded-xl bg-white p-6 shadow-xl dark:bg-dk-card">
+      <h3 class="mb-4 text-lg font-semibold text-gray-900 dark:text-white">
+        {{ t('calendar.create_calendar') }}
+      </h3>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.name') }} *
+        </label>
+        <input
+          v-model="form.name"
+          type="text"
+          class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+          :placeholder="t('calendar.name_placeholder')"
+        />
+      </div>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.description') }}
+        </label>
+        <textarea
+          v-model="form.description"
+          rows="3"
+          class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+          :placeholder="t('calendar.description_placeholder')"
+        ></textarea>
+      </div>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.color') }}
+        </label>
+        <div class="flex gap-2">
+          <button
+            v-for="color in colorOptions"
+            :key="color"
+            @click="form.color = color"
+            class="h-8 w-8 rounded-full transition-transform hover:scale-110"
+            :class="{ 'ring-2 ring-blue-500 ring-offset-2': form.color === color }"
+            :style="{ backgroundColor: color }"
+          ></button>
+        </div>
+      </div>
+
+      <div class="mb-6 flex items-center gap-2">
+        <input
+          id="is_public"
+          v-model="form.is_public"
+          type="checkbox"
+          class="rounded border-gray-300"
+        />
+        <label for="is_public" class="text-sm text-gray-700 dark:text-gray-300">
+          {{ t('calendar.is_public') }}
+        </label>
+      </div>
+
+      <div class="flex justify-end gap-2">
+        <button
+          @click="showCreateModal = false"
+          class="rounded-lg border border-gray-300 px-4 py-2 text-sm text-gray-600 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:text-gray-300 dark:hover:bg-dk-muted"
+        >
+          {{ t('cancel') }}
+        </button>
+        <button
+          @click="createCalendar"
+          class="rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+        >
+          {{ t('create') }}
+        </button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Edit Calendar Modal -->
+  <div
+    v-if="showEditModal"
+    class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
+    @click.self="showEditModal = false"
+  >
+    <div class="w-full max-w-md rounded-xl bg-white p-6 shadow-xl dark:bg-dk-card">
+      <h3 class="mb-4 text-lg font-semibold text-gray-900 dark:text-white">
+        {{ t('calendar.edit_calendar') }}
+      </h3>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.name') }} *
+        </label>
+        <input
+          v-model="form.name"
+          type="text"
+          class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+          :placeholder="t('calendar.name_placeholder')"
+        />
+      </div>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.description') }}
+        </label>
+        <textarea
+          v-model="form.description"
+          rows="3"
+          class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+          :placeholder="t('calendar.description_placeholder')"
+        ></textarea>
+      </div>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.color') }}
+        </label>
+        <div class="flex gap-2">
+          <button
+            v-for="color in colorOptions"
+            :key="color"
+            @click="form.color = color"
+            class="h-8 w-8 rounded-full transition-transform hover:scale-110"
+            :class="{ 'ring-2 ring-blue-500 ring-offset-2': form.color === color }"
+            :style="{ backgroundColor: color }"
+          ></button>
+        </div>
+      </div>
+
+      <div class="mb-6 flex items-center gap-2">
+        <input
+          id="edit_is_public"
+          v-model="form.is_public"
+          type="checkbox"
+          class="rounded border-gray-300"
+        />
+        <label for="edit_is_public" class="text-sm text-gray-700 dark:text-gray-300">
+          {{ t('calendar.is_public') }}
+        </label>
+      </div>
+
+      <div class="flex justify-end gap-2">
+        <button
+          @click="showEditModal = false"
+          class="rounded-lg border border-gray-300 px-4 py-2 text-sm text-gray-600 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:text-gray-300 dark:hover:bg-dk-muted"
+        >
+          {{ t('cancel') }}
+        </button>
+        <button
+          @click="updateCalendar"
+          class="rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+        >
+          {{ t('save') }}
+        </button>
+      </div>
+    </div>
+  </div>
+</template>

From 49785004aaa149134c7485a6d038c20ad77ac1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 15:47:26 +0800
Subject: [PATCH 02/21] up

---
 backend/my_work/routers/apiCalendar.go        |  77 ++-
 frontend/ops_vue_js/src/api/calendar.js       |  16 +-
 frontend/ops_vue_js/src/i18n/en.json          |   1 +
 frontend/ops_vue_js/src/i18n/zh-CN.json       |   1 +
 frontend/ops_vue_js/src/router/index.js       |   7 +-
 .../src/views/calendar/CalendarDetail.vue     | 618 +++++++++++-------
 .../src/views/calendar/CalendarList.vue       |   4 +-
 7 files changed, 438 insertions(+), 286 deletions(-)

diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index 59a3479..a93a141 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -26,14 +26,16 @@ type TabCalendar struct {
 
 // TabCalendarEvent 日历事件表
 type TabCalendarEvent struct {
-	ID         uint   `gorm:"primarykey"`
-	CalendarID uint   `gorm:"not null;index;comment:关联日历ID"`
-	UserID     uint   `gorm:"not null;comment:创建人ID"`
-	Title      string `gorm:"size:200;not null;comment:事件标题"`
-	StartDate  string `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
-	EndDate    string `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
-	BgColor    string `gorm:"size:50;default:#3788d9;comment:背景颜色"`
-	Remark     string `gorm:"type:text;comment:备注"`
+	ID         uint       `gorm:"primarykey"`
+	CalendarID uint       `gorm:"not null;index;comment:关联日历ID"`
+	UserID     uint       `gorm:"not null;comment:创建人ID"`
+	UsersID    []uint     `gorm:"type:json; null;comment:其他关联用户ID"`
+	Title      string     `gorm:"size:200;not null;comment:事件标题"`
+	StartDate  *time.Time `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
+	EndDate    *time.Time `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
+	IsAllDay   bool       `gorm:"default:true;comment:是否全日事件"`
+	BgColor    string     `gorm:"size:50;default:#3788d9;comment:背景颜色"`
+	Remark     string     `gorm:"type:text;comment:备注"`
 
 	CreatedAt *time.Time     `gorm:"type:datetime;autoCreateTime;comment:创建时间"`
 	UpdatedAt *time.Time     `gorm:"type:datetime;autoUpdateTime;comment:最后修改时间"`
@@ -60,7 +62,7 @@ type fromCreateCalendar struct {
 	Name        string `json:"name" binding:"required"`
 	Description string `json:"description"`
 	Color       string `json:"color"`
-	IsPublic    bool   `json:"is_public"`
+	Is_public   bool   `json:"is_public"`
 }
 
 type fromUpdateCalendar struct {
@@ -68,7 +70,7 @@ type fromUpdateCalendar struct {
 	Name        string `json:"name" binding:"required"`
 	Description string `json:"description"`
 	Color       string `json:"color"`
-	IsPublic    bool   `json:"is_public"`
+	Is_public   bool   `json:"is_public"`
 }
 
 type fromDeleteCalendar struct {
@@ -76,27 +78,27 @@ type fromDeleteCalendar struct {
 }
 
 type fromGetCalendarEvents struct {
-	CalendarID uint   `json:"calendar_id" binding:"required"`
-	Start      string `json:"start" binding:"required"`
-	End        string `json:"end" binding:"required"`
+	CalendarID uint       `json:"calendar_id" binding:"required"`
+	Start      *time.Time `json:"start" binding:"required"`
+	End        *time.Time `json:"end" binding:"required"`
 }
 
 type fromAddCalendarEvent struct {
-	CalendarID uint   `json:"calendar_id" binding:"required"`
-	Title      string `json:"title" binding:"required"`
-	Start      string `json:"start" binding:"required"`
-	End        string `json:"end" binding:"required"`
-	Color      string `json:"color"`
-	Remark     string `json:"remark"`
+	CalendarID uint       `json:"calendar_id" binding:"required"`
+	Title      string     `json:"title" binding:"required"`
+	Start      *time.Time `json:"start" binding:"required"`
+	End        *time.Time `json:"end" binding:"required"`
+	Color      string     `json:"color"`
+	Remark     string     `json:"remark"`
 }
 
 type fromUpdateCalendarEvent struct {
-	ID         uint   `json:"id" binding:"required"`
-	Title      string `json:"title" binding:"required"`
-	Start      string `json:"start" binding:"required"`
-	End        string `json:"end" binding:"required"`
-	Color      string `json:"color"`
-	Remark     string `json:"remark"`
+	ID     uint       `json:"id" binding:"required"`
+	Title  string     `json:"title" binding:"required"`
+	Start  *time.Time `json:"start" binding:"required"`
+	End    *time.Time `json:"end" binding:"required"`
+	Color  string     `json:"color"`
+	Remark string     `json:"remark"`
 }
 
 type fromDeleteCalendarEvent struct {
@@ -122,7 +124,7 @@ func ApiCalendar(r *gin.RouterGroup) {
 					Name:        from.Name,
 					Description: from.Description,
 					Color:       from.Color,
-					IsPublic:    from.IsPublic,
+					IsPublic:    from.Is_public,
 				}
 				if calendar.Color == "" {
 					calendar.Color = "#3788d9"
@@ -152,14 +154,11 @@ func ApiCalendar(r *gin.RouterGroup) {
 
 	// 获取日历列表
 	r.POST("/calendar/list", func(ctx *gin.Context) {
-		isAuth, _, _ := AuthenticationAuthority(ctx)
-		if isAuth {
-			var calendars []TabCalendar
-			models.DB.Where("deleted_at IS NULL").Order("created_at DESC").Find(&calendars)
-			ReturnJson(ctx, "apiOK", gin.H{"list": calendars})
-		} else {
-			ReturnJson(ctx, "userCookieError", nil)
-		}
+
+		var calendars []TabCalendar
+		models.DB.Where("deleted_at IS NULL").Order("created_at DESC").Find(&calendars)
+		ReturnJson(ctx, "apiOK", gin.H{"list": calendars})
+
 	})
 
 	// 更新日历
@@ -180,7 +179,7 @@ func ApiCalendar(r *gin.RouterGroup) {
 						Name:        from.Name,
 						Description: from.Description,
 						Color:       from.Color,
-						IsPublic:    from.IsPublic,
+						IsPublic:    from.Is_public,
 					}
 					if newCalendar.Color == "" {
 						newCalendar.Color = "#3788d9"
@@ -349,11 +348,11 @@ func ApiCalendar(r *gin.RouterGroup) {
 					}
 
 					newEvent := TabCalendarEvent{
-						Title:   from.Title,
+						Title:     from.Title,
 						StartDate: from.Start,
-						EndDate: from.End,
-						BgColor: from.Color,
-						Remark:  from.Remark,
+						EndDate:   from.End,
+						BgColor:   from.Color,
+						Remark:    from.Remark,
 					}
 					if newEvent.BgColor == "" {
 						// 获取日历颜色
diff --git a/frontend/ops_vue_js/src/api/calendar.js b/frontend/ops_vue_js/src/api/calendar.js
index 26fb8fb..4d23479 100644
--- a/frontend/ops_vue_js/src/api/calendar.js
+++ b/frontend/ops_vue_js/src/api/calendar.js
@@ -3,41 +3,41 @@ import { api } from './index'
 export const calendarApi = {
   // 创建日历
   createCalendar(data) {
-    return api.post('/calendar/calendar/create', { data })
+    return api.post('/calendar/calendar/create', data)
   },
 
   // 获取日历列表
   getCalendars() {
-    return api.post('/calendar/calendar/list', { data: {} })
+    return api.post('/calendar/calendar/list', {})
   },
 
   // 更新日历
   updateCalendar(data) {
-    return api.post('/calendar/calendar/update', { data })
+    return api.post('/calendar/calendar/update', data)
   },
 
   // 删除日历
   deleteCalendar(id) {
-    return api.post('/calendar/calendar/delete', { data: { id } })
+    return api.post('/calendar/calendar/delete', { id })
   },
 
   // 获取日历事件
   getEvents(data) {
-    return api.post('/calendar/calendar/events', { data })
+    return api.post('/calendar/calendar/events', data)
   },
 
   // 添加日历事件
   addEvent(data) {
-    return api.post('/calendar/calendar/addevent', { data })
+    return api.post('/calendar/calendar/addevent', data)
   },
 
   // 更新日历事件
   updateEvent(data) {
-    return api.post('/calendar/calendar/updateevent', { data })
+    return api.post('/calendar/calendar/updateevent', data)
   },
 
   // 删除日历事件
   deleteEvent(id) {
-    return api.post('/calendar/calendar/deleteevent', { data: { id } })
+    return api.post('/calendar/calendar/deleteevent', { id })
   }
 }
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index ec6d7f7..2882dc7 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -627,6 +627,7 @@
     "loading": "Loading...",
     "add_event": "Add Event",
     "edit_event": "Edit Event",
+    "view_event": "View Event",
     "delete_event": "Delete Event",
     "event_title": "Event Title",
     "event_title_required": "Event title is required",
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index e14f6f3..fac28c8 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -627,6 +627,7 @@
     "loading": "加载中...",
     "add_event": "添加事件",
     "edit_event": "编辑事件",
+    "view_event": "查看事件",
     "delete_event": "删除事件",
     "event_title": "事件标题",
     "event_title_required": "请输入事件标题",
diff --git a/frontend/ops_vue_js/src/router/index.js b/frontend/ops_vue_js/src/router/index.js
index f30419b..cb69a49 100644
--- a/frontend/ops_vue_js/src/router/index.js
+++ b/frontend/ops_vue_js/src/router/index.js
@@ -194,9 +194,10 @@ const router = createRouter({
 router.beforeEach((to) => {
   const userStore = useUserStore()
 
-  // 不需要登录的页面
-  const publicPages = ['/', '/login', '/register', '/forgot_password', '/schedule', '/404']
-  if (publicPages.includes(to.path)) return true
+  // 不需要登录的页面（精确匹配或前缀匹配）
+  const publicPages = ['/', '/login', '/register', '/forgot_password', '/schedule', '/calendars', '/404']
+  const publicPrefixes = ['/calendar/']
+  if (publicPages.includes(to.path) || publicPrefixes.some(p => to.path.startsWith(p))) return true
 
   // 未登录 → 跳转登录
   if (!userStore.isLoggedIn) {
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index 0657f2c..08b4d78 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -12,7 +12,7 @@ import { useToastStore } from "@/stores/toast"
 import { useUserStore } from "@/stores/user"
 import { calendarApi } from "@/api/calendar"
 import { useDateUtils } from "@/composables/useDateUtils"
-import { IconPlus, IconTrash, IconEdit, IconCalendar } from "@tabler/icons-vue"
+import DatatimePickerForFullCalendar from "@/components/datatimePickerForFullCalendar.vue"
 
 const route = useRoute()
 const router = useRouter()
@@ -37,16 +37,17 @@ const eventData = ref({
   startDate: "",
   endDate: "",
   color: "#3788d9",
-  remark: "",
   isEditing: false,
-  isEditable: false
+  isEditable: false,
 })
 
 const colorOptions = ref([
-  { value: "#3788d9", label: t("schedule.work") },
-  { value: "#06d6a0", label: t("schedule.duty") },
-  { value: "#ff595e", label: t("schedule.exam") },
-  { value: "#ffca3a", label: t("schedule.standby") },
+  { value: "#3788d9", label: t("schedule.work"), name: t("schedule.work"), type: "work" },
+  { value: "#06d6a0", label: t("schedule.duty"), name: t("schedule.duty"), type: "duty" },
+  { value: "#ff595e", label: t("schedule.exam"), name: t("schedule.exam"), type: "exam" },
+  { value: "#ffca3a", label: t("schedule.standby"), name: t("schedule.standby"), type: "standby" },
+  { value: "#D16C13", label: t("schedule.personal_holiday"), name: t("schedule.personal_holiday"), type: "personal_holiday" },
+  { value: "#D10D21", label: t("schedule.public_holiday"), name: t("schedule.public_holiday"), type: "public_holiday" },
 ])
 
 const pageData = ref({
@@ -55,91 +56,127 @@ const pageData = ref({
   lastClickTimeStr: "",
   lastEventClickTime: 0,
   lastEventClickID: 0,
-  submitChecked: false
+  submitChecked: false,
+  lastEventsSnapshot: null,
 })
 
-function openEventModal(startDate, endDate) {
+// 选中/取消选中事件
+function unseleEvent(eventID) {
+  const target = calendarOptions.value.events.find(item => item.id === eventID)
+  if (target) {
+    target.borderColor = "#F7F7F7"
+  }
+}
+
+function unseleEventAll() {
+  unseleEvent(pageData.value.seleEventID)
+  pageData.value.seleEventID = 0
+}
+
+function closeEventModal() {
+  showModal.value = false
+}
+
+function openEventModal(dateStr, dataEnd, id = 0, title = "", color = "#3788d9", isEditing = false, isEditable = true) {
   eventData.value = {
-    id: 0,
-    title: "",
-    startDate: startDate || "",
-    endDate: endDate || "",
-    color: calendarInfo.value.Color || "#3788d9",
-    remark: "",
-    isEditing: false,
-    isEditable: true
+    id: id,
+    title: title,
+    startDate: dateStr,
+    endDate: dataEnd,
+    color: color,
+    isEditing: isEditing,
+    isEditable: isEditable,
   }
   showModal.value = true
 }
 
-function editEvent(event) {
-  eventData.value = {
-    id: event.id,
-    title: event.title,
-    startDate: event.start,
-    endDate: event.end || event.start,
-    color: event.backgroundColor,
-    remark: event.extendedProps?.remark || "",
-    isEditing: true,
-    isEditable: true
+function editEvent(info) {
+  openEventModal(
+    info.event.startStr,
+    info.event.end ? info.event.endStr : info.event.startStr,
+    parseInt(info.event.id),
+    info.event.title,
+    info.event.backgroundColor,
+    true,
+    info.event.durationEditable,
+  )
+}
+
+function selectColor(colorValue) {
+  if (eventData.value.isEditable) {
+    eventData.value.color = colorValue
   }
-  showModal.value = true
+}
+
+// 日期转后端格式：YYYY-MM-DD 00:00:00
+function toDatetime(dateStr) {
+  return dateStr ? dateStr + " 00:00:00" : ""
 }
 
 async function saveEvent() {
   if (!eventData.value.title.trim()) {
-    toast.error(t('calendar.event_title_required'))
+    pageData.value.submitChecked = true
+    toast.warning(t('calendar.event_title_required'))
+    return
+  }
+  pageData.value.submitChecked = false
+
+  if (!eventData.value.startDate || !eventData.value.endDate) {
+    toast.warning(t('schedule.date_required'))
     return
   }
 
-  pageData.value.submitChecked = true
+  const selectedColor = colorOptions.value.find(c => c.value === eventData.value.color)
+  const scheduleType = selectedColor ? selectedColor.type : "work"
 
   try {
     let result
     if (eventData.value.isEditing) {
       result = await calendarApi.updateEvent({
         id: eventData.value.id,
-        title: eventData.value.title,
-        start: eventData.value.startDate,
-        end: eventData.value.endDate,
-        color: eventData.value.color,
-        remark: eventData.value.remark
+        title: eventData.value.title.trim(),
+        start: toDatetime(eventData.value.startDate),
+        end: toDatetime(
+          eventData.value.startDate === eventData.value.endDate
+            ? eventData.value.endDate
+            : DateUtils.toRealEnd(eventData.value.endDate),
+        ),
+        schedule_type: scheduleType,
       })
     } else {
       result = await calendarApi.addEvent({
         calendar_id: calendarId.value,
-        title: eventData.value.title,
-        start: eventData.value.startDate,
-        end: eventData.value.endDate,
-        color: eventData.value.color,
-        remark: eventData.value.remark
+        title: eventData.value.title.trim(),
+        start: toDatetime(eventData.value.startDate),
+        end: toDatetime(
+          eventData.value.startDate === eventData.value.endDate
+            ? eventData.value.endDate
+            : DateUtils.toRealEnd(eventData.value.endDate),
+        ),
+        schedule_type: scheduleType,
       })
     }
 
     if (result.errCode === 0) {
       toast.success(t('calendar.event_save_success'))
-      showModal.value = false
+      closeEventModal()
       getEvents()
     } else {
       toast.error(t('message.server_error'))
     }
   } catch {
     // 拦截器已处理
-  } finally {
-    pageData.value.submitChecked = false
   }
 }
 
 async function deleteEvent() {
-  if (!confirm(t('calendar.confirm_delete_event'))) {
-    return
-  }
+  if (!confirm(t('calendar.confirm_delete_event'))) return
 
   try {
     const result = await calendarApi.deleteEvent(eventData.value.id)
     if (result.errCode === 0) {
       toast.success(t('calendar.event_delete_success'))
-      showModal.value = false
+      closeEventModal()
       getEvents()
     } else {
       toast.error(t('message.server_error'))
@@ -152,31 +189,32 @@ async function deleteEvent() {
 async function getEvents() {
   if (!calendarRef.value) return
 
-  const calendarApi2 = calendarRef.value.getApi()
-  const view = calendarApi2.view
-  const start = DateUtils.formatDate(view.activeStart)
-  const end = DateUtils.formatDate(view.activeEnd)
+  const calApi = calendarRef.value.getApi()
+  const start = DateUtils.dateToStr(calendarNowShow.value.start)
+  const end = DateUtils.toRealEnd(calendarNowShow.value.end)
 
   try {
     const { errCode, data } = await calendarApi.getEvents({
       calendar_id: calendarId.value,
       start: start,
-      end: end
+      end: end,
     })
 
     if (errCode === 0) {
-      const events = (data.list || []).map(event => ({
-        id: event.ID,
-        title: event.Title,
-        start: event.StartDate,
-        end: event.EndDate,
-        backgroundColor: event.BgColor,
-        borderColor: event.BgColor,
-        extendedProps: {
-          remark: event.Remark
-        }
-      }))
-      calendarOptions.value.events = events
+      calendarOptions.value.events = []
+      ;(data.list || []).forEach(item => {
+        calendarOptions.value.events.push({
+          id: item.ID,
+          title: item.Title,
+          start: item.StartDate,
+          end: item.StartDate === item.EndDate
+            ? item.EndDate
+            : DateUtils.toCalendarEnd(item.EndDate),
+          backgroundColor: item.BgColor,
+          borderColor: item.ID === pageData.value.seleEventID ? "#000000" : "#F7F7F7",
+          allDay: true,
+        })
+      })
     }
   } catch {
     // 拦截器已处理
@@ -203,18 +241,29 @@ async function fetchCalendarInfo() {
   }
 }
 
-function unseleEvent(eventID) {
-  const target = calendarOptions.value.events.find(item => item.id === eventID)
-  if (target) {
-    target.borderColor = target.backgroundColor
+// ─── 滚动标题工具函数 ───────────────────────────────────────────────────────
+function applyScrollToTitle(titleEl) {
+  titleEl.removeAttribute("data-truncated")
+  titleEl.style.removeProperty("--scroll-distance")
+  const overflow = titleEl.scrollWidth - titleEl.clientWidth
+  if (overflow > 0) {
+    titleEl.style.setProperty("--scroll-distance", `-${overflow}px`)
+    titleEl.setAttribute("data-truncated", "true")
   }
 }
 
-function unseleEventAll() {
-  unseleEvent(pageData.value.seleEventID)
-  pageData.value.seleEventID = 0
+function recalcScrollTitles() {
+  nextTick(() => {
+    requestAnimationFrame(() => {
+      const calendarEl = calendarRef.value?.$el
+      if (!calendarEl) return
+      calendarEl.querySelectorAll(".fc-event-title").forEach(applyScrollToTitle)
+    })
+  })
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+
 const calendarOptions = ref({
   height: "100%",
   contentHeight: "auto",
@@ -230,52 +279,55 @@ const calendarOptions = ref({
   expandRows: true,
   stickyHeaderDates: true,
 
+  dayCellDidMount(info) {
+    if (info.date.getDay() === 0 || info.date.getDay() === 6) {
+      info.el.style.backgroundColor = "#f5f5f5"
+    }
+    info.el.style.border = "1px solid #e5e7eb"
+  },
+
   headerToolbar: {
     left: "prevYear,prev,today,next,nextYear",
     center: "title",
-    right: ""
+    right: "",
   },
 
   customButtons: {
     prevYear: {
       text: t("schedule.previous_year"),
-      click() {
-        calendarRef.value.getApi().prevYear()
-        getEvents()
-      }
+      click() { calendarRef.value.getApi().prevYear(); getEvents() },
     },
     nextYear: {
       text: t("schedule.next_year"),
-      click() {
-        calendarRef.value.getApi().nextYear()
-        getEvents()
-      }
+      click() { calendarRef.value.getApi().nextYear(); getEvents() },
     },
     prev: {
       text: t("schedule.previous_month"),
-      click() {
-        calendarRef.value.getApi().prev()
-        getEvents()
-      }
+      click() { calendarRef.value.getApi().prev(); getEvents() },
     },
     next: {
       text: t("schedule.next_month"),
-      click() {
-        calendarRef.value.getApi().next()
-        getEvents()
-      }
+      click() { calendarRef.value.getApi().next(); getEvents() },
     },
     today: {
       text: t("schedule.today"),
-      click() {
-        calendarRef.value.getApi().today()
-        getEvents()
-      }
-    }
+      click() { calendarRef.value.getApi().today(); getEvents() },
+    },
+    week: {
+      text: t("schedule.week"),
+      click() { calendarRef.value.getApi().changeView("timeGridWeek") },
+    },
   },
 
   events: [],
 
+  eventDidMount(info) {
+    const titleEl = info.el.querySelector(".fc-event-title")
+    if (titleEl) {
+      requestAnimationFrame(() => applyScrollToTitle(titleEl))
+    }
+  },
+
   datesSet(info) {
     calendarNowShow.value = info
     getEvents()
@@ -284,7 +336,6 @@ const calendarOptions = ref({
   dateClick(info) {
     const nowTime = new Date().getTime()
     const timeDifference = nowTime - pageData.value.lastClickTime
-
     unseleEventAll()
 
     if (info.dateStr === pageData.value.lastClickTimeStr) {
@@ -314,179 +365,278 @@ const calendarOptions = ref({
   eventClick(info) {
     const nowTime = new Date().getTime()
     const timeDifference = nowTime - pageData.value.lastEventClickTime
+    const eventid = parseInt(info.event.id)
 
-    if (info.event.id === pageData.value.lastEventClickID) {
-      if (timeDifference < 400 && timeDifference > 0) {
-        editEvent({
-          id: info.event.id,
-          title: info.event.title,
-          start: info.event.startStr?.split('T')[0] || info.event.start?.toISOString().split('T')[0],
-          end: info.event.endStr?.split('T')[0] || info.event.end?.toISOString().split('T')[0],
-          backgroundColor: info.event.backgroundColor
-        })
-      }
-    }
-    pageData.value.lastEventClickID = info.event.id
-    pageData.value.lastEventClickTime = nowTime
-
-    // 选中效果
     unseleEventAll()
     const target = calendarOptions.value.events.find(item => String(item.id) === String(info.event.id))
     if (target) {
       target.borderColor = "#000000"
       pageData.value.seleEventID = target.id
     }
-  }
+
+    if (eventid === pageData.value.lastEventClickID) {
+      if (timeDifference < 400 && timeDifference > 0) {
+        editEvent(info)
+        unseleEventAll()
+      }
+    }
+    pageData.value.lastEventClickID = eventid
+    pageData.value.lastEventClickTime = nowTime
+  },
+
+  eventDrop(info) {
+    // 拖拽后直接更新
+    const selectedColor = colorOptions.value.find(c => c.value === info.event.backgroundColor)
+    const scheduleType = selectedColor ? selectedColor.type : "work"
+    const startStr = info.event.startStr
+    const endStr = info.event.end ? info.event.endStr : startStr
+    calendarApi.updateEvent({
+      id: parseInt(info.event.id),
+      title: info.event.title,
+      start: toDatetime(startStr),
+      end: toDatetime(startStr === endStr ? endStr : DateUtils.toRealEnd(endStr)),
+      schedule_type: scheduleType,
+    }).then(r => {
+      if (r.errCode !== 0) toast.error(t('message.server_error'))
+      else getEvents()
+    })
+  },
 })
 
+// 监听语言变化
+watch(locale, () => {
+  calendarOptions.value.locale = locale.value
+  calendarOptions.value.customButtons.prevYear.text = t("schedule.previous_year")
+  calendarOptions.value.customButtons.nextYear.text = t("schedule.next_year")
+  calendarOptions.value.customButtons.prev.text = t("schedule.previous_month")
+  calendarOptions.value.customButtons.next.text = t("schedule.next_month")
+  calendarOptions.value.customButtons.today.text = t("schedule.today")
+  calendarOptions.value.customButtons.week.text = t("schedule.week")
+  colorOptions.value = [
+    { value: "#3788d9", label: t("schedule.work"), name: t("schedule.work"), type: "work" },
+    { value: "#06d6a0", label: t("schedule.duty"), name: t("schedule.duty"), type: "duty" },
+    { value: "#ff595e", label: t("schedule.exam"), name: t("schedule.exam"), type: "exam" },
+    { value: "#ffca3a", label: t("schedule.standby"), name: t("schedule.standby"), type: "standby" },
+    { value: "#D16C13", label: t("schedule.personal_holiday"), name: t("schedule.personal_holiday"), type: "personal_holiday" },
+    { value: "#D10D21", label: t("schedule.public_holiday"), name: t("schedule.public_holiday"), type: "public_holiday" },
+  ]
+})
+
+let resizeObserver = null
+
 onMounted(() => {
   fetchCalendarInfo()
+  // 监听日历容器宽度变化
+  let resizeTimer = null
+  resizeObserver = new ResizeObserver(() => {
+    clearTimeout(resizeTimer)
+    resizeTimer = setTimeout(() => recalcScrollTitles(), 150)
+  })
+  if (calendarRef.value?.$el) {
+    resizeObserver.observe(calendarRef.value.$el)
+  }
+  onBeforeUnmount(() => {
+    if (resizeObserver) {
+      resizeObserver.disconnect()
+      resizeObserver = null
+    }
+    clearTimeout(resizeTimer)
+  })
 })
 </script>
 
 <template>
-  <div class="flex flex-col gap-6 px-6 py-6">
-    <div class="flex items-center justify-between">
-      <div class="flex items-center gap-3">
-        <button
-          @click="router.push('/calendars')"
-          class="rounded-lg p-2 text-gray-600 transition-colors hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-dk-muted"
-        >
-          ←
-        </button>
-        <div>
-          <h3 class="text-lg font-semibold text-gray-900 dark:text-white">
-            {{ calendarInfo.Name || t('calendar.loading') }}
-          </h3>
-          <p v-if="calendarInfo.Description" class="text-sm text-gray-500 dark:text-gray-400">
-            {{ calendarInfo.Description }}
-          </p>
-        </div>
-      </div>
-      <div
-        v-if="userStore.isLoggedIn"
-        class="flex items-center gap-2"
-      >
-        <button
-          @click="openEventModal()"
-          class="inline-flex items-center gap-1.5 rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-blue-700"
-        >
-          <IconPlus :size="16" />
-          {{ t('calendar.add_event') }}
-        </button>
-      </div>
-    </div>
-
-    <div class="rounded-xl border border-gray-200 bg-white shadow-lg dark:border-dk-muted dark:bg-dk-card">
-      <FullCalendar
-        ref="calendarRef"
-        :options="calendarOptions"
-      />
-    </div>
-
-    <!-- Event Modal -->
+  <div class="flex w-full flex-col relative">
+    <!-- 事件编辑模态框 -->
     <div
       v-if="showModal"
-      class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
-      @click.self="showModal = false"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-gray-800/20"
     >
-      <div class="w-full max-w-md rounded-xl bg-white p-6 shadow-xl dark:bg-dk-card">
-        <h3 class="mb-4 text-lg font-semibold text-gray-900 dark:text-white">
-          {{ eventData.isEditing ? t('calendar.edit_event') : t('calendar.add_event') }}
-        </h3>
-
-        <div class="mb-4">
-          <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
-            {{ t('calendar.event_title') }} *
-          </label>
-          <input
-            v-model="eventData.title"
-            type="text"
-            class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
-            :placeholder="t('calendar.event_title_placeholder')"
-          />
-        </div>
-
-        <div class="mb-4 grid grid-cols-2 gap-3">
-          <div>
-            <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
-              {{ t('calendar.start_date') }} *
-            </label>
-            <input
-              v-model="eventData.startDate"
-              type="date"
-              class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
-            />
-          </div>
-          <div>
-            <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
-              {{ t('calendar.end_date') }} *
-            </label>
-            <input
-              v-model="eventData.endDate"
-              type="date"
-              class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
-            />
-          </div>
-        </div>
-
-        <div class="mb-4">
-          <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
-            {{ t('calendar.color') }}
-          </label>
-          <div class="flex gap-2">
-            <button
-              v-for="color in colorOptions"
-              :key="color.value"
-              @click="eventData.color = color.value"
-              class="h-8 w-8 rounded-full transition-transform hover:scale-110"
-              :class="{ 'ring-2 ring-blue-500 ring-offset-2': eventData.color === color.value }"
-              :style="{ backgroundColor: color.value }"
-              :title="color.label"
-            ></button>
-          </div>
-        </div>
-
-        <div class="mb-4">
-          <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
-            {{ t('calendar.remark') }}
-          </label>
-          <textarea
-            v-model="eventData.remark"
-            rows="3"
-            class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
-            :placeholder="t('calendar.remark_placeholder')"
-          ></textarea>
-        </div>
-
-        <div class="flex justify-between">
+      <div
+        class="modal-content bg-white rounded-lg shadow-lg w-full max-w-2xl max-h-[95vh] flex flex-col"
+      >
+        <!-- 模态框头部 -->
+        <div
+          class="modal-header border-b p-4 flex justify-between items-center flex-shrink-0"
+        >
+          <h5 class="modal-title text-lg font-semibold">
+            {{
+              userStore.isLoggedIn
+                ? eventData.isEditing
+                  ? t("calendar.edit_event")
+                  : t("calendar.add_event")
+                : t("calendar.view_event")
+            }}
+          </h5>
           <button
-            v-if="eventData.isEditing"
-            @click="deleteEvent"
-            class="inline-flex items-center gap-1 rounded-lg bg-red-600 px-3 py-2 text-sm font-medium text-white transition-colors hover:bg-red-700"
+            @click="closeEventModal"
+            class="btn-close text-gray-500 hover:text-gray-700"
           >
-            <IconTrash :size="16" />
-            {{ t('delete') }}
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="24"
+              height="24"
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              class="icon icon-tabler icons-tabler-outline icon-tabler-x"
+            >
+              <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+              <path d="M18 6l-12 12"></path>
+              <path d="M6 6l12 12"></path>
+            </svg>
           </button>
-          <div v-else></div>
+        </div>
 
+        <!-- 主体区域 -->
+        <div class="modal-body p-4 flex-1 overflow-y-auto">
+          <!-- 日期选择区域 -->
+          <DatatimePickerForFullCalendar
+            v-model:startDate="eventData.startDate"
+            v-model:endDate="eventData.endDate"
+            :color="eventData.color"
+            :title="eventData.title"
+            :isEditable="eventData.isEditable"
+          />
+
+          <!-- 内容输入区域 -->
+          <div class="mb-4">
+            <div class="uni-easyinput input relative">
+              <div
+                class="uni-easyinput__content is-input-border border border-gray-300 rounded-md bg-white relative"
+                :class="{
+                  'border-gray-300': eventData.title || !pageData.submitChecked,
+                  'border-red-500': !eventData.title && pageData.submitChecked,
+                }"
+              >
+                <input
+                  v-model="eventData.title"
+                  type="text"
+                  maxlength="140"
+                  class="uni-easyinput__content-input w-full px-3 py-2 outline-none"
+                  :placeholder="t('calendar.event_title_placeholder')"
+                  @keyup.enter="saveEvent"
+                  :disabled="!eventData.isEditable"
+                />
+              </div>
+            </div>
+          </div>
+
+          <!-- 颜色选择区域 -->
+          <div class="mb-4">
+            <div class="color_box grid grid-cols-3 gap-2">
+              <div
+                v-for="color in colorOptions"
+                :key="color.value"
+                class="color_box_item"
+              >
+                <label
+                  class="uni-label-pointer form-colorinput flex items-center gap-2 cursor-pointer"
+                  @click="selectColor(color.value)"
+                >
+                  <div class="uni-radio-wrapper">
+                    <div
+                      class="uni-radio-input flex items-center justify-center w-6 h-6 rounded-full transition-all"
+                      :style="{
+                        backgroundColor: color.value,
+                        borderColor: color.value,
+                      }"
+                    >
+                      <svg
+                        v-if="eventData.color === color.value"
+                        width="18"
+                        height="18"
+                        viewBox="0 0 32 32"
+                      >
+                        <path
+                          d="M1.952 18.080q-0.32-0.352-0.416-0.88t0.128-0.976l0.16-0.352q0.224-0.416 0.64-0.528t0.8 0.176l6.496 4.704q0.384 0.288 0.912 0.272t0.88-0.336l17.312-14.272q0.352-0.288 0.848-0.256t0.848 0.352l-0.416-0.416q0.32 0.352 0.32 0.816t-0.32 0.816l-18.656 18.912q-0.32 0.352-0.8 0.352t-0.8-0.32l-7.936-8.064z"
+                          fill="#ffffff"
+                        ></path>
+                      </svg>
+                    </div>
+                  </div>
+                  <span class="text-gray-700">{{ color.label }}</span>
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 底部固定 -->
+        <div
+          v-if="userStore.isLoggedIn"
+          class="modal-footer border-t p-4 flex justify-end items-center flex-shrink-0"
+        >
           <div class="flex gap-2">
             <button
-              @click="showModal = false"
-              class="rounded-lg border border-gray-300 px-4 py-2 text-sm text-gray-600 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:text-gray-300 dark:hover:bg-dk-muted"
+              v-if="eventData.isEditing"
+              @click="deleteEvent"
+              class="btn px-4 py-2 text-white bg-red-500 hover:bg-red-600 rounded-md disabled:bg-gray-400 disabled:cursor-not-allowed"
+              :disabled="!eventData.isEditable"
             >
-              {{ t('cancel') }}
+              {{ t('delete') }}
             </button>
             <button
+              v-if="!eventData.isEditing"
               @click="saveEvent"
-              :disabled="pageData.submitChecked"
-              class="rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-blue-700 disabled:opacity-50"
+              class="btn btn-primary px-4 py-2 bg-cyan-600 text-white hover:bg-cyan-700 rounded-md disabled:bg-gray-400 disabled:cursor-not-allowed"
+              :disabled="!eventData.isEditable"
             >
-              {{ t('save') }}
+              {{ t('calendar.add_event') }}
+            </button>
+            <button
+              v-if="eventData.isEditing"
+              @click="saveEvent"
+              class="btn btn-primary px-4 py-2 bg-teal-600 text-white hover:bg-teal-700 rounded-md disabled:bg-gray-400 disabled:cursor-not-allowed"
+              :disabled="!eventData.isEditable"
+            >
+              {{ t('calendar.edit_event') }}
             </button>
           </div>
         </div>
       </div>
     </div>
+
+    <!-- 日历主体区域 -->
+    <div
+      class="flex-1 rounded-lg border border-gray-200 bg-white p-0.5 shadow dark:border-dk-muted dark:bg-dk-card"
+    >
+      <div class="h-full w-full overflow-hidden rounded-md">
+        <FullCalendar ref="calendarRef" :options="calendarOptions" />
+      </div>
+    </div>
   </div>
 </template>
+
+<style scoped>
+/* 父容器作为裁剪视口 */
+:deep(.fc-daygrid-event .fc-event-title-container) {
+  overflow: hidden !important;
+}
+
+/* 默认状态：单行截断省略 */
+:deep(.fc-daygrid-event .fc-event-title) {
+  white-space: nowrap !important;
+  overflow: visible !important;
+  text-overflow: ellipsis !important;
+  display: block !important;
+  will-change: transform;
+}
+
+/* 需要滚动的标题 */
+:deep(.fc-daygrid-event .fc-event-title[data-truncated="true"]) {
+  text-overflow: clip !important;
+  display: inline-block !important;
+  animation: marquee-bounce 6s ease-in-out infinite !important;
+}
+
+@keyframes marquee-bounce {
+  0%, 20% { transform: translateX(0); }
+  60% { transform: translateX(var(--scroll-distance, 0px)); }
+  80% { transform: translateX(var(--scroll-distance, 0px)); }
+  100% { transform: translateX(0); }
+}
+</style>
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarList.vue b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
index a0374fe..6e20c71 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
@@ -188,14 +188,14 @@ onMounted(fetchCalendars)
 
               <div class="flex items-center gap-1" @click.stop>
                 <button
-                  v-if="calendar.UserID === userStore.userInfo.ID"
+                  v-if="calendar.UserID === userStore.userInfo?.ID"
                   @click="openEditModal(calendar)"
                   class="rounded p-1 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-dk-muted"
                 >
                   <IconEdit :size="16" />
                 </button>
                 <button
-                  v-if="calendar.UserID === userStore.userInfo.ID"
+                  v-if="calendar.UserID === userStore.userInfo?.ID"
                   @click="deleteCalendar(calendar)"
                   class="rounded p-1 text-gray-400 transition-colors hover:bg-red-50 hover:text-red-600 dark:hover:bg-dk-muted"
                 >

From 3fcc98f6f632bf7d7dfa5f0112448f245a8dce31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 16:47:17 +0800
Subject: [PATCH 03/21] up

---
 backend/my_work/routers/apiCalendar.go        | 83 +++++++++++++++++--
 backend/my_work/routers/apiSysAdmin.go        |  4 +-
 backend/my_work/routers/apiUsers.go           |  2 +-
 frontend/ops_vue_js/src/i18n/en.json          |  3 +-
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  3 +-
 .../src/views/calendar/CalendarDetail.vue     | 21 ++++-
 6 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index a93a141..746de6c 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -3,6 +3,7 @@ package routers
 import (
 	"encoding/json"
 	"ops/models"
+	"slices"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -35,6 +36,7 @@ type TabCalendarEvent struct {
 	EndDate    *time.Time `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
 	IsAllDay   bool       `gorm:"default:true;comment:是否全日事件"`
 	BgColor    string     `gorm:"size:50;default:#3788d9;comment:背景颜色"`
+	IsPublic   bool       `gorm:"default:false;comment:是否为公共日程"`
 	Remark     string     `gorm:"type:text;comment:备注"`
 
 	CreatedAt *time.Time     `gorm:"type:datetime;autoCreateTime;comment:创建时间"`
@@ -89,27 +91,61 @@ type fromAddCalendarEvent struct {
 	Start      *time.Time `json:"start" binding:"required"`
 	End        *time.Time `json:"end" binding:"required"`
 	Color      string     `json:"color"`
+	Is_public  bool       `json:"is_public"`
 	Remark     string     `json:"remark"`
 }
 
 type fromUpdateCalendarEvent struct {
-	ID     uint       `json:"id" binding:"required"`
-	Title  string     `json:"title" binding:"required"`
-	Start  *time.Time `json:"start" binding:"required"`
-	End    *time.Time `json:"end" binding:"required"`
-	Color  string     `json:"color"`
-	Remark string     `json:"remark"`
+	ID        uint       `json:"id" binding:"required"`
+	Title     string     `json:"title" binding:"required"`
+	Start     *time.Time `json:"start" binding:"required"`
+	End       *time.Time `json:"end" binding:"required"`
+	Color     string     `json:"color"`
+	Is_public bool       `json:"is_public"`
+	Remark    string     `json:"remark"`
 }
 
 type fromDeleteCalendarEvent struct {
 	ID uint `json:"id" binding:"required"`
 }
 
+var (
+	calendarUserGroup TabUserGroups
+	calendarAdmins    []uint
+)
+
+// CalendarUpdateAdminsCash 更新客户管理员缓存
+func CalendarUpdateAdminsCash() {
+	calendarAdmins = nil
+	calendarAdmins = append(calendarAdmins, 1) // id=1 系统管理员默认拥有所有权限
+	var binds []TabUserGroupBinds
+	models.DB.Where("group_id = ?", calendarUserGroup.ID).Find(&binds)
+	for _, item := range binds {
+		if !slices.Contains(calendarAdmins, item.UserID) {
+			calendarAdmins = append(calendarAdmins, item.UserID)
+		}
+	}
+}
+
+// canModifyCustomer 判断是否有权限修改/删除客户（创建者或管理员）
+func canModifyCalendar(userID, creatorUserID uint) bool {
+	if slices.Contains(calendarAdmins, userID) {
+		return true
+	}
+	return userID == creatorUserID
+}
+
 func ApiCalendarInit() {
 	// 初始化数据表
 	models.DB.AutoMigrate(&TabCalendar{})
 	models.DB.AutoMigrate(&TabCalendarEvent{})
 	models.DB.AutoMigrate(&TabCalendarLog{})
+
+	// 自动创建 calendar_admin 用户组
+	models.DB.Where("name = ?", "calendar_admin").FirstOrCreate(&calendarUserGroup, TabUserGroups{
+		Name: "calendar_admin",
+		Type: "usergroup",
+	})
 }
 
 func ApiCalendar(r *gin.RouterGroup) {
@@ -152,12 +188,41 @@ func ApiCalendar(r *gin.RouterGroup) {
 		}
 	})
 
-	// 获取日历列表
+	// 获取日历列表（不需要登录）
 	r.POST("/calendar/list", func(ctx *gin.Context) {
+		isAuth, user, _ := AuthenticationAuthority(ctx)
 
 		var calendars []TabCalendar
 		models.DB.Where("deleted_at IS NULL").Order("created_at DESC").Find(&calendars)
-		ReturnJson(ctx, "apiOK", gin.H{"list": calendars})
+
+		type CalendarWithEdit struct {
+			TabCalendar
+			CanEdit bool `json:"canEdit"`
+		}
+		var result []CalendarWithEdit
+		for _, cal := range calendars {
+			// 私有日历：只有创建者可见
+			if !cal.IsPublic {
+				if !isAuth || cal.UserID != user.ID {
+					continue
+				}
+				result = append(result, CalendarWithEdit{
+					TabCalendar: cal,
+					CanEdit:     true,
+				})
+				continue
+			}
+			// 公开日历
+			canEdit := false
+			if isAuth {
+				canEdit = canModifyCalendar(user.ID, cal.UserID)
+			}
+			result = append(result, CalendarWithEdit{
+				TabCalendar: cal,
+				CanEdit:     canEdit,
+			})
+		}
+		ReturnJson(ctx, "apiOK", gin.H{"list": result})
 
 	})
 
@@ -303,6 +368,7 @@ func ApiCalendar(r *gin.RouterGroup) {
 					StartDate:  from.Start,
 					EndDate:    from.End,
 					BgColor:    from.Color,
+					IsPublic:   from.Is_public,
 					Remark:     from.Remark,
 				}
 				if event.BgColor == "" {
@@ -352,6 +418,7 @@ func ApiCalendar(r *gin.RouterGroup) {
 						StartDate: from.Start,
 						EndDate:   from.End,
 						BgColor:   from.Color,
+						IsPublic:  from.Is_public,
 						Remark:    from.Remark,
 					}
 					if newEvent.BgColor == "" {
diff --git a/backend/my_work/routers/apiSysAdmin.go b/backend/my_work/routers/apiSysAdmin.go
index 30a328e..3783548 100644
--- a/backend/my_work/routers/apiSysAdmin.go
+++ b/backend/my_work/routers/apiSysAdmin.go
@@ -164,7 +164,7 @@ func ApiSysAdmin(r *gin.RouterGroup) {
 			return
 		}
 
-	var params struct {
+		var params struct {
 			GroupID  float64 `json:"group_id" mapstructure:"group_id"`
 			Page     float64 `json:"page" mapstructure:"page"`
 			PageSize float64 `json:"page_size" mapstructure:"page_size"`
@@ -462,6 +462,8 @@ func ApiSysAdmin(r *gin.RouterGroup) {
 			WarehouseUpdateAdminsCash()
 		case "customer_admin":
 			CustomerUpdateAdminsCash()
+		case "calendar_admin":
+			CalendarUpdateAdminsCash()
 		}
 
 		ReturnJson(ctx, "apiOK", nil)
diff --git a/backend/my_work/routers/apiUsers.go b/backend/my_work/routers/apiUsers.go
index f7274a4..a78b58d 100644
--- a/backend/my_work/routers/apiUsers.go
+++ b/backend/my_work/routers/apiUsers.go
@@ -339,7 +339,7 @@ func AuthenticationAuthority(ctx *gin.Context) (bool, TabUser, map[string]interf
 		}
 
 	} else {
-		ReturnJson(ctx, "userCookieError", nil)
+		//ReturnJson(ctx, "userCookieError", nil)
 		return false, user, nil
 	}
 
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index 2882dc7..0e6d2df 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -638,6 +638,7 @@
     "remark_placeholder": "Enter remark",
     "event_save_success": "Event saved successfully",
     "event_delete_success": "Event deleted successfully",
-    "confirm_delete_event": "Are you sure you want to delete this event?"
+    "confirm_delete_event": "Are you sure you want to delete this event?",
+    "is_public_event": "Public Event"
   }
 }
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index fac28c8..b5b0974 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -638,6 +638,7 @@
     "remark_placeholder": "请输入备注",
     "event_save_success": "事件保存成功",
     "event_delete_success": "事件删除成功",
-    "confirm_delete_event": "确定要删除此事件吗？"
+    "confirm_delete_event": "确定要删除此事件吗？",
+    "is_public_event": "公共日程"
   }
 }
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index 08b4d78..c5e578d 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -37,6 +37,7 @@ const eventData = ref({
   startDate: "",
   endDate: "",
   color: "#3788d9",
+  isPublic: false,
   isEditing: false,
   isEditable: false,
 })
@@ -77,13 +78,14 @@ function closeEventModal() {
   showModal.value = false
 }
 
-function openEventModal(dateStr, dataEnd, id = 0, title = "", color = "#3788d9", isEditing = false, isEditable = true) {
+function openEventModal(dateStr, dataEnd, id = 0, title = "", color = "#3788d9", isPublic = false, isEditing = false, isEditable = true) {
   eventData.value = {
     id: id,
     title: title,
     startDate: dateStr,
     endDate: dataEnd,
     color: color,
+    isPublic: isPublic,
     isEditing: isEditing,
     isEditable: isEditable,
   }
@@ -97,6 +99,7 @@ function editEvent(info) {
     parseInt(info.event.id),
     info.event.title,
     info.event.backgroundColor,
+    info.event.extendedProps?.isPublic || false,
     true,
     info.event.durationEditable,
   )
@@ -142,6 +145,7 @@ async function saveEvent() {
             : DateUtils.toRealEnd(eventData.value.endDate),
         ),
         schedule_type: scheduleType,
+        is_public: eventData.value.isPublic,
       })
     } else {
       result = await calendarApi.addEvent({
@@ -154,6 +158,7 @@ async function saveEvent() {
             : DateUtils.toRealEnd(eventData.value.endDate),
         ),
         schedule_type: scheduleType,
+        is_public: eventData.value.isPublic,
       })
     }
 
@@ -563,6 +568,20 @@ onMounted(() => {
               </div>
             </div>
           </div>
+
+          <!-- 公共日程开关 -->
+          <div class="mb-4 flex items-center justify-between">
+            <span class="text-gray-700">{{ t('calendar.is_public_event') }}</span>
+            <label class="relative inline-flex items-center cursor-pointer">
+              <input
+                v-model="eventData.isPublic"
+                type="checkbox"
+                class="sr-only peer"
+                :disabled="!eventData.isEditable"
+              />
+              <div class="w-11 h-6 bg-gray-300 peer-focus:outline-none peer-focus:ring-2 peer-focus:ring-cyan-300 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-cyan-600 peer-disabled:opacity-50 peer-disabled:cursor-not-allowed"></div>
+            </label>
+          </div>
         </div>
 
         <!-- 底部固定 -->

From 7369fe4117b0d15fc6b0ca0995dc7563b468fb9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 17:03:57 +0800
Subject: [PATCH 04/21] up

---
 backend/my_work/routers/apiCalendar.go | 244 ++++++++++++++-----------
 1 file changed, 137 insertions(+), 107 deletions(-)

diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index 746de6c..c26fbc1 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -27,17 +27,17 @@ type TabCalendar struct {
 
 // TabCalendarEvent 日历事件表
 type TabCalendarEvent struct {
-	ID         uint       `gorm:"primarykey"`
-	CalendarID uint       `gorm:"not null;index;comment:关联日历ID"`
-	UserID     uint       `gorm:"not null;comment:创建人ID"`
-	UsersID    []uint     `gorm:"type:json; null;comment:其他关联用户ID"`
-	Title      string     `gorm:"size:200;not null;comment:事件标题"`
-	StartDate  *time.Time `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
-	EndDate    *time.Time `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
-	IsAllDay   bool       `gorm:"default:true;comment:是否全日事件"`
-	BgColor    string     `gorm:"size:50;default:#3788d9;comment:背景颜色"`
-	IsPublic   bool       `gorm:"default:false;comment:是否为公共日程"`
-	Remark     string     `gorm:"type:text;comment:备注"`
+	ID         uint `gorm:"primarykey"`
+	CalendarID uint `gorm:"not null;index;comment:关联日历ID"`
+	UserID     uint `gorm:"not null;comment:创建人ID"`
+	//UsersID    []uint     `gorm:"type:json; null;comment:其他关联用户ID"`
+	Title     string     `gorm:"size:200;not null;comment:事件标题"`
+	StartDate *time.Time `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
+	EndDate   *time.Time `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
+	IsAllDay  bool       `gorm:"default:true;comment:是否全日事件"`
+	BgColor   string     `gorm:"size:50;default:#3788d9;comment:背景颜色"`
+	IsPublic  bool       `gorm:"default:false;comment:是否为公共日程"`
+	Remark    string     `gorm:"type:text;comment:备注"`
 
 	CreatedAt *time.Time     `gorm:"type:datetime;autoCreateTime;comment:创建时间"`
 	UpdatedAt *time.Time     `gorm:"type:datetime;autoUpdateTime;comment:最后修改时间"`
@@ -86,23 +86,25 @@ type fromGetCalendarEvents struct {
 }
 
 type fromAddCalendarEvent struct {
-	CalendarID uint       `json:"calendar_id" binding:"required"`
-	Title      string     `json:"title" binding:"required"`
-	Start      *time.Time `json:"start" binding:"required"`
-	End        *time.Time `json:"end" binding:"required"`
-	Color      string     `json:"color"`
-	Is_public  bool       `json:"is_public"`
-	Remark     string     `json:"remark"`
+	CalendarID   uint   `json:"calendar_id" binding:"required"`
+	Title        string `json:"title" binding:"required"`
+	Start        string `json:"start" binding:"required"`
+	End          string `json:"end" binding:"required"`
+	Color        string `json:"color"`
+	ScheduleType string `json:"schedule_type"`
+	Is_public    bool   `json:"is_public"`
+	Remark       string `json:"remark"`
 }
 
 type fromUpdateCalendarEvent struct {
-	ID        uint       `json:"id" binding:"required"`
-	Title     string     `json:"title" binding:"required"`
-	Start     *time.Time `json:"start" binding:"required"`
-	End       *time.Time `json:"end" binding:"required"`
-	Color     string     `json:"color"`
-	Is_public bool       `json:"is_public"`
-	Remark    string     `json:"remark"`
+	ID           uint   `json:"id" binding:"required"`
+	Title        string `json:"title" binding:"required"`
+	Start        string `json:"start" binding:"required"`
+	End          string `json:"end" binding:"required"`
+	Color        string `json:"color"`
+	ScheduleType string `json:"schedule_type"`
+	Is_public    bool   `json:"is_public"`
+	Remark       string `json:"remark"`
 }
 
 type fromDeleteCalendarEvent struct {
@@ -352,47 +354,61 @@ func ApiCalendar(r *gin.RouterGroup) {
 	r.POST("/calendar/addevent", func(ctx *gin.Context) {
 		isAuth, user, data := AuthenticationAuthority(ctx)
 		if isAuth {
-			var from fromAddCalendarEvent
-			if err := mapstructure.Decode(data, &from); err == nil {
-				// 检查日历是否存在
-				var calendar TabCalendar
-				if models.DB.Where("id = ? AND deleted_at IS NULL", from.CalendarID).First(&calendar).Error != nil {
-					ReturnJson(ctx, "calendar_not_find", nil)
-					return
-				}
-
-				event := TabCalendarEvent{
-					CalendarID: from.CalendarID,
-					UserID:     user.ID,
-					Title:      from.Title,
-					StartDate:  from.Start,
-					EndDate:    from.End,
-					BgColor:    from.Color,
-					IsPublic:   from.Is_public,
-					Remark:     from.Remark,
-				}
-				if event.BgColor == "" {
-					event.BgColor = calendar.Color
-				}
-
-				if models.DB.Create(&event).Error == nil {
-					// 记录日志
-					newContent, _ := json.Marshal(event)
-					log := TabCalendarLog{
-						CalendarID: event.CalendarID,
-						EventID:    event.ID,
-						UserID:     user.ID,
-						ActionType: "create_event",
-						NewContent: string(newContent),
-						IP:         ctx.ClientIP(),
-					}
-					models.DB.Create(&log)
-					ReturnJson(ctx, "apiOK", gin.H{"id": event.ID})
-				} else {
-					ReturnJson(ctx, "apiErr", nil)
-				}
-			} else {
+			// 先检查必需字段
+			calendarIDRaw, ok := data["calendar_id"].(float64)
+			if !ok || calendarIDRaw == 0 {
 				ReturnJson(ctx, "jsonErr", nil)
+				return
+			}
+			calendarID := uint(calendarIDRaw)
+
+			// 检查日历是否存在
+			var calendar TabCalendar
+			if models.DB.Where("id = ? AND deleted_at IS NULL", calendarID).First(&calendar).Error != nil {
+				ReturnJson(ctx, "calendar_not_find", nil)
+				return
+			}
+
+			// 解析日期
+			startStr, _ := data["start"].(string)
+			endStr, _ := data["end"].(string)
+			title, _ := data["title"].(string)
+			color, _ := data["color"].(string)
+			remark, _ := data["remark"].(string)
+			isPublic, _ := data["is_public"].(bool)
+
+			startDate, _ := time.Parse("2006-01-02 15:04:05", startStr)
+			endDate, _ := time.Parse("2006-01-02 15:04:05", endStr)
+
+			event := TabCalendarEvent{
+				CalendarID: calendarID,
+				UserID:     user.ID,
+				Title:      title,
+				StartDate:  &startDate,
+				EndDate:    &endDate,
+				BgColor:    color,
+				IsPublic:   isPublic,
+				Remark:     remark,
+			}
+			if event.BgColor == "" {
+				event.BgColor = calendar.Color
+			}
+
+			if models.DB.Create(&event).Error == nil {
+				// 记录日志
+				newContent, _ := json.Marshal(event)
+				log := TabCalendarLog{
+					CalendarID: event.CalendarID,
+					EventID:    event.ID,
+					UserID:     user.ID,
+					ActionType: "create_event",
+					NewContent: string(newContent),
+					IP:         ctx.ClientIP(),
+				}
+				models.DB.Create(&log)
+				ReturnJson(ctx, "apiOK", gin.H{"id": event.ID})
+			} else {
+				ReturnJson(ctx, "apiErr", nil)
 			}
 		} else {
 			ReturnJson(ctx, "userCookieError", nil)
@@ -403,54 +419,68 @@ func ApiCalendar(r *gin.RouterGroup) {
 	r.POST("/calendar/updateevent", func(ctx *gin.Context) {
 		isAuth, user, data := AuthenticationAuthority(ctx)
 		if isAuth {
-			var from fromUpdateCalendarEvent
-			if err := mapstructure.Decode(data, &from); err == nil {
-				oldEvent := TabCalendarEvent{}
-				if models.DB.Where("id = ?", from.ID).First(&oldEvent).Error == nil {
-					// 检查权限（只有创建人可以修改）
-					if oldEvent.UserID != user.ID {
-						ReturnJson(ctx, "permission_denied", nil)
-						return
-					}
+			// 先检查必需字段
+			idRaw, ok := data["id"].(float64)
+			if !ok || idRaw == 0 {
+				ReturnJson(ctx, "jsonErr", nil)
+				return
+			}
+			eventID := uint(idRaw)
 
-					newEvent := TabCalendarEvent{
-						Title:     from.Title,
-						StartDate: from.Start,
-						EndDate:   from.End,
-						BgColor:   from.Color,
-						IsPublic:  from.Is_public,
-						Remark:    from.Remark,
-					}
-					if newEvent.BgColor == "" {
-						// 获取日历颜色
-						var calendar TabCalendar
-						models.DB.Where("id = ?", oldEvent.CalendarID).First(&calendar)
-						newEvent.BgColor = calendar.Color
-					}
+			oldEvent := TabCalendarEvent{}
+			if models.DB.Where("id = ?", eventID).First(&oldEvent).Error == nil {
+				// 检查权限（只有创建人可以修改）
+				if oldEvent.UserID != user.ID {
+					ReturnJson(ctx, "permission_denied", nil)
+					return
+				}
 
-					if models.DB.Model(&oldEvent).Updates(&newEvent).Error == nil {
-						// 记录日志
-						newContent, _ := json.Marshal(newEvent)
-						oldContent, _ := json.Marshal(oldEvent)
-						log := TabCalendarLog{
-							CalendarID: oldEvent.CalendarID,
-							EventID:    oldEvent.ID,
-							UserID:     user.ID,
-							ActionType: "update_event",
-							OldContent: string(oldContent),
-							NewContent: string(newContent),
-							IP:         ctx.ClientIP(),
-						}
-						models.DB.Create(&log)
-						ReturnJson(ctx, "apiOK", nil)
-					} else {
-						ReturnJson(ctx, "apiErr", nil)
+				// 解析字段
+				startStr, _ := data["start"].(string)
+				endStr, _ := data["end"].(string)
+				title, _ := data["title"].(string)
+				color, _ := data["color"].(string)
+				remark, _ := data["remark"].(string)
+				isPublic, _ := data["is_public"].(bool)
+
+				startDate, _ := time.Parse("2006-01-02 15:04:05", startStr)
+				endDate, _ := time.Parse("2006-01-02 15:04:05", endStr)
+
+				newEvent := TabCalendarEvent{
+					Title:     title,
+					StartDate: &startDate,
+					EndDate:   &endDate,
+					BgColor:   color,
+					IsPublic:  isPublic,
+					Remark:    remark,
+				}
+				if newEvent.BgColor == "" {
+					// 获取日历颜色
+					var calendar TabCalendar
+					models.DB.Where("id = ?", oldEvent.CalendarID).First(&calendar)
+					newEvent.BgColor = calendar.Color
+				}
+
+				if models.DB.Model(&oldEvent).Updates(&newEvent).Error == nil {
+					// 记录日志
+					newContent, _ := json.Marshal(newEvent)
+					oldContent, _ := json.Marshal(oldEvent)
+					log := TabCalendarLog{
+						CalendarID: oldEvent.CalendarID,
+						EventID:    oldEvent.ID,
+						UserID:     user.ID,
+						ActionType: "update_event",
+						OldContent: string(oldContent),
+						NewContent: string(newContent),
+						IP:         ctx.ClientIP(),
 					}
+					models.DB.Create(&log)
+					ReturnJson(ctx, "apiOK", nil)
 				} else {
-					ReturnJson(ctx, "event_not_find", nil)
+					ReturnJson(ctx, "apiErr", nil)
 				}
 			} else {
-				ReturnJson(ctx, "jsonErr", nil)
+				ReturnJson(ctx, "event_not_find", nil)
 			}
 		} else {
 			ReturnJson(ctx, "userCookieError", nil)

From fcc6acbcee5ea27a868ede82f528f7991025bf82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 18:55:17 +0800
Subject: [PATCH 05/21] up

---
 .workbuddy/memory/2026-05-06.md               | 32 ++++++++++
 backend/my_work/routers/apiCalendar.go        | 60 +++++++++++--------
 frontend/ops_vue_js/src/i18n/en.json          |  1 +
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  1 +
 .../src/views/calendar/CalendarDetail.vue     | 31 +++++++---
 5 files changed, 91 insertions(+), 34 deletions(-)
 create mode 100644 .workbuddy/memory/2026-05-06.md

diff --git a/.workbuddy/memory/2026-05-06.md b/.workbuddy/memory/2026-05-06.md
new file mode 100644
index 0000000..3487e3b
--- /dev/null
+++ b/.workbuddy/memory/2026-05-06.md
@@ -0,0 +1,32 @@
+# 2026-05-06 日志
+
+## 日历事件日程类型功能
+
+### 修改内容
+- **后端** `routers/apiCalendar.go`:
+  - `TabCalendarEvent` 结构体新增 `ScheduleType string` 字段（默认值 work）
+  - `addevent`/`updateevent` 接口解析并保存 `schedule_type` 参数
+
+- **前端** `CalendarDetail.vue`:
+  - `eventData` 新增 `scheduleType` 字段
+  - `openEventModal`/`editEvent` 传递 `scheduleType`
+  - `selectColor` 函数联动更新 `scheduleType`
+  - `saveEvent`/`eventDrop` 提交 `schedule_type`
+  - `getEvents` 返回数据附加 `extendedProps.scheduleType`
+  - 模态框显示日程类型标签
+
+- **i18n**:
+  - `zh-CN.json`: 新增 `event_type: "日程类型"`
+  - `en.json`: 新增 `event_type: "Event Type"`
+
+### 日程类型选项
+- work - 工作
+- duty - 值班
+- exam - 考试
+- standby - 备用
+- personal_holiday - 个人假期
+- public_holiday - 公众假期
+
+### 注意事项
+- GORM AutoMigrate 会自动添加新字段
+- 前端颜色选择与日程类型联动
diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index c26fbc1..e87163b 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -27,17 +27,17 @@ type TabCalendar struct {
 
 // TabCalendarEvent 日历事件表
 type TabCalendarEvent struct {
-	ID         uint `gorm:"primarykey"`
-	CalendarID uint `gorm:"not null;index;comment:关联日历ID"`
-	UserID     uint `gorm:"not null;comment:创建人ID"`
-	//UsersID    []uint     `gorm:"type:json; null;comment:其他关联用户ID"`
-	Title     string     `gorm:"size:200;not null;comment:事件标题"`
-	StartDate *time.Time `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
-	EndDate   *time.Time `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
-	IsAllDay  bool       `gorm:"default:true;comment:是否全日事件"`
-	BgColor   string     `gorm:"size:50;default:#3788d9;comment:背景颜色"`
-	IsPublic  bool       `gorm:"default:false;comment:是否为公共日程"`
-	Remark    string     `gorm:"type:text;comment:备注"`
+	ID           uint `gorm:"primarykey"`
+	CalendarID   uint `gorm:"not null;index;comment:关联日历ID"`
+	UserID       uint `gorm:"not null;comment:创建人ID"`
+	Title        string     `gorm:"size:200;not null;comment:事件标题"`
+	StartDate    *time.Time `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
+	EndDate      *time.Time `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
+	IsAllDay     bool       `gorm:"default:true;comment:是否全日事件"`
+	ScheduleType string     `gorm:"size:50;default:work;comment:日程类型: work-工作 duty-值班 exam-考试 standby-待命 personal_holiday-调休 personal_holiday-公假"`
+	BgColor      string     `gorm:"size:50;default:#3788d9;comment:背景颜色"`
+	IsPublic     bool       `gorm:"default:false;comment:是否为公共日程"`
+	Remark       string     `gorm:"type:text;comment:备注"`
 
 	CreatedAt *time.Time     `gorm:"type:datetime;autoCreateTime;comment:创建时间"`
 	UpdatedAt *time.Time     `gorm:"type:datetime;autoUpdateTime;comment:最后修改时间"`
@@ -376,19 +376,24 @@ func ApiCalendar(r *gin.RouterGroup) {
 			color, _ := data["color"].(string)
 			remark, _ := data["remark"].(string)
 			isPublic, _ := data["is_public"].(bool)
+			scheduleType, _ := data["schedule_type"].(string)
+			if scheduleType == "" {
+				scheduleType = "work"
+			}
 
 			startDate, _ := time.Parse("2006-01-02 15:04:05", startStr)
 			endDate, _ := time.Parse("2006-01-02 15:04:05", endStr)
 
 			event := TabCalendarEvent{
-				CalendarID: calendarID,
-				UserID:     user.ID,
-				Title:      title,
-				StartDate:  &startDate,
-				EndDate:    &endDate,
-				BgColor:    color,
-				IsPublic:   isPublic,
-				Remark:     remark,
+				CalendarID:   calendarID,
+				UserID:       user.ID,
+				Title:        title,
+				StartDate:    &startDate,
+				EndDate:      &endDate,
+				ScheduleType: scheduleType,
+				BgColor:      color,
+				IsPublic:     isPublic,
+				Remark:       remark,
 			}
 			if event.BgColor == "" {
 				event.BgColor = calendar.Color
@@ -442,17 +447,22 @@ func ApiCalendar(r *gin.RouterGroup) {
 				color, _ := data["color"].(string)
 				remark, _ := data["remark"].(string)
 				isPublic, _ := data["is_public"].(bool)
+				scheduleType, _ := data["schedule_type"].(string)
+				if scheduleType == "" {
+					scheduleType = "work"
+				}
 
 				startDate, _ := time.Parse("2006-01-02 15:04:05", startStr)
 				endDate, _ := time.Parse("2006-01-02 15:04:05", endStr)
 
 				newEvent := TabCalendarEvent{
-					Title:     title,
-					StartDate: &startDate,
-					EndDate:   &endDate,
-					BgColor:   color,
-					IsPublic:  isPublic,
-					Remark:    remark,
+					Title:        title,
+					StartDate:    &startDate,
+					EndDate:      &endDate,
+					ScheduleType: scheduleType,
+					BgColor:      color,
+					IsPublic:     isPublic,
+					Remark:       remark,
 				}
 				if newEvent.BgColor == "" {
 					// 获取日历颜色
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index 0e6d2df..017c91e 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -312,6 +312,7 @@
     "standby": "Standby",
     "personal_holiday": "Personal Holiday",
     "public_holiday": "Public Holiday",
+    "event_type": "Event Type",
     "to": "To",
     "close": "Close",
     "copy": "Copy",
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index b5b0974..d7e8bea 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -312,6 +312,7 @@
     "standby": "备用",
     "personal_holiday": "个人假期",
     "public_holiday": "公众假期",
+    "event_type": "日程类型",
     "to": "至",
     "close": "关闭",
     "copy": "复制",
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index c5e578d..c8dbe69 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -37,6 +37,7 @@ const eventData = ref({
   startDate: "",
   endDate: "",
   color: "#3788d9",
+  scheduleType: "work",
   isPublic: false,
   isEditing: false,
   isEditable: false,
@@ -78,13 +79,14 @@ function closeEventModal() {
   showModal.value = false
 }
 
-function openEventModal(dateStr, dataEnd, id = 0, title = "", color = "#3788d9", isPublic = false, isEditing = false, isEditable = true) {
+function openEventModal(dateStr, dataEnd, id = 0, title = "", color = "#3788d9", scheduleType = "work", isPublic = false, isEditing = false, isEditable = true) {
   eventData.value = {
     id: id,
     title: title,
     startDate: dateStr,
     endDate: dataEnd,
     color: color,
+    scheduleType: scheduleType,
     isPublic: isPublic,
     isEditing: isEditing,
     isEditable: isEditable,
@@ -99,6 +101,7 @@ function editEvent(info) {
     parseInt(info.event.id),
     info.event.title,
     info.event.backgroundColor,
+    info.event.extendedProps?.scheduleType || "work",
     info.event.extendedProps?.isPublic || false,
     true,
     info.event.durationEditable,
@@ -108,6 +111,11 @@ function editEvent(info) {
 function selectColor(colorValue) {
   if (eventData.value.isEditable) {
     eventData.value.color = colorValue
+    // 根据颜色更新日程类型
+    const selectedColor = colorOptions.value.find(c => c.value === colorValue)
+    if (selectedColor) {
+      eventData.value.scheduleType = selectedColor.type
+    }
   }
 }
 
@@ -129,9 +137,6 @@ async function saveEvent() {
     return
   }
 
-  const selectedColor = colorOptions.value.find(c => c.value === eventData.value.color)
-  const scheduleType = selectedColor ? selectedColor.type : "work"
-
   try {
     let result
     if (eventData.value.isEditing) {
@@ -144,7 +149,7 @@ async function saveEvent() {
             ? eventData.value.endDate
             : DateUtils.toRealEnd(eventData.value.endDate),
         ),
-        schedule_type: scheduleType,
+        schedule_type: eventData.value.scheduleType,
         is_public: eventData.value.isPublic,
       })
     } else {
@@ -157,7 +162,7 @@ async function saveEvent() {
             ? eventData.value.endDate
             : DateUtils.toRealEnd(eventData.value.endDate),
         ),
-        schedule_type: scheduleType,
+        schedule_type: eventData.value.scheduleType,
         is_public: eventData.value.isPublic,
       })
     }
@@ -218,6 +223,10 @@ async function getEvents() {
           backgroundColor: item.BgColor,
           borderColor: item.ID === pageData.value.seleEventID ? "#000000" : "#F7F7F7",
           allDay: true,
+          extendedProps: {
+            scheduleType: item.ScheduleType || "work",
+            isPublic: item.IsPublic || false,
+          },
         })
       })
     }
@@ -391,8 +400,6 @@ const calendarOptions = ref({
 
   eventDrop(info) {
     // 拖拽后直接更新
-    const selectedColor = colorOptions.value.find(c => c.value === info.event.backgroundColor)
-    const scheduleType = selectedColor ? selectedColor.type : "work"
     const startStr = info.event.startStr
     const endStr = info.event.end ? info.event.endStr : startStr
     calendarApi.updateEvent({
@@ -400,7 +407,7 @@ const calendarOptions = ref({
       title: info.event.title,
       start: toDatetime(startStr),
       end: toDatetime(startStr === endStr ? endStr : DateUtils.toRealEnd(endStr)),
-      schedule_type: scheduleType,
+      schedule_type: info.event.extendedProps?.scheduleType || "work",
     }).then(r => {
       if (r.errCode !== 0) toast.error(t('message.server_error'))
       else getEvents()
@@ -569,6 +576,12 @@ onMounted(() => {
             </div>
           </div>
 
+          <!-- 日程类型标签 -->
+          <div class="mb-4 px-1">
+            <span class="text-sm text-gray-600">{{ t('schedule.event_type') }}: </span>
+            <span class="text-sm font-medium" :style="{ color: eventData.color }">{{ t('schedule.' + eventData.scheduleType) || eventData.scheduleType }}</span>
+          </div>
+
           <!-- 公共日程开关 -->
           <div class="mb-4 flex items-center justify-between">
             <span class="text-gray-700">{{ t('calendar.is_public_event') }}</span>

From 0a85cd4c49515ad7057d88d6004eb11bcfed6b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 19:07:54 +0800
Subject: [PATCH 06/21] up

---
 .workbuddy/memory/2026-05-06.md               | 12 ++++
 backend/my_work/routers/apiCalendar.go        | 70 +++++++++----------
 .../src/views/calendar/CalendarDetail.vue     |  8 ++-
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/.workbuddy/memory/2026-05-06.md b/.workbuddy/memory/2026-05-06.md
index 3487e3b..4395f28 100644
--- a/.workbuddy/memory/2026-05-06.md
+++ b/.workbuddy/memory/2026-05-06.md
@@ -30,3 +30,15 @@
 ### 注意事项
 - GORM AutoMigrate 会自动添加新字段
 - 前端颜色选择与日程类型联动
+
+## 修复：calendar/events jsonErr
+
+**问题**：`fromGetCalendarEvents` 的 `start/end` 是 `*time.Time` 类型，无法直接解析字符串格式的日期。
+
+**修复**：改为直接用类型断言解析字符串，用 `time.Parse("2006-01-02", ...)` 解析。
+
+## 优化：BgColor 弃用，前端根据 ScheduleType 渲染颜色
+
+**前端**：添加 `getColorByScheduleType()` 函数，`getEvents` 中使用 scheduleType 映射颜色。
+
+**后端**：只存储 ScheduleType，不处理颜色逻辑。颜色完全由前端 `colorOptions` 控制。
diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index e87163b..007130f 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -325,26 +325,35 @@ func ApiCalendar(r *gin.RouterGroup) {
 	r.POST("/calendar/events", func(ctx *gin.Context) {
 		isAuth, _, data := AuthenticationAuthority(ctx)
 		if isAuth {
-			var from fromGetCalendarEvents
-			if err := mapstructure.Decode(data, &from); err == nil {
-				var events []TabCalendarEvent
-				models.DB.Where("calendar_id = ? AND start_date <= ? AND end_date >= ? AND deleted_at IS NULL",
-					from.CalendarID, from.End, from.Start).Find(&events)
-
-				// 为事件添加编辑权限标识
-				var relist []map[string]interface{}
-				for _, event := range events {
-					data, _ := json.Marshal(event)
-					var temp map[string]interface{}
-					json.Unmarshal(data, &temp)
-					// 这里可以根据需要添加 edit 字段
-					relist = append(relist, temp)
-				}
-
-				ReturnJson(ctx, "apiOK", gin.H{"list": relist})
-			} else {
+			// 直接从 data 中解析，避免 float64 → uint 类型问题
+			calendarIDRaw, ok := data["calendar_id"].(float64)
+			if !ok || calendarIDRaw == 0 {
 				ReturnJson(ctx, "jsonErr", nil)
+				return
 			}
+			calendarID := uint(calendarIDRaw)
+
+			// 解析日期字符串
+			startStr, _ := data["start"].(string)
+			endStr, _ := data["end"].(string)
+			startDate, _ := time.Parse("2006-01-02", startStr)
+			endDate, _ := time.Parse("2006-01-02", endStr)
+
+			var events []TabCalendarEvent
+			models.DB.Where("calendar_id = ? AND start_date <= ? AND end_date >= ? AND deleted_at IS NULL",
+				calendarID, &endDate, &startDate).Find(&events)
+
+			// 为事件添加编辑权限标识
+			var relist []map[string]interface{}
+			for _, event := range events {
+				data, _ := json.Marshal(event)
+				var temp map[string]interface{}
+				json.Unmarshal(data, &temp)
+				// 这里可以根据需要添加 edit 字段
+				relist = append(relist, temp)
+			}
+
+			ReturnJson(ctx, "apiOK", gin.H{"list": relist})
 		} else {
 			ReturnJson(ctx, "userCookieError", nil)
 		}
@@ -373,7 +382,6 @@ func ApiCalendar(r *gin.RouterGroup) {
 			startStr, _ := data["start"].(string)
 			endStr, _ := data["end"].(string)
 			title, _ := data["title"].(string)
-			color, _ := data["color"].(string)
 			remark, _ := data["remark"].(string)
 			isPublic, _ := data["is_public"].(bool)
 			scheduleType, _ := data["schedule_type"].(string)
@@ -386,17 +394,13 @@ func ApiCalendar(r *gin.RouterGroup) {
 
 			event := TabCalendarEvent{
 				CalendarID:   calendarID,
-				UserID:       user.ID,
-				Title:        title,
-				StartDate:    &startDate,
-				EndDate:      &endDate,
+				UserID:      user.ID,
+				Title:       title,
+				StartDate:   &startDate,
+				EndDate:     &endDate,
 				ScheduleType: scheduleType,
-				BgColor:      color,
-				IsPublic:     isPublic,
-				Remark:       remark,
-			}
-			if event.BgColor == "" {
-				event.BgColor = calendar.Color
+				IsPublic:    isPublic,
+				Remark:      remark,
 			}
 
 			if models.DB.Create(&event).Error == nil {
@@ -444,7 +448,6 @@ func ApiCalendar(r *gin.RouterGroup) {
 				startStr, _ := data["start"].(string)
 				endStr, _ := data["end"].(string)
 				title, _ := data["title"].(string)
-				color, _ := data["color"].(string)
 				remark, _ := data["remark"].(string)
 				isPublic, _ := data["is_public"].(bool)
 				scheduleType, _ := data["schedule_type"].(string)
@@ -460,16 +463,9 @@ func ApiCalendar(r *gin.RouterGroup) {
 					StartDate:    &startDate,
 					EndDate:      &endDate,
 					ScheduleType: scheduleType,
-					BgColor:      color,
 					IsPublic:     isPublic,
 					Remark:       remark,
 				}
-				if newEvent.BgColor == "" {
-					// 获取日历颜色
-					var calendar TabCalendar
-					models.DB.Where("id = ?", oldEvent.CalendarID).First(&calendar)
-					newEvent.BgColor = calendar.Color
-				}
 
 				if models.DB.Model(&oldEvent).Updates(&newEvent).Error == nil {
 					// 记录日志
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index c8dbe69..8ea89dc 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -119,6 +119,12 @@ function selectColor(colorValue) {
   }
 }
 
+// 根据日程类型获取颜色
+function getColorByScheduleType(scheduleType) {
+  const found = colorOptions.value.find(c => c.type === scheduleType)
+  return found ? found.value : "#3788d9" // 默认蓝色
+}
+
 // 日期转后端格式：YYYY-MM-DD 00:00:00
 function toDatetime(dateStr) {
   return dateStr ? dateStr + " 00:00:00" : ""
@@ -220,7 +226,7 @@ async function getEvents() {
           end: item.StartDate === item.EndDate
             ? item.EndDate
             : DateUtils.toCalendarEnd(item.EndDate),
-          backgroundColor: item.BgColor,
+          backgroundColor: getColorByScheduleType(item.ScheduleType),
           borderColor: item.ID === pageData.value.seleEventID ? "#000000" : "#F7F7F7",
           allDay: true,
           extendedProps: {

From 8bbde00594a26c5686db02dfd87a8f4ee331a939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 19:39:41 +0800
Subject: [PATCH 07/21] up

---
 backend/my_work/routers/apiCalendar.go | 104 +++++++++++++++----------
 1 file changed, 62 insertions(+), 42 deletions(-)

diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index 007130f..469b74e 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -27,9 +27,9 @@ type TabCalendar struct {
 
 // TabCalendarEvent 日历事件表
 type TabCalendarEvent struct {
-	ID           uint `gorm:"primarykey"`
-	CalendarID   uint `gorm:"not null;index;comment:关联日历ID"`
-	UserID       uint `gorm:"not null;comment:创建人ID"`
+	ID           uint       `gorm:"primarykey"`
+	CalendarID   uint       `gorm:"not null;index;comment:关联日历ID"`
+	UserID       uint       `gorm:"not null;comment:创建人ID"`
 	Title        string     `gorm:"size:200;not null;comment:事件标题"`
 	StartDate    *time.Time `gorm:"size:10;not null;index;comment:开始日期 YYYY-MM-DD"`
 	EndDate      *time.Time `gorm:"size:10;not null;index;comment:结束日期 YYYY-MM-DD"`
@@ -321,42 +321,62 @@ func ApiCalendar(r *gin.RouterGroup) {
 		}
 	})
 
-	// 获取日历事件
+	// 获取日历事件（公开接口，无需登录）
 	r.POST("/calendar/events", func(ctx *gin.Context) {
-		isAuth, _, data := AuthenticationAuthority(ctx)
-		if isAuth {
-			// 直接从 data 中解析，避免 float64 → uint 类型问题
-			calendarIDRaw, ok := data["calendar_id"].(float64)
-			if !ok || calendarIDRaw == 0 {
-				ReturnJson(ctx, "jsonErr", nil)
-				return
-			}
-			calendarID := uint(calendarIDRaw)
+		data, cookieval := SeparateData(ctx)
 
-			// 解析日期字符串
-			startStr, _ := data["start"].(string)
-			endStr, _ := data["end"].(string)
-			startDate, _ := time.Parse("2006-01-02", startStr)
-			endDate, _ := time.Parse("2006-01-02", endStr)
-
-			var events []TabCalendarEvent
-			models.DB.Where("calendar_id = ? AND start_date <= ? AND end_date >= ? AND deleted_at IS NULL",
-				calendarID, &endDate, &startDate).Find(&events)
-
-			// 为事件添加编辑权限标识
-			var relist []map[string]interface{}
-			for _, event := range events {
-				data, _ := json.Marshal(event)
-				var temp map[string]interface{}
-				json.Unmarshal(data, &temp)
-				// 这里可以根据需要添加 edit 字段
-				relist = append(relist, temp)
-			}
-
-			ReturnJson(ctx, "apiOK", gin.H{"list": relist})
-		} else {
-			ReturnJson(ctx, "userCookieError", nil)
+		if data == nil {
+			ReturnJson(ctx, "jsonErr", nil)
+			return
 		}
+		calendarIDRaw, ok := data["calendar_id"].(float64)
+		if !ok || calendarIDRaw == 0 {
+			ReturnJson(ctx, "jsonErr", nil)
+			return
+		}
+		calendarID := uint(calendarIDRaw)
+
+		startStr, _ := data["start"].(string)
+		endStr, _ := data["end"].(string)
+		startDate, _ := time.Parse("2006-01-02", startStr)
+		endDate, _ := time.Parse("2006-01-02", endStr)
+
+		// 查询：当前日历的事件 + 所有公共日程
+		var events []TabCalendarEvent
+		models.DB.Where(
+			"(calendar_id = ? OR is_public = ?) AND start_date <= ? AND end_date >= ? AND deleted_at IS NULL",
+			calendarID, true, &endDate, &startDate,
+		).Find(&events)
+
+		// 判断是否已登录
+		var currentUserID uint
+		isLogin := false
+		if cookieval != "" {
+			user, err := AuthenticationAuthorityFromCookie(cookieval)
+			if err == nil {
+				isLogin = true
+				currentUserID = user.ID
+			}
+		}
+
+		var relist []map[string]interface{}
+		for _, event := range events {
+			eventMap, _ := json.Marshal(event)
+			var item map[string]interface{}
+			json.Unmarshal(eventMap, &item)
+
+			// 可编辑条件：事件创建者 或 日历管理员
+			canEdit := false
+			if isLogin {
+				if event.UserID == currentUserID || slices.Contains(calendarAdmins, currentUserID) {
+					canEdit = true
+				}
+			}
+			item["canEdit"] = canEdit
+			relist = append(relist, item)
+		}
+
+		ReturnJson(ctx, "apiOK", gin.H{"list": relist})
 	})
 
 	// 添加日历事件
@@ -394,13 +414,13 @@ func ApiCalendar(r *gin.RouterGroup) {
 
 			event := TabCalendarEvent{
 				CalendarID:   calendarID,
-				UserID:      user.ID,
-				Title:       title,
-				StartDate:   &startDate,
-				EndDate:     &endDate,
+				UserID:       user.ID,
+				Title:        title,
+				StartDate:    &startDate,
+				EndDate:      &endDate,
 				ScheduleType: scheduleType,
-				IsPublic:    isPublic,
-				Remark:      remark,
+				IsPublic:     isPublic,
+				Remark:       remark,
 			}
 
 			if models.DB.Create(&event).Error == nil {

From 056eb4798d8ee07b311ff7e19bed25f7d7d167c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 20:01:58 +0800
Subject: [PATCH 08/21] up

---
 .../src/views/calendar/CalendarDetail.vue     | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index 8ea89dc..ae14464 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -95,6 +95,7 @@ function openEventModal(dateStr, dataEnd, id = 0, title = "", color = "#3788d9",
 }
 
 function editEvent(info) {
+  const canEdit = info.event.extendedProps?.canEdit ?? false
   openEventModal(
     info.event.startStr,
     info.event.end ? info.event.endStr : info.event.startStr,
@@ -104,7 +105,7 @@ function editEvent(info) {
     info.event.extendedProps?.scheduleType || "work",
     info.event.extendedProps?.isPublic || false,
     true,
-    info.event.durationEditable,
+    canEdit,
   )
 }
 
@@ -219,6 +220,7 @@ async function getEvents() {
     if (errCode === 0) {
       calendarOptions.value.events = []
       ;(data.list || []).forEach(item => {
+        const canEdit = item.canEdit === true
         calendarOptions.value.events.push({
           id: item.ID,
           title: item.Title,
@@ -229,12 +231,22 @@ async function getEvents() {
           backgroundColor: getColorByScheduleType(item.ScheduleType),
           borderColor: item.ID === pageData.value.seleEventID ? "#000000" : "#F7F7F7",
           allDay: true,
+          editable: canEdit,
+          durationEditable: canEdit,
           extendedProps: {
             scheduleType: item.ScheduleType || "work",
             isPublic: item.IsPublic || false,
+            canEdit: canEdit,
           },
         })
       })
+
+      // 检测数据是否变化（多浏览器同步场景），变了就重新计算滚动
+      const newSnapshot = JSON.stringify(data.list)
+      if (newSnapshot !== pageData.value.lastEventsSnapshot) {
+        pageData.value.lastEventsSnapshot = newSnapshot
+        setTimeout(recalcScrollTitles, 150)
+      }
     }
   } catch {
     // 拦截器已处理
@@ -405,6 +417,12 @@ const calendarOptions = ref({
   },
 
   eventDrop(info) {
+    const canEdit = info.event.extendedProps?.canEdit ?? false
+    if (!canEdit) {
+      info.revert()
+      toast.warning(t("message.no_permission"))
+      return
+    }
     // 拖拽后直接更新
     const startStr = info.event.startStr
     const endStr = info.event.end ? info.event.endStr : startStr
@@ -441,9 +459,14 @@ watch(locale, () => {
 })
 
 let resizeObserver = null
+let refreshTimer = null
 
 onMounted(() => {
   fetchCalendarInfo()
+  // 每 5 秒刷新一次数据
+  refreshTimer = setInterval(() => {
+    getEvents()
+  }, 5000)
   // 监听日历容器宽度变化
   let resizeTimer = null
   resizeObserver = new ResizeObserver(() => {
@@ -454,6 +477,10 @@ onMounted(() => {
     resizeObserver.observe(calendarRef.value.$el)
   }
   onBeforeUnmount(() => {
+    if (refreshTimer) {
+      clearInterval(refreshTimer)
+      refreshTimer = null
+    }
     if (resizeObserver) {
       resizeObserver.disconnect()
       resizeObserver = null

From 1d5f0b4bc086ea13e8e9ed14227d637a93c6a306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 20:36:52 +0800
Subject: [PATCH 09/21] up

---
 .workbuddy/memory/2026-05-06.md               | 24 ++++++++
 .../src/components/ConfirmDialog.vue          |  8 ++-
 frontend/ops_vue_js/src/i18n/en.json          |  3 +
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  3 +
 .../src/views/calendar/CalendarDetail.vue     | 59 +++++++++++++++++--
 .../src/views/calendar/CalendarList.vue       | 33 ++++++++---
 6 files changed, 114 insertions(+), 16 deletions(-)

diff --git a/.workbuddy/memory/2026-05-06.md b/.workbuddy/memory/2026-05-06.md
index 4395f28..50d9e60 100644
--- a/.workbuddy/memory/2026-05-06.md
+++ b/.workbuddy/memory/2026-05-06.md
@@ -42,3 +42,27 @@
 **前端**：添加 `getColorByScheduleType()` 函数，`getEvents` 中使用 scheduleType 映射颜色。
 
 **后端**：只存储 ScheduleType，不处理颜色逻辑。颜色完全由前端 `colorOptions` 控制。
+
+## CalendarDetail 滚动标题快照对比
+
+**功能**：每次 getEvents 存快照，数据变化或宽度变化时重新计算标题滚动。
+
+**实现**：
+- `pageData.lastEventsSnapshot`：存储上一次的 JSON 快照
+- `getEvents()` 末尾对比快照，变化则 `setTimeout(recalcScrollTitles, 150)`
+- `ResizeObserver` 监听日历容器宽度变化，防抖 150ms 后重算
+- `applyScrollToTitle()`：清除旧状态 → 测量 overflow → 设置 `--scroll-distance` 和 `data-truncated` 属性
+
+## CalendarList 编辑/删除按钮改用 canEdit
+
+**改动**：
+- `CalendarList.vue`：编辑/删除按钮 `v-if` 条件从 `calendar.UserID === userStore.userInfo?.ID` 改为 `calendar.canEdit`
+- 移除废弃的 `useUserStore` 导入
+
+## CalendarList 删除改用 ConfirmDialog 组件
+
+**改动**：
+- `CalendarList.vue` 导入并使用 `ConfirmDialog` 组件
+- 新增 `showDeleteModal` + `deletingCalendar` 状态
+- `deleteCalendar()` 改为打开确认弹窗，`confirmDelete()` 执行实际删除 API
+- i18n 新增 `calendar.confirm_delete_message`：zh-CN「确定要删除日历「{name}」吗？此操作不可撤销。」，en 英文版
diff --git a/frontend/ops_vue_js/src/components/ConfirmDialog.vue b/frontend/ops_vue_js/src/components/ConfirmDialog.vue
index 704bae7..31c2289 100644
--- a/frontend/ops_vue_js/src/components/ConfirmDialog.vue
+++ b/frontend/ops_vue_js/src/components/ConfirmDialog.vue
@@ -15,7 +15,7 @@
  * 或者作为组件使用 v-model：
  *   <ConfirmDialog v-model="show" @confirm="..." @cancel="..." />
  */
-import { ref, watch } from "vue";
+import { ref, watch, onMounted, getCurrentInstance } from "vue";
 import { useI18n } from "vue-i18n";
 
 const props = defineProps({
@@ -47,7 +47,11 @@ const props = defineProps({
 
 const emit = defineEmits(["update:modelValue", "confirm", "cancel"]);
 
-const { t } = useI18n();
+// 优先用组件内 i18n，Teleport 场景下可能为空，从全局补足
+const instance = getCurrentInstance();
+const { t: componentT } = useI18n();
+const globalT = instance?.appContext?.config?.globalProperties?.$i18n?.t;
+const t = (key, ...args) => componentT(key, ...args) || globalT?.(key, ...args) || key;
 
 function close() {
   emit("update:modelValue", false);
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index 017c91e..45e1c1c 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -1,4 +1,6 @@
 {
+  "delete": "Delete",
+  "cancel": "Cancel",
   "common": {
     "actions": "Actions",
     "search": "Search",
@@ -625,6 +627,7 @@
     "update_success": "Calendar updated successfully",
     "delete_success": "Calendar deleted successfully",
     "confirm_delete": "Are you sure you want to delete this calendar?",
+    "confirm_delete_message": "Are you sure you want to delete calendar '{name}'? This action cannot be undone.",
     "loading": "Loading...",
     "add_event": "Add Event",
     "edit_event": "Edit Event",
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index d7e8bea..7c28b72 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -1,4 +1,6 @@
 {
+  "delete": "删除",
+  "cancel": "取消",
   "common": {
     "actions": "操作",
     "search": "搜索",
@@ -625,6 +627,7 @@
     "update_success": "更新成功",
     "delete_success": "删除成功",
     "confirm_delete": "确定要删除此日历吗？",
+    "confirm_delete_message": "确定要删除日历「{name}」吗？此操作不可撤销。",
     "loading": "加载中...",
     "add_event": "添加事件",
     "edit_event": "编辑事件",
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index ae14464..8d26126 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -13,6 +13,7 @@ import { useUserStore } from "@/stores/user"
 import { calendarApi } from "@/api/calendar"
 import { useDateUtils } from "@/composables/useDateUtils"
 import DatatimePickerForFullCalendar from "@/components/datatimePickerForFullCalendar.vue"
+import ConfirmDialog from "@/components/ConfirmDialog.vue"
 
 const route = useRoute()
 const router = useRouter()
@@ -62,6 +63,8 @@ const pageData = ref({
   lastEventsSnapshot: null,
 })
 
+const showDeleteModal = ref(false)
+
 // 选中/取消选中事件
 function unseleEvent(eventID) {
   const target = calendarOptions.value.events.find(item => item.id === eventID)
@@ -187,19 +190,23 @@ async function saveEvent() {
 }
 
 async function deleteEvent() {
-  if (!confirm(t('calendar.confirm_delete_event'))) return
+  showDeleteModal.value = true
+}
 
+async function confirmDeleteEvent() {
   try {
     const result = await calendarApi.deleteEvent(eventData.value.id)
     if (result.errCode === 0) {
-      toast.success(t('calendar.event_delete_success'))
+      toast.success(t("calendar.event_delete_success"))
       closeEventModal()
       getEvents()
     } else {
-      toast.error(t('message.server_error'))
+      toast.error(t("message.server_error"))
     }
   } catch {
     // 拦截器已处理
+  } finally {
+    showDeleteModal.value = false
   }
 }
 
@@ -319,12 +326,20 @@ const calendarOptions = ref({
   },
 
   headerToolbar: {
-    left: "prevYear,prev,today,next,nextYear",
-    center: "title",
-    right: "",
+    left: "backToList,prevYear,prev,today,next,nextYear",
+    center: "myTitle",
+    right: "title",
   },
 
   customButtons: {
+    backToList: {
+      text: t("calendar.calendars"),
+      click() { router.push("/calendars") },
+    },
+    myTitle: {
+      text: calendarInfo.value?.Name || "",
+      disabled: true,
+    },
     prevYear: {
       text: t("schedule.previous_year"),
       click() { calendarRef.value.getApi().prevYear(); getEvents() },
@@ -439,9 +454,15 @@ const calendarOptions = ref({
   },
 })
 
+// 监听日历信息变化
+watch(calendarInfo, () => {
+  calendarOptions.value.customButtons.myTitle.text = calendarInfo.value?.Name || ""
+})
+
 // 监听语言变化
 watch(locale, () => {
   calendarOptions.value.locale = locale.value
+  calendarOptions.value.customButtons.backToList.text = t("calendar.calendars")
   calendarOptions.value.customButtons.prevYear.text = t("schedule.previous_year")
   calendarOptions.value.customButtons.nextYear.text = t("schedule.next_year")
   calendarOptions.value.customButtons.prev.text = t("schedule.previous_month")
@@ -674,9 +695,35 @@ onMounted(() => {
       </div>
     </div>
   </div>
+
+  <!-- Delete Confirm Dialog -->
+  <ConfirmDialog
+    v-model="showDeleteModal"
+    :title="t('calendar.delete_event')"
+    :message="t('calendar.confirm_delete_event')"
+    :confirm-text="t('delete')"
+    :cancel-text="t('cancel')"
+    danger
+    @confirm="confirmDeleteEvent"
+  />
 </template>
 
 <style scoped>
+/* 日历名称按钮样式 */
+:deep(.fc-myTitle-button) {
+  background: none !important;
+  border: none !important;
+  box-shadow: none !important;
+  cursor: default !important;
+  font-size: 1.1rem;
+  font-weight: 600;
+  color: #374151;
+  padding: 0 8px;
+}
+:deep(.fc-myTitle-button:disabled) {
+  opacity: 1 !important;
+}
+
 /* 父容器作为裁剪视口 */
 :deep(.fc-daygrid-event .fc-event-title-container) {
   overflow: hidden !important;
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarList.vue b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
index 6e20c71..a9b8b35 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
@@ -5,20 +5,21 @@ import { useI18n } from 'vue-i18n'
 import { useToastStore } from '@/stores/toast'
 import { usePageTitle } from '@/composables/usePageTitle'
 import { calendarApi } from '@/api/calendar'
-import { useUserStore } from '@/stores/user'
 import { IconPlus, IconCalendar, IconTrash, IconEdit } from '@tabler/icons-vue'
+import ConfirmDialog from '@/components/ConfirmDialog.vue'
 
 usePageTitle('appname.calendar')
 const { t } = useI18n()
 const router = useRouter()
 const toast = useToastStore()
-const userStore = useUserStore()
 
 const calendars = ref([])
 const loading = ref(false)
 const showCreateModal = ref(false)
 const showEditModal = ref(false)
+const showDeleteModal = ref(false)
 const editingCalendar = ref(null)
+const deletingCalendar = ref(null)
 
 const form = ref({
   name: '',
@@ -112,12 +113,14 @@ async function updateCalendar() {
 }
 
 async function deleteCalendar(calendar) {
-  if (!confirm(t('calendar.confirm_delete'))) {
-    return
-  }
+  deletingCalendar.value = calendar
+  showDeleteModal.value = true
+}
 
+async function confirmDelete() {
+  if (!deletingCalendar.value) return
   try {
-    const { errCode } = await calendarApi.deleteCalendar(calendar.ID)
+    const { errCode } = await calendarApi.deleteCalendar(deletingCalendar.value.ID)
     if (errCode === 0) {
       toast.success(t('calendar.delete_success'))
       fetchCalendars()
@@ -126,6 +129,9 @@ async function deleteCalendar(calendar) {
     }
   } catch {
     // 拦截器已处理
+  } finally {
+    showDeleteModal.value = false
+    deletingCalendar.value = null
   }
 }
 
@@ -188,14 +194,14 @@ onMounted(fetchCalendars)
 
               <div class="flex items-center gap-1" @click.stop>
                 <button
-                  v-if="calendar.UserID === userStore.userInfo?.ID"
+                  v-if="calendar.canEdit"
                   @click="openEditModal(calendar)"
                   class="rounded p-1 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-dk-muted"
                 >
                   <IconEdit :size="16" />
                 </button>
                 <button
-                  v-if="calendar.UserID === userStore.userInfo?.ID"
+                  v-if="calendar.canEdit"
                   @click="deleteCalendar(calendar)"
                   class="rounded p-1 text-gray-400 transition-colors hover:bg-red-50 hover:text-red-600 dark:hover:bg-dk-muted"
                 >
@@ -373,4 +379,15 @@ onMounted(fetchCalendars)
       </div>
     </div>
   </div>
+
+  <!-- Delete Confirm Dialog -->
+  <ConfirmDialog
+    v-model="showDeleteModal"
+    :title="t('calendar.confirm_delete')"
+    :message="t('calendar.confirm_delete_message', { name: deletingCalendar?.Name || '' })"
+    :confirm-text="t('delete')"
+    :cancel-text="t('cancel')"
+    danger
+    @confirm="confirmDelete"
+  />
 </template>

From bbf5f47fc67c334ec66fc19b14979331425a7f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 20:41:41 +0800
Subject: [PATCH 10/21] up

---
 .../src/views/calendar/CalendarDetail.vue          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index 8d26126..4949e35 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -709,16 +709,22 @@ onMounted(() => {
 </template>
 
 <style scoped>
+/* 减少工具栏与日历主体之间的间距 */
+:deep(.fc .fc-toolbar) {
+  margin-bottom: 8px;
+}
+
 /* 日历名称按钮样式 */
 :deep(.fc-myTitle-button) {
   background: none !important;
   border: none !important;
   box-shadow: none !important;
   cursor: default !important;
-  font-size: 1.1rem;
-  font-weight: 600;
-  color: #374151;
-  padding: 0 8px;
+  font-size: 2rem;
+  font-weight: 700;
+  color: #1f2937;
+  padding: 0 0px;
+  pointer-events: none;
 }
 :deep(.fc-myTitle-button:disabled) {
   opacity: 1 !important;

From a4ed48a26f144585d1889631811da2be7314d4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 21:11:28 +0800
Subject: [PATCH 11/21] up

---
 backend/my_work/routers/apiSysAdmin.go        | 22 +++++++++++++++++++
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  1 +
 .../src/views/calendar/CalendarDetail.vue     |  2 +-
 .../src/views/sysadmin/OperationLogsTab.vue   |  2 ++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/backend/my_work/routers/apiSysAdmin.go b/backend/my_work/routers/apiSysAdmin.go
index 3783548..c320e48 100644
--- a/backend/my_work/routers/apiSysAdmin.go
+++ b/backend/my_work/routers/apiSysAdmin.go
@@ -581,6 +581,28 @@ func ApiSysAdmin(r *gin.RouterGroup) {
 			}
 		}
 
+		if params.Module == "all" || params.Module == "calendar" {
+			var logs []TabCalendarLog
+			query := models.DB.Model(&TabCalendarLog{})
+			if params.Module == "calendar" {
+				query.Order("created_at DESC").Find(&logs)
+			} else {
+				query.Order("created_at DESC").Limit(1000).Find(&logs)
+			}
+			for _, log := range logs {
+				allLogs = append(allLogs, LogEntry{
+					ID:         log.ID,
+					Module:     "calendar",
+					EntityID:   log.CalendarID,
+					UserID:     log.UserID,
+					ActionType: log.ActionType,
+					IP:         log.IP,
+					Remark:     log.Remark,
+					CreatedAt:  log.CreatedAt,
+				})
+			}
+		}
+
 		if params.Module == "all" || params.Module == "warehouse" {
 			var logs []TabWarehouseLog
 			query := models.DB.Model(&TabWarehouseLog{})
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index 7c28b72..d432344 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -553,6 +553,7 @@
     "module_purchase": "采购",
     "module_schedule": "日程",
     "module_warehouse": "仓库",
+    "module_calendar": "日历",
     "module_work_order": "工单",
     "action_create": "创建",
     "action_update": "更新",
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index 4949e35..db78d8e 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -47,7 +47,7 @@ const eventData = ref({
 const colorOptions = ref([
   { value: "#3788d9", label: t("schedule.work"), name: t("schedule.work"), type: "work" },
   { value: "#06d6a0", label: t("schedule.duty"), name: t("schedule.duty"), type: "duty" },
-  { value: "#ff595e", label: t("schedule.exam"), name: t("schedule.exam"), type: "exam" },
+  { value: "#976BC2", label: t("schedule.exam"), name: t("schedule.exam"), type: "exam" },
   { value: "#ffca3a", label: t("schedule.standby"), name: t("schedule.standby"), type: "standby" },
   { value: "#D16C13", label: t("schedule.personal_holiday"), name: t("schedule.personal_holiday"), type: "personal_holiday" },
   { value: "#D10D21", label: t("schedule.public_holiday"), name: t("schedule.public_holiday"), type: "public_holiday" },
diff --git a/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue b/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue
index 1c4e493..22c4ac4 100644
--- a/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue
+++ b/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue
@@ -24,6 +24,7 @@ const modules = [
   { id: 'schedule', label: 'schedule.title' },
   { id: 'warehouse', label: 'warehouse.title' },
   { id: 'work_order', label: 'work_order.title' },
+  { id: 'calendar', label: 'calendar.calendars' },
 ]
 const activeModule = ref('all')
 
@@ -83,6 +84,7 @@ function getModuleClass(module) {
     purchase: 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400',
     schedule: 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-400',
     warehouse: 'bg-orange-100 text-orange-800 dark:bg-orange-900/30 dark:text-orange-400',
+    calendar: 'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-400',
     work_order: 'bg-cyan-100 text-cyan-800 dark:bg-cyan-900/30 dark:text-cyan-400',
   }
   return map[module] || 'bg-gray-100 text-gray-800 dark:bg-gray-900/30 dark:text-gray-400'

From be565b08103a13915423f04f11ba6f80071358b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 21:28:17 +0800
Subject: [PATCH 12/21] up

---
 .workbuddy/memory/2026-05-06.md               |  18 +
 backend/my_work/routers/apiCalendar.go        |  70 +++
 frontend/ops_vue_js/src/api/calendar.js       |  10 +
 frontend/ops_vue_js/src/i18n/en.json          |   9 +-
 frontend/ops_vue_js/src/i18n/zh-CN.json       |   9 +-
 frontend/ops_vue_js/src/router/index.js       |   6 +
 .../src/views/calendar/CalendarAdminList.vue  | 464 ++++++++++++++++++
 .../src/views/sysadmin/SysAdminView.vue       |   1 +
 8 files changed, 585 insertions(+), 2 deletions(-)
 create mode 100644 frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue

diff --git a/.workbuddy/memory/2026-05-06.md b/.workbuddy/memory/2026-05-06.md
index 50d9e60..2cde560 100644
--- a/.workbuddy/memory/2026-05-06.md
+++ b/.workbuddy/memory/2026-05-06.md
@@ -66,3 +66,21 @@
 - 新增 `showDeleteModal` + `deletingCalendar` 状态
 - `deleteCalendar()` 改为打开确认弹窗，`confirmDelete()` 执行实际删除 API
 - i18n 新增 `calendar.confirm_delete_message`：zh-CN「确定要删除日历「{name}」吗？此操作不可撤销。」，en 英文版
+
+## 新增日历管理页面 /calendars/admin
+
+**功能**：系统管理员查看所有日历列表，包含日程数量、创建者、创建时间。
+
+**新增文件**：
+- `src/views/calendar/CalendarAdminList.vue` - 日历管理列表组件
+
+**路由修改** `src/router/index.js`：
+- 新增 `/calendars/admin` 路由，指向 `CalendarAdminList.vue`
+- 设置 `meta: { requireSysAdmin: true }` 要求管理员权限
+
+**SysAdminView.vue**：
+- `tabs` 数组新增 `{ id: 'calendar', label: t('calendar.admin_title'), to: '/calendars/admin' }`
+
+**i18n 新增**：
+- `zh-CN.json`: `calendar.admin_title = "日历管理"`, `calendar.event_count = "日程数量"`
+- `en.json`: `calendar.admin_title = "Calendar Admin"`, `calendar.event_count = "Event Count"`
diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index 469b74e..ca12de9 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -111,6 +111,10 @@ type fromDeleteCalendarEvent struct {
 	ID uint `json:"id" binding:"required"`
 }
 
+type fromRestoreCalendar struct {
+	ID uint `json:"id" binding:"required"`
+}
+
 var (
 	calendarUserGroup TabUserGroups
 	calendarAdmins    []uint
@@ -280,6 +284,72 @@ func ApiCalendar(r *gin.RouterGroup) {
 		}
 	})
 
+	// 获取所有日历（包括已删除的，系统管理员专用）
+	r.POST("/calendar/list_all", func(ctx *gin.Context) {
+		isAuth, _, _ := AuthenticationAuthority(ctx)
+		if !isAuth {
+			ReturnJson(ctx, "userCookieError", nil)
+			return
+		}
+
+		// 使用 Unscoped 查询所有日历（包括软删除的）
+		var calendars []TabCalendar
+		models.DB.Unscoped().Order("created_at DESC").Find(&calendars)
+
+		type CalendarWithEdit struct {
+			TabCalendar
+			CanEdit bool `json:"canEdit"`
+		}
+		var result []CalendarWithEdit
+		for _, cal := range calendars {
+			result = append(result, CalendarWithEdit{
+				TabCalendar: cal,
+				CanEdit:     true,
+			})
+		}
+		ReturnJson(ctx, "apiOK", gin.H{"list": result})
+	})
+
+	// 恢复已删除的日历
+	r.POST("/calendar/restore", func(ctx *gin.Context) {
+		isAuth, user, data := AuthenticationAuthority(ctx)
+		if !isAuth {
+			ReturnJson(ctx, "userCookieError", nil)
+			return
+		}
+
+		var from fromRestoreCalendar
+		if err := mapstructure.Decode(data, &from); err != nil {
+			ReturnJson(ctx, "jsonErr", nil)
+			return
+		}
+
+		// 使用 Unscoped 查询（包括软删除的）
+		var calendar TabCalendar
+		if models.DB.Unscoped().Where("id = ?", from.ID).First(&calendar).Error != nil {
+			ReturnJson(ctx, "calendar_not_find", nil)
+			return
+		}
+
+		// 恢复软删除（将 deleted_at 设为 NULL）
+		if models.DB.Unscoped().Model(&calendar).Update("deleted_at", nil).Error != nil {
+			ReturnJson(ctx, "apiErr", nil)
+			return
+		}
+
+		// 记录日志
+		newContent, _ := json.Marshal(calendar)
+		log := TabCalendarLog{
+			CalendarID: calendar.ID,
+			UserID:     user.ID,
+			ActionType: "restore",
+			NewContent: string(newContent),
+			IP:         ctx.ClientIP(),
+		}
+		models.DB.Create(&log)
+		ReturnJson(ctx, "apiOK", nil)
+	})
+
 	// 删除日历
 	r.POST("/calendar/delete", func(ctx *gin.Context) {
 		isAuth, user, data := AuthenticationAuthority(ctx)
diff --git a/frontend/ops_vue_js/src/api/calendar.js b/frontend/ops_vue_js/src/api/calendar.js
index 4d23479..796b34d 100644
--- a/frontend/ops_vue_js/src/api/calendar.js
+++ b/frontend/ops_vue_js/src/api/calendar.js
@@ -11,6 +11,11 @@ export const calendarApi = {
     return api.post('/calendar/calendar/list', {})
   },
 
+  // 获取所有日历（包括已删除的，系统管理员专用）
+  getAllCalendars() {
+    return api.post('/calendar/calendar/list_all', {})
+  },
+
   // 更新日历
   updateCalendar(data) {
     return api.post('/calendar/calendar/update', data)
@@ -21,6 +26,11 @@ export const calendarApi = {
     return api.post('/calendar/calendar/delete', { id })
   },
 
+  // 恢复已删除的日历
+  restoreCalendar(id) {
+    return api.post('/calendar/calendar/restore', { id })
+  },
+
   // 获取日历事件
   getEvents(data) {
     return api.post('/calendar/calendar/events', data)
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index 45e1c1c..2932a1f 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -643,6 +643,13 @@
     "event_save_success": "Event saved successfully",
     "event_delete_success": "Event deleted successfully",
     "confirm_delete_event": "Are you sure you want to delete this event?",
-    "is_public_event": "Public Event"
+    "is_public_event": "Public Event",
+    "admin_title": "Calendar Admin",
+    "event_count": "Event Count",
+    "restore": "Restore",
+    "restore_success": "Restored successfully",
+    "deleted": "Deleted",
+    "confirm_restore": "Are you sure you want to restore this calendar?",
+    "confirm_restore_message": "Are you sure you want to restore calendar '{name}'?"
   }
 }
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index d432344..8cee082 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -644,6 +644,13 @@
     "event_save_success": "事件保存成功",
     "event_delete_success": "事件删除成功",
     "confirm_delete_event": "确定要删除此事件吗？",
-    "is_public_event": "公共日程"
+    "is_public_event": "公共日程",
+    "admin_title": "日历管理",
+    "event_count": "日程数量",
+    "restore": "恢复",
+    "restore_success": "恢复成功",
+    "deleted": "已删除",
+    "confirm_restore": "确定要恢复此日历吗？",
+    "confirm_restore_message": "确定要恢复日历「{name}」吗？"
   }
 }
diff --git a/frontend/ops_vue_js/src/router/index.js b/frontend/ops_vue_js/src/router/index.js
index cb69a49..e90ad30 100644
--- a/frontend/ops_vue_js/src/router/index.js
+++ b/frontend/ops_vue_js/src/router/index.js
@@ -129,6 +129,12 @@ const router = createRouter({
           name: 'customer-edit',
           component: () => import('@/views/customer/CustomerFormPage.vue'),
         },
+        {
+          path: 'calendars/admin',
+          name: 'calendars-admin',
+          component: () => import('@/views/calendar/CalendarAdminList.vue'),
+          meta: { requireSysAdmin: true },
+        },
         {
           path: 'calendars',
           name: 'calendars',
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue b/frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue
new file mode 100644
index 0000000..bd12ab3
--- /dev/null
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue
@@ -0,0 +1,464 @@
+<script setup>
+import { ref, onMounted } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { usePageTitle } from '@/composables/usePageTitle'
+import { useToastStore } from '@/stores/toast'
+import { calendarApi } from '@/api/calendar'
+import { useUsersStore } from '@/stores/users'
+import { IconCalendar, IconClock, IconEdit, IconRestore } from '@tabler/icons-vue'
+import ConfirmDialog from '@/components/ConfirmDialog.vue'
+
+usePageTitle('calendar.admin_title')
+const { t } = useI18n()
+const toast = useToastStore()
+const usersStore = useUsersStore()
+
+const calendars = ref([])
+const loading = ref(false)
+const eventCounts = ref({}) // calendarId -> event count
+
+// 编辑相关
+const showEditModal = ref(false)
+const editingCalendar = ref(null)
+const showDeleteModal = ref(false)
+const deletingCalendar = ref(null)
+const showRestoreModal = ref(false)
+const restoringCalendar = ref(null)
+
+const form = ref({
+  name: '',
+  description: '',
+  color: '#3788d9',
+  is_public: false
+})
+
+const colorOptions = [
+  '#3788d9',
+  '#06d6a0',
+  '#ff595e',
+  '#ffca3a',
+  '#8b5cf6',
+  '#ec4899'
+]
+
+async function fetchCalendars() {
+  loading.value = true
+  try {
+    // 使用 getAllCalendars 获取所有日历（包括已删除的）
+    const { errCode, data } = await calendarApi.getAllCalendars()
+    if (errCode === 0) {
+      calendars.value = data.list || []
+      // 预加载创建者信息
+      calendars.value.forEach(cal => {
+        if (cal.UserID) {
+          usersStore.fetchUser(cal.UserID)
+        }
+      })
+      // 获取每个日历的事件数量
+      fetchEventCounts()
+    }
+  } catch {
+    // 拦截器已处理
+  } finally {
+    loading.value = false
+  }
+}
+
+async function fetchEventCounts() {
+  // 获取一年前到现在的事件，用于统计
+  const now = new Date()
+  const oneYearAgo = new Date()
+  oneYearAgo.setFullYear(now.getFullYear() - 1)
+
+  const startStr = oneYearAgo.toISOString().split('T')[0]
+  const endStr = now.toISOString().split('T')[0]
+
+  try {
+    const { errCode, data } = await calendarApi.getEvents({
+      start_date: startStr,
+      end_date: endStr
+    })
+    if (errCode === 0 && data.list) {
+      // 按日历ID统计事件数量
+      const counts = {}
+      data.list.forEach(event => {
+        if (event.CalendarID) {
+          counts[event.CalendarID] = (counts[event.CalendarID] || 0) + 1
+        }
+      })
+      eventCounts.value = counts
+    }
+  } catch {
+    // 忽略错误
+  }
+}
+
+function getCreatorName(userID) {
+  return usersStore.getUsernameFromUserID(userID) || '...'
+}
+
+function getCreatorAvatar(userID) {
+  return usersStore.getAvatarUrlFromUserID(userID)
+}
+
+function formatDateTime(dateStr) {
+  if (!dateStr) return '-'
+  const date = new Date(dateStr)
+  return date.toLocaleString()
+}
+
+// 判断日历是否已删除（deleted_at 不为 NULL）
+function isDeleted(calendar) {
+  return calendar.DeletedAt !== null && calendar.DeletedAt !== undefined
+}
+
+function openEditModal(calendar) {
+  editingCalendar.value = calendar
+  form.value = {
+    name: calendar.Name,
+    description: calendar.Description || '',
+    color: calendar.Color,
+    is_public: calendar.IsPublic
+  }
+  showEditModal.value = true
+}
+
+async function updateCalendar() {
+  if (!form.value.name.trim()) {
+    toast.error(t('calendar.name_required'))
+    return
+  }
+
+  try {
+    const { errCode } = await calendarApi.updateCalendar({
+      id: editingCalendar.value.ID,
+      ...form.value
+    })
+    if (errCode === 0) {
+      toast.success(t('calendar.update_success'))
+      showEditModal.value = false
+      fetchCalendars()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  }
+}
+
+function openDeleteModal(calendar) {
+  deletingCalendar.value = calendar
+  showDeleteModal.value = true
+}
+
+async function confirmDelete() {
+  if (!deletingCalendar.value) return
+  try {
+    const { errCode } = await calendarApi.deleteCalendar(deletingCalendar.value.ID)
+    if (errCode === 0) {
+      toast.success(t('calendar.delete_success'))
+      fetchCalendars()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  } finally {
+    showDeleteModal.value = false
+    deletingCalendar.value = null
+  }
+}
+
+function openRestoreModal(calendar) {
+  restoringCalendar.value = calendar
+  showRestoreModal.value = true
+}
+
+async function confirmRestore() {
+  if (!restoringCalendar.value) return
+  try {
+    const { errCode } = await calendarApi.restoreCalendar(restoringCalendar.value.ID)
+    if (errCode === 0) {
+      toast.success(t('calendar.restore_success'))
+      fetchCalendars()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  } finally {
+    showRestoreModal.value = false
+    restoringCalendar.value = null
+  }
+}
+
+onMounted(fetchCalendars)
+</script>
+
+<template>
+  <div class="min-h-screen bg-gray-50 p-6 dark:bg-dk-base">
+    <div class="mx-auto max-w-6xl">
+      <!-- Header -->
+      <div class="mb-6 flex items-center justify-between">
+        <div>
+          <h1 class="text-2xl font-bold text-gray-900 dark:text-dk-text">{{ t('calendar.admin_title') }}</h1>
+          <p class="mt-1 text-sm text-gray-500 dark:text-dk-subtle">
+            {{ t('calendar.calendars') }}
+          </p>
+        </div>
+        <button
+          @click="fetchCalendars"
+          class="inline-flex items-center gap-2 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+        >
+          <IconClock :size="16" />
+          {{ t('sysadmin.refresh') }}
+        </button>
+      </div>
+
+      <!-- Calendar List Table -->
+      <div class="rounded-lg border border-gray-200 bg-white dark:border-dk-muted dark:bg-dk-card">
+        <!-- Loading -->
+        <div v-if="loading" class="flex items-center justify-center py-12">
+          <svg class="h-6 w-6 animate-spin text-blue-500" viewBox="0 0 24 24" fill="none">
+            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
+            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z" />
+          </svg>
+          <span class="ml-2 text-gray-500 dark:text-dk-subtle">{{ t('calendar.loading') }}</span>
+        </div>
+
+        <!-- Empty -->
+        <div v-else-if="calendars.length === 0" class="py-12 text-center">
+          <IconCalendar :size="48" class="mx-auto mb-3 text-gray-300 dark:text-dk-muted" />
+          <p class="text-gray-500 dark:text-dk-subtle">{{ t('calendar.no_calendars') }}</p>
+        </div>
+
+        <!-- Table -->
+        <div v-else class="overflow-x-auto">
+          <table class="min-w-full divide-y divide-gray-200 dark:divide-dk-muted">
+            <thead class="bg-gray-50 dark:bg-dk-base">
+              <tr>
+                <th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500 dark:text-dk-subtle">
+                  {{ t('calendar.name') }}
+                </th>
+                <th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500 dark:text-dk-subtle">
+                  {{ t('schedule.event_type') }}
+                </th>
+                <th class="px-6 py-3 text-center text-xs font-medium uppercase tracking-wider text-gray-500 dark:text-dk-subtle">
+                  {{ t('calendar.event_count') }}
+                </th>
+                <th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500 dark:text-dk-subtle">
+                  {{ t('customer.created_by') }}
+                </th>
+                <th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500 dark:text-dk-subtle">
+                  {{ t('customer.created_at') }}
+                </th>
+                <th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500 dark:text-dk-subtle">
+                  {{ t('common.actions') }}
+                </th>
+              </tr>
+            </thead>
+            <tbody class="divide-y divide-gray-200 dark:divide-dk-muted">
+              <tr
+                v-for="calendar in calendars"
+                :key="calendar.ID"
+                class="hover:bg-gray-50 dark:hover:bg-dk-base"
+                :class="{ 'opacity-50': isDeleted(calendar) }"
+              >
+                <!-- Name + Color -->
+                <td class="whitespace-nowrap px-6 py-4">
+                  <div class="flex items-center gap-3">
+                    <div
+                      class="h-4 w-4 rounded-full flex-shrink-0"
+                      :style="{ backgroundColor: calendar.Color || '#3788d9' }"
+                    ></div>
+                    <div>
+                      <div class="flex items-center gap-2 font-medium text-gray-900 dark:text-dk-text">
+                        {{ calendar.Name }}
+                        <span
+                          v-if="isDeleted(calendar)"
+                          class="inline-flex rounded-full bg-red-100 px-2 py-0.5 text-xs font-medium text-red-800 dark:bg-red-900/30 dark:text-red-400"
+                        >
+                          {{ t('calendar.deleted') }}
+                        </span>
+                      </div>
+                      <div v-if="calendar.Description" class="text-sm text-gray-500 dark:text-dk-subtle">
+                        {{ calendar.Description }}
+                      </div>
+                    </div>
+                  </div>
+                </td>
+
+                <!-- Public/Private -->
+                <td class="whitespace-nowrap px-6 py-4">
+                  <span
+                    class="inline-flex rounded-full px-2 py-1 text-xs font-medium"
+                    :class="calendar.IsPublic
+                      ? 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400'
+                      : 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300'"
+                  >
+                    {{ calendar.IsPublic ? t('calendar.public') : t('calendar.private') }}
+                  </span>
+                </td>
+
+                <!-- Event Count -->
+                <td class="whitespace-nowrap px-6 py-4 text-center">
+                  <div class="inline-flex items-center gap-1 text-gray-900 dark:text-dk-text">
+                    <IconCalendar :size="16" class="text-gray-400" />
+                    <span class="font-medium">{{ eventCounts[calendar.ID] || 0 }}</span>
+                  </div>
+                </td>
+
+                <!-- Creator -->
+                <td class="whitespace-nowrap px-6 py-4">
+                  <div class="flex items-center gap-2">
+                    <img
+                      :src="getCreatorAvatar(calendar.UserID)"
+                      class="h-6 w-6 rounded-full"
+                      alt="avatar"
+                    />
+                    <span class="text-sm text-gray-900 dark:text-dk-text">
+                      {{ getCreatorName(calendar.UserID) }}
+                    </span>
+                  </div>
+                </td>
+
+                <!-- Created At -->
+                <td class="whitespace-nowrap px-6 py-4 text-sm text-gray-500 dark:text-dk-subtle">
+                  {{ formatDateTime(calendar.CreatedAt) }}
+                </td>
+
+                <!-- Actions -->
+                <td class="whitespace-nowrap px-6 py-4">
+                  <div class="flex items-center gap-1">
+                    <button
+                      v-if="isDeleted(calendar)"
+                      @click="openRestoreModal(calendar)"
+                      class="rounded p-1.5 text-gray-400 transition-colors hover:bg-green-50 hover:text-green-600 dark:hover:bg-dk-muted"
+                      :title="t('calendar.restore')"
+                    >
+                      <IconRestore :size="16" />
+                    </button>
+                    <button
+                      v-else
+                      @click="openEditModal(calendar)"
+                      class="rounded p-1.5 text-gray-400 transition-colors hover:bg-blue-50 hover:text-blue-600 dark:hover:bg-dk-muted"
+                      :title="t('common.edit')"
+                    >
+                      <IconEdit :size="16" />
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+      <!-- Summary -->
+      <div v-if="calendars.length > 0" class="mt-4 text-sm text-gray-500 dark:text-dk-subtle">
+        {{ t('calendar.calendars') }}: {{ calendars.length }}
+      </div>
+    </div>
+  </div>
+
+  <!-- Edit Calendar Modal -->
+  <div
+    v-if="showEditModal"
+    class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
+    @click.self="showEditModal = false"
+  >
+    <div class="w-full max-w-md rounded-xl bg-white p-6 shadow-xl dark:bg-dk-card">
+      <h3 class="mb-4 text-lg font-semibold text-gray-900 dark:text-white">
+        {{ t('calendar.edit_calendar') }}
+      </h3>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.name') }} *
+        </label>
+        <input
+          v-model="form.name"
+          type="text"
+          class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+          :placeholder="t('calendar.name_placeholder')"
+        />
+      </div>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.description') }}
+        </label>
+        <textarea
+          v-model="form.description"
+          rows="3"
+          class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 outline-none transition-colors focus:border-blue-500 dark:border-dk-muted dark:bg-dk-base dark:text-white"
+          :placeholder="t('calendar.description_placeholder')"
+        ></textarea>
+      </div>
+
+      <div class="mb-4">
+        <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+          {{ t('calendar.color') }}
+        </label>
+        <div class="flex gap-2">
+          <button
+            v-for="color in colorOptions"
+            :key="color"
+            @click="form.color = color"
+            class="h-8 w-8 rounded-full transition-transform hover:scale-110"
+            :class="{ 'ring-2 ring-blue-500 ring-offset-2': form.color === color }"
+            :style="{ backgroundColor: color }"
+          ></button>
+        </div>
+      </div>
+
+      <div class="mb-6 flex items-center gap-2">
+        <input
+          id="edit_is_public"
+          v-model="form.is_public"
+          type="checkbox"
+          class="rounded border-gray-300"
+        />
+        <label for="edit_is_public" class="text-sm text-gray-700 dark:text-gray-300">
+          {{ t('calendar.is_public') }}
+        </label>
+      </div>
+
+      <div class="flex justify-end gap-2">
+        <button
+          @click="showEditModal = false"
+          class="rounded-lg border border-gray-300 px-4 py-2 text-sm text-gray-600 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:text-gray-300 dark:hover:bg-dk-muted"
+        >
+          {{ t('cancel') }}
+        </button>
+        <button
+          @click="updateCalendar"
+          class="rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+        >
+          {{ t('save') }}
+        </button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Delete Confirm Dialog -->
+  <ConfirmDialog
+    v-model="showDeleteModal"
+    :title="t('calendar.confirm_delete')"
+    :message="t('calendar.confirm_delete_message', { name: deletingCalendar?.Name || '' })"
+    :confirm-text="t('delete')"
+    :cancel-text="t('cancel')"
+    danger
+    @confirm="confirmDelete"
+  />
+
+  <!-- Restore Confirm Dialog -->
+  <ConfirmDialog
+    v-model="showRestoreModal"
+    :title="t('calendar.confirm_restore')"
+    :message="t('calendar.confirm_restore_message', { name: restoringCalendar?.Name || '' })"
+    :confirm-text="t('calendar.restore')"
+    :cancel-text="t('cancel')"
+    @confirm="confirmRestore"
+  />
+</template>
diff --git a/frontend/ops_vue_js/src/views/sysadmin/SysAdminView.vue b/frontend/ops_vue_js/src/views/sysadmin/SysAdminView.vue
index 4670c0d..617e9b3 100644
--- a/frontend/ops_vue_js/src/views/sysadmin/SysAdminView.vue
+++ b/frontend/ops_vue_js/src/views/sysadmin/SysAdminView.vue
@@ -31,6 +31,7 @@ const tabs = [
   { id: 'logs', label: t('sysadmin.tab_logs') },
   { id: 'operation_logs', label: t('sysadmin.tab_operation_logs') },
   { id: 'customer', label: t('customer.title'), to: '/customer' },
+  { id: 'calendar', label: t('calendar.admin_title'), to: '/calendars/admin' },
 ]
 
 async function fetchSysAdmins() {

From 8dd971bec62e69f6805579403b920c585b97754c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 21:37:01 +0800
Subject: [PATCH 13/21] up

---
 .../ops_vue_js/src/components/AppHeader.vue   |  16 +++
 frontend/ops_vue_js/src/i18n/en.json          |   8 +-
 frontend/ops_vue_js/src/i18n/zh-CN.json       |   8 +-
 frontend/ops_vue_js/src/router/index.js       |   5 +
 .../ops_vue_js/src/views/user/MyProfile.vue   | 100 ++++++++++++++++++
 5 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 frontend/ops_vue_js/src/views/user/MyProfile.vue

diff --git a/frontend/ops_vue_js/src/components/AppHeader.vue b/frontend/ops_vue_js/src/components/AppHeader.vue
index e1d632c..ccd366a 100644
--- a/frontend/ops_vue_js/src/components/AppHeader.vue
+++ b/frontend/ops_vue_js/src/components/AppHeader.vue
@@ -144,6 +144,14 @@ const navItems = computed(() => [
               v-if="userDropdownOpen"
               class="absolute right-0 z-50 mt-1 w-48 rounded-lg border border-gray-200 bg-white py-1 shadow-lg dark:border-dk-muted dark:bg-dk-card"
             >
+              <RouterLink
+                to="/user/my"
+                class="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-dk-subtle dark:hover:bg-dk-muted"
+                @click="userDropdownOpen = false"
+              >
+                <IconUser :size="16" />
+                {{ t("message.profile_information") }}
+              </RouterLink>
               <RouterLink
                 to="/settings/account"
                 class="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-dk-subtle dark:hover:bg-dk-muted"
@@ -219,6 +227,14 @@ const navItems = computed(() => [
               </div>
             </div>
             <hr class="my-1 border-gray-200 dark:border-dk-muted" />
+            <RouterLink
+              to="/user/my"
+              class="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-dk-subtle dark:hover:bg-dk-muted"
+              @click="userDropdownOpen = false"
+            >
+              <IconUser :size="16" />
+              {{ t("message.profile_information") }}
+            </RouterLink>
             <RouterLink
               to="/settings/account"
               class="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-dk-subtle dark:hover:bg-dk-muted"
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index 2932a1f..2d47305 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -398,7 +398,8 @@
     "save_success": "Saved successfully",
     "submit": "Submit",
     "submitting": "Submitting...",
-    "loading": "Loading..."
+    "loading": "Loading...",
+    "profile_information": "Profile Information"
   },
   "settings": {
     "cancel": "Cancel",
@@ -438,7 +439,10 @@
     "placeholder_name": "Enter your name",
     "placeholder_remark": "Personal introduction or remark",
     "name_hint": "Display only, login name unchanged.",
-    "remark_hint": "Remark only"
+    "remark_hint": "Remark only",
+    "edit_profile": "Edit Profile",
+    "security": "Security",
+    "security_description": "Manage your account security settings"
   },
   "button": {
     "submit": "Submit",
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index 8cee082..0093f84 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -398,7 +398,8 @@
     "save_success": "保存成功",
     "submit": "提交",
     "submitting": "提交中...",
-    "loading": "加载中..."
+    "loading": "加载中...",
+    "profile_information": "个人信息"
   },
   "settings": {
     "cancel": "取消",
@@ -438,7 +439,10 @@
     "placeholder_name": "请输入您的姓名",
     "placeholder_remark": "个人简介或备注",
     "name_hint": "仅用于显示，不影响登录名",
-    "remark_hint": "仅备注"
+    "remark_hint": "仅备注",
+    "edit_profile": "编辑资料",
+    "security": "安全设置",
+    "security_description": "管理您的账户安全设置"
   },
   "button": {
     "submit": "提交",
diff --git a/frontend/ops_vue_js/src/router/index.js b/frontend/ops_vue_js/src/router/index.js
index e90ad30..f791676 100644
--- a/frontend/ops_vue_js/src/router/index.js
+++ b/frontend/ops_vue_js/src/router/index.js
@@ -145,6 +145,11 @@ const router = createRouter({
           name: 'calendar-detail',
           component: () => import('@/views/calendar/CalendarDetail.vue'),
         },
+        {
+          path: 'user/my',
+          name: 'user-my',
+          component: () => import('@/views/user/MyProfile.vue'),
+        },
       ],
     },
 
diff --git a/frontend/ops_vue_js/src/views/user/MyProfile.vue b/frontend/ops_vue_js/src/views/user/MyProfile.vue
new file mode 100644
index 0000000..4d5e193
--- /dev/null
+++ b/frontend/ops_vue_js/src/views/user/MyProfile.vue
@@ -0,0 +1,100 @@
+<script setup>
+import { ref, onMounted } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { usePageTitle } from '@/composables/usePageTitle'
+import { useUserStore } from '@/stores/user'
+
+usePageTitle('message.profile_information')
+const { t } = useI18n()
+const userStore = useUserStore()
+
+onMounted(() => {
+  userStore.fetchUserInfo()
+})
+</script>
+
+<template>
+  <div class="min-h-screen bg-gray-50 p-6 dark:bg-dk-base">
+    <div class="mx-auto max-w-4xl">
+      <!-- Header -->
+      <div class="mb-6">
+        <h1 class="text-2xl font-bold text-gray-900 dark:text-dk-text">
+          {{ t('message.profile_information') }}
+        </h1>
+      </div>
+
+      <!-- Profile Card -->
+      <div class="rounded-xl border border-gray-200 bg-white p-6 shadow-sm dark:border-dk-muted dark:bg-dk-card">
+        <div class="flex flex-col items-center gap-6 md:flex-row md:items-start">
+          <!-- Avatar -->
+          <div class="flex-shrink-0">
+            <img
+              :src="userStore.avatarUrl"
+              class="h-24 w-24 rounded-full border-4 border-white shadow-lg dark:border-dk-muted"
+              alt="avatar"
+            />
+          </div>
+
+          <!-- User Info -->
+          <div class="flex-1 text-center md:text-left">
+            <h2 class="text-xl font-semibold text-gray-900 dark:text-dk-text">
+              {{ userStore.user?.Name || '-' }}
+            </h2>
+            <p class="mt-1 text-sm text-gray-500 dark:text-dk-subtle">
+              {{ userStore.userInfo?.Username || '-' }}
+            </p>
+
+            <!-- Additional Info -->
+            <div class="mt-4 grid grid-cols-1 gap-3 text-sm md:grid-cols-2">
+              <div class="rounded-lg bg-gray-50 p-3 dark:bg-dk-base">
+                <div class="text-xs text-gray-500 dark:text-dk-subtle">{{ t('settings.remark') }}</div>
+                <div class="mt-1 font-medium text-gray-900 dark:text-dk-text">
+                  {{ userStore.userInfo?.FirstName || '-' }}
+                </div>
+              </div>
+              <div class="rounded-lg bg-gray-50 p-3 dark:bg-dk-base">
+                <div class="text-xs text-gray-500 dark:text-dk-subtle">{{ t('settings.birthday') }}</div>
+                <div class="mt-1 font-medium text-gray-900 dark:text-dk-text">
+                  {{ userStore.birthday || '-' }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Quick Actions -->
+      <div class="mt-6 grid gap-4 md:grid-cols-2">
+        <RouterLink
+          to="/settings/account"
+          class="flex items-center gap-3 rounded-xl border border-gray-200 bg-white p-4 shadow-sm transition-shadow hover:shadow-md dark:border-dk-muted dark:bg-dk-card"
+        >
+          <div class="rounded-full bg-blue-100 p-3 dark:bg-blue-900/30">
+            <svg class="h-6 w-6 text-blue-600 dark:text-blue-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+            </svg>
+          </div>
+          <div>
+            <div class="font-medium text-gray-900 dark:text-dk-text">{{ t('message.user_settings') }}</div>
+            <div class="text-sm text-gray-500 dark:text-dk-subtle">{{ t('settings.edit_profile') }}</div>
+          </div>
+        </RouterLink>
+
+        <RouterLink
+          to="/settings/security"
+          class="flex items-center gap-3 rounded-xl border border-gray-200 bg-white p-4 shadow-sm transition-shadow hover:shadow-md dark:border-dk-muted dark:bg-dk-card"
+        >
+          <div class="rounded-full bg-green-100 p-3 dark:bg-green-900/30">
+            <svg class="h-6 w-6 text-green-600 dark:text-green-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" />
+            </svg>
+          </div>
+          <div>
+            <div class="font-medium text-gray-900 dark:text-dk-text">{{ t('settings.security') }}</div>
+            <div class="text-sm text-gray-500 dark:text-dk-subtle">{{ t('settings.security_description') }}</div>
+          </div>
+        </RouterLink>
+      </div>
+    </div>
+  </div>
+</template>

From cd2c90ffb43f68230d0b2e234348a83bf8c732cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 21:54:30 +0800
Subject: [PATCH 14/21] up

---
 backend/my_work/routers/apiCalendar.go        | 35 +++++++++++++++----
 backend/my_work/routers/apiSysAdmin.go        |  2 ++
 backend/my_work/routers/apiUsers.go           | 17 +++++++++
 frontend/ops_vue_js/src/i18n/en.json          |  4 ++-
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  4 ++-
 frontend/ops_vue_js/src/stores/user.js        |  9 +++++
 .../ops_vue_js/src/views/user/MyProfile.vue   | 22 ++++++++++++
 7 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index ca12de9..5c308cf 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -120,7 +120,7 @@ var (
 	calendarAdmins    []uint
 )
 
-// CalendarUpdateAdminsCash 更新客户管理员缓存
+// CalendarUpdateAdminsCash
 func CalendarUpdateAdminsCash() {
 	calendarAdmins = nil
 	calendarAdmins = append(calendarAdmins, 1) // id=1 系统管理员默认拥有所有权限
@@ -152,6 +152,8 @@ func ApiCalendarInit() {
 		Name: "calendar_admin",
 		Type: "usergroup",
 	})
+
+	CalendarUpdateAdminsCash()
 }
 
 func ApiCalendar(r *gin.RouterGroup) {
@@ -429,22 +431,31 @@ func ApiCalendar(r *gin.RouterGroup) {
 			}
 		}
 
+		// 查询日历创建者（用于判断权限）
+		var calendarCreatorID uint
+		var calendar TabCalendar
+		if models.DB.Where("id = ?", calendarID).First(&calendar).Error == nil {
+			calendarCreatorID = calendar.UserID
+		}
+
 		var relist []map[string]interface{}
 		for _, event := range events {
 			eventMap, _ := json.Marshal(event)
 			var item map[string]interface{}
 			json.Unmarshal(eventMap, &item)
 
-			// 可编辑条件：事件创建者 或 日历管理员
+			// 可编辑条件：事件创建者 或 日历创建者 或 日历管理员
 			canEdit := false
 			if isLogin {
-				if event.UserID == currentUserID || slices.Contains(calendarAdmins, currentUserID) {
+				if event.UserID == currentUserID || calendarCreatorID == currentUserID || slices.Contains(calendarAdmins, currentUserID) {
 					canEdit = true
 				}
 			}
 			item["canEdit"] = canEdit
 			relist = append(relist, item)
 		}
+		//fmt.Println(calendarAdmins)
+		//fmt.Println(calendarUserGroup)
 
 		ReturnJson(ctx, "apiOK", gin.H{"list": relist})
 	})
@@ -528,8 +539,13 @@ func ApiCalendar(r *gin.RouterGroup) {
 
 			oldEvent := TabCalendarEvent{}
 			if models.DB.Where("id = ?", eventID).First(&oldEvent).Error == nil {
-				// 检查权限（只有创建人可以修改）
-				if oldEvent.UserID != user.ID {
+				// 检查权限（事件创建人、日历创建人或管理员可修改）
+				var calendarCreatorID uint
+				var calendar TabCalendar
+				if models.DB.Where("id = ?", oldEvent.CalendarID).First(&calendar).Error == nil {
+					calendarCreatorID = calendar.UserID
+				}
+				if !canModifyCalendar(user.ID, oldEvent.UserID) && calendarCreatorID != user.ID {
 					ReturnJson(ctx, "permission_denied", nil)
 					return
 				}
@@ -591,8 +607,13 @@ func ApiCalendar(r *gin.RouterGroup) {
 			if err := mapstructure.Decode(data, &from); err == nil {
 				oldEvent := TabCalendarEvent{}
 				if models.DB.Where("id = ?", from.ID).First(&oldEvent).Error == nil {
-					// 检查权限（只有创建人可以删除）
-					if oldEvent.UserID != user.ID {
+					// 检查权限（事件创建人、日历创建人或管理员可删除）
+					var calendarCreatorID uint
+					var calendar TabCalendar
+					if models.DB.Where("id = ?", oldEvent.CalendarID).First(&calendar).Error == nil {
+						calendarCreatorID = calendar.UserID
+					}
+					if !canModifyCalendar(user.ID, oldEvent.UserID) && calendarCreatorID != user.ID {
 						ReturnJson(ctx, "permission_denied", nil)
 						return
 					}
diff --git a/backend/my_work/routers/apiSysAdmin.go b/backend/my_work/routers/apiSysAdmin.go
index c320e48..ec5f4ad 100644
--- a/backend/my_work/routers/apiSysAdmin.go
+++ b/backend/my_work/routers/apiSysAdmin.go
@@ -407,6 +407,8 @@ func ApiSysAdmin(r *gin.RouterGroup) {
 			WarehouseUpdateAdminsCash()
 		case "customer_admin":
 			CustomerUpdateAdminsCash()
+		case "calendar_admin":
+			CalendarUpdateAdminsCash()
 		}
 
 		ReturnJson(ctx, "apiOK", nil)
diff --git a/backend/my_work/routers/apiUsers.go b/backend/my_work/routers/apiUsers.go
index a78b58d..9e26ef9 100644
--- a/backend/my_work/routers/apiUsers.go
+++ b/backend/my_work/routers/apiUsers.go
@@ -594,6 +594,23 @@ func ApiUser(r *gin.RouterGroup) {
 			}
 			redata["isSysAdmin"] = isSysAdmin
 
+			// 获取用户加入的群组列表
+			var binds []TabUserGroupBinds
+			models.DB.Where("user_id = ?", user.ID).Find(&binds)
+
+			var groups []map[string]interface{}
+			for _, bind := range binds {
+				var group TabUserGroups
+				if models.DB.Where("id = ?", bind.GroupID).First(&group).Error == nil {
+					groups = append(groups, map[string]interface{}{
+						"id":   group.ID,
+						"name": group.Name,
+						"type": group.Type,
+					})
+				}
+			}
+			redata["groups"] = groups
+
 			ReturnJson(ctx, "apiOK", redata)
 
 		}
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index 2d47305..d96777f 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -442,7 +442,9 @@
     "remark_hint": "Remark only",
     "edit_profile": "Edit Profile",
     "security": "Security",
-    "security_description": "Manage your account security settings"
+    "security_description": "Manage your account security settings",
+    "my_groups": "My Groups",
+    "no_groups": "Not joined any groups yet"
   },
   "button": {
     "submit": "Submit",
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index 0093f84..a113cf5 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -442,7 +442,9 @@
     "remark_hint": "仅备注",
     "edit_profile": "编辑资料",
     "security": "安全设置",
-    "security_description": "管理您的账户安全设置"
+    "security_description": "管理您的账户安全设置",
+    "my_groups": "我的群组",
+    "no_groups": "暂未加入任何群组"
   },
   "button": {
     "submit": "提交",
diff --git a/frontend/ops_vue_js/src/stores/user.js b/frontend/ops_vue_js/src/stores/user.js
index d035ad7..3afdd63 100644
--- a/frontend/ops_vue_js/src/stores/user.js
+++ b/frontend/ops_vue_js/src/stores/user.js
@@ -41,6 +41,7 @@ export const useUserStore = defineStore('user', () => {
   const userInfo = ref(null)    // TabUserInfo_ 详情
   const userCookie = ref(null)  // Cookie session
   const isLoggedIn = ref(false)
+  const groups = ref([])        // 用户加入的群组列表
   // ── Getters ──
   const cookieValue = computed(() => userCookie.value?.Value ?? '')
 
@@ -63,6 +64,9 @@ export const useUserStore = defineStore('user', () => {
   // 是否系统管理员（后端直接返回）
   const isSysAdmin = ref(false)
 
+  // 用户加入的群组名称列表（计算属性）
+  const groupNames = computed(() => groups.value.map(g => g.name))
+
   // ── Actions ──
   function login(cookie) {
     userCookie.value = cookie
@@ -86,6 +90,7 @@ export const useUserStore = defineStore('user', () => {
     user.value = null
     userInfo.value = null
     isSysAdmin.value = false
+    groups.value = []
     isLoggedIn.value = false
     removeStorage(STORAGE_KEY_COOKIE)
   }
@@ -98,6 +103,8 @@ export const useUserStore = defineStore('user', () => {
         userInfo.value = data.userInfo ?? null
         // 存储系统管理员状态
         isSysAdmin.value = data.isSysAdmin === true
+        // 存储用户群组列表
+        groups.value = data.groups ?? []
       }
     } catch {
       // 拦截器已处理错误提示
@@ -123,6 +130,8 @@ export const useUserStore = defineStore('user', () => {
     userCookie,
     isLoggedIn,
     isSysAdmin,
+    groups,
+    groupNames,
     cookieValue,
     avatarUrl,
     birthday,
diff --git a/frontend/ops_vue_js/src/views/user/MyProfile.vue b/frontend/ops_vue_js/src/views/user/MyProfile.vue
index 4d5e193..187f1ad 100644
--- a/frontend/ops_vue_js/src/views/user/MyProfile.vue
+++ b/frontend/ops_vue_js/src/views/user/MyProfile.vue
@@ -95,6 +95,28 @@ onMounted(() => {
           </div>
         </RouterLink>
       </div>
+
+      <!-- My Groups -->
+      <div class="mt-6">
+        <h2 class="mb-3 text-lg font-semibold text-gray-900 dark:text-dk-text">
+          {{ t('settings.my_groups') }}
+        </h2>
+        <div v-if="userStore.groups.length > 0" class="flex flex-wrap gap-2">
+          <span
+            v-for="group in userStore.groups"
+            :key="group.id"
+            class="inline-flex items-center rounded-full bg-purple-100 px-3 py-1 text-sm font-medium text-purple-800 dark:bg-purple-900/30 dark:text-purple-300"
+          >
+            <svg class="mr-1.5 h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" />
+            </svg>
+            {{ group.name }}
+          </span>
+        </div>
+        <div v-else class="rounded-lg border border-gray-200 bg-white p-4 text-center text-sm text-gray-500 dark:border-dk-muted dark:bg-dk-card dark:text-dk-subtle">
+          {{ t('settings.no_groups') }}
+        </div>
+      </div>
     </div>
   </div>
 </template>

From 4cbb266becf2cff3a67c7309689b856f527a2de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 22:20:51 +0800
Subject: [PATCH 15/21] up

---
 backend/my_work/routers/apiCalendar.go        | 36 +++++++++++++++++--
 frontend/ops_vue_js/src/i18n/en.json          |  6 ++--
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  6 ++--
 frontend/ops_vue_js/src/stores/user.js        |  6 ++++
 .../src/views/calendar/CalendarAdminList.vue  | 34 +-----------------
 .../src/views/calendar/CalendarList.vue       | 31 +++++++++++-----
 6 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/backend/my_work/routers/apiCalendar.go b/backend/my_work/routers/apiCalendar.go
index 5c308cf..d63a822 100644
--- a/backend/my_work/routers/apiCalendar.go
+++ b/backend/my_work/routers/apiCalendar.go
@@ -286,27 +286,51 @@ func ApiCalendar(r *gin.RouterGroup) {
 		}
 	})
 
-	// 获取所有日历（包括已删除的，系统管理员专用）
+	// 获取所有日历（包括已删除的，管理员专用）
 	r.POST("/calendar/list_all", func(ctx *gin.Context) {
-		isAuth, _, _ := AuthenticationAuthority(ctx)
+		isAuth, user, _ := AuthenticationAuthority(ctx)
 		if !isAuth {
 			ReturnJson(ctx, "userCookieError", nil)
 			return
 		}
 
+		// 限制只有日历管理员可访问
+		if !slices.Contains(calendarAdmins, user.ID) {
+			ReturnJson(ctx, "permission_denied", nil)
+			return
+		}
+
 		// 使用 Unscoped 查询所有日历（包括软删除的）
 		var calendars []TabCalendar
 		models.DB.Unscoped().Order("created_at DESC").Find(&calendars)
 
+		// 一次性查询所有日历的事件数量（仅统计未删除的事件）
+		type calendarEventCount struct {
+			CalendarID uint `gorm:"column:calendar_id"`
+			Cnt        int  `gorm:"column:cnt"`
+		}
+		var rows []calendarEventCount
+		models.DB.Model(&TabCalendarEvent{}).
+			Select("calendar_id, COUNT(*) as cnt").
+			Where("deleted_at IS NULL").
+			Group("calendar_id").
+			Scan(&rows)
+		eventCountMap := make(map[uint]int)
+		for _, row := range rows {
+			eventCountMap[row.CalendarID] = row.Cnt
+		}
+
 		type CalendarWithEdit struct {
 			TabCalendar
-			CanEdit bool `json:"canEdit"`
+			CanEdit    bool `json:"canEdit"`
+			EventCount int  `json:"event_count"`
 		}
 		var result []CalendarWithEdit
 		for _, cal := range calendars {
 			result = append(result, CalendarWithEdit{
 				TabCalendar: cal,
 				CanEdit:     true,
+				EventCount:  eventCountMap[cal.ID],
 			})
 		}
 		ReturnJson(ctx, "apiOK", gin.H{"list": result})
@@ -320,6 +344,12 @@ func ApiCalendar(r *gin.RouterGroup) {
 			return
 		}
 
+		// 限制只有日历管理员可操作
+		if !slices.Contains(calendarAdmins, user.ID) {
+			ReturnJson(ctx, "permission_denied", nil)
+			return
+		}
+
 		var from fromRestoreCalendar
 		if err := mapstructure.Decode(data, &from); err != nil {
 			ReturnJson(ctx, "jsonErr", nil)
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index d96777f..45d52f2 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -444,7 +444,8 @@
     "security": "Security",
     "security_description": "Manage your account security settings",
     "my_groups": "My Groups",
-    "no_groups": "Not joined any groups yet"
+    "no_groups": "Not joined any groups yet",
+    "admin_panel": "Admin"
   },
   "button": {
     "submit": "Submit",
@@ -656,6 +657,7 @@
     "restore_success": "Restored successfully",
     "deleted": "Deleted",
     "confirm_restore": "Are you sure you want to restore this calendar?",
-    "confirm_restore_message": "Are you sure you want to restore calendar '{name}'?"
+    "confirm_restore_message": "Are you sure you want to restore calendar '{name}'?",
+    "admin_panel": "Admin"
   }
 }
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index a113cf5..35ec349 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -444,7 +444,8 @@
     "security": "安全设置",
     "security_description": "管理您的账户安全设置",
     "my_groups": "我的群组",
-    "no_groups": "暂未加入任何群组"
+    "no_groups": "暂未加入任何群组",
+    "admin_panel": "管理"
   },
   "button": {
     "submit": "提交",
@@ -657,6 +658,7 @@
     "restore_success": "恢复成功",
     "deleted": "已删除",
     "confirm_restore": "确定要恢复此日历吗？",
-    "confirm_restore_message": "确定要恢复日历「{name}」吗？"
+    "confirm_restore_message": "确定要恢复日历「{name}」吗？",
+    "admin_panel": "管理"
   }
 }
diff --git a/frontend/ops_vue_js/src/stores/user.js b/frontend/ops_vue_js/src/stores/user.js
index 3afdd63..7c5fd6a 100644
--- a/frontend/ops_vue_js/src/stores/user.js
+++ b/frontend/ops_vue_js/src/stores/user.js
@@ -64,6 +64,11 @@ export const useUserStore = defineStore('user', () => {
   // 是否系统管理员（后端直接返回）
   const isSysAdmin = ref(false)
 
+  // 是否为日历管理员（在 calendar_admin 群组中）
+  const isCalendarAdmin = computed(() =>
+    groups.value.some(g => g.name === 'calendar_admin')
+  )
+
   // 用户加入的群组名称列表（计算属性）
   const groupNames = computed(() => groups.value.map(g => g.name))
 
@@ -130,6 +135,7 @@ export const useUserStore = defineStore('user', () => {
     userCookie,
     isLoggedIn,
     isSysAdmin,
+    isCalendarAdmin,
     groups,
     groupNames,
     cookieValue,
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue b/frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue
index bd12ab3..7fc16e6 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarAdminList.vue
@@ -15,7 +15,6 @@ const usersStore = useUsersStore()
 
 const calendars = ref([])
 const loading = ref(false)
-const eventCounts = ref({}) // calendarId -> event count
 
 // 编辑相关
 const showEditModal = ref(false)
@@ -54,8 +53,6 @@ async function fetchCalendars() {
           usersStore.fetchUser(cal.UserID)
         }
       })
-      // 获取每个日历的事件数量
-      fetchEventCounts()
     }
   } catch {
     // 拦截器已处理
@@ -64,35 +61,6 @@ async function fetchCalendars() {
   }
 }
 
-async function fetchEventCounts() {
-  // 获取一年前到现在的事件，用于统计
-  const now = new Date()
-  const oneYearAgo = new Date()
-  oneYearAgo.setFullYear(now.getFullYear() - 1)
-
-  const startStr = oneYearAgo.toISOString().split('T')[0]
-  const endStr = now.toISOString().split('T')[0]
-
-  try {
-    const { errCode, data } = await calendarApi.getEvents({
-      start_date: startStr,
-      end_date: endStr
-    })
-    if (errCode === 0 && data.list) {
-      // 按日历ID统计事件数量
-      const counts = {}
-      data.list.forEach(event => {
-        if (event.CalendarID) {
-          counts[event.CalendarID] = (counts[event.CalendarID] || 0) + 1
-        }
-      })
-      eventCounts.value = counts
-    }
-  } catch {
-    // 忽略错误
-  }
-}
-
 function getCreatorName(userID) {
   return usersStore.getUsernameFromUserID(userID) || '...'
 }
@@ -304,7 +272,7 @@ onMounted(fetchCalendars)
                 <td class="whitespace-nowrap px-6 py-4 text-center">
                   <div class="inline-flex items-center gap-1 text-gray-900 dark:text-dk-text">
                     <IconCalendar :size="16" class="text-gray-400" />
-                    <span class="font-medium">{{ eventCounts[calendar.ID] || 0 }}</span>
+                    <span class="font-medium">{{ calendar.event_count ?? 0 }}</span>
                   </div>
                 </td>
 
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarList.vue b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
index a9b8b35..64826e9 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarList.vue
@@ -1,17 +1,20 @@
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { useToastStore } from '@/stores/toast'
 import { usePageTitle } from '@/composables/usePageTitle'
 import { calendarApi } from '@/api/calendar'
-import { IconPlus, IconCalendar, IconTrash, IconEdit } from '@tabler/icons-vue'
+import { IconPlus, IconCalendar, IconTrash, IconEdit, IconSettings } from '@tabler/icons-vue'
+import { useUserStore } from '@/stores/user'
 import ConfirmDialog from '@/components/ConfirmDialog.vue'
 
 usePageTitle('appname.calendar')
 const { t } = useI18n()
 const router = useRouter()
 const toast = useToastStore()
+const userStore = useUserStore()
+const isCalendarAdmin = computed(() => userStore.isCalendarAdmin)
 
 const calendars = ref([])
 const loading = ref(false)
@@ -148,13 +151,23 @@ onMounted(fetchCalendars)
       <!-- Header -->
       <div class="flex items-center justify-between border-b border-gray-100 px-6 py-4 dark:border-dk-muted">
         <h3 class="text-lg font-semibold text-gray-900 dark:text-white">{{ t('calendar.calendars') }}</h3>
-        <button
-          @click="openCreateModal"
-          class="inline-flex items-center gap-1.5 rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-blue-700"
-        >
-          <IconPlus :size="16" />
-          {{ t('calendar.create_calendar') }}
-        </button>
+        <div class="flex items-center gap-2">
+          <RouterLink
+            v-if="isCalendarAdmin"
+            to="/calendars/admin"
+            class="inline-flex items-center gap-1.5 rounded-lg border border-gray-300 px-3 py-1.5 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:text-gray-300 dark:hover:bg-dk-muted"
+          >
+            <IconSettings :size="16" />
+            {{ t('calendar.admin_panel') }}
+          </RouterLink>
+          <button
+            @click="openCreateModal"
+            class="inline-flex items-center gap-1.5 rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+          >
+            <IconPlus :size="16" />
+            {{ t('calendar.create_calendar') }}
+          </button>
+        </div>
       </div>
 
       <!-- Calendar List -->

From 6c70392a98471b6d6749dafce9580901ff5a479f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 22:25:48 +0800
Subject: [PATCH 16/21] up

---
 backend/my_work/routers/apiSchedule.go        | 20 +++++++++----------
 .../ops_vue_js/src/components/AppHeader.vue   |  2 +-
 frontend/ops_vue_js/src/views/HomeView.vue    | 20 +++++++++----------
 .../src/views/sysadmin/OperationLogsTab.vue   |  5 +++--
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/backend/my_work/routers/apiSchedule.go b/backend/my_work/routers/apiSchedule.go
index 2fbb7f4..5a75375 100644
--- a/backend/my_work/routers/apiSchedule.go
+++ b/backend/my_work/routers/apiSchedule.go
@@ -81,17 +81,17 @@ func ScheduleUpdateAdminsCash() {
 
 func ApiScheduleInit() {
 	//先初始化数据表
-	models.DB.AutoMigrate(&TabSchedule{})
-	models.DB.AutoMigrate(&TabScheduleLog{})
+	// models.DB.AutoMigrate(&TabSchedule{})
+	// models.DB.AutoMigrate(&TabScheduleLog{})
 
-	//先检查用户组有没有这个key
-	userGroup.Name = "schedule_admin"
-	if models.DB.Where(&userGroup).First(&userGroup).Error == nil {
-		ScheduleUpdateAdminsCash()
-	} else {
-		userGroup.Type = "usergroup"
-		models.DB.Create(&userGroup)
-	}
+	// //先检查用户组有没有这个key
+	// userGroup.Name = "schedule_admin"
+	// if models.DB.Where(&userGroup).First(&userGroup).Error == nil {
+	// 	ScheduleUpdateAdminsCash()
+	// } else {
+	// 	userGroup.Type = "usergroup"
+	// 	models.DB.Create(&userGroup)
+	// }
 }
 
 func ApiSchedule(r *gin.RouterGroup) {
diff --git a/frontend/ops_vue_js/src/components/AppHeader.vue b/frontend/ops_vue_js/src/components/AppHeader.vue
index ccd366a..bb00897 100644
--- a/frontend/ops_vue_js/src/components/AppHeader.vue
+++ b/frontend/ops_vue_js/src/components/AppHeader.vue
@@ -53,7 +53,7 @@ const normalClass = "rounded-md px-3 py-2 text-sm font-medium text-gray-600 tran
 
 const navItems = computed(() => [
   { label: t("appname.home"), to: "/" },
-  { label: t("appname.schedule"), to: "/schedule" },
+  // { label: t("appname.schedule"), to: "/schedule" },
   { label: t("appname.calendar"), to: "/calendars" },
   { label: t("appname.purchase"), to: "/purchase" },
   { label: t("appname.work_order"), to: "/work_order" },
diff --git a/frontend/ops_vue_js/src/views/HomeView.vue b/frontend/ops_vue_js/src/views/HomeView.vue
index e9a13c4..d07f034 100644
--- a/frontend/ops_vue_js/src/views/HomeView.vue
+++ b/frontend/ops_vue_js/src/views/HomeView.vue
@@ -131,19 +131,19 @@ onMounted(() => {
     <h2 class="mb-6 text-2xl font-bold text-gray-900 dark:text-white">{{ t('message.welcome') }}</h2>
 
     <!-- 日程卡片 -->
-    <div class="mb-6 rounded-xl border border-gray-200 bg-white px-5 py-4 dark:border-dk-muted dark:bg-dk-card">
-      <div class="mb-3 flex items-center justify-between">
+    <!-- <div class="mb-6 rounded-xl border border-gray-200 bg-white px-5 py-4 dark:border-dk-muted dark:bg-dk-card"> -->
+      <!-- <div class="mb-3 flex items-center justify-between">
         <h3 class="text-lg font-semibold text-gray-900 dark:text-white">{{ t('appname.schedule') }}</h3>
         <span class="text-sm text-gray-500 dark:text-gray-400">{{ t('home.today', { date: todayDisplay }) }}</span>
-      </div>
+      </div> -->
 
       <!-- 加载状态 -->
-      <div v-if="loadingSchedules" class="py-4 text-center text-gray-500">
+      <!-- <div v-if="loadingSchedules" class="py-4 text-center text-gray-500">
         {{ t('home.loading') }}
-      </div>
+      </div> -->
 
       <!-- 日程列表 -->
-      <div v-else-if="todaySchedules.length > 0">
+      <!-- <div v-else-if="todaySchedules.length > 0">
         <div class="mb-2 text-sm text-gray-600 dark:text-gray-400">
           {{ t('home.today_schedule_count', { count: todayCount }) }}
         </div>
@@ -173,13 +173,13 @@ onMounted(() => {
             </div>
           </li>
         </ul>
-      </div>
+      </div> -->
 
       <!-- 无日程 -->
-      <div v-else class="py-4 text-center text-gray-500 dark:text-gray-400">
+      <!-- <div v-else class="py-4 text-center text-gray-500 dark:text-gray-400">
         {{ t('home.today_no_schedule') }}
-      </div>
-    </div>
+      </div> -->
+    <!-- </div> -->
 
     <!-- 功能入口卡片 -->
     <div class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
diff --git a/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue b/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue
index 22c4ac4..a8ad707 100644
--- a/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue
+++ b/frontend/ops_vue_js/src/views/sysadmin/OperationLogsTab.vue
@@ -19,12 +19,13 @@ const totalPages = computed(() => Math.ceil(total.value / pageSize.value))
 // 模块列表
 const modules = [
   { id: 'all', label: 'operation_logs.all' },
+  { id: 'calendar', label: 'calendar.calendars' },
   { id: 'customer', label: 'customer.title' },
   { id: 'purchase', label: 'purchase.title' },
-  { id: 'schedule', label: 'schedule.title' },
+  // { id: 'schedule', label: 'schedule.title' },
   { id: 'warehouse', label: 'warehouse.title' },
   { id: 'work_order', label: 'work_order.title' },
-  { id: 'calendar', label: 'calendar.calendars' },
+  
 ]
 const activeModule = ref('all')
 

From c7ee091ad18e29ca3ab8bad7533ae7fb78202815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 22:31:26 +0800
Subject: [PATCH 17/21] up

---
 backend/my_work/routers/binds.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backend/my_work/routers/binds.go b/backend/my_work/routers/binds.go
index e5199b3..86f6976 100644
--- a/backend/my_work/routers/binds.go
+++ b/backend/my_work/routers/binds.go
@@ -82,6 +82,15 @@ type TabWarehouseItemCustomerBind struct {
 	CreatedAt  *time.Time `gorm:"type:datetime;autoCreateTime"`
 }
 
+// TabCalendarEventUserBind 日程与用户关联表（日程分配给的用户）
+type TabCalendarEventUserBind struct {
+	ID        uint       `gorm:"primarykey"`
+	EventID   uint       `gorm:"not null;index;comment:关联日程ID"`
+	UserID    uint       `gorm:"not null;index;comment:关联用户ID"`
+	CreatorID uint       `gorm:"not null;comment:分配人id"`
+	CreatedAt *time.Time `gorm:"type:datetime;autoCreateTime"`
+}
+
 func BindsInit() {
 	models.DB.AutoMigrate(
 		&TabPurchaseFileBind{},
@@ -93,6 +102,7 @@ func BindsInit() {
 		&TabWorkOrderPurchaseOrderBind{},
 		&TabWorkOrderCustomerBind{},
 		&TabWarehouseItemCustomerBind{},
+		&TabCalendarEventUserBind{},
 	)
 
 }

From 18af17e9b3c28c3c6388504f13cccb82b3a8e1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 22:45:14 +0800
Subject: [PATCH 18/21] up

---
 .workbuddy/memory/2026-05-06.md               |  29 ++++
 frontend/ops_vue_js/src/i18n/en.json          |   7 +-
 frontend/ops_vue_js/src/i18n/zh-CN.json       |   7 +-
 .../src/views/calendar/CalendarDetail.vue     | 155 ++++++++++++++++++
 4 files changed, 196 insertions(+), 2 deletions(-)

diff --git a/.workbuddy/memory/2026-05-06.md b/.workbuddy/memory/2026-05-06.md
index 2cde560..f09fce0 100644
--- a/.workbuddy/memory/2026-05-06.md
+++ b/.workbuddy/memory/2026-05-06.md
@@ -84,3 +84,32 @@
 **i18n 新增**：
 - `zh-CN.json`: `calendar.admin_title = "日历管理"`, `calendar.event_count = "日程数量"`
 - `en.json`: `calendar.admin_title = "Calendar Admin"`, `calendar.event_count = "Event Count"`
+
+## 修复：CalendarAdminList eventCounts 未定义
+
+**问题**：模板访问 `eventCounts[calendar.ID]` 但 `eventCounts` 从未声明，且 `fetchEventCounts` 未被调用。
+
+**修复**：后端已直接返回 `event_count` 字段，改为模板直接用 `calendar.event_count ?? 0`，删除多余的 `eventCounts` ref 和 `fetchEventCounts` 函数。
+
+## 新增：后端 TabCalendarEventUserBind 绑定表
+
+**文件**：`routers/binds.go`
+- 新增 `TabCalendarEventUserBind` 结构体（EventID/UserID/CreatorID/CreatedAt）
+- 在 `BindsInit` AutoMigrate 中注册
+
+## 新增：日历右键菜单（复制/粘贴日程）
+
+**文件**：`CalendarDetail.vue`
+
+**功能**：
+- 右键日程事件弹出上下文菜单，显示「复制日程」「粘贴日程」
+- 复制：将日程数据存入 `clipboard` ref
+- 粘贴：以 clipboard 数据调用 `addEvent` API 创建新日程
+- 点击任意位置关闭菜单
+
+**实现**：
+- `contextMenu` ref 管理菜单显示/位置/事件数据
+- `clipboard` ref 存储复制的日程
+- `eventDidMount` 中为每个事件绑定 `contextmenu` 事件
+- `onMounted` 注册全局 click 关闭菜单，`onBeforeUnmount` 移除
+- i18n 新增 `calendar.copy_event/paste_event/copy_success/paste_success/no_event_to_paste`
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index 45d52f2..ba71fb3 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -658,6 +658,11 @@
     "deleted": "Deleted",
     "confirm_restore": "Are you sure you want to restore this calendar?",
     "confirm_restore_message": "Are you sure you want to restore calendar '{name}'?",
-    "admin_panel": "Admin"
+    "admin_panel": "Admin",
+    "copy_event": "Copy Event",
+    "paste_event": "Paste Event",
+    "copy_success": "Event copied",
+    "paste_success": "Event pasted",
+    "no_event_to_paste": "No event to paste"
   }
 }
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index 35ec349..c71ac91 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -659,6 +659,11 @@
     "deleted": "已删除",
     "confirm_restore": "确定要恢复此日历吗？",
     "confirm_restore_message": "确定要恢复日历「{name}」吗？",
-    "admin_panel": "管理"
+    "admin_panel": "管理",
+    "copy_event": "复制日程",
+    "paste_event": "粘贴日程",
+    "copy_success": "日程已复制",
+    "paste_success": "日程已粘贴",
+    "no_event_to_paste": "没有可粘贴的日程"
   }
 }
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index db78d8e..be81448 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -65,6 +65,113 @@ const pageData = ref({
 
 const showDeleteModal = ref(false)
 
+// 右键菜单
+const contextMenu = ref({
+  visible: false,
+  x: 0,
+  y: 0,
+  eventInfo: null,
+})
+
+// 剪贴板：存储复制的日程数据
+const clipboard = ref(null)
+
+// 右键菜单处理
+function handleEventContextMenu(info) {
+  info.jsEvent.preventDefault()
+  const canEdit = info.event.extendedProps?.canEdit ?? false
+  contextMenu.value = {
+    visible: true,
+    x: info.jsEvent.clientX,
+    y: info.jsEvent.clientY,
+    eventInfo: {
+      id: parseInt(info.event.id),
+      title: info.event.title,
+      start: info.event.startStr,
+      end: info.event.end ? info.event.endStr : info.event.startStr,
+      color: info.event.backgroundColor,
+      scheduleType: info.event.extendedProps?.scheduleType || 'work',
+      isPublic: info.event.extendedProps?.isPublic || false,
+      canEdit: canEdit,
+    },
+    targetDate: info.event.startStr.split('T')[0],
+  }
+}
+
+function closeContextMenu() {
+  contextMenu.value.visible = false
+}
+
+function copyEvent() {
+  if (!contextMenu.value.eventInfo) return
+  clipboard.value = { ...contextMenu.value.eventInfo }
+  toast.success(t('calendar.copy_success'))
+  closeContextMenu()
+}
+
+async function pasteEvent() {
+  if (!clipboard.value) {
+    toast.warning(t('calendar.no_event_to_paste'))
+    closeContextMenu()
+    return
+  }
+
+  // 确定粘贴目标日期：优先右键菜单记录的日期，其次选中日程的 start
+  let targetStart = contextMenu.value.targetDate
+  if (!targetStart) {
+    const selectedEvent = calendarOptions.value.events.find(
+      item => item.id === pageData.value.seleEventID
+    )
+    if (selectedEvent) {
+      targetStart = selectedEvent.start.split('T')[0]
+    }
+  }
+  if (!targetStart) {
+    toast.warning(t('calendar.no_event_to_paste'))
+    closeContextMenu()
+    return
+  }
+
+  // 计算原始日程的时长（天数）
+  const origStart = clipboard.value.start.split('T')[0]
+  const origEnd = clipboard.value.end.split('T')[0]
+  const origStartMs = new Date(origStart).getTime()
+  const origEndMs = new Date(origEnd).getTime()
+  const durationMs = origEndMs - origStartMs
+  const isSameDay = durationMs === 0 || origStart === origEnd
+
+  // 粘贴的结束日期 = 目标起始日期 + 原始时长
+  let targetEnd = targetStart
+  if (!isSameDay) {
+    const targetEndMs = new Date(targetStart).getTime() + durationMs
+    targetEnd = new Date(targetEndMs).toISOString().split('T')[0]
+  }
+
+  try {
+    const result = await calendarApi.addEvent({
+      calendar_id: calendarId.value,
+      title: clipboard.value.title,
+      start: toDatetime(targetStart),
+      end: toDatetime(
+        isSameDay
+          ? targetEnd
+          : DateUtils.toRealEnd(targetEnd),
+      ),
+      schedule_type: clipboard.value.scheduleType,
+      is_public: clipboard.value.isPublic,
+    })
+    if (result.errCode === 0) {
+      toast.success(t('calendar.paste_success'))
+      getEvents()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  }
+  closeContextMenu()
+}
+
 // 选中/取消选中事件
 function unseleEvent(eventID) {
   const target = calendarOptions.value.events.find(item => item.id === eventID)
@@ -323,6 +430,21 @@ const calendarOptions = ref({
       info.el.style.backgroundColor = "#f5f5f5"
     }
     info.el.style.border = "1px solid #e5e7eb"
+    // 空白格子右键菜单
+    info.el.addEventListener("contextmenu", (e) => {
+      e.preventDefault()
+      const y = info.date.getFullYear()
+      const m = String(info.date.getMonth() + 1).padStart(2, '0')
+      const d = String(info.date.getDate()).padStart(2, '0')
+      const dateStr = `${y}-${m}-${d}`
+      contextMenu.value = {
+        visible: true,
+        x: e.clientX,
+        y: e.clientY,
+        eventInfo: null,
+        targetDate: dateStr,
+      }
+    })
   },
 
   headerToolbar: {
@@ -373,6 +495,11 @@ const calendarOptions = ref({
     if (titleEl) {
       requestAnimationFrame(() => applyScrollToTitle(titleEl))
     }
+    // 绑定右键菜单
+    info.el.addEventListener("contextmenu", (e) => {
+      e.stopPropagation() // 阻止冒泡到 dayCell
+      handleEventContextMenu({ event: info.event, jsEvent: e })
+    })
   },
 
   datesSet(info) {
@@ -484,6 +611,8 @@ let refreshTimer = null
 
 onMounted(() => {
   fetchCalendarInfo()
+  // 点击任意位置关闭右键菜单
+  document.addEventListener('click', closeContextMenu)
   // 每 5 秒刷新一次数据
   refreshTimer = setInterval(() => {
     getEvents()
@@ -506,6 +635,7 @@ onMounted(() => {
       resizeObserver.disconnect()
       resizeObserver = null
     }
+    document.removeEventListener('click', closeContextMenu)
     clearTimeout(resizeTimer)
   })
 })
@@ -696,6 +826,31 @@ onMounted(() => {
     </div>
   </div>
 
+  <!-- 右键菜单 -->
+  <div
+    v-if="contextMenu.visible"
+    class="fixed z-[60] min-w-[140px] rounded-lg border border-gray-200 bg-white py-1 shadow-lg dark:border-dk-muted dark:bg-dk-card"
+    :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
+  >
+    <button
+      v-if="contextMenu.eventInfo"
+      @click="copyEvent"
+      class="flex w-full items-center gap-2 px-3 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-dk-text dark:hover:bg-dk-base"
+    >
+      <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>
+      {{ t('calendar.copy_event') }}
+    </button>
+    <button
+      @click="pasteEvent"
+      class="flex w-full items-center gap-2 px-3 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-dk-text dark:hover:bg-dk-base"
+      :class="{ 'opacity-40 cursor-not-allowed': !clipboard }"
+      :disabled="!clipboard"
+    >
+      <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 4h2a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2"></path><rect x="8" y="2" width="8" height="4" rx="1" ry="1"></rect></svg>
+      {{ t('calendar.paste_event') }}
+    </button>
+  </div>
+
   <!-- Delete Confirm Dialog -->
   <ConfirmDialog
     v-model="showDeleteModal"

From af8e63552fd5edef9252aa41504f2ae1cdc9c9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 22:56:08 +0800
Subject: [PATCH 19/21] up

---
 .workbuddy/memory/2026-05-06.md               |  19 +++
 .../src/views/calendar/CalendarDetail.vue     | 138 +++++++++++++-----
 2 files changed, 118 insertions(+), 39 deletions(-)

diff --git a/.workbuddy/memory/2026-05-06.md b/.workbuddy/memory/2026-05-06.md
index f09fce0..d7df543 100644
--- a/.workbuddy/memory/2026-05-06.md
+++ b/.workbuddy/memory/2026-05-06.md
@@ -113,3 +113,22 @@
 - `eventDidMount` 中为每个事件绑定 `contextmenu` 事件
 - `onMounted` 注册全局 click 关闭菜单，`onBeforeUnmount` 移除
 - i18n 新增 `calendar.copy_event/paste_event/copy_success/paste_success/no_event_to_paste`
+
+## 修复：粘贴多天日程时结束日期少1天
+
+**问题**：Ctrl+V 粘贴大于1天的日程时，目标结束日期少1天。
+
+**原因**：`pasteToDate` 中用 `new Date(targetEndMs).toISOString().split('T')[0]` 计算目标结束日期，`toISOString()` 输出 UTC 时间，在 UTC+8 时区下日期会往前偏移1天。
+
+**修复**（`CalendarDetail.vue` `pasteToDate` 函数）：
+- 改用天数差 `Math.round((origEndDate - origStartDate) / 86400000)` 替代毫秒差
+- 用本地日期方法 `targetEndDate.setDate(targetEndDate.getDate() + diffDays)` + 手动拼接 `YYYY-MM-DD`，替代 `toISOString().split('T')[0]`
+
+## 修复：Ctrl+C 无法复制大于1天的日程
+
+**问题**：Ctrl+C 复制多天日程后粘贴无效果。
+
+**根因**：`calendarOptions.value.events` 中多天事件的 `end` 是 `DateUtils.toCalendarEnd()` 返回的 **Date 对象**（非字符串）。Ctrl+C 直接 `selectedEvent.end || selectedEvent.start` 存入 clipboard，导致 `pasteToDate` 调用 `clipboard.value.end.split('T')[0]` 时 Date 对象没有 `split` 方法而报错。单天事件因走 `isSameDay` 分支不解析 `end`，所以不受影响。
+
+**修复**（`CalendarDetail.vue` `handleKeyDown` Ctrl+C 分支）：
+- 检测 `end` 是否为 Date 实例，如果是则用本地日期方法转为 `YYYY-MM-DD` 字符串再存入 clipboard
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index be81448..07612aa 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -55,6 +55,7 @@ const colorOptions = ref([
 
 const pageData = ref({
   seleEventID: 0,
+  selectedDate: '', // 选中的格子日期，用于 Ctrl+V 粘贴
   lastClickTime: 0,
   lastClickTimeStr: "",
   lastEventClickTime: 0,
@@ -126,50 +127,13 @@ async function pasteEvent() {
       targetStart = selectedEvent.start.split('T')[0]
     }
   }
+  closeContextMenu()
   if (!targetStart) {
     toast.warning(t('calendar.no_event_to_paste'))
-    closeContextMenu()
     return
   }
 
-  // 计算原始日程的时长（天数）
-  const origStart = clipboard.value.start.split('T')[0]
-  const origEnd = clipboard.value.end.split('T')[0]
-  const origStartMs = new Date(origStart).getTime()
-  const origEndMs = new Date(origEnd).getTime()
-  const durationMs = origEndMs - origStartMs
-  const isSameDay = durationMs === 0 || origStart === origEnd
-
-  // 粘贴的结束日期 = 目标起始日期 + 原始时长
-  let targetEnd = targetStart
-  if (!isSameDay) {
-    const targetEndMs = new Date(targetStart).getTime() + durationMs
-    targetEnd = new Date(targetEndMs).toISOString().split('T')[0]
-  }
-
-  try {
-    const result = await calendarApi.addEvent({
-      calendar_id: calendarId.value,
-      title: clipboard.value.title,
-      start: toDatetime(targetStart),
-      end: toDatetime(
-        isSameDay
-          ? targetEnd
-          : DateUtils.toRealEnd(targetEnd),
-      ),
-      schedule_type: clipboard.value.scheduleType,
-      is_public: clipboard.value.isPublic,
-    })
-    if (result.errCode === 0) {
-      toast.success(t('calendar.paste_success'))
-      getEvents()
-    } else {
-      toast.error(t('message.server_error'))
-    }
-  } catch {
-    // 拦截器已处理
-  }
-  closeContextMenu()
+  await pasteToDate(targetStart)
 }
 
 // 选中/取消选中事件
@@ -511,6 +475,7 @@ const calendarOptions = ref({
     const nowTime = new Date().getTime()
     const timeDifference = nowTime - pageData.value.lastClickTime
     unseleEventAll()
+    pageData.value.selectedDate = info.dateStr
 
     if (info.dateStr === pageData.value.lastClickTimeStr) {
       if (timeDifference < 400 && timeDifference > 0) {
@@ -542,6 +507,7 @@ const calendarOptions = ref({
     const eventid = parseInt(info.event.id)
 
     unseleEventAll()
+    pageData.value.selectedDate = ''
     const target = calendarOptions.value.events.find(item => String(item.id) === String(info.event.id))
     if (target) {
       target.borderColor = "#000000"
@@ -606,6 +572,97 @@ watch(locale, () => {
   ]
 })
 
+// 键盘快捷键：Ctrl+C 复制选中日程，Ctrl+V 粘贴到选中格子
+function handleKeyDown(e) {
+  // 忽略在输入框中的快捷键
+  if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') return
+
+  if (e.ctrlKey || e.metaKey) {
+    if (e.key === 'c') {
+      // Ctrl+C：复制选中日程
+      if (pageData.value.seleEventID) {
+        const selectedEvent = calendarOptions.value.events.find(
+          item => item.id === pageData.value.seleEventID
+        )
+        if (selectedEvent) {
+          // 将 end 统一转为 YYYY-MM-DD 字符串（多天事件的 end 是 Date 对象）
+          let endStr = selectedEvent.end || selectedEvent.start
+          if (endStr instanceof Date) {
+            const y = endStr.getFullYear()
+            const m = String(endStr.getMonth() + 1).padStart(2, '0')
+            const d = String(endStr.getDate()).padStart(2, '0')
+            endStr = `${y}-${m}-${d}`
+          }
+          clipboard.value = {
+            id: selectedEvent.id,
+            title: selectedEvent.title,
+            start: selectedEvent.start,
+            end: endStr,
+            color: selectedEvent.backgroundColor,
+            scheduleType: selectedEvent.extendedProps?.scheduleType || 'work',
+            isPublic: selectedEvent.extendedProps?.isPublic || false,
+          }
+          toast.success(t('calendar.copy_success'))
+        }
+      }
+    } else if (e.key === 'v') {
+      // Ctrl+V：粘贴到选中格子
+      if (clipboard.value && pageData.value.selectedDate) {
+        e.preventDefault()
+        pasteToDate(pageData.value.selectedDate)
+      }
+    }
+  }
+}
+
+// 粘贴到指定日期
+async function pasteToDate(targetStart) {
+  if (!clipboard.value) return
+
+  const origStart = clipboard.value.start.split('T')[0]
+  const origEnd = clipboard.value.end.split('T')[0]
+
+  // 计算原始事件天数（使用本地日期避免时区偏移）
+  const origStartDate = new Date(origStart)
+  const origEndDate = new Date(origEnd)
+  const diffDays = Math.round((origEndDate - origStartDate) / 86400000)
+  const isSameDay = diffDays === 0
+
+  let targetEnd = targetStart
+  if (!isSameDay) {
+    // 用本地日期方法计算目标结束日期，避免 toISOString() 的 UTC 时区偏移
+    const targetEndDate = new Date(targetStart)
+    targetEndDate.setDate(targetEndDate.getDate() + diffDays)
+    const y = targetEndDate.getFullYear()
+    const m = String(targetEndDate.getMonth() + 1).padStart(2, '0')
+    const d = String(targetEndDate.getDate()).padStart(2, '0')
+    targetEnd = `${y}-${m}-${d}`
+  }
+
+  try {
+    const result = await calendarApi.addEvent({
+      calendar_id: calendarId.value,
+      title: clipboard.value.title,
+      start: toDatetime(targetStart),
+      end: toDatetime(
+        isSameDay
+          ? targetEnd
+          : DateUtils.toRealEnd(targetEnd),
+      ),
+      schedule_type: clipboard.value.scheduleType,
+      is_public: clipboard.value.isPublic,
+    })
+    if (result.errCode === 0) {
+      toast.success(t('calendar.paste_success'))
+      getEvents()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch {
+    // 拦截器已处理
+  }
+}
+
 let resizeObserver = null
 let refreshTimer = null
 
@@ -613,6 +670,8 @@ onMounted(() => {
   fetchCalendarInfo()
   // 点击任意位置关闭右键菜单
   document.addEventListener('click', closeContextMenu)
+  // 键盘快捷键
+  document.addEventListener('keydown', handleKeyDown)
   // 每 5 秒刷新一次数据
   refreshTimer = setInterval(() => {
     getEvents()
@@ -636,6 +695,7 @@ onMounted(() => {
       resizeObserver = null
     }
     document.removeEventListener('click', closeContextMenu)
+    document.removeEventListener('keydown', handleKeyDown)
     clearTimeout(resizeTimer)
   })
 })

From 15e3104d2f609fd7a53429597a311ed8d9a2d233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 23:03:49 +0800
Subject: [PATCH 20/21] up

---
 .workbuddy/memory/2026-05-06.md               | 13 ++++++++
 frontend/ops_vue_js/src/i18n/en.json          |  3 +-
 frontend/ops_vue_js/src/i18n/zh-CN.json       |  3 +-
 .../src/views/calendar/CalendarDetail.vue     | 33 +++++++++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/.workbuddy/memory/2026-05-06.md b/.workbuddy/memory/2026-05-06.md
index d7df543..dc4afb5 100644
--- a/.workbuddy/memory/2026-05-06.md
+++ b/.workbuddy/memory/2026-05-06.md
@@ -132,3 +132,16 @@
 
 **修复**（`CalendarDetail.vue` `handleKeyDown` Ctrl+C 分支）：
 - 检测 `end` 是否为 Date 实例，如果是则用本地日期方法转为 `YYYY-MM-DD` 字符串再存入 clipboard
+
+## 新增：编辑事件窗口显示创建者
+
+**功能**：编辑事件模态框标题居中显示「xxx 创建」
+
+**实现**（参考 ScheduleView.vue）：
+- 导入 `useUsersStore`，添加 `usersStore`
+- `pageData.eventBindUserID`：数组，每项 `{ eventID, userID }`
+- `getUserIdFromEventID(eventID)`：通过事件ID查创建者用户ID
+- `getUsernameFromUserID(userID)`：调用 `usersStore.getUsernameFromUserID(userID)`（有缓存）
+- `getEvents` 中遍历事件时 `pageData.value.eventBindUserID.push({ eventID: item.ID, userID: item.UserID })`
+- 模态框标题新增 `<h5 v-if="eventData.isEditing && getUserIdFromEventID(eventData.id)">` 居中显示
+- i18n：`calendar.created_by` = "{name} 创建" / "Created by {name}"
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index ba71fb3..30b61b6 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -663,6 +663,7 @@
     "paste_event": "Paste Event",
     "copy_success": "Event copied",
     "paste_success": "Event pasted",
-    "no_event_to_paste": "No event to paste"
+    "no_event_to_paste": "No event to paste",
+    "created_by": "Created by {name}"
   }
 }
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index c71ac91..6d1562b 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -664,6 +664,7 @@
     "paste_event": "粘贴日程",
     "copy_success": "日程已复制",
     "paste_success": "日程已粘贴",
-    "no_event_to_paste": "没有可粘贴的日程"
+    "no_event_to_paste": "没有可粘贴的日程",
+    "created_by": "{name} 创建"
   }
 }
diff --git a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
index 07612aa..9eb6186 100644
--- a/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
+++ b/frontend/ops_vue_js/src/views/calendar/CalendarDetail.vue
@@ -10,6 +10,7 @@ import { useI18n } from "vue-i18n"
 import { usePageTitle } from "@/composables/usePageTitle"
 import { useToastStore } from "@/stores/toast"
 import { useUserStore } from "@/stores/user"
+import { useUsersStore } from "@/stores/users"
 import { calendarApi } from "@/api/calendar"
 import { useDateUtils } from "@/composables/useDateUtils"
 import DatatimePickerForFullCalendar from "@/components/datatimePickerForFullCalendar.vue"
@@ -20,6 +21,7 @@ const router = useRouter()
 const { t, locale } = useI18n()
 const toast = useToastStore()
 const userStore = useUserStore()
+const usersStore = useUsersStore()
 const DateUtils = useDateUtils()
 
 const calendarId = ref(parseInt(route.params.id))
@@ -62,6 +64,7 @@ const pageData = ref({
   lastEventClickID: 0,
   submitChecked: false,
   lastEventsSnapshot: null,
+  eventBindUserID: [], // 事件ID → 创建者UserID 映射
 })
 
 const showDeleteModal = ref(false)
@@ -103,6 +106,18 @@ function closeContextMenu() {
   contextMenu.value.visible = false
 }
 
+// 通过事件ID获取创建者用户ID
+function getUserIdFromEventID(eventID) {
+  const target = pageData.value.eventBindUserID.find(item => item.eventID === eventID)
+  return target ? target.userID : 0
+}
+
+// 通过用户ID获取用户名
+function getUsernameFromUserID(userID) {
+  if (userID == 0) return ""
+  return usersStore.getUsernameFromUserID(userID)
+}
+
 function copyEvent() {
   if (!contextMenu.value.eventInfo) return
   clipboard.value = { ...contextMenu.value.eventInfo }
@@ -297,8 +312,13 @@ async function getEvents() {
 
     if (errCode === 0) {
       calendarOptions.value.events = []
+      pageData.value.eventBindUserID = []
       ;(data.list || []).forEach(item => {
         const canEdit = item.canEdit === true
+        pageData.value.eventBindUserID.push({
+          eventID: item.ID,
+          userID: item.UserID,
+        })
         calendarOptions.value.events.push({
           id: item.ID,
           title: item.Title,
@@ -724,6 +744,19 @@ onMounted(() => {
                 : t("calendar.view_event")
             }}
           </h5>
+          <div
+            v-if="eventData.isEditing && userStore.isLoggedIn && getUserIdFromEventID(eventData.id)"
+            class="absolute left-1/2 -translate-x-1/2 flex items-center gap-2"
+          >
+            <img
+              :src="usersStore.getAvatarUrlFromUserID(getUserIdFromEventID(eventData.id))"
+              class="h-6 w-6 rounded-full"
+              alt="avatar"
+            />
+            <span class="text-sm text-gray-500">
+              {{ t("calendar.created_by", { name: getUsernameFromUserID(getUserIdFromEventID(eventData.id)) }) }}
+            </span>
+          </div>
           <button
             @click="closeEventModal"
             class="btn-close text-gray-500 hover:text-gray-700"

From f199d5879b1a9d87fe7ed9826c1a25b2dbdf52e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= <kevin@lmve.net>
Date: Wed, 6 May 2026 23:04:32 +0800
Subject: [PATCH 21/21] up

---
 frontend/ops_vue_js/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/ops_vue_js/package.json b/frontend/ops_vue_js/package.json
index b742121..eaf6ece 100644
--- a/frontend/ops_vue_js/package.json
+++ b/frontend/ops_vue_js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ops_vue_js",
-  "version": "1.3.5",
+  "version": "1.4.7",
   "private": true,
   "type": "module",
   "engines": {