From a090328183d32414ee4ccde1ae9f74961517d285 Mon Sep 17 00:00:00 2001 From: mfnefd Date: Wed, 11 Dec 2024 04:39:57 +0400 Subject: [PATCH] =?UTF-8?q?fix:=20=D1=84=D1=80=D0=BE=D0=BD=D1=82=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=BA=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.debug.yml | 22 ++++++++++----------- front/src/components/pages/Groups.vue | 1 - front/src/components/pages/OffsetReport.vue | 2 +- front/src/components/pages/PeriodReport.vue | 4 ++-- front/src/core/api/http-client.ts | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml index 32a0470..1d23e24 100644 --- a/docker-compose.debug.yml +++ b/docker-compose.debug.yml @@ -16,17 +16,17 @@ services: - ~/.vsdbg:/remote_debugger:rw depends_on: - database - # dombudg: - # image: dombudg - # build: - # context: front - # dockerfile: ./Dockerfile - # environment: - # - VITE_API_URL=http://api:5125 - # ports: - # - 80:80 - # depends_on: - # - api + dombudg: + image: dombudg + build: + context: front + dockerfile: ./Dockerfile + environment: + - VITE_API_URL=http://api:5125 + ports: + - 80:80 + depends_on: + - api database: image: postgres:14 environment: diff --git a/front/src/components/pages/Groups.vue b/front/src/components/pages/Groups.vue index 0f32444..43b2c9b 100644 --- a/front/src/components/pages/Groups.vue +++ b/front/src/components/pages/Groups.vue @@ -4,7 +4,6 @@ import { inject } from 'vue'; import { GroupService } from '../../core/services/group-service'; import SpendingGroupManager from '../support/SpendingGroupManager.vue'; import { DeleteOutlined, CalendarOutlined } from '@ant-design/icons-vue'; -import GetPeriodReportForm from '../support/GetPeriodReportForm.vue'; const groupService = inject(GroupService.name) as GroupService; diff --git a/front/src/components/pages/OffsetReport.vue b/front/src/components/pages/OffsetReport.vue index 0b9c992..5960890 100644 --- a/front/src/components/pages/OffsetReport.vue +++ b/front/src/components/pages/OffsetReport.vue @@ -89,7 +89,7 @@ import { inject } from 'vue'; import { OffsetFromPlanReportData, ReportService } from '../../core/services/report-service'; import { useRoute } from 'vue-router'; import { useAsyncState } from '@vueuse/core'; -import { Chart, Grid, Tooltip, Line, Pie, Marker, Responsive, Area } from 'vue3-charts'; +import { Chart, Grid, Tooltip, Line, Marker, Responsive, Area } from 'vue3-charts'; import { CheckOutlined, WarningOutlined } from '@ant-design/icons-vue'; let reportService = inject(ReportService.name) as ReportService; let planId = useRoute().params.planId as string; diff --git a/front/src/components/pages/PeriodReport.vue b/front/src/components/pages/PeriodReport.vue index 595c1ad..3f6dae2 100644 --- a/front/src/components/pages/PeriodReport.vue +++ b/front/src/components/pages/PeriodReport.vue @@ -72,8 +72,8 @@ import { inject } from 'vue'; import { PeriodReportData, ReportService } from '../../core/services/report-service'; import { useRoute } from 'vue-router'; import { useAsyncState } from '@vueuse/core'; -import { Grid, Pie, Chart, Tooltip, Bar, Responsive, Marker, Line } from 'vue3-charts'; -import { MonitorOutlined, DollarOutlined } from '@ant-design/icons-vue'; +import { Pie, Chart, Tooltip, Responsive } from 'vue3-charts'; +import { MonitorOutlined } from '@ant-design/icons-vue'; import dayjs from 'dayjs'; let reportService = inject(ReportService.name) as ReportService; let { startAt, endAt } = useRoute().query as { startAt: string, endAt: string }; diff --git a/front/src/core/api/http-client.ts b/front/src/core/api/http-client.ts index fc3b2c7..5140e54 100644 --- a/front/src/core/api/http-client.ts +++ b/front/src/core/api/http-client.ts @@ -55,7 +55,7 @@ export enum ContentType { } export class HttpClient { - public baseUrl: string = "http://172.29.224.204:5125"; + public baseUrl: string = import.meta.env.VITE_API_URL; private securityData: SecurityDataType | null = null; private securityWorker?: ApiConfig["securityWorker"]; private abortControllers = new Map();