diff --git a/src/router/index.js b/src/router/index.js index ea32beb..891e313 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,7 @@ -import { createRouter, createWebHistory } from 'vue-router' +import { createRouter, createWebHashHistory } from 'vue-router' const router = createRouter({ - history: createWebHistory(), + history: createWebHashHistory(), routes: [ { path: '/', diff --git a/src/views/Admin.vue b/src/views/Admin.vue index 1898bce..b063847 100644 --- a/src/views/Admin.vue +++ b/src/views/Admin.vue @@ -223,9 +223,9 @@ onMounted(async () => { await store.initialize() }) -// 跳转到大屏展示页面 +// 跳转到大屏展示页面(新窗口) const goToDisplay = () => { - router.push('/display') + window.open('/#/display', '_blank') } // 快捷键指南 diff --git a/src/views/Display.vue b/src/views/Display.vue index 38158aa..151f852 100644 --- a/src/views/Display.vue +++ b/src/views/Display.vue @@ -281,14 +281,17 @@ onUnmounted(() => { align-items: center; justify-content: center; overflow: hidden; - padding: 0 40px; + padding: 0; + box-sizing: border-box; } .scroll-list { display: grid; gap: 30px; - width: 100%; + width: calc(100% - 80px); max-width: 1600px; + padding: 0 40px; + box-sizing: border-box; } .scroll-item { @@ -307,8 +310,9 @@ onUnmounted(() => { .scroll-name { white-space: pre-line; word-wrap: break-word; - word-break: break-all; + word-break: break-word; width: 100%; + overflow-wrap: break-word; } /* 结果模式 */ @@ -319,15 +323,18 @@ onUnmounted(() => { flex-direction: column; align-items: center; justify-content: center; - padding: 0 40px; + padding: 0; + box-sizing: border-box; } .winners-list { display: grid; grid-template-columns: repeat(3, 1fr); gap: 30px; - width: 100%; + width: calc(100% - 80px); max-width: 1600px; + padding: 0 40px; + box-sizing: border-box; } .winner-item { @@ -346,7 +353,8 @@ onUnmounted(() => { .winner-name { white-space: pre-line; word-wrap: break-word; - word-break: break-all; + word-break: break-word; width: 100%; + overflow-wrap: break-word; } diff --git a/vite.config.js b/vite.config.js index d944d72..ac487d5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,11 +4,12 @@ import path from 'path' export default defineConfig({ plugins: [vue()], + base: '.', resolve: { alias: { '@': path.resolve(__dirname, './src'), - '@utils': path.resolve(__dirname, './utils') + '@utils': path.resolve(__dirname, './utils'), }, - extensions: ['.js', '.ts', '.jsx', '.tsx', '.json', '.vue'] - } -}) \ No newline at end of file + extensions: ['.js', '.ts', '.jsx', '.tsx', '.json', '.vue'], + }, +})