|
@@ -169,7 +169,6 @@ async function fetchCurrentTotalData(taskIds) {
|
|
|
|
|
|
async function fetchData(taskIds, apiFunc, startDate, endDate, dataColumns, dateTypeKey) {
|
|
async function fetchData(taskIds, apiFunc, startDate, endDate, dataColumns, dateTypeKey) {
|
|
try {
|
|
try {
|
|
- gridOptions.loading = true;
|
|
|
|
loadSortState();
|
|
loadSortState();
|
|
const resp = await apiFunc({
|
|
const resp = await apiFunc({
|
|
page: gridOptions.pagerConfig.currentPage,
|
|
page: gridOptions.pagerConfig.currentPage,
|
|
@@ -252,8 +251,6 @@ async function fetchData(taskIds, apiFunc, startDate, endDate, dataColumns, date
|
|
saveSortState();
|
|
saveSortState();
|
|
} catch (error) {
|
|
} catch (error) {
|
|
console.error('Error fetching task data:', error);
|
|
console.error('Error fetching task data:', error);
|
|
- } finally {
|
|
|
|
- gridOptions.loading = false;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -270,6 +267,7 @@ async function fetchMonthData(taskIds) {
|
|
}
|
|
}
|
|
|
|
|
|
async function fetchCurrentData(taskIds, resetPage = false) {
|
|
async function fetchCurrentData(taskIds, resetPage = false) {
|
|
|
|
+ gridOptions.loading = true;
|
|
if (resetPage) {
|
|
if (resetPage) {
|
|
gridOptions.pagerConfig.currentPage = 1; // 重置页码为第一页
|
|
gridOptions.pagerConfig.currentPage = 1; // 重置页码为第一页
|
|
}
|
|
}
|
|
@@ -281,6 +279,7 @@ async function fetchCurrentData(taskIds, resetPage = false) {
|
|
} else if (dateType.value === 'month') {
|
|
} else if (dateType.value === 'month') {
|
|
await fetchMonthData(taskIds);
|
|
await fetchMonthData(taskIds);
|
|
}
|
|
}
|
|
|
|
+ gridOptions.loading = false;
|
|
}
|
|
}
|
|
|
|
|
|
function handleSortChange({ field, order }) {
|
|
function handleSortChange({ field, order }) {
|
|
@@ -413,4 +412,4 @@ onMounted(() => {
|
|
color: #a6d8fc;
|
|
color: #a6d8fc;
|
|
border: 1px solid #0085ff;
|
|
border: 1px solid #0085ff;
|
|
}
|
|
}
|
|
-</style>
|
|
|
|
|
|
+</style>
|