diff --git a/frontend/src/components/Layout/AppLayout.vue b/frontend/src/components/Layout/AppLayout.vue index 9bdbda8..421cb14 100644 --- a/frontend/src/components/Layout/AppLayout.vue +++ b/frontend/src/components/Layout/AppLayout.vue @@ -87,14 +87,14 @@ route.path === '/olap/columns' ? 'bg-primary-50 text-primary-700' : 'text-gray-700', sidebarCollapsed ? 'justify-center p-2' : 'px-4 py-3 space-x-3' ]" - :title="sidebarCollapsed ? t('app.olapColumns') : ''" + :title="sidebarCollapsed ? t('olapColumns.title') : ''" > - {{ t('app.olapColumns') }} + {{ t('olapColumns.title') }} - - OLAP запросы + {{ t('olapQueries.title') }}
-

{{ t('olap.columnsTitle') }}

+

{{ t('olapColumns.title') }}

@@ -30,18 +30,18 @@
- - + +
- +
- +
- + - +
- +
- +
@@ -309,8 +309,8 @@
-

{{ t('olap.deleteField') }}

-

{{ t('olap.deleteFieldConfirm') }}

+

{{ t('olapColumns.deleteField') }}

+

{{ t('olapColumns.deleteFieldConfirm') }}

@@ -332,7 +332,7 @@ {{ initializingText }}

- {{ t('olap.waitMessage') }} + {{ t('olapColumns.waitMessage') }}

@@ -453,7 +453,7 @@ async function loadColumns() { } } catch (error) { console.error(error); - showNotification('olap.loadError', 'error'); + showNotification('olapColumns.loadError', 'error'); columns.value = []; } finally { loading.value = false; @@ -486,12 +486,12 @@ const filteredRestaurants = computed(() => { }); function openInitModal() { - initModalTitle.value = t('olap.selectRestaurant'); + initModalTitle.value = t('olapColumns.selectRestaurant'); loadRestaurants().then(() => { initModalOpen.value = true; }); } function openRefreshModal() { - initModalTitle.value = t('olap.refreshStructure'); + initModalTitle.value = t('olapColumns.refreshStructure'); loadRestaurants().then(() => { initModalOpen.value = true; }); } @@ -517,7 +517,7 @@ function onInitConfirm() { async function executeInitialize() { const id = pendingRestaurantId.value ?? selectedRestaurantId.value; if (!id) { - showNotification('olap.selectRestaurantFirst', 'error'); + showNotification('olapColumns.selectRestaurantFirst', 'error'); return; } @@ -526,7 +526,7 @@ async function executeInitialize() { editModalOpen.value = false; deleteFieldConfirm.value.show = false; - initializingText.value = hasData.value ? t('olap.refreshingData') : t('olap.initializingData'); + initializingText.value = hasData.value ? t('olapColumns.refreshingData') : t('olapColumns.initializingData'); initializing.value = true; try { @@ -539,10 +539,10 @@ async function executeInitialize() { const errText = await res.text(); throw new Error(errText || `HTTP ${res.status}`); } - showNotification('olap.initSuccess', 'success'); + showNotification('olapColumns.initSuccess', 'success'); await loadColumns(); } catch (error: any) { - showNotification('olap.initError', 'error', { error: error.message }); + showNotification('olapColumns.initError', 'error', { error: error.message }); } finally { initializing.value = false; initializingText.value = ''; @@ -583,11 +583,11 @@ async function updateField() { }) }); if (!res.ok) throw new Error(); - showNotification('olap.updateSuccess', 'success'); + showNotification('olapColumns.updateSuccess', 'success'); closeEditModal(); await loadColumns(); } catch (error) { - showNotification('olap.updateError', 'error'); + showNotification('olapColumns.updateError', 'error'); } } @@ -603,11 +603,11 @@ async function confirmDeleteField() { method: 'DELETE' }); if (!res.ok) throw new Error(); - showNotification('olap.deleteSuccess', 'success'); + showNotification('olapColumns.deleteSuccess', 'success'); deleteFieldConfirm.value.show = false; await loadColumns(); } catch (error) { - showNotification('olap.deleteError', 'error'); + showNotification('olapColumns.deleteError', 'error'); } } diff --git a/frontend/src/views/OlapConstructor.vue b/frontend/src/views/OlapConstructor.vue index df9471c..657e71f 100644 --- a/frontend/src/views/OlapConstructor.vue +++ b/frontend/src/views/OlapConstructor.vue @@ -1354,7 +1354,7 @@ onMounted(async () => { isDirty.value = false } triggerSqlUpdate() - isReady.value = true // <- Страница полностью загружена + isReady.value = true }) diff --git a/frontend/src/views/OlapQueries.vue b/frontend/src/views/OlapQueries.vue index dd5786a..12d9d74 100644 --- a/frontend/src/views/OlapQueries.vue +++ b/frontend/src/views/OlapQueries.vue @@ -1,8 +1,8 @@