chet novoe
This commit is contained in:
@@ -46,7 +46,6 @@ const toggleDrawer = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const transactionUpdate = () => {
|
const transactionUpdate = () => {
|
||||||
console.log('my tut 1')
|
|
||||||
emits('transaction-updated')
|
emits('transaction-updated')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -398,15 +398,13 @@ const updateTransactions = async () => {
|
|||||||
const categories = ref<BudgetCategory[]>([])
|
const categories = ref<BudgetCategory[]>([])
|
||||||
const fetchBudgetCategories = async () => {
|
const fetchBudgetCategories = async () => {
|
||||||
categories.value = await getBudgetCategories(route.params.id)
|
categories.value = await getBudgetCategories(route.params.id)
|
||||||
console.log(categories.value)
|
|
||||||
categories.value = [...categories.value];
|
categories.value = [...categories.value];
|
||||||
updateLoading.value = false
|
updateLoading.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
const transactionCategoriesSums = computed(() => {
|
const transactionCategoriesSums = computed(() => {
|
||||||
// Используем reduce для создания массива сумм по категориям
|
// Используем reduce для создания массива сумм по категориям
|
||||||
const categorySums = transactions.value.reduce((acc, transaction) => {
|
return transactions.value.reduce((acc, transaction) => {
|
||||||
console.log(transaction.category.name)
|
|
||||||
const category = transaction.category;
|
const category = transaction.category;
|
||||||
|
|
||||||
// Проверяем, существует ли категория в аккумуляторе
|
// Проверяем, существует ли категория в аккумуляторе
|
||||||
@@ -418,13 +416,11 @@ const transactionCategoriesSums = computed(() => {
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Если категории еще нет в аккумуляторе, добавляем ее
|
// Если категории еще нет в аккумуляторе, добавляем ее
|
||||||
acc.push({ category: category, sum: transaction.amount });
|
acc.push({category: category, sum: transaction.amount});
|
||||||
}
|
}
|
||||||
|
|
||||||
return acc;
|
return acc;
|
||||||
}, []);
|
}, []);
|
||||||
console.log(categorySums)
|
|
||||||
return categorySums;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@@ -648,7 +644,6 @@ const incomeExpenseChartOptions = ref({
|
|||||||
return tooltipItems[0].dataset.label;
|
return tooltipItems[0].dataset.label;
|
||||||
},
|
},
|
||||||
label: function (tooltipItems) {
|
label: function (tooltipItems) {
|
||||||
console.log(tooltipItems);
|
|
||||||
return formatAmount(tooltipItems.raw) + '₽';
|
return formatAmount(tooltipItems.raw) + '₽';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,6 @@ const fetchCategoriesAndTypes = async () => {
|
|||||||
|
|
||||||
categoryTypes.value = categoryTypesResponse.data;
|
categoryTypes.value = categoryTypesResponse.data;
|
||||||
transactionTypes.value = transactionTypesResponse.data;
|
transactionTypes.value = transactionTypesResponse.data;
|
||||||
console.log(entireCategories.value)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error fetching categories and types:', error);
|
console.error('Error fetching categories and types:', error);
|
||||||
}
|
}
|
||||||
@@ -259,7 +258,6 @@ onMounted(async () => {
|
|||||||
loading.value = false;
|
loading.value = false;
|
||||||
const deviceInfo = platform;
|
const deviceInfo = platform;
|
||||||
isMobile.value = deviceInfo.os.family === 'iOS' || deviceInfo.os.family === 'Android';
|
isMobile.value = deviceInfo.os.family === 'iOS' || deviceInfo.os.family === 'Android';
|
||||||
console.log()
|
|
||||||
|
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ api.interceptors.response.use(
|
|||||||
if (error.response && error.response.status === 401) {
|
if (error.response && error.response.status === 401) {
|
||||||
localStorage.removeItem('token');
|
localStorage.removeItem('token');
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
console.log(router.params)
|
|
||||||
router.push('/login');
|
router.push('/login');
|
||||||
}
|
}
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ export const updateTransactionRequest = async (transaction: Transaction) => {
|
|||||||
const response = await apiClient.put(`/transactions/${id}`, transaction);
|
const response = await apiClient.put(`/transactions/${id}`, transaction);
|
||||||
transaction = response.data
|
transaction = response.data
|
||||||
transaction.date = new Date(transaction.date);
|
transaction.date = new Date(transaction.date);
|
||||||
console.log(transaction.date);
|
|
||||||
|
|
||||||
return transaction
|
return transaction
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user