diff --git a/AdminPanel/src/router/index.ts b/AdminPanel/src/router/index.ts index 63452cc..7b194a1 100644 --- a/AdminPanel/src/router/index.ts +++ b/AdminPanel/src/router/index.ts @@ -4,12 +4,12 @@ const routes: RouteRecordRaw[] = [ { path: '/', name: 'Home', - component: () => import('@/view/Home.vue') + component: () => import('../view/Home.vue') }, { path: '/iframe', name: 'IframePage', - component: () => import('@/view/IframePage.vue') + component: () => import('../view/IframePage.vue') } ] diff --git a/AdminPanel/src/view/Home.vue b/AdminPanel/src/view/Home.vue new file mode 100644 index 0000000..ea26a07 --- /dev/null +++ b/AdminPanel/src/view/Home.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/AdminPanel/src/view/IframePage.vue b/AdminPanel/src/view/IframePage.vue index 7ac807e..8551dfb 100644 --- a/AdminPanel/src/view/IframePage.vue +++ b/AdminPanel/src/view/IframePage.vue @@ -45,7 +45,7 @@ const loading = ref(true) const currentUrl = ref( // localStorage.getItem('adminPanelUrl') || 'https://app.aidg168.uk' - localStorage.getItem('adminPanelUrl') || 'http://localhost:5175/#/login' + localStorage.getItem('adminPanelUrl') || 'http://localhost:5173/#/login' ) function goBack() { diff --git a/AdminPanel/vite.config.ts b/AdminPanel/vite.config.ts index ee11a9b..be39a09 100644 --- a/AdminPanel/vite.config.ts +++ b/AdminPanel/vite.config.ts @@ -26,8 +26,8 @@ export default defineConfig(({ command }) => { base: './', resolve: { alias: { - "@/": new URL("./src/", import.meta.url).pathname, - '@plugins': path.resolve(__dirname, './plugins') + "@": path.resolve(__dirname, 'src').replace(/\\/g, '/'), + '@plugins': path.resolve(__dirname, './plugins').replace(/\\/g, '/') } }, define: { diff --git a/Server/docker-compose.yml b/Server/docker-compose.yml index b87dcd4..66afbbb 100644 --- a/Server/docker-compose.yml +++ b/Server/docker-compose.yml @@ -94,9 +94,24 @@ services: networks: - designer_net + # ==================== Portainer (Docker管理) ==================== + portainer: + image: portainer/portainer-ce:latest + container_name: designercep_portainer + restart: unless-stopped + ports: + - "9000:9000" + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - portainer_data:/data + networks: + - designer_net + volumes: db_data2: driver: local + portainer_data: + driver: local networks: designer_net: