fix: фронт подготовлен к докеру

This commit is contained in:
mfnefd 2024-12-11 04:39:57 +04:00
parent 3c301ee41d
commit a090328183
5 changed files with 15 additions and 16 deletions

View File

@ -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:

View File

@ -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;

View File

@ -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;

View File

@ -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 };

View File

@ -55,7 +55,7 @@ export enum ContentType {
}
export class HttpClient<SecurityDataType = unknown> {
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<SecurityDataType>["securityWorker"];
private abortControllers = new Map<CancelToken, AbortController>();