更新makefile

Makefile

@@ -1,2 +1,6 @@
 dev:
 	npm run dev
+
+# 启用谷歌浏览器MCP服务器
+mcp-chrome:
+	node "C:\nvm4w\nodejs\node_modules\chrome-devtools-mcp\build\src\index.js"

src/api/areaController.js

@@ -1,5 +1,12 @@
 import http from '../utils/http';
 
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
+
 /**
  * @typedef {object} AreaControllerResponse
  * @property {number} id
@@ -67,8 +74,16 @@ export const updateAreaController = (id, areaControllerData) => {
 /**
  * 根据ID删除一个区域主控（软删除）
  * @param {string} id - 区域主控ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const deleteAreaController = (id) => {
   return http.delete(`/api/v1/area-controllers/${id}`);
 };
+
+export const AreaControllerApi = {
+  list: getAreaControllers,
+  create: createAreaController,
+  getById: getAreaControllerById,
+  update: updateAreaController,
+  delete: deleteAreaController,
+};

src/api/device.js

@@ -2,6 +2,13 @@ import http from '../utils/http';
 
 // --- Typedefs ---
 
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
+
 /**
  * @typedef {object} DeviceResponse
  * @property {number} id
@@ -109,7 +116,7 @@ export const updateDevice = (id, deviceData) => {
 /**
  * 根据设备ID删除一个设备（软删除）
  * @param {string} id - 设备ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const deleteDevice = (id) => {
   return http.delete(`/api/v1/devices/${id}`);
@@ -119,7 +126,7 @@ export const deleteDevice = (id) => {
  * 根据设备ID和指定的动作（开启或关闭）来手动控制设备
  * @param {string} id - 设备ID
  * @param {ManualControlDeviceRequest} manualControlData - 手动控制指令
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const manualControlDevice = (id, manualControlData) => {
   return http.post(`/api/v1/devices/manual-control/${id}`, manualControlData);
@@ -167,7 +174,7 @@ export const updateAreaController = (id, areaControllerData) => {
 /**
  * 根据ID删除一个区域主控
  * @param {string} id - 区域主控ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const deleteAreaController = (id) => {
   return http.delete(`/api/v1/area-controllers/${id}`);

src/api/deviceTemplate.js

@@ -1,5 +1,12 @@
 import http from '../utils/http';
 
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
+
 /**
  * @typedef {('执行器'|'传感器')} DeviceCategory
  */
@@ -68,7 +75,7 @@ const createDeviceTemplate = (deviceTemplateData) => {
 
 /**
  * 根据设备模板ID获取单个设备模板的详细信息
- * @param {string} id - 设备模板ID
+ * @param {number} id - 设备模板ID
  * @returns {Promise<DeviceTemplateResponse>}
  */
 const getDeviceTemplateById = (id) => {
@@ -77,7 +84,7 @@ const getDeviceTemplateById = (id) => {
 
 /**
  * 根据设备模板ID更新一个已存在的设备模板信息
- * @param {string} id - 设备模板ID
+ * @param {number} id - 设备模板ID
  * @param {UpdateDeviceTemplateRequest} deviceTemplateData - 要更新的设备模板信息
  * @returns {Promise<DeviceTemplateResponse>}
  */
@@ -87,8 +94,8 @@ const updateDeviceTemplate = (id, deviceTemplateData) => {
 
 /**
  * 根据设备模板ID删除一个设备模板（软删除）
- * @param {string} id - 设备模板ID
+ * @param {number} id - 设备模板ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 const deleteDeviceTemplate = (id) => {
   return http.delete(`/api/v1/device-templates/${id}`);

src/api/monitor.js

@@ -5,7 +5,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PaginationDTO
  * @property {number} page
- * @property {number} pageSize
+ * @property {number} page_size
  * @property {number} total
  */
 
@@ -27,7 +27,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} DeviceCommandLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [device_id]
  * @property {string} [start_time]
@@ -69,7 +69,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} FeedUsageRecordsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pen_id]
  * @property {number} [feed_formula_id]
@@ -111,7 +111,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} MedicationLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pig_batch_id]
  * @property {number} [medication_id]
@@ -121,6 +121,49 @@ import http from '../utils/http';
  * @property {number} [operator_id]
  */
 
+/**
+ * @typedef {('邮件'|'企业微信'|'飞书'|'日志')} NotifierType
+ */
+
+/**
+ * @typedef {('发送成功'|'发送失败'|'已跳过')} NotificationStatus
+ */
+
+/**
+ * @typedef {object} NotificationDTO
+ * @property {number} id
+ * @property {number} user_id
+ * @property {NotifierType} notifier_type
+ * @property {string} to_address
+ * @property {string} title
+ * @property {string} message
+ * @property {number} level - 日志级别, 见 ZapcoreLevel 枚举
+ * @property {string} alarm_timestamp
+ * @property {NotificationStatus} status
+ * @property {string} error_message
+ * @property {string} created_at
+ * @property {string} updated_at
+ */
+
+/**
+ * @typedef {object} ListNotificationResponse
+ * @property {Array<NotificationDTO>} list
+ * @property {PaginationDTO} pagination
+ */
+
+/**
+ * @typedef {object} NotificationsParams
+ * @property {number} [page]
+ * @property {number} [page_size]
+ * @property {string} [order_by]
+ * @property {string} [start_time]
+ * @property {string} [end_time]
+ * @property {number} [level] - 日志级别, 见 ZapcoreLevel 枚举
+ * @property {NotifierType} [notifier_type]
+ * @property {NotificationStatus} [status]
+ * @property {number} [user_id]
+ */
+
 /**
  * @typedef {('等待中'|'已完成'|'已超时')} PendingCollectionStatus
  */
@@ -144,7 +187,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PendingCollectionsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [device_id]
  * @property {string} [status]
@@ -180,7 +223,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PigBatchLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pig_batch_id]
  * @property {string} [change_type]
@@ -213,7 +256,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PigPurchasesParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pig_batch_id]
  * @property {string} [supplier]
@@ -246,7 +289,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PigSalesParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pig_batch_id]
  * @property {string} [buyer]
@@ -289,7 +332,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PigSickLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pig_batch_id]
  * @property {number} [pen_id]
@@ -328,7 +371,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PigTransferLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pig_batch_id]
  * @property {number} [pen_id]
@@ -347,6 +390,7 @@ import http from '../utils/http';
  * @typedef {object} PlanExecutionLogDTO
  * @property {number} id
  * @property {number} plan_id
+ * @property {string} plan_name
  * @property {ExecutionStatus} status
  * @property {string} started_at
  * @property {string} ended_at
@@ -364,7 +408,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PlanExecutionLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [plan_id]
  * @property {string} [status]
@@ -400,7 +444,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} RawMaterialPurchasesParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [raw_material_id]
  * @property {string} [supplier]
@@ -432,7 +476,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} RawMaterialStockLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [raw_material_id]
  * @property {string} [source_type]
@@ -463,7 +507,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} SensorDataParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [device_id]
  * @property {string} [sensor_type]
@@ -501,7 +545,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} TaskExecutionLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [plan_execution_log_id]
  * @property {number} [task_id]
@@ -539,7 +583,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} UserActionLogsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [user_id]
  * @property {string} [username]
@@ -568,7 +612,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} WeighingBatchesParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [pig_batch_id]
  * @property {string} [start_time]
@@ -597,7 +641,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} WeighingRecordsParams
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [order_by]
  * @property {number} [weighing_batch_id]
  * @property {number} [pen_id]
@@ -606,6 +650,25 @@ import http from '../utils/http';
  * @property {number} [operator_id]
  */
 
+// --- Enums ---
+
+/**
+ * 日志级别, 对应后端的 zapcore.Level
+ * @enum {number}
+ */
+export const ZapcoreLevel = {
+  Debug: -1,
+  Info: 0,
+  Warn: 1,
+  Error: 2,
+  DPanic: 3,
+  Panic: 4,
+  Fatal: 5,
+  _minLevel: -1,
+  _maxLevel: 5,
+  Invalid: 6,
+  _numLevels: 7,
+};
 
 // --- Functions ---
 
@@ -623,7 +686,8 @@ const processResponse = (responseData) => {
  * @returns {Promise<{list: Array<DeviceCommandLogDTO>, total: number}>}
  */
 export const getDeviceCommandLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/device-command-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/device-command-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -633,7 +697,8 @@ export const getDeviceCommandLogs = async (params) => {
  * @returns {Promise<{list: Array<FeedUsageRecordDTO>, total: number}>}
  */
 export const getFeedUsageRecords = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/feed-usage-records', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/feed-usage-records', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -643,7 +708,19 @@ export const getFeedUsageRecords = async (params) => {
  * @returns {Promise<{list: Array<MedicationLogDTO>, total: number}>}
  */
 export const getMedicationLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/medication-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/medication-logs', { params: newParams });
+  return processResponse(responseData);
+};
+
+/**
+ * 批量查询通知
+ * @param {NotificationsParams} params - 查询参数
+ * @returns {Promise<{list: Array<NotificationDTO>, total: number}>}
+ */
+export const getNotifications = async (params) => {
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/notifications', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -653,7 +730,8 @@ export const getMedicationLogs = async (params) => {
  * @returns {Promise<{list: Array<PendingCollectionDTO>, total: number}>}
  */
 export const getPendingCollections = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/pending-collections', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/pending-collections', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -663,7 +741,8 @@ export const getPendingCollections = async (params) => {
  * @returns {Promise<{list: Array<PigBatchLogDTO>, total: number}>}
  */
 export const getPigBatchLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/pig-batch-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/pig-batch-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -673,7 +752,8 @@ export const getPigBatchLogs = async (params) => {
  * @returns {Promise<{list: Array<PigPurchaseDTO>, total: number}>}
  */
 export const getPigPurchases = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/pig-purchases', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/pig-purchases', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -683,7 +763,8 @@ export const getPigPurchases = async (params) => {
  * @returns {Promise<{list: Array<PigSaleDTO>, total: number}>}
  */
 export const getPigSales = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/pig-sales', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/pig-sales', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -693,7 +774,8 @@ export const getPigSales = async (params) => {
  * @returns {Promise<{list: Array<PigSickLogDTO>, total: number}>}
  */
 export const getPigSickLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/pig-sick-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/pig-sick-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -703,7 +785,8 @@ export const getPigSickLogs = async (params) => {
  * @returns {Promise<{list: Array<PigTransferLogDTO>, total: number}>}
  */
 export const getPigTransferLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/pig-transfer-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/pig-transfer-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -713,7 +796,8 @@ export const getPigTransferLogs = async (params) => {
  * @returns {Promise<{list: Array<PlanExecutionLogDTO>, total: number}>}
  */
 export const getPlanExecutionLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/plan-execution-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/plan-execution-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -723,7 +807,8 @@ export const getPlanExecutionLogs = async (params) => {
  * @returns {Promise<{list: Array<RawMaterialPurchaseDTO>, total: number}>}
  */
 export const getRawMaterialPurchases = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/raw-material-purchases', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/raw-material-purchases', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -733,7 +818,8 @@ export const getRawMaterialPurchases = async (params) => {
  * @returns {Promise<{list: Array<RawMaterialStockLogDTO>, total: number}>}
  */
 export const getRawMaterialStockLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/raw-material-stock-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/raw-material-stock-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -743,7 +829,8 @@ export const getRawMaterialStockLogs = async (params) => {
  * @returns {Promise<{list: Array<SensorDataDTO>, total: number}>}
  */
 export const getSensorData = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/sensor-data', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/sensor-data', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -753,7 +840,8 @@ export const getSensorData = async (params) => {
  * @returns {Promise<{list: Array<TaskExecutionLogDTO>, total: number}>}
  */
 export const getTaskExecutionLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/task-execution-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/task-execution-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -763,7 +851,8 @@ export const getTaskExecutionLogs = async (params) => {
  * @returns {Promise<{list: Array<UserActionLogDTO>, total: number}>}
  */
 export const getUserActionLogs = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/user-action-logs', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/user-action-logs', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -773,7 +862,8 @@ export const getUserActionLogs = async (params) => {
  * @returns {Promise<{list: Array<WeighingBatchDTO>, total: number}>}
  */
 export const getWeighingBatches = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/weighing-batches', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/weighing-batches', { params: newParams });
   return processResponse(responseData);
 };
 
@@ -783,6 +873,28 @@ export const getWeighingBatches = async (params) => {
  * @returns {Promise<{list: Array<WeighingRecordDTO>, total: number}>}
  */
 export const getWeighingRecords = async (params) => {
-  const responseData = await http.get('/api/v1/monitor/weighing-records', { params });
+  const newParams = { ...params, page_size: params.page_size };
+  const responseData = await http.get('/api/v1/monitor/weighing-records', { params: newParams });
   return processResponse(responseData);
 };
+
+export const MonitorApi = {
+  getDeviceCommandLogs,
+  getFeedUsageRecords,
+  getMedicationLogs,
+  getNotifications,
+  getPendingCollections,
+  getPigBatchLogs,
+  getPigPurchases,
+  getPigSales,
+  getPigSickLogs,
+  getPigTransferLogs,
+  getPlanExecutionLogs,
+  getRawMaterialPurchases,
+  getRawMaterialStockLogs,
+  getSensorData,
+  getTaskExecutionLogs,
+  getUserActionLogs,
+  getWeighingBatches,
+  getWeighingRecords,
+};

src/api/pen.js

@@ -1,5 +1,12 @@
 import http from '../utils/http';
 
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
+
 /**
  * @typedef {object} PenResponse
  * @property {number} id
@@ -70,7 +77,7 @@ export const updatePen = (id, penData) => {
 /**
  * 根据ID删除一个猪栏
  * @param {number} id - 猪栏ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const deletePen = (id) => {
   return http.delete(`/api/v1/pens/${id}`);
@@ -85,3 +92,12 @@ export const deletePen = (id) => {
 export const updatePenStatus = (id, statusData) => {
   return http.put(`/api/v1/pens/${id}/status`, statusData);
 };
+
+export const PenApi = {
+  getPens,
+  createPen,
+  getPenById,
+  updatePen,
+  deletePen,
+  updatePenStatus,
+};

src/api/pigBatch.js

@@ -2,6 +2,13 @@ import http from '../utils/http';
 
 // --- Typedefs ---
 
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
+
 /**
  * @typedef {('自繁'|'外购')} PigBatchOriginType
  */
@@ -15,15 +22,15 @@ import http from '../utils/http';
  * @property {number} id - 批次ID
  * @property {string} batch_number - 批次编号
  * @property {PigBatchOriginType} origin_type - 批次来源
- * @property {string} start_date - 批次开始日期
+ * @property {string} [start_date] - 批次开始日期
  * @property {string} [end_date] - 批次结束日期
  * @property {number} initial_count - 初始数量
  * @property {PigBatchStatus} status - 批次状态
  * @property {boolean} is_active - 是否活跃
  * @property {string} create_time - 创建时间
  * @property {string} update_time - 更新时间
- * @property {number} currentTotalQuantity - 当前总数
+ * @property {number} current_total_quantity - 当前总数
- * @property {number} currentTotalPigsInPens - 当前存栏总数
+ * @property {number} current_total_pigs_in_pens - 当前存栏总数
  */
 
 /**
@@ -57,54 +64,54 @@ import http from '../utils/http';
 
 /**
  * @typedef {object} BuyPigsRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 买入猪只数量
- * @property {number} unitPrice - 单价
+ * @property {number} unit_price - 单价
- * @property {number} totalPrice - 总价
+ * @property {number} total_price - 总价
- * @property {string} traderName - 交易方名称
+ * @property {string} trader_name - 交易方名称
- * @property {string} tradeDate - 交易日期
+ * @property {string} trade_date - 交易日期
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} SellPigsRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 卖出猪只数量
- * @property {number} unitPrice - 单价
+ * @property {number} unit_price - 单价
- * @property {number} totalPrice - 总价
+ * @property {number} total_price - 总价
- * @property {string} traderName - 交易方名称
+ * @property {string} trader_name - 交易方名称
- * @property {string} tradeDate - 交易日期
+ * @property {string} trade_date - 交易日期
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} MovePigsIntoPenRequest
- * @property {number} toPenID - 目标猪栏ID
+ * @property {number} to_pen_id - 目标猪栏ID
  * @property {number} quantity - 移入猪只数量
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} TransferPigsWithinBatchRequest
- * @property {number} fromPenID - 源猪栏ID
+ * @property {number} from_pen_id - 源猪栏ID
- * @property {number} toPenID - 目标猪栏ID
+ * @property {number} to_pen_id - 目标猪栏ID
  * @property {number} quantity - 调栏猪只数量
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} TransferPigsAcrossBatchesRequest
- * @property {number} fromPenID - 源猪栏ID
+ * @property {number} dest_batch_id - 目标猪批次ID
- * @property {number} destBatchID - 目标猪批次ID
+ * @property {number} from_pen_id - 源猪栏ID
- * @property {number} toPenID - 目标猪栏ID
+ * @property {number} to_pen_id - 目标猪栏ID
  * @property {number} quantity - 调栏猪只数量
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} ReclassifyPenToNewBatchRequest
- * @property {number} penID - 待划拨的猪栏ID
+ * @property {number} pen_id - 待划拨的猪栏ID
- * @property {number} toBatchID - 目标猪批次ID
+ * @property {number} to_batch_id - 目标猪批次ID
  * @property {string} [remarks] - 备注
  */
 
@@ -114,53 +121,53 @@ import http from '../utils/http';
 
 /**
  * @typedef {object} RecordSickPigsRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 病猪数量
- * @property {PigBatchSickPigTreatmentLocation} treatmentLocation - 治疗地点
+ * @property {PigBatchSickPigTreatmentLocation} treatment_location - 治疗地点
- * @property {string} happenedAt - 发生时间
+ * @property {string} happened_at - 发生时间
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} RecordSickPigRecoveryRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 康复猪数量
- * @property {PigBatchSickPigTreatmentLocation} treatmentLocation - 治疗地点
+ * @property {PigBatchSickPigTreatmentLocation} treatment_location - 治疗地点
- * @property {string} happenedAt - 发生时间
+ * @property {string} happened_at - 发生时间
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} RecordSickPigDeathRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 死亡猪数量
- * @property {PigBatchSickPigTreatmentLocation} treatmentLocation - 治疗地点
+ * @property {PigBatchSickPigTreatmentLocation} treatment_location - 治疗地点
- * @property {string} happenedAt - 发生时间
+ * @property {string} happened_at - 发生时间
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} RecordSickPigCullRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 淘汰猪数量
- * @property {PigBatchSickPigTreatmentLocation} treatmentLocation - 治疗地点
+ * @property {PigBatchSickPigTreatmentLocation} treatment_location - 治疗地点
- * @property {string} happenedAt - 发生时间
+ * @property {string} happened_at - 发生时间
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} RecordDeathRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 死亡猪数量
- * @property {string} happenedAt - 发生时间
+ * @property {string} happened_at - 发生时间
  * @property {string} [remarks] - 备注
  */
 
 /**
  * @typedef {object} RecordCullRequest
- * @property {number} penID - 猪栏ID
+ * @property {number} pen_id - 猪栏ID
  * @property {number} quantity - 淘汰猪数量
- * @property {string} happenedAt - 发生时间
+ * @property {string} happened_at - 发生时间
  * @property {string} [remarks] - 备注
  */
 
@@ -190,7 +197,7 @@ import http from '../utils/http';
  * @returns {Promise<Array<PigBatchResponseDTO>>}
  */
 export const getPigBatches = (params) => {
-  return http.get('/api/v1/pig-batches', { params });
+    return http.get('/api/v1/pig-batches', params);
 };
 
 /**
@@ -199,7 +206,7 @@ export const getPigBatches = (params) => {
  * @returns {Promise<PigBatchResponseDTO>}
  */
 export const createPigBatch = (batchData) => {
-  return http.post('/api/v1/pig-batches', batchData);
+    return http.post('/api/v1/pig-batches', batchData);
 };
 
 /**
@@ -208,7 +215,7 @@ export const createPigBatch = (batchData) => {
  * @returns {Promise<PigBatchResponseDTO>}
  */
 export const getPigBatchById = (id) => {
-  return http.get(`/api/v1/pig-batches/${id}`);
+    return http.get(`/api/v1/pig-batches/${id}`);
 };
 
 /**
@@ -218,16 +225,16 @@ export const getPigBatchById = (id) => {
  * @returns {Promise<PigBatchResponseDTO>}
  */
 export const updatePigBatch = (id, batchData) => {
-  return http.put(`/api/v1/pig-batches/${id}`, batchData);
+    return http.put(`/api/v1/pig-batches/${id}`, batchData);
 };
 
 /**
  * 根据ID删除一个猪批次
  * @param {number} id - 猪批次ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const deletePigBatch = (id) => {
-  return http.delete(`/api/v1/pig-batches/${id}`);
+    return http.delete(`/api/v1/pig-batches/${id}`);
 };
 
 // --- 猪批次业务操作 ---
@@ -236,80 +243,80 @@ export const deletePigBatch = (id) => {
  * 为猪批次分配空栏
  * @param {number} id - 猪批次ID
  * @param {AssignEmptyPensToBatchRequest} pensData - 待分配的猪栏ID列表
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const assignPensToBatch = (id, pensData) => {
-  return http.post(`/api/v1/pig-batches/assign-pens/${id}`, pensData);
+    return http.post(`/api/v1/pig-batches/assign-pens/${id}`, pensData);
 };
 
 /**
  * 从猪批次移除空栏
- * @param {number} batchID - 猪批次ID
  * @param {number} penID - 待移除的猪栏ID
- * @returns {Promise<*>}
+ * @param {number} batchID - 猪批次ID
+ * @returns {Promise<Response>}
  */
-export const removePenFromBatch = (batchID, penID) => {
+export const removePenFromBatch = (penID, batchID) => {
-  return http.delete(`/api/v1/pig-batches/remove-pen/${penID}/${batchID}`);
+    return http.delete(`/api/v1/pig-batches/remove-pen/${penID}/${batchID}`);
 };
 
 /**
  * 处理买猪的业务逻辑
  * @param {number} id - 猪批次ID
  * @param {BuyPigsRequest} buyData - 买猪请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const buyPigsForBatch = (id, buyData) => {
-  return http.post(`/api/v1/pig-batches/buy-pigs/${id}`, buyData);
+    return http.post(`/api/v1/pig-batches/buy-pigs/${id}`, buyData);
 };
 
 /**
  * 处理卖猪的业务逻辑
  * @param {number} id - 猪批次ID
  * @param {SellPigsRequest} sellData - 卖猪请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const sellPigsFromBatch = (id, sellData) => {
-  return http.post(`/api/v1/pig-batches/sell-pigs/${id}`, sellData);
+    return http.post(`/api/v1/pig-batches/sell-pigs/${id}`, sellData);
 };
 
 /**
  * 将猪只从“虚拟库存”移入指定猪栏
  * @param {number} id - 猪批次ID
  * @param {MovePigsIntoPenRequest} moveData - 移入猪只请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const movePigsIntoPen = (id, moveData) => {
-  return http.post(`/api/v1/pig-batches/move-pigs-into-pen/${id}`, moveData);
+    return http.post(`/api/v1/pig-batches/move-pigs-into-pen/${id}`, moveData);
 };
 
 /**
  * 群内调栏
  * @param {number} id - 猪批次ID
  * @param {TransferPigsWithinBatchRequest} transferData - 群内调栏请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const transferPigsWithinBatch = (id, transferData) => {
-  return http.post(`/api/v1/pig-batches/transfer-within-batch/${id}`, transferData);
+    return http.post(`/api/v1/pig-batches/transfer-within-batch/${id}`, transferData);
 };
 
 /**
  * 跨猪群调栏
  * @param {number} sourceBatchID - 源猪批次ID
  * @param {TransferPigsAcrossBatchesRequest} transferData - 跨群调栏请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const transferPigsAcrossBatches = (sourceBatchID, transferData) => {
-  return http.post(`/api/v1/pig-batches/transfer-across-batches/${sourceBatchID}`, transferData);
+    return http.post(`/api/v1/pig-batches/transfer-across-batches/${sourceBatchID}`, transferData);
 };
 
 /**
  * 将猪栏划拨到新批次
  * @param {number} fromBatchID - 源猪批次ID
  * @param {ReclassifyPenToNewBatchRequest} reclassifyData - 划拨请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const reclassifyPenToNewBatch = (fromBatchID, reclassifyData) => {
-  return http.post(`/api/v1/pig-batches/reclassify-pen/${fromBatchID}`, reclassifyData);
+    return http.post(`/api/v1/pig-batches/reclassify-pen/${fromBatchID}`, reclassifyData);
 };
 
 // --- 猪只数量变更记录 ---
@@ -318,60 +325,60 @@ export const reclassifyPenToNewBatch = (fromBatchID, reclassifyData) => {
  * 记录新增病猪事件
  * @param {number} id - 猪批次ID
  * @param {RecordSickPigsRequest} sickData - 记录病猪请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const recordSickPigsInBatch = (id, sickData) => {
-  return http.post(`/api/v1/pig-batches/record-sick-pigs/${id}`, sickData);
+    return http.post(`/api/v1/pig-batches/record-sick-pigs/${id}`, sickData);
 };
 
 /**
  * 记录病猪康复事件
  * @param {number} id - 猪批次ID
  * @param {RecordSickPigRecoveryRequest} recoveryData - 记录病猪康复请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const recordSickPigRecoveryInBatch = (id, recoveryData) => {
-  return http.post(`/api/v1/pig-batches/record-sick-pig-recovery/${id}`, recoveryData);
+    return http.post(`/api/v1/pig-batches/record-sick-pig-recovery/${id}`, recoveryData);
 };
 
 /**
  * 记录病猪死亡事件
  * @param {number} id - 猪批次ID
  * @param {RecordSickPigDeathRequest} deathData - 记录病猪死亡请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const recordSickPigDeathInBatch = (id, deathData) => {
-  return http.post(`/api/v1/pig-batches/record-sick-pig-death/${id}`, deathData);
+    return http.post(`/api/v1/pig-batches/record-sick-pig-death/${id}`, deathData);
 };
 
 /**
  * 记录病猪淘汰事件
  * @param {number} id - 猪批次ID
  * @param {RecordSickPigCullRequest} cullData - 记录病猪淘汰请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const recordSickPigCullInBatch = (id, cullData) => {
-  return http.post(`/api/v1/pig-batches/record-sick-pig-cull/${id}`, cullData);
+    return http.post(`/api/v1/pig-batches/record-sick-pig-cull/${id}`, cullData);
 };
 
 /**
  * 记录正常猪只死亡事件
  * @param {number} id - 猪批次ID
  * @param {RecordDeathRequest} deathData - 记录正常猪只死亡请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const recordDeathInBatch = (id, deathData) => {
-  return http.post(`/api/v1/pig-batches/record-death/${id}`, deathData);
+    return http.post(`/api/v1/pig-batches/record-death/${id}`, deathData);
 };
 
 /**
  * 记录正常猪只淘汰事件
  * @param {number} id - 猪批次ID
  * @param {RecordCullRequest} cullData - 记录正常猪只淘汰请求信息
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const recordCullInBatch = (id, cullData) => {
-  return http.post(`/api/v1/pig-batches/record-cull/${id}`, cullData);
+    return http.post(`/api/v1/pig-batches/record-cull/${id}`, cullData);
 };
 
 // --- 新增的猪栏和猪舍API ---
@@ -381,7 +388,7 @@ export const recordCullInBatch = (id, cullData) => {
  * @returns {Promise<Array<PenResponse>>}
  */
 export const getAllPens = () => {
-  return http.get('/api/v1/pens');
+    return http.get('/api/v1/pens');
 };
 
 /**
@@ -389,5 +396,29 @@ export const getAllPens = () => {
  * @returns {Promise<Array<PigHouseResponse>>}
  */
 export const getAllPigHouses = () => {
-  return http.get('/api/v1/pig-houses');
+    return http.get('/api/v1/pig-houses');
+};
+
+export const PigBatchApi = {
+    getPigBatches,
+    createPigBatch,
+    getPigBatchById,
+    updatePigBatch,
+    deletePigBatch,
+    assignPensToBatch,
+    removePenFromBatch,
+    buyPigsForBatch,
+    sellPigsFromBatch,
+    movePigsIntoPen,
+    transferPigsWithinBatch,
+    transferPigsAcrossBatches,
+    reclassifyPenToNewBatch,
+    recordSickPigsInBatch,
+    recordSickPigRecoveryInBatch,
+    recordSickPigDeathInBatch,
+    recordSickPigCullInBatch,
+    recordDeathInBatch,
+    recordCullInBatch,
+    getAllPens,
+    getAllPigHouses,
 };

src/api/pigHouse.js

@@ -1,5 +1,12 @@
 import http from '../utils/http';
 
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
+
 /**
  * @typedef {object} PigHouseResponse
  * @property {number} id
@@ -58,8 +65,16 @@ export const updatePigHouse = (id, pigHouseData) => {
 /**
  * 根据ID删除一个猪舍
  * @param {number} id - 猪舍ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 export const deletePigHouse = (id) => {
   return http.delete(`/api/v1/pig-houses/${id}`);
 };
+
+export const PigHouseApi = {
+  getPigHouses,
+  createPigHouse,
+  getPigHouseById,
+  updatePigHouse,
+  deletePigHouse,
+};

src/api/plan.js

@@ -1,7 +1,7 @@
 import http from '../utils/http';
 
 /**
- * @typedef {('计划分析'|'等待'|'下料')} TaskType
+ * @typedef {('计划分析'|'等待'|'下料'|'全量采集')} TaskType
  */
 
 /**
@@ -67,6 +67,10 @@ import http from '../utils/http';
  * @typedef {('子计划'|'任务')} PlanContentType
  */
 
+/**
+ * @typedef {('自定义任务'|'系统任务')} PlanType
+ */
+
 /**
  * @typedef {object} PlanResponse
  * @property {number} id
@@ -78,17 +82,52 @@ import http from '../utils/http';
  * @property {number} execute_count
  * @property {PlanStatus} status
  * @property {PlanContentType} content_type
+ * @property {PlanType} plan_type
  * @property {Array<TaskResponse>} tasks
  * @property {Array<SubPlanResponse>} sub_plans
  */
 
+/**
+ * @typedef {object} ListPlansResponse
+ * @property {Array<PlanResponse>} plans
+ * @property {number} total
+ */
+
+/**
+ * @typedef {object} PlanExecutionLogDTO
+ * @property {string} created_at
+ * @property {string} ended_at
+ * @property {string} error
+ * @property {number} id
+ * @property {number} plan_id
+ * @property {string} plan_name
+ * @property {string} started_at
+ * @property {string} status
+ * @property {string} updated_at
+ */
+
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
 
 /**
  * 获取所有计划的列表
- * @returns {Promise<Array<PlanResponse>>}
+ * @param {object} params - 查询参数
+ * @param {number} [params.page] - 页码
+ * @param {number} [params.page_size] - 每页大小
+ * @param {('所有任务'|'自定义任务'|'系统任务')} [params.plan_type] - 计划类型
+ * @returns {Promise<ListPlansResponse>}
  */
-const getPlans = () => {
+const getPlans = (params) => {
-  return http.get('/api/v1/plans');
+  const newParams = {
+    page: params.page,
+    page_size: params.page_size,
+    plan_type: params.plan_type,
+  };
+  return http.get('/api/v1/plans', { params: newParams });
 };
 
 /**
@@ -110,7 +149,7 @@ const getPlanById = (id) => {
 };
 
 /**
- * 根据计划ID更新计划的详细信息
+ * 根据计划ID更新计划的详细信息。系统计划不允许修改。
  * @param {number} id - 计划ID
  * @param {UpdatePlanRequest} planData - 更新后的计划信息
  * @returns {Promise<PlanResponse>}
@@ -120,27 +159,27 @@ const updatePlan = (id, planData) => {
 };
 
 /**
- * 根据计划ID删除计划（软删除）
+ * 根据计划ID删除计划。（软删除）系统计划不允许删除。
  * @param {number} id - 计划ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 const deletePlan = (id) => {
   return http.delete(`/api/v1/plans/${id}`);
 };
 
 /**
- * 根据计划ID启动一个计划的执行
+ * 根据计划ID启动一个计划的执行。系统计划不允许手动启动。
  * @param {number} id - 计划ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 const startPlan = (id) => {
   return http.post(`/api/v1/plans/${id}/start`);
 };
 
 /**
- * 根据计划ID停止一个正在执行的计划
+ * 根据计划ID停止一个正在执行的计划。系统计划不能被停止。
  * @param {number} id - 计划ID
- * @returns {Promise<*>}
+ * @returns {Promise<Response>}
  */
 const stopPlan = (id) => {
   return http.post(`/api/v1/plans/${id}/stop`);

src/api/user.js

@@ -48,7 +48,7 @@ import http from '../utils/http';
 /**
  * @typedef {object} PaginationDTO
  * @property {number} page
- * @property {number} pageSize
+ * @property {number} page_size
  * @property {number} total
  */
 
@@ -64,13 +64,29 @@ import http from '../utils/http';
  * @property {string} [end_time]
  * @property {string} [order_by]
  * @property {number} [page]
- * @property {number} [pageSize]
+ * @property {number} [page_size]
  * @property {string} [start_time]
  * @property {string} [status]
  * @property {number} [user_id]
  * @property {string} [username]
  */
 
+/**
+ * @typedef {('邮件'|'企业微信'|'飞书'|'日志')} NotifierType
+ */
+
+/**
+ * @typedef {object} SendTestNotificationRequest
+ * @property {NotifierType} type - Type 指定要测试的通知渠道
+ */
+
+/**
+ * @typedef {object} Response
+ * @property {number} code - 业务状态码
+ * @property {object} [data] - 业务数据
+ * @property {string} [message] - 提示信息
+ */
+
 /**
  * 创建一个新用户
  * @param {CreateUserRequest} userData - 用户信息
@@ -90,17 +106,38 @@ const login = (credentials) => {
 };
 
 /**
- * 获取指定用户的操作历史
+ * 获取用户操作日志列表
- * @param {number} id - 用户ID
  * @param {UserHistoryParams} params - 查询参数
  * @returns {Promise<ListUserActionLogResponse>}
  */
-const getUserHistory = (id, params) => {
+const getUserActionLogs = (params) => {
-  return http.get(`/api/v1/users/${id}/history`, { params });
+  const newParams = {
+    action_type: params.action_type,
+    end_time: params.end_time,
+    order_by: params.order_by,
+    page: params.page,
+    page_size: params.page_size,
+    start_time: params.start_time,
+    status: params.status,
+    user_id: params.user_id,
+    username: params.username,
+  };
+  return http.get('/api/v1/monitor/user-action-logs', { params: newParams });
+};
+
+/**
+ * 发送测试通知
+ * @param {number} id - 用户ID
+ * @param {SendTestNotificationRequest} data - 请求体
+ * @returns {Promise<Response>}
+ */
+const sendTestNotification = (id, data) => {
+  return http.post(`/api/v1/users/${id}/notifications/test`, data);
 };
 
 export const UserApi = {
   createUser,
   login,
-  getUserHistory,
+  getUserActionLogs,
+  sendTestNotification,
 };

src/components/GenericMonitorList.vue

@@ -167,7 +167,7 @@ const loadData = async () => {
   try {
     const params = {
       page: pagination.currentPage,
-      pageSize: pagination.pageSize,
+      page_size: pagination.pageSize, // Changed from pageSize to page_size
       ...filters,
       orderBy: sortOrder.prop,
       order: sortOrder.order === 'ascending' ? 'asc' : (sortOrder.order === 'descending' ? 'desc' : undefined),

src/components/PigBatchList.vue

@@ -7,7 +7,9 @@
             <span>批次编号: {{ batch.batch_number }}</span>
             <span>状态: {{ batch.status }}</span>
             <span>初始数量: {{ batch.initial_count }}</span>
-            <span v-if="batch.currentTotalQuantity !== undefined && batch.currentTotalQuantity !== null">当前总数: {{ batch.currentTotalQuantity }}</span>
+            <span v-if="batch.currentTotalQuantity !== undefined && batch.currentTotalQuantity !== null">当前总数: {{
+                batch.currentTotalQuantity
+              }}</span>
             <span v-if="batch.origin_type">批次来源: {{ batch.origin_type }}</span>
           </div>
           <div class="batch-info-line">
@@ -27,20 +29,47 @@
           </div>
         </div>
         <div class="batch-actions">
-          <el-button size="small" type="primary" @click.stop="showAddPenDialog(batch)" :disabled="!batch.is_active">增加猪栏</el-button>
+          <el-dropdown trigger="click" class="batch-dropdown">
-          <el-button size="small" @click.stop="emitEditBatch(batch)">编辑</el-button>
+            <el-button type="primary" size="small">
-          <el-button size="small" type="danger" @click.stop="emitDeleteBatch(batch)">删除</el-button>
+              管理猪群<el-icon class="el-icon--right"><arrow-down /></el-icon>
+            </el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item @click="showAddPenDialog(batch)" :disabled="!batch.is_active">增加猪栏</el-dropdown-item>
+                <el-dropdown-item @click="emitEditBatch(batch)">编辑</el-dropdown-item>
+                <el-dropdown-item @click="emitDeleteBatch(batch)" divided>删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+          <el-dropdown trigger="click" class="batch-dropdown">
+            <el-button type="success" size="small">
+              调栏<el-icon class="el-icon--right"><arrow-down /></el-icon>
+            </el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item 
+                  @click="emitTransferPigs(batch)"
+                  :disabled="!batch.is_active || !batch.pens || batch.pens.length < 2"
+                >群内调栏</el-dropdown-item>
+                <el-dropdown-item 
+                  @click="emitTransferPigsAcrossBatches(batch)"
+                  :disabled="!batch.is_active || !batch.pens || batch.pens.length === 0"
+                >跨群调栏</el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
         </div>
       </div>
       <div v-if="batch.isExpanded" class="batch-content">
         <div v-if="batch.pens && batch.pens.length > 0" class="pig-pen-list">
           <PigBatchPenCard
-            v-for="pen in batch.pens"
+              v-for="pen in batch.pens"
-            :key="pen.id"
+              :key="pen.id"
-            :pen="pen"
+              :pen="pen"
-            :isBatchActive="batch.is_active"
+              :isBatchActive="batch.is_active"
-            @allocate-pigs="showAllocatePigsDialog($event, batch)"
+              :batchUnassignedPigCount="batch.unassigned_pig_count"
-            @remove="emitRemovePen"
+              @allocate-pigs="showAllocatePigsDialog($event, batch)"
+              @remove="emitRemovePen"
           />
         </div>
         <div v-else class="no-pens-message">
@@ -53,10 +82,10 @@
     <el-dialog title="选择猪栏" v-model="addPenDialogVisible" width="30%">
       <el-select v-model="selectedPenId" placeholder="请选择猪栏" style="width: 100%;">
         <el-option
-          v-for="pen in availablePens"
+            v-for="pen in availablePens"
-          :key="pen.id"
+            :key="pen.id"
-          :label="pen.label"
+            :label="pen.label"
-          :value="pen.id">
+            :value="pen.id">
         </el-option>
       </el-select>
       <template #footer>
@@ -69,11 +98,10 @@
 
     <!-- 分配猪只对话框 -->
     <AllocatePigsDialog
-      v-if="allocatePigsDialogVisible"
+        v-model:visible="allocatePigsDialogVisible"
-      :visible.sync="allocatePigsDialogVisible"
+        :unassigned-pig-count="currentBatch ? currentBatch.unassigned_pig_count : 0"
-      :unassigned-pig-count="currentBatch ? currentBatch.unassigned_pig_count : 0"
+        :pen-id="selectedPenForAllocation ? selectedPenForAllocation.id : 0"
-      :pen-id="selectedPenForAllocation ? selectedPenForAllocation.id : 0"
+        @confirm="handleAllocatePigs"
-      @confirm="handleAllocatePigs"
     />
   </div>
 </template>
@@ -81,14 +109,16 @@
 <script>
 import PigBatchPenCard from './PigBatchPenCard.vue';
 import AllocatePigsDialog from './AllocatePigsDialog.vue';
-import { getAllPens, getAllPigHouses, movePigsIntoPen } from '../api/pigBatch';
+import {getAllPens, getAllPigHouses, movePigsIntoPen} from '../api/pigBatch';
-import { formatRFC3339 } from '../utils/format'; // 导入格式化函数
+import {formatRFC3339} from '../utils/format'; // 导入格式化函数
+import { ArrowDown } from '@element-plus/icons-vue'; // 导入 ArrowDown 图标
 
 export default {
   name: 'PigBatchList',
   components: {
     PigBatchPenCard,
-    AllocatePigsDialog
+    AllocatePigsDialog,
+    ArrowDown // 注册 ArrowDown 图标
   },
   props: {
     pigBatches: {
@@ -96,7 +126,7 @@ export default {
       required: true
     }
   },
-  emits: ['edit-batch', 'delete-batch', 'add-pen', 'remove-pen', 'assign-pen-to-batch', 'reload-data'],
+  emits: ['edit-batch', 'delete-batch', 'add-pen', 'remove-pen', 'assign-pen-to-batch', 'reload-data', 'transfer-pigs', 'transfer-pigs-across-batches'],
   data() {
     return {
       addPenDialogVisible: false,
@@ -125,9 +155,12 @@ export default {
         // Create a map for quick lookup of house names by ID
         const houseMap = new Map(houses.map(house => [house.id, house.name]));
 
-        this.availablePens = pens.map(pen => ({
+        // Filter for pens that are not assigned to any batch
+        const unassignedPens = pens.filter(pen => !pen.pig_batch_id);
+
+        this.availablePens = unassignedPens.map(pen => ({
           id: pen.id,
-          label: `${pen.pen_number}(${houseMap.get(pen.house_id) || '未知猪舍'})` // Changed format here
+          label: `${pen.pen_number} (${houseMap.get(pen.house_id) || '未知猪舍'})`
         }));
       } catch (error) {
         console.error("Error fetching pens or houses:", error);
@@ -156,9 +189,9 @@ export default {
       this.selectedPenForAllocation = pen;
       this.allocatePigsDialogVisible = true;
     },
-    async handleAllocatePigs({ penId, quantity }) {
+    async handleAllocatePigs({penId, quantity}) {
       try {
-        await movePigsIntoPen(this.currentBatch.id, { toPenID: penId, quantity });
+        await movePigsIntoPen(this.currentBatch.id, {toPenID: penId, quantity});
         this.$message.success('猪只分配成功');
         this.allocatePigsDialogVisible = false;
         this.$emit('reload-data'); // 通知父组件重新加载数据
@@ -174,6 +207,12 @@ export default {
     emitDeleteBatch(batch) {
       this.$emit('delete-batch', batch);
     },
+    emitTransferPigs(batch) {
+      this.$emit('transfer-pigs', batch);
+    },
+    emitTransferPigsAcrossBatches(batch) {
+      this.$emit('transfer-pigs-across-batches', batch);
+    },
     // 猪栏操作
     emitRemovePen(pen) {
       this.$emit('remove-pen', pen);
@@ -234,6 +273,10 @@ export default {
   gap: 10px;
 }
 
+.batch-dropdown {
+  margin-left: 10px; /* 为下拉菜单添加左边距 */
+}
+
 .batch-content {
   padding: 16px;
   border-top: 1px solid #eee;

src/components/PigBatchPenCard.vue

@@ -7,11 +7,11 @@
       <div class="info-item">猪舍: {{ pen.house_name || '未知' }}</div>
       <div class="info-item border-left">容量: {{ pen.capacity }}</div>
       <div class="info-item">批次: {{ pen.batch_number || '未分配' }}</div>
-      <div class="info-item border-left">存栏: {{ pen.current_pig_count || 0 }}</div>
+      <div class="info-item border-left">存栏: <span :class="{'over-capacity': pen.current_pig_count > pen.capacity}">{{ pen.current_pig_count || 0 }}</span></div>
     </div>
     <div class="actions-section">
-      <el-button size="small" @click="emitAllocatePigs" :disabled="!isBatchActive">分配猪只</el-button>
+      <el-button size="small" @click="emitAllocatePigs" :disabled="!isBatchActive || batchUnassignedPigCount <= 0">分配猪只</el-button>
-      <el-button size="small" type="danger" @click="emitRemove" :disabled="!isBatchActive">移除</el-button>
+      <el-button size="small" type="danger" @click="emitRemove" :disabled="!isBatchActive || pen.current_pig_count > 0">移除</el-button>
     </div>
   </div>
 </template>
@@ -29,6 +29,10 @@ export default {
     isBatchActive: {
       type: Boolean,
       default: true // 默认活跃，以防万一没有传递
+    },
+    batchUnassignedPigCount: {
+      type: Number,
+      default: 0
     }
   },
   emits: ['remove', 'allocate-pigs'],
@@ -124,4 +128,8 @@ export default {
   width: 100%;
   margin: 0;
 }
+
+.over-capacity {
+  color: red;
+}
 </style>

src/components/PigPenInfoCard.vue

@@ -7,7 +7,7 @@
       <div class="info-item">猪舍: {{ pen.house_name || '未知' }}</div>
       <div class="info-item border-left">容量: {{ pen.capacity }}</div>
       <div class="info-item">批次: {{ pen.batch_number || '未分配' }}</div>
-      <div class="info-item border-left">存栏: {{ pen.current_pig_count || 0 }}</div>
+      <div class="info-item border-left">存栏: <span :class="{'over-capacity': pen.current_pig_count > pen.capacity}">{{ pen.current_pig_count || 0 }}</span></div>
     </div>
     <div class="actions-section">
       <el-button size="small" @click="emitEdit">编辑</el-button>
@@ -120,4 +120,8 @@ export default {
   width: 100%;
   margin: 0;
 }
+
+.over-capacity {
+  color: red;
+}
 </style>

src/components/PlanDetail.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="plan-detail">
     <div v-if="loading" class="loading">
-      <el-skeleton animated />
+      <el-skeleton animated/>
     </div>
     <div v-else-if="error" class="error">
       <el-alert
-        :title="'加载计划内容失败 (ID: ' + planId + ')'"
+          :title="'加载计划内容失败 (ID: ' + planId + ')'"
-        :description="error"
+          :description="error"
-        type="error"
+          type="error"
-        show-icon
+          show-icon
-        @close="error = null"
+          @close="error = null"
       />
       <el-button type="primary" @click="fetchPlan" class="retry-btn">重新加载</el-button>
     </div>
@@ -20,25 +20,35 @@
             <span>{{ plan.name }} - 内容</span>
             <div>
               <template v-if="!isSubPlan">
-                <el-button class="button" type="primary" @click="savePlanContent" v-if="isEditingContent">保存</el-button>
+                <el-button class="button" type="primary" @click="savePlanContent" v-if="isEditingContent"
-                <el-button class="button" type="danger" @click="cancelEdit" v-if="isEditingContent">取消</el-button>
+                           :disabled="plan.plan_type === '系统任务'">保存
-                <el-button class="button" @click="enterEditMode" v-else>编辑内容</el-button>
+                </el-button>
+                <el-button class="button" type="danger" @click="cancelEdit" v-if="isEditingContent"
+                           :disabled="plan.plan_type === '系统任务'">取消
+                </el-button>
+                <el-button class="button" @click="enterEditMode" v-else :disabled="plan.plan_type === '系统任务'">
+                  编辑内容
+                </el-button>
               </template>
 
               <!-- Dynamic Add Buttons -->
               <template v-if="isEditingContent">
                 <el-button
-                  v-if="plan.content_type === 'sub_plans' || !plan.content_type"
+                    v-if="plan.content_type === 'sub_plans' || !plan.content_type"
-                  type="primary"
+                    type="primary"
-                  size="small"
+                    size="small"
-                  @click="showAddSubPlanDialog"
+                    @click="showAddSubPlanDialog"
-                >增加子计划</el-button>
+                    :disabled="plan.plan_type === '系统任务'"
+                >增加子计划
+                </el-button>
                 <el-button
-                  v-if="plan.content_type === 'tasks' || !plan.content_type"
+                    v-if="plan.content_type === 'tasks' || !plan.content_type"
-                  type="primary"
+                    type="primary"
-                  size="small"
+                    size="small"
-                  @click="showTaskEditorDialog()"
+                    @click="showTaskEditorDialog()"
-                >增加子任务</el-button>
+                    :disabled="plan.plan_type === '系统任务'"
+                >增加子任务
+                </el-button>
               </template>
             </div>
           </div>
@@ -49,10 +59,10 @@
           <h4>任务列表</h4>
           <el-timeline v-if="plan.tasks.length > 0">
             <el-timeline-item
-              v-for="(task, index) in plan.tasks"
+                v-for="(task, index) in plan.tasks"
-              :key="task.id || 'new-task-' + index"
+                :key="task.id || 'new-task-' + index"
-              :timestamp="'执行顺序: ' + (task.execution_order !== undefined ? task.execution_order : index + 1)"
+                :timestamp="'执行顺序: ' + (task.execution_order !== undefined ? task.execution_order : index + 1)"
-              placement="top"
+                placement="top"
             >
               <el-card>
                 <h5>{{ task.name }} ({{ task.type === 'waiting' ? '延时任务' : '未知任务' }})</h5>
@@ -61,8 +71,12 @@
                   延时: {{ task.parameters.delay_duration }} 秒
                 </p>
                 <el-button-group v-if="isEditingContent">
-                  <el-button type="primary" size="small" @click="editTask(task)">编辑</el-button>
+                  <el-button type="primary" size="small" @click="editTask(task)"
-                  <el-button type="danger" size="small" @click="deleteTask(task)">删除</el-button>
+                             :disabled="plan.plan_type === '系统任务'">编辑
+                  </el-button>
+                  <el-button type="danger" size="small" @click="deleteTask(task)"
+                             :disabled="plan.plan_type === '系统任务'">删除
+                  </el-button>
                 </el-button-group>
               </el-card>
             </el-timeline-item>
@@ -74,13 +88,16 @@
         <div v-else-if="plan.content_type === 'sub_plans'">
           <h4>子计划列表</h4>
           <div v-if="plan.sub_plans.length > 0">
-            <div v-for="(subPlan, index) in plan.sub_plans" :key="subPlan.id || 'new-subplan-' + index" class="sub-plan-wrapper">
+            <div v-for="(subPlan, index) in plan.sub_plans" :key="subPlan.id || 'new-subplan-' + index"
+                 class="sub-plan-wrapper">
               <el-card>
                 <div class="sub-plan-card-content">
                   <!-- Pass child_plan_id to recursive PlanDetail -->
-                  <plan-detail :plan-id="subPlan.child_plan_id" :is-sub-plan="true" />
+                  <plan-detail :plan-id="subPlan.child_plan_id" :is-sub-plan="true"/>
                   <el-button-group v-if="isEditingContent" class="sub-plan-actions">
-                    <el-button type="danger" size="small" @click="deleteSubPlan(subPlan)">删除</el-button>
+                    <el-button type="danger" size="small" @click="deleteSubPlan(subPlan)"
+                               :disabled="plan.plan_type === '系统任务'">删除
+                    </el-button>
                   </el-button-group>
                 </div>
               </el-card>
@@ -100,22 +117,22 @@
 
     <!-- Add Sub-plan Dialog -->
     <el-dialog
-      v-model="addSubPlanDialogVisible"
+        v-model="addSubPlanDialogVisible"
-      title="选择子计划"
+        title="选择子计划"
-      width="600px"
+        width="600px"
-      @close="resetAddSubPlanDialog"
+        @close="resetAddSubPlanDialog"
     >
       <el-select
-        v-model="selectedSubPlanId"
+          v-model="selectedSubPlanId"
-        placeholder="请选择一个计划作为子计划"
+          placeholder="请选择一个计划作为子计划"
-        filterable
+          filterable
-        style="width: 100%;"
+          style="width: 100%;"
       >
         <el-option
-          v-for="item in availablePlans"
+            v-for="item in availablePlans"
-          :key="item.id"
+            :key="item.id"
-          :label="item.name"
+            :label="item.name"
-          :value="item.id"
+            :value="item.id"
         ></el-option>
       </el-select>
       <template #footer>
@@ -128,31 +145,35 @@
 
     <!-- Task Editor Dialog (for Add and Edit) -->
     <el-dialog
-      v-model="taskEditorDialogVisible"
+        v-model="taskEditorDialogVisible"
-      :title="isEditingTask ? '编辑子任务' : '增加子任务'"
+        :title="isEditingTask ? '编辑子任务' : '增加子任务'"
-      width="600px"
+        width="600px"
-      @close="resetTaskEditorDialog"
+        @close="resetTaskEditorDialog"
     >
       <el-form :model="currentTaskForm" ref="taskFormRef" :rules="taskFormRules" label-width="100px">
         <el-form-item label="任务类型" prop="type">
-          <el-select v-model="currentTaskForm.type" placeholder="请选择任务类型" style="width: 100%;" :disabled="isEditingTask">
+          <el-select v-model="currentTaskForm.type" placeholder="请选择任务类型" style="width: 100%;"
+                     :disabled="isEditingTask || plan.plan_type === '系统任务'">
             <!-- Only Delay Task for now -->
             <el-option label="延时任务" value="delay_task"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="任务名称" prop="name">
-          <el-input v-model="currentTaskForm.name" placeholder="请输入任务名称"></el-input>
+          <el-input v-model="currentTaskForm.name" placeholder="请输入任务名称"
+                    :disabled="plan.plan_type === '系统任务'"></el-input>
         </el-form-item>
         <el-form-item label="任务描述" prop="description">
-          <el-input type="textarea" v-model="currentTaskForm.description" placeholder="请输入任务描述"></el-input>
+          <el-input type="textarea" v-model="currentTaskForm.description" placeholder="请输入任务描述"
+                    :disabled="plan.plan_type === '系统任务'"></el-input>
         </el-form-item>
         <!-- Dynamic task component for specific parameters -->
         <template v-if="currentTaskForm.type === 'delay_task'">
           <DelayTaskEditor
-            :parameters="currentTaskForm.parameters"
+              :parameters="currentTaskForm.parameters"
-            @update:parameters="val => currentTaskForm.parameters = val"
+              @update:parameters="val => currentTaskForm.parameters = val"
-            prop-path="parameters.delay_duration"
+              prop-path="parameters.delay_duration"
-            :is-editing="true" 
+              :is-editing="true"
+              :disabled="plan.plan_type === '系统任务'"
           />
         </template>
         <!-- More task types can be rendered here -->
@@ -160,7 +181,7 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="taskEditorDialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="confirmTaskEdit">确定</el-button>
+          <el-button type="primary" @click="confirmTaskEdit" :disabled="plan.plan_type === '系统任务'">确定</el-button>
         </span>
       </template>
     </el-dialog>
@@ -169,8 +190,8 @@
 
 <script>
 import apiClient from '../api/index.js';
-import { ElMessage, ElMessageBox } from 'element-plus';
+import {ElMessage, ElMessageBox} from 'element-plus';
-import { ArrowDown } from '@element-plus/icons-vue'; 
+import {ArrowDown} from '@element-plus/icons-vue';
 import DelayTaskEditor from './tasks/DelayTask.vue';
 
 export default {
@@ -224,15 +245,15 @@ export default {
         parameters: {},
       },
       taskFormRules: {
-        type: [{ required: true, message: '请选择任务类型', trigger: 'change' }],
+        type: [{required: true, message: '请选择任务类型', trigger: 'change'}],
-        name: [{ required: true, message: '请输入任务名称', trigger: 'blur' }],
+        name: [{required: true, message: '请输入任务名称', trigger: 'blur'}],
         // Rule for delay_duration will be added/removed dynamically
       },
     };
   },
   computed: {
     delayDurationRules() {
-      return [{ required: true, message: '请输入延时时间', trigger: 'blur' }];
+      return [{required: true, message: '请输入延时时间', trigger: 'blur'}];
     },
   },
   watch: {
@@ -303,17 +324,17 @@ export default {
           execute_num: this.plan.execute_num,
           cron_expression: this.plan.cron_expression,
           sub_plan_ids: this.plan.content_type === 'sub_plans'
-            ? this.plan.sub_plans.map(sp => sp.child_plan_id) 
+              ? this.plan.sub_plans.map(sp => sp.child_plan_id)
-            : [],
+              : [],
           tasks: this.plan.content_type === 'tasks'
-            ? this.plan.tasks.map((task, index) => ({
+              ? this.plan.tasks.map((task, index) => ({
                 name: task.name,
                 description: task.description,
                 type: task.type,
                 execution_order: index + 1,
                 parameters: task.parameters || {},
               }))
-            : [],
+              : [],
         };
 
         delete submitData.execute_count;
@@ -355,9 +376,9 @@ export default {
     },
     async fetchAvailablePlans() {
       try {
-        const response = await apiClient.plans.getPlans(); // 更正此处
+        const response = await apiClient.plans.getPlans({plan_type: '自定义任务', page: 1, page_size: 1000});
         this.availablePlans = response.data.plans.filter(p =>
-          p.id !== this.planId
+            p.id !== this.planId
         );
       } catch (error) {
         ElMessage.error('加载可用计划失败: ' + (error.message || '未知错误'));
@@ -409,17 +430,17 @@ export default {
       console.log("PlanDetail: Showing task editor dialog.");
       if (this.plan.sub_plans.length > 0 && !task) {
         ElMessageBox.confirm('当前计划包含子计划，添加任务将清空现有子计划。是否继续？', '警告', {
-            confirmButtonText: '确定',
+          confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          cancelButtonText: '取消',
-            type: 'warning'
+          type: 'warning'
-          }).then(() => {
+        }).then(() => {
-            this.plan.sub_plans = []; 
+          this.plan.sub_plans = [];
-            this.taskEditorDialogVisible = true;
+          this.taskEditorDialogVisible = true;
-            this.prepareTaskForm(task);
+          this.prepareTaskForm(task);
-          }).catch(() => {
+        }).catch(() => {
-            // User cancelled
+          // User cancelled
-          });
+        });
-          return;
+        return;
       }
       this.taskEditorDialogVisible = true;
       this.prepareTaskForm(task);
@@ -444,7 +465,7 @@ export default {
         this.isEditingTask = false;
         this.editingTaskOriginalId = null;
         // For new tasks, ensure delay_duration is reactive from start
-        this.currentTaskForm.parameters = { delay_duration: null }; 
+        this.currentTaskForm.parameters = {delay_duration: null};
         console.log("PlanDetail: Prepared currentTaskForm for adding:", JSON.parse(JSON.stringify(this.currentTaskForm)));
       }
       // Manually trigger watch for type to ensure rules and default parameters are set
@@ -476,7 +497,7 @@ export default {
                 name: this.currentTaskForm.name,
                 description: this.currentTaskForm.description,
                 type: this.currentTaskForm.type === 'delay_task' ? 'waiting' : this.currentTaskForm.type,
-                parameters: { ...this.currentTaskForm.parameters }, // Deep copy parameters to ensure new reference
+                parameters: {...this.currentTaskForm.parameters}, // Deep copy parameters to ensure new reference
               };
               this.plan.tasks.splice(index, 1, updatedTask); // Replace the old task with the new one
               ElMessage.success(`子任务 "${this.currentTaskForm.name}" 已更新`);
@@ -491,7 +512,7 @@ export default {
               type: this.currentTaskForm.type === 'delay_task' ? 'waiting' : this.currentTaskForm.type,
               name: this.currentTaskForm.name,
               description: this.currentTaskForm.description,
-              parameters: { ...this.currentTaskForm.parameters }, // Deep copy parameters to ensure new reference
+              parameters: {...this.currentTaskForm.parameters}, // Deep copy parameters to ensure new reference
             };
             this.plan.tasks = [...this.plan.tasks, newTask]; // Create a new array reference
             ElMessage.success(`子任务 "${newTask.name}" 已添加`);
@@ -540,35 +561,43 @@ export default {
 .plan-detail {
   margin-top: 10px;
 }
+
 .loading, .error {
   padding: 20px;
   text-align: center;
 }
+
 .retry-btn {
   margin-top: 15px;
 }
+
 .sub-plan-wrapper {
   margin-bottom: 10px;
 }
+
 .sub-plan-container {
   margin-left: 20px;
   margin-top: 10px;
   border-left: 2px solid #ebeef5;
   padding-left: 10px;
 }
+
 .sub-plan-card-content {
   display: flex;
   flex-direction: column;
   gap: 10px;
 }
+
 .sub-plan-actions {
   align-self: flex-end;
 }
+
 .card-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
+
 /* 调整子计划卡片内部的header，避免重复样式 */
 .sub-plan-container .card-header {
   padding: 0;

src/components/PlanForm.vue

@@ -145,7 +145,7 @@ export default {
     // 处理执行方式变更
     const handleExecutionTypeChange = (value) => {
       // 如果切换为手动执行，清空执行次数和cron表达式
-      if (value === 'manual') {
+      if (value === '手动') {
         formData.execute_num = 0;
         formData.cron_expression = '';
       } else {
@@ -178,7 +178,7 @@ export default {
             }
             
             // 如果是手动执行，清除执行次数和cron表达式
-            if (formData.execution_type === 'manual') {
+            if (formData.execution_type === '手动') {
               submitData.execute_num = 0;
               submitData.cron_expression = '';
             }

src/components/TransferPigsAcrossBatchesModal.vue

@@ -0,0 +1,204 @@
+<template>
+  <el-dialog
+    title="跨群调栏"
+    :model-value="visible"
+    @update:model-value="$emit('update:visible', $event)"
+    width="40%"
+    @close="resetForm"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="源猪群批次">
+        <span>{{ batch.batch_number }}</span>
+      </el-form-item>
+      <el-form-item label="源猪栏" prop="fromPenID">
+        <el-select v-model="form.fromPenID" placeholder="请选择源猪栏" style="width: 100%;">
+          <el-option
+            v-for="pen in sourcePens"
+            :key="pen.id"
+            :label="`${pen.pen_number} (存栏: ${pen.current_pig_count})`"
+            :value="pen.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="目标猪群批次" prop="destBatchID">
+        <el-select v-model="form.destBatchID" placeholder="请选择目标猪群" style="width: 100%;" @change="onDestBatchChange">
+          <el-option
+            v-for="b in availableBatches"
+            :key="b.id"
+            :label="b.batch_number"
+            :value="b.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="目标猪栏" prop="toPenID">
+        <el-select v-model="form.toPenID" placeholder="请选择目标猪栏" style="width: 100%;">
+          <el-option
+            v-for="pen in destinationPens"
+            :key="pen.id"
+            :label="`${pen.pen_number} (容量: ${pen.capacity})`"
+            :value="pen.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="调栏数量" prop="quantity">
+        <el-input-number v-model="form.quantity" :min="1" :max="maxTransferQuantity" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input v-model="form.remarks" type="textarea" :rows="2" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="$emit('update:visible', false)">取 消</el-button>
+        <el-button type="primary" @click="handleConfirm">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { getPigBatches, transferPigsAcrossBatches } from '@/api/pigBatch';
+import { getPens } from '@/api/pen';
+
+export default {
+  name: 'TransferPigsAcrossBatchesModal',
+  props: {
+    visible: {
+      type: Boolean,
+      required: true
+    },
+    batch: {
+      type: Object,
+      required: true // 源猪群批次信息
+    }
+  },
+  emits: ['update:visible', 'success'],
+  data() {
+    return {
+      form: {
+        fromPenID: null,
+        destBatchID: null,
+        toPenID: null,
+        quantity: 1,
+        remarks: ''
+      },
+      rules: {
+        fromPenID: [{ required: true, message: '请选择源猪栏', trigger: 'change' }],
+        destBatchID: [{ required: true, message: '请选择目标猪群批次', trigger: 'change' }],
+        toPenID: [{ required: true, message: '请选择目标猪栏', trigger: 'change' }],
+        quantity: [
+          { required: true, message: '请输入调栏数量', trigger: 'blur' },
+          { type: 'integer', message: '请输入整数', trigger: 'blur' },
+          { validator: this.validateQuantity, trigger: 'blur' }
+        ]
+      },
+      sourcePens: [], // 源猪群的猪栏列表
+      availableBatches: [], // 可用的目标猪群列表
+      destinationPens: [], // 目标猪群的猪栏列表
+      maxTransferQuantity: 1 // 最大可调栏数量
+    };
+  },
+  watch: {
+    visible(newVal) {
+      if (newVal) {
+        this.initData();
+      }
+    },
+    'form.fromPenID': function(newVal) {
+      if (newVal) {
+        const selectedPen = this.sourcePens.find(pen => pen.id === newVal);
+        this.maxTransferQuantity = selectedPen ? selectedPen.current_pig_count : 1;
+        // 如果当前数量大于最大值，重置数量
+        if (this.form.quantity > this.maxTransferQuantity) {
+          this.form.quantity = this.maxTransferQuantity;
+        }
+      }
+    }
+  },
+  methods: {
+    async initData() {
+      this.resetForm();
+      this.sourcePens = this.batch.pens.filter(pen => pen.current_pig_count > 0); // 过滤掉没有猪的猪栏
+      await this.fetchAvailableBatchesAndPens();
+    },
+    async fetchAvailableBatchesAndPens() {
+      try {
+        const [batchesResponse, pensResponse] = await Promise.all([
+          getPigBatches({ is_active: true }), // 获取所有活跃猪群
+          getPens() // 获取所有猪栏
+        ]);
+
+        const allBatches = batchesResponse.data || [];
+        const allPens = pensResponse.data || [];
+
+        // 过滤掉源猪群自身，以及非活跃的猪群
+        this.availableBatches = allBatches.filter(b => b.id !== this.batch.id && b.is_active);
+
+        // 将所有猪栏按批次ID分组，方便后续查找
+        const pensByBatch = allPens.reduce((acc, pen) => {
+          if (pen.pig_batch_id) {
+            if (!acc[pen.pig_batch_id]) {
+              acc[pen.pig_batch_id] = [];
+            }
+            acc[pen.pig_batch_id].push(pen);
+          }
+          return acc;
+        }, {});
+        this.pensByBatch = pensByBatch; // 存储起来，以便 onDestBatchChange 使用
+
+      } catch (error) {
+        console.error("Error fetching batches or pens:", error);
+        this.$message.error("获取猪群或猪栏信息失败");
+      }
+    },
+    onDestBatchChange(batchId) {
+      this.form.toPenID = null; // 重置目标猪栏选择
+      // 允许选择目标批次下的所有猪栏，包括已满的
+      this.destinationPens = (this.pensByBatch[batchId] || []);
+    },
+    validateQuantity(rule, value, callback) {
+      if (value > this.maxTransferQuantity) {
+        callback(new Error(`调栏数量不能超过源猪栏存栏数量 (${this.maxTransferQuantity})`));
+      } else {
+        callback();
+      }
+    },
+    handleConfirm() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            await transferPigsAcrossBatches(this.batch.id, {
+              fromPenID: this.form.fromPenID,
+              destBatchID: this.form.destBatchID,
+              toPenID: this.form.toPenID,
+              quantity: this.form.quantity,
+              remarks: this.form.remarks
+            });
+            this.$message.success('跨群调栏成功');
+            this.$emit('success');
+            this.$emit('update:visible', false);
+          } catch (error) {
+            console.error('Error transferring pigs across batches:', error);
+            this.$message.error('跨群调栏失败: ' + (error.response?.data?.message || error.message || '未知错误'));
+          }
+        }
+      });
+    },
+    resetForm() {
+      this.$refs.form?.resetFields();
+      this.form.fromPenID = null;
+      this.form.destBatchID = null;
+      this.form.toPenID = null;
+      this.form.quantity = 1;
+      this.form.remarks = '';
+      this.sourcePens = [];
+      this.availableBatches = [];
+      this.destinationPens = [];
+      this.maxTransferQuantity = 1;
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/components/TransferPigsModal.vue

@@ -0,0 +1,161 @@
+<template>
+  <el-dialog
+    title="群内调栏"
+    :model-value="visible"
+    @update:model-value="$emit('update:visible', $event)"
+    width="500px"
+    :before-close="handleClose"
+  >
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="调出猪栏" prop="fromPenID">
+        <el-select v-model="form.fromPenID" placeholder="请选择调出猪栏" style="width: 100%;" @change="handleFromPenChange">
+          <el-option
+            v-for="pen in sourcePens"
+            :key="pen.id"
+            :label="`${pen.pen_number} (存栏: ${pen.current_pig_count})`"
+            :value="pen.id"
+            :disabled="pen.current_pig_count === 0"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="调入猪栏" prop="toPenID">
+        <el-select v-model="form.toPenID" placeholder="请选择调入猪栏" style="width: 100%;" :disabled="!form.fromPenID">
+          <el-option
+            v-for="pen in destinationPens"
+            :key="pen.id"
+            :label="`${pen.pen_number} (存栏: ${pen.current_pig_count})`"
+            :value="pen.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="调栏数量" prop="quantity">
+        <el-input-number
+          v-model="form.quantity"
+          :min="1"
+          :max="maxQuantity"
+          :disabled="!form.fromPenID"
+          placeholder="请输入数量"
+          style="width: 100%;"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit" :loading="loading">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { transferPigsWithinBatch } from '@/api/pigBatch.js';
+
+export default {
+  name: 'TransferPigsModal',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    batch: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ['update:visible', 'success'],
+  data() {
+    return {
+      loading: false,
+      form: {
+        fromPenID: null,
+        toPenID: null,
+        quantity: 1,
+        remarks: '',
+      },
+      rules: {
+        fromPenID: [{ required: true, message: '请选择调出猪栏', trigger: 'change' }],
+        toPenID: [{ required: true, message: '请选择调入猪栏', trigger: 'change' }],
+        quantity: [{ required: true, message: '请输入调栏数量', trigger: 'blur' }],
+      },
+    };
+  },
+  computed: {
+    sourcePens() {
+      return this.batch.pens || [];
+    },
+    destinationPens() {
+      if (!this.form.fromPenID) return [];
+      return this.batch.pens.filter(pen => pen.id !== this.form.fromPenID);
+    },
+    maxQuantity() {
+      if (!this.form.fromPenID) return 1;
+      const selectedPen = this.sourcePens.find(p => p.id === this.form.fromPenID);
+      return selectedPen ? selectedPen.current_pig_count : 1;
+    },
+  },
+  watch: {
+    visible(newVal) {
+      if (newVal) {
+        this.resetForm();
+      }
+    },
+  },
+  methods: {
+    handleFromPenChange(penId) {
+      this.form.toPenID = null;
+      this.form.quantity = 1;
+      const selectedPen = this.sourcePens.find(p => p.id === penId);
+      if (selectedPen && selectedPen.current_pig_count === 0) {
+        this.$message.warning('该猪栏没有猪，无法调出。');
+        this.form.fromPenID = null;
+      }
+    },
+    handleSubmit() {
+      this.$refs.formRef.validate(async (valid) => {
+        if (valid) {
+          if (this.form.quantity > this.maxQuantity) {
+            this.$message.error('调栏数量不能超过当前存栏量');
+            return;
+          }
+          this.loading = true;
+          try {
+            await transferPigsWithinBatch(this.batch.id, this.form);
+            this.$message.success('调栏成功');
+            this.$emit('success');
+            this.handleClose();
+          } catch (error) {
+            this.$message.error('调栏失败: ' + (error.response?.data?.message || error.message));
+            console.error('Failed to transfer pigs:', error);
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    handleClose() {
+      this.$emit('update:visible', false);
+    },
+    resetForm() {
+      if (this.$refs.formRef) {
+        this.$refs.formRef.resetFields();
+      }
+      this.form = {
+        fromPenID: null,
+        toPenID: null,
+        quantity: 1,
+        remarks: '',
+      };
+    },
+  },
+};
+</script>
+
+<style scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>

src/layouts/MainLayout.vue

@@ -77,6 +77,10 @@
             <el-icon><FirstAidKit /></el-icon>
             <template #title>用药记录</template>
           </el-menu-item>
+          <el-menu-item index="/monitor/notifications">
+            <el-icon><Bell /></el-icon>
+            <template #title>通知记录</template>
+          </el-menu-item>
           <el-menu-item index="/monitor/pending-collections">
             <el-icon><Clock /></el-icon>
             <template #title>待采集请求</template>
@@ -101,10 +105,6 @@
             <el-icon><Switch /></el-icon>
             <template #title>猪只迁移日志</template>
           </el-menu-item>
-          <el-menu-item index="/monitor/plan-execution-logs">
-            <el-icon><List /></el-icon>
-            <template #title>计划执行日志</template>
-          </el-menu-item>
           <el-menu-item index="/monitor/raw-material-purchases">
             <el-icon><Shop /></el-icon>
             <template #title>原料采购记录</template>
@@ -117,6 +117,10 @@
             <el-icon><DataLine /></el-icon>
             <template #title>传感器数据</template>
           </el-menu-item>
+          <el-menu-item index="/monitor/plan-execution-logs">
+            <el-icon><List /></el-icon>
+            <template #title>计划执行日志</template>
+          </el-menu-item>
           <el-menu-item index="/monitor/task-execution-logs">
             <el-icon><Finished /></el-icon>
             <template #title>任务执行日志</template>
@@ -183,14 +187,14 @@ import { ref, computed, onMounted, onUnmounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { 
   House, Monitor, Calendar, ArrowDown, Menu, Fold, Expand, Setting, Tickets, DataAnalysis, Document, Food,
-  FirstAidKit, Clock, Files, ShoppingCart, SoldOut, Warning, Switch, List, Shop, Coin, DataLine, Finished, User, ScaleToOriginal, OfficeBuilding, Management
+  FirstAidKit, Clock, Files, ShoppingCart, SoldOut, Warning, Switch, List, Shop, Coin, DataLine, Finished, User, ScaleToOriginal, OfficeBuilding, Management, Bell
 } from '@element-plus/icons-vue';
 
 export default {
   name: 'MainLayout',
   components: {
     House, Monitor, Calendar, ArrowDown, Menu, Fold, Expand, Setting, Tickets, DataAnalysis, Document, Food,
-    FirstAidKit, Clock, Files, ShoppingCart, SoldOut, Warning, Switch, List, Shop, Coin, DataLine, Finished, User, ScaleToOriginal, OfficeBuilding, Management
+    FirstAidKit, Clock, Files, ShoppingCart, SoldOut, Warning, Switch, List, Shop, Coin, DataLine, Finished, User, ScaleToOriginal, OfficeBuilding, Management, Bell
   },
   setup() {
     const route = useRoute();
@@ -233,6 +237,7 @@ export default {
         '/monitor/device-command-logs': '设备命令日志',
         '/monitor/feed-usage-records': '饲料使用记录',
         '/monitor/medication-logs': '用药记录',
+        '/monitor/notifications': '通知记录',
         '/monitor/pending-collections': '待采集请求',
         '/monitor/pig-batch-logs': '猪批次日志',
         '/monitor/pig-purchases': '猪只采购记录',

src/main.js

@@ -17,6 +17,7 @@ import PigBatchManagementView from './views/pms/PigBatchManagementView.vue'; //
 import DeviceCommandLogView from './views/monitor/DeviceCommandLogView.vue';
 import FeedUsageRecordsView from './views/monitor/FeedUsageRecordsView.vue';
 import MedicationLogsView from './views/monitor/MedicationLogsView.vue';
+import NotificationLogView from './views/monitor/NotificationLogView.vue';
 import PendingCollectionsView from './views/monitor/PendingCollectionsView.vue';
 import PigBatchLogsView from './views/monitor/PigBatchLogsView.vue';
 import PigPurchasesView from './views/monitor/PigPurchasesView.vue';
@@ -50,6 +51,7 @@ const routes = [
     {path: '/monitor/device-command-logs', component: DeviceCommandLogView, meta: {requiresAuth: true}},
     {path: '/monitor/feed-usage-records', component: FeedUsageRecordsView, meta: {requiresAuth: true}},
     {path: '/monitor/medication-logs', component: MedicationLogsView, meta: {requiresAuth: true}},
+    {path: '/monitor/notifications', component: NotificationLogView, meta: {requiresAuth: true}},
     {path: '/monitor/pending-collections', component: PendingCollectionsView, meta: {requiresAuth: true}},
     {path: '/monitor/pig-batch-logs', component: PigBatchLogsView, meta: {requiresAuth: true}},
     {path: '/monitor/pig-purchases', component: PigPurchasesView, meta: {requiresAuth: true}},

src/utils/http.js

@@ -53,9 +53,7 @@ http.interceptors.response.use(
       if (error.response.status === 401) {
         // 清除token并重定向到登录页
         localStorage.removeItem('jwt_token');
-        // 这里需要访问router，但http.js是纯工具文件，不应直接依赖Vue Router实例
+        window.location.href = '/login';
-        // 可以在main.js的全局错误处理或组件中处理401错误
-        // 例如：window.location.href = '/login';
       }
     } else if (error.request) {
       // 请求发出但没有收到响应

src/views/device/DeviceList.vue

@@ -63,6 +63,7 @@
           <template #default="scope">
             <el-button size="small" @click="editDevice(scope.row)">编辑</el-button>
             <el-button size="small" type="danger" @click="deleteDevice(scope.row)">删除</el-button>
+            <el-button size="small" @click="handleTestDevice(scope.row)" :disabled="isTestButtonDisabled(scope.row)">测试</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -82,6 +83,8 @@
 <script>
 import { Refresh } from '@element-plus/icons-vue';
 import deviceService from '../../services/deviceService.js';
+import { DeviceApi } from '../../api/device.js';
+import { DeviceTemplateApi } from '../../api/deviceTemplate.js';
 import DeviceForm from '../../components/DeviceForm.vue';
 
 export default {
@@ -95,6 +98,7 @@ export default {
       tableData: [], // 树形表格数据
       originalTableData: [], // 存储原始未排序的树形数据
       allDevices: [], // 存储所有设备用于构建树形结构
+      deviceTemplates: [], // 存储所有设备模板
       loading: false,
       error: null,
       saving: false,
@@ -113,12 +117,14 @@ export default {
       this.error = null;
       
       try {
-        const data = await deviceService.getDevices();
+        const [deviceData, templateData] = await Promise.all([
-        // Default sort by ID ascending
+          deviceService.getDevices(),
-        data.sort((a, b) => a.id - b.id);
+          DeviceTemplateApi.getDeviceTemplates()
-        this.allDevices = data;
+        ]);
-        this.tableData = this.buildTreeData(data);
+        this.allDevices = deviceData;
+        this.tableData = this.buildTreeData(deviceData);
         this.originalTableData = [...this.tableData]; // 保存原始顺序
+        this.deviceTemplates = templateData.data; // 存储设备模板
       } catch (err) {
         this.error = err.message || '未知错误';
         console.error('加载设备列表失败:', err);
@@ -236,6 +242,53 @@ export default {
         return 'is-device-row';
       }
       return '';
+    },
+
+    isTestButtonDisabled(device) {
+      // 区域主控禁用
+      if (device.type !== 'device') {
+        return true;
+      }
+
+      // 查找设备模板
+      const deviceTemplate = this.deviceTemplates.find(template => template.id === device.device_template_id);
+
+      // 如果找不到设备模板，也禁用
+      if (!deviceTemplate) {
+        return true;
+      }
+
+      // 如果设备模板类型不是'传感器'，则禁用
+      if (deviceTemplate.category !== '传感器') {
+        return true;
+      }
+
+      return false; // 否则启用
+    },
+
+    async handleTestDevice(device) {
+      if (device.type !== 'device') {
+        this.$message.warning('暂不支持非传感器类的测试');
+        return;
+      }
+
+      const deviceTemplate = this.deviceTemplates.find(template => template.id === device.device_template_id);
+
+      if (!deviceTemplate) {
+        this.$message.error('无法获取设备模板信息，请刷新重试');
+        return;
+      }
+
+      if (deviceTemplate.category === '传感器') {
+        try {
+          await DeviceApi.manualControl(device.id, {});
+          this.$message.success('测试请求已发送，请前往传感器数据页面查看结果');
+        } catch (error) {
+          this.$message.error('发送测试请求失败: ' + (error.message || '未知错误'));
+        }
+      } else if (deviceTemplate.category === '执行器') {
+        this.$message.warning('暂不支持非传感器类的测试');
+      }
     }
   }
 };

src/views/monitor/NotificationLogView.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="notification-log-view">
+    <GenericMonitorList
+      :fetchData="fetchNotifications"
+      :columnsConfig="notificationLogColumns"
+    />
+  </div>
+</template>
+
+<script setup>
+import GenericMonitorList from '../../components/GenericMonitorList.vue';
+import { getNotifications, ZapcoreLevel } from '../../api/monitor.js';
+import { formatRFC3339 } from '../../utils/format.js';
+
+// 适配通用组件的 fetchData prop
+const fetchNotifications = async (params) => {
+  return await getNotifications(params);
+};
+
+// 定义表格的列
+const notificationLogColumns = [
+  {
+    title: '用户ID',
+    dataIndex: 'user_id',
+    key: 'user_id',
+    sorter: true,
+    filterType: 'number',
+    minWidth: 100,
+  },
+  {
+    title: '通知渠道',
+    dataIndex: 'notifier_type',
+    key: 'notifier_type',
+    filterType: 'select',
+    filterOptions: [
+      { value: '邮件', text: '邮件' },
+      { value: '企业微信', text: '企业微信' },
+      { value: '飞书', text: '飞书' },
+      { value: '日志', text: '日志' },
+    ],
+    minWidth: 120,
+  },
+  {
+    title: '目标地址',
+    dataIndex: 'to_address',
+    key: 'to_address',
+    minWidth: 200,
+  },
+  {
+    title: '标题',
+    dataIndex: 'title',
+    key: 'title',
+    minWidth: 200,
+  },
+  {
+    title: '消息',
+    dataIndex: 'message',
+    key: 'message',
+    minWidth: 300,
+  },
+  {
+    title: '日志级别',
+    dataIndex: 'level',
+    key: 'level',
+    sorter: true,
+    filterType: 'select',
+    filterOptions: Object.entries(ZapcoreLevel).map(([text, value]) => ({ value, text })),
+    minWidth: 110,
+  },
+  {
+    title: '告警时间',
+    dataIndex: 'alarm_timestamp',
+    key: 'alarm_timestamp',
+    sorter: true,
+    formatter: (row, column, cellValue) => formatRFC3339(cellValue),
+    minWidth: 180,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
+    filterType: 'select',
+    filterOptions: [
+      { value: '发送成功', text: '发送成功' },
+      { value: '发送失败', text: '发送失败' },
+      { value: '已跳过', text: '已跳过' },
+    ],
+    minWidth: 120,
+  },
+  {
+    title: '错误信息',
+    dataIndex: 'error_message',
+    key: 'error_message',
+    minWidth: 200,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'created_at',
+    key: 'created_at',
+    sorter: true,
+    formatter: (row, column, cellValue) => formatRFC3339(cellValue),
+    minWidth: 180,
+  },
+];
+</script>
+
+<style scoped>
+.notification-log-view {
+  /* 视图容器样式 */
+}
+</style>

src/views/monitor/PlanExecutionLogsView.vue

@@ -34,6 +34,12 @@ const planExecutionLogColumns = [
     sorter: true,
     minWidth: 120,
   },
+  {
+    title: '计划名称',
+    dataIndex: 'plan_name',
+    key: 'plan_name',
+    minWidth: 150,
+  },
   {
     title: '状态',
     dataIndex: 'status',

src/views/plan/PlanList.vue

@@ -6,50 +6,61 @@
           <div class="title-container">
             <h2 class="page-title">计划管理</h2>
             <el-button type="text" @click="loadPlans" class="refresh-btn" title="刷新计划列表">
-              <el-icon :size="20"><Refresh /></el-icon>
+              <el-icon :size="20">
+                <Refresh/>
+              </el-icon>
             </el-button>
           </div>
-          <el-button type="primary" @click="addPlan">添加计划</el-button>
+
+          <div class="filter-and-add">
+            <el-select v-model="planTypeFilter" placeholder="选择计划类型" @change="loadPlans"
+                       style="width: 150px; margin-right: 10px;">
+              <el-option label="所有任务" value="所有任务"></el-option>
+              <el-option label="自定义任务" value="自定义任务"></el-option>
+              <el-option label="系统任务" value="系统任务"></el-option>
+            </el-select>
+            <el-button type="primary" @click="addPlan">添加计划</el-button>
+          </div>
         </div>
       </template>
 
       <!-- 加载状态 -->
       <div v-if="loading" class="loading">
-        <el-skeleton animated />
+        <el-skeleton animated/>
       </div>
 
       <!-- 错误状态 -->
       <div v-else-if="error" class="error">
         <el-alert
-          title="获取计划数据失败"
+            title="获取计划数据失败"
-          :description="error"
+            :description="error"
-          type="error"
+            type="error"
-          show-icon
+            show-icon
-          closable
+            closable
-          @close="error = null"
+            @close="error = null"
         />
         <el-button type="primary" @click="loadPlans" class="retry-btn">重新加载</el-button>
       </div>
 
       <el-table
-        v-else
+          v-else
-        :data="plans"
+          :data="plans"
-        style="width: 100%" 
+          style="width: 100%"
-        class="plan-list-table"
+          class="plan-list-table"
-        :fit="true"
+          :fit="true"
-        :scrollbar-always-on="true"
+          :scrollbar-always-on="true"
-        @sort-change="handleSortChange">
+          @sort-change="handleSortChange">
-        <el-table-column prop="id" label="计划ID" min-width="100" sortable="custom" />
+        <el-table-column prop="id" label="计划ID" min-width="100" sortable="custom"/>
-        <el-table-column prop="name" label="计划名称" min-width="120" sortable="custom" />
+        <el-table-column prop="name" label="计划名称" min-width="120" sortable="custom"/>
-        <el-table-column prop="description" label="计划描述" min-width="150" />
+        <el-table-column prop="description" label="计划描述" min-width="150"/>
         <el-table-column prop="execution_type" label="执行类型" min-width="150" sortable="custom">
           <template #default="scope">
-            <el-tag v-if="scope.row.execution_type === 'manual'">手动</el-tag>
+            <el-tag v-if="scope.row.execution_type === '手动'">手动</el-tag>
             <el-tag v-else-if="scope.row.execute_num === 0" type="success">自动(无限执行)</el-tag>
             <el-tag v-else type="warning">自动({{ scope.row.execute_num }}次)</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="execute_count" label="已执行次数" min-width="120" sortable="custom" />
+        <el-table-column prop="execute_count" label="已执行次数" min-width="120" sortable="custom"/>
         <el-table-column prop="status" label="状态" min-width="100" sortable="custom">
           <template #default="scope">
             <el-tag v-if="scope.row.status === 0" type="danger">禁用计划</el-tag>
@@ -65,17 +76,21 @@
         </el-table-column>
         <el-table-column label="操作" width="280">
           <template #default="scope">
-            <el-button size="small" @click="editPlan(scope.row)">编辑</el-button>
+            <el-button size="small" @click="editPlan(scope.row)" :disabled="scope.row.plan_type === '系统任务'">编辑
+            </el-button>
             <el-button size="small" @click="showDetails(scope.row)">详情</el-button>
             <el-button
-              size="small" 
+                size="small"
-              :type="scope.row.status === 1 ? 'warning' : 'primary'"
+                :type="scope.row.status === 1 ? 'warning' : 'primary'"
-              @click="scope.row.status === 1 ? stopPlan(scope.row) : startPlan(scope.row)"
+                @click="scope.row.status === 1 ? stopPlan(scope.row) : startPlan(scope.row)"
-              :loading="stoppingPlanId === scope.row.id || startingPlanId === scope.row.id"
+                :loading="stoppingPlanId === scope.row.id || startingPlanId === scope.row.id"
+                :disabled="scope.row.plan_type === '系统任务'"
             >
               {{ scope.row.status === 1 ? '停止' : '启动' }}
             </el-button>
-            <el-button size="small" type="danger" @click="deletePlan(scope.row)">删除</el-button>
+            <el-button size="small" type="danger" @click="deletePlan(scope.row)"
+                       :disabled="scope.row.plan_type === '系统任务'">删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -84,23 +99,23 @@
 
     <!-- 计划表单 -->
     <PlanForm
-      v-model:visible="dialogVisible" 
+        v-model:visible="dialogVisible"
-      :plan-data="currentPlan" 
+        :plan-data="currentPlan"
-      :is-edit="isEdit"
+        :is-edit="isEdit"
-      @success="handlePlanSuccess"
+        @success="handlePlanSuccess"
-      @cancel="handlePlanCancel"
+        @cancel="handlePlanCancel"
     />
 
     <!-- 计划详情 -->
     <el-dialog
-      v-model="detailsVisible"
+        v-model="detailsVisible"
-      title="计划详情"
+        title="计划详情"
-      width="70%"
+        width="70%"
-      top="5vh"
+        top="5vh"
     >
       <plan-detail
-        v-if="detailsVisible" 
+          v-if="detailsVisible"
-        :plan-id="selectedPlanIdForDetails"
+          :plan-id="selectedPlanIdForDetails"
       />
       <template #footer>
         <span class="dialog-footer">
@@ -113,7 +128,7 @@
 </template>
 
 <script>
-import { Refresh } from '@element-plus/icons-vue';
+import {Refresh} from '@element-plus/icons-vue';
 import apiClient from '../../api';
 import PlanForm from '../../components/PlanForm.vue';
 import PlanDetail from '../../components/PlanDetail.vue'; // 导入新组件
@@ -145,7 +160,8 @@ export default {
       },
       selectedPlanIdForDetails: null, // 当前要查看详情的计划ID
       startingPlanId: null,
-      stoppingPlanId: null
+      stoppingPlanId: null,
+      planTypeFilter: '自定义任务', // 新增：计划类型筛选，默认自定义任务
     };
   },
   async mounted() {
@@ -158,7 +174,7 @@ export default {
       this.error = null;
 
       try {
-        const response = await apiClient.plans.getPlans(); // 更正此处
+        const response = await apiClient.plans.getPlans({plan_type: this.planTypeFilter, page: 1, page_size: 1000}); // 传递 plan_typeFilter
         let fetchedPlans = response.data?.plans || [];
         // Default sort by ID ascending
         fetchedPlans.sort((a, b) => a.id - b.id);
@@ -173,7 +189,7 @@ export default {
     },
 
     // 处理表格排序
-    handleSortChange({ prop, order }) {
+    handleSortChange({prop, order}) {
       if (!order) {
         // 恢复原始顺序
         this.plans = [...this.originalPlans];
@@ -249,7 +265,7 @@ export default {
     },
 
     editPlan(plan) {
-      this.currentPlan = { ...plan };
+      this.currentPlan = {...plan};
       this.isEdit = true;
       this.dialogVisible = true;
     },
@@ -326,6 +342,10 @@ export default {
     handlePlanCancel() {
       this.dialogVisible = false;
     }
+  },
+  watch: {
+    // 监听 planTypeFilter 变化，重新加载计划列表
+    planTypeFilter: 'loadPlans'
   }
 };
 </script>
@@ -388,10 +408,16 @@ export default {
   height: 20px;
 }
 
+.filter-and-add {
+  display: flex;
+  align-items: center;
+}
+
 @media (max-width: 768px) {
   .plan-list {
     padding: 10px;
   }
+
   .card-header {
     flex-direction: column;
     gap: 15px;

src/views/pms/PigBatchManagementView.vue

@@ -42,6 +42,8 @@
           @modify-pig-count-pen="handleModifyPigCountPen"
           @remove-pen="handleRemovePen"
           @assign-pen-to-batch="handleAssignPenToBatch"
+          @transfer-pigs="handleTransferPigs"
+          @transfer-pigs-across-batches="handleTransferPigsAcrossBatches"
           @reload-data="loadData"
         />
         <el-empty v-else description="暂无数据" />
@@ -66,16 +68,33 @@
       @success="handlePenSuccess"
       @cancel="penDialogVisible = false"
     />
+
+    <!-- 群内调栏对话框 -->
+    <TransferPigsModal
+      v-if="transferDialogVisible"
+      v-model:visible="transferDialogVisible"
+      :batch="currentBatchForTransfer"
+      @success="handleTransferSuccess"
+    />
+
+    <!-- 跨群调栏对话框 -->
+    <TransferPigsAcrossBatchesModal
+      v-model:visible="transferAcrossBatchesDialogVisible"
+      :batch="currentBatchForTransferAcrossBatches"
+      @success="handleTransferAcrossBatchesSuccess"
+    />
   </div>
 </template>
 
 <script>
-import { getPigBatches, deletePigBatch, assignPensToBatch } from '@/api/pigBatch.js';
+import { getPigBatches, deletePigBatch, assignPensToBatch, removePenFromBatch } from '@/api/pigBatch.js';
-import { getPens, deletePen } from '@/api/pen.js';
+import { getPens } from '@/api/pen.js';
 import { getPigHouses } from '@/api/pigHouse.js';
 import PigBatchList from '@/components/PigBatchList.vue';
 import PigBatchForm from '@/components/PigBatchForm.vue';
 import PenForm from '@/components/PenForm.vue';
+import TransferPigsModal from '@/components/TransferPigsModal.vue';
+import TransferPigsAcrossBatchesModal from '@/components/TransferPigsAcrossBatchesModal.vue';
 import { Refresh } from '@element-plus/icons-vue';
 
 export default {
@@ -84,6 +103,8 @@ export default {
     PigBatchList,
     PigBatchForm,
     PenForm,
+    TransferPigsModal,
+    TransferPigsAcrossBatchesModal,
     Refresh
   },
   data() {
@@ -99,6 +120,12 @@ export default {
       penDialogVisible: false,
       isEditPen: false,
       currentPen: {},
+      // 调栏模态框状态
+      transferDialogVisible: false,
+      currentBatchForTransfer: {},
+      // 跨群调栏模态框状态
+      transferAcrossBatchesDialogVisible: false,
+      currentBatchForTransferAcrossBatches: {},
       // 辅助映射
       houseMap: new Map(), // 用于猪栏显示猪舍名称
     };
@@ -208,6 +235,11 @@ export default {
       }
     },
     // --- 猪栏操作 (在猪群管理中) ---
+    handleAddPen(house) {
+      this.currentPen = { ...house }; // 修正：这里应该是传入house对象，而不是pen对象
+      this.isEditPen = false;
+      this.penDialogVisible = true;
+    },
     handleModifyPigCountPen(pen) {
       this.currentPen = { ...pen };
       this.isEditPen = true;
@@ -215,22 +247,18 @@ export default {
     },
     async handleRemovePen(pen) {
       try {
-        await this.$confirm(`确认删除猪栏 "${pen.pen_number}" 吗？`, '提示', {
+        await this.$confirm(`确认将猪栏 "${pen.pen_number}" 从猪群中移除吗？`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         });
-        await deletePen(pen.id);
+        await removePenFromBatch(pen.id, pen.pig_batch_id);
-        this.$message.success('删除成功');
+        this.$message.success('猪栏已成功从猪群中移除');
-        // 本地更新数据
+        await this.loadData(); // Refresh data to show updated state
-        const batch = this.pigBatchesData.find(b => b.id === pen.pig_batch_id);
-        if (batch) {
-          batch.pens = batch.pens.filter(p => p.id !== pen.id);
-        }
       } catch (err) {
         if (err !== 'cancel') {
-          this.$message.error('删除失败: ' + (err.message || '未知错误'));
+          this.$message.error('移除失败: ' + (err.message || '未知错误'));
-          console.error('Failed to delete pen:', err);
+          console.error('Failed to remove pen from batch:', err);
         }
       }
     },
@@ -268,6 +296,25 @@ export default {
         this.$message.error('分配猪栏失败: ' + (error.response?.data?.message || error.message || '未知错误'));
         console.error('Failed to assign pen to batch:', error);
       }
+    },
+    // --- 调栏操作 ---
+    handleTransferPigs(batch) {
+      this.currentBatchForTransfer = batch;
+      this.transferDialogVisible = true;
+    },
+    handleTransferSuccess() {
+      this.transferDialogVisible = false;
+      this.loadData(); // 重新加载数据以反映变化
+    },
+    handleTransferPigsAcrossBatches(batch) {
+      console.log('handleTransferPigsAcrossBatches called with batch:', batch);
+      this.currentBatchForTransferAcrossBatches = batch;
+      this.transferAcrossBatchesDialogVisible = true;
+      console.log('transferAcrossBatchesDialogVisible set to:', this.transferAcrossBatchesDialogVisible);
+    },
+    handleTransferAcrossBatchesSuccess() {
+      this.transferAcrossBatchesDialogVisible = false;
+      this.loadData(); // 重新加载数据以反映变化
     }
   }
 }