diff --git a/manager/src/api/timedTask.js b/manager/src/api/timedTask.js index 7b8383659..e2ff644ad 100644 --- a/manager/src/api/timedTask.js +++ b/manager/src/api/timedTask.js @@ -1,11 +1,16 @@ -import { managerApiUrl, getRequest, postRequest } from '@/libs/axios'; +import { managerApiUrl, getRequest, postRequest, putRequestWithNoForm } from '@/libs/axios'; // 获取定时任务列表 export const getTimedTaskList = () => { return getRequest(`${managerApiUrl}/manager/setting/timed-task`); }; -// 手动触发定时任务 -export const triggerTimedTask = (type) => { - return postRequest(`${managerApiUrl}/manager/setting/timed-task/trigger/${type}`); +// 修改定时任务(Cron表达式、启用/暂停状态) +export const updateTimedTask = (params) => { + return putRequestWithNoForm(`${managerApiUrl}/manager/setting/timed-task`, params); +}; + +// 手动触发定时任务 +export const triggerTimedTask = (taskId) => { + return postRequest(`${managerApiUrl}/manager/setting/timed-task/trigger/${taskId}`); }; diff --git a/manager/src/components/lili-dialog/goods-dialog.vue b/manager/src/components/lili-dialog/goods-dialog.vue index 13376751b..103bf5e79 100644 --- a/manager/src/components/lili-dialog/goods-dialog.vue +++ b/manager/src/components/lili-dialog/goods-dialog.vue @@ -189,7 +189,7 @@ function syncTableSelection() { return; } goodsData.value.forEach((item) => { - const selected = selectedList.value.some((e) => e.id && e.id === item.id); + const selected = selectedList.value.some((e) => (e.id || e.skuId) && String(e.id || e.skuId) === String(item.id || item.skuId)); table.toggleRowSelection(item, selected); }); } diff --git a/manager/src/views/sensitive-words/index.vue b/manager/src/views/sensitive-words/index.vue index 0e949d836..872aac8ad 100644 --- a/manager/src/views/sensitive-words/index.vue +++ b/manager/src/views/sensitive-words/index.vue @@ -1,48 +1,105 @@