diff --git a/internal/services/tasks/task_service.go b/internal/services/tasks/task_service.go index b97a84e..d1161fd 100644 --- a/internal/services/tasks/task_service.go +++ b/internal/services/tasks/task_service.go @@ -108,7 +108,7 @@ func (ts *TaskService) GetTasksWithPagination(page, pageSize int, name string, a } query.Count(&total) - query.Order("pin_type DESC, updated_at DESC").Offset((page - 1) * pageSize).Limit(pageSize).Find(&tasks) + query.Order("pin_type DESC, created_at DESC").Offset((page - 1) * pageSize).Limit(pageSize).Find(&tasks) return tasks, total } diff --git a/web/src/views/tasks/Tasks.vue b/web/src/views/tasks/Tasks.vue index d95b161..d48d2b0 100644 --- a/web/src/views/tasks/Tasks.vue +++ b/web/src/views/tasks/Tasks.vue @@ -571,7 +571,7 @@ watch(() => route.query.agent_id, (newVal: any) => {
-
#{{ total - (currentPage - 1) * pageSize - index }}
+
#{{ (currentPage - 1) * pageSize + index + 1 }}
@@ -666,7 +666,7 @@ watch(() => route.query.agent_id, (newVal: any) => {
-
#{{ total - (currentPage - 1) * pageSize - index }}
+
#{{ (currentPage - 1) * pageSize + index + 1 }}
@@ -734,7 +734,7 @@ watch(() => route.query.agent_id, (newVal: any) => {
- #{{ total - (currentPage - 1) * pageSize - index }} + #{{ (currentPage - 1) * pageSize + index + 1 }}