From c4a9cad1c50e89365e2a58b50e259af642ed3b8c Mon Sep 17 00:00:00 2001
From: Codex Assistant <codex@example.com>
Date: 星期二, 07 十月 2025 16:12:20 +0800
Subject: [PATCH] feat(review): 调整评审详情展示顺序与样式，描述支持多行，项目信息列宽40/60 fix(auth): 登录页与首页循环跳转保护；api.ts 在登录页不再重定向；401分支在登录页不跳转 fix(router): /login 放行策略优化，避免死循环；评审列表跳转到 /project-review/:id/detail fix(frontend): 补齐 utils/appConfig.ts，避免启动白屏 fix(review): 详情页提交评分缺少stageId时回退使用项目详情的stageId feat(backend): ActivityPlayerDetailResponse.playerInfo 补充 avatarUrl/avatar，服务组装时填充用户头像 chore(dev): 启动脚本注入本地JWT密钥，重启前后端
---
web/src/router/index.ts | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/web/src/router/index.ts b/web/src/router/index.ts
index b052ee7..3aa9c0a 100644
--- a/web/src/router/index.ts
+++ b/web/src/router/index.ts
@@ -1,5 +1,5 @@
import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
-import { isLoggedIn } from '@/utils/auth'
+import { isLoggedIn, getToken, isTokenExpired } from '@/utils/auth'
const routes: RouteRecordRaw[] = [
{
@@ -13,17 +13,12 @@
component: () => import('@/views/dashboard/index.vue'),
meta: { title: '宸ヤ綔鍙�', icon: 'Grid' }
},
+
{
path: '/activity',
name: 'Activity',
- component: () => import('@/views/activity/index.vue'),
+ component: () => import('@/views/activity-list.vue'),
meta: { title: '姣旇禌绠＄悊', icon: 'Trophy' }
- },
- {
- path: '/activity/:id',
- name: 'ActivityDetail',
- component: () => import('@/views/ActivityDetail.vue'),
- meta: { title: '姣旇禌璇︽儏', icon: 'Trophy' }
},
{
path: '/activity/new',
@@ -38,40 +33,46 @@
meta: { title: '缂栬緫姣旇禌', icon: 'Trophy' }
},
{
+ path: '/activity/:id',
+ name: 'ActivityDetail',
+ component: () => import('@/views/ActivityDetail.vue'),
+ meta: { title: '姣旇禌璇︽儏', icon: 'Trophy' }
+ },
+ {
path: '/judge',
name: 'Judge',
- component: () => import('@/views/judge/index.vue'),
+ component: () => import('@/views/judge-list.vue'),
meta: { title: '璇勫绠＄悊', icon: 'UserFilled' }
},
{
path: '/rating-scheme',
name: 'RatingScheme',
- component: () => import('@/views/rating/index.vue'),
- meta: { title: '璇勫垎妯℃澘', icon: 'Score' }
+ component: () => import('@/views/rating-list.vue'),
+ meta: { title: '璇勫垎妯℃澘', icon: 'Document' }
},
{
path: '/rating-scheme/new',
name: 'RatingSchemeCreate',
- component: () => import('@/views/rating/Form.vue'),
- meta: { title: '鏂板璇勫垎妯℃澘', icon: 'Score' }
+ component: () => import('@/views/rating-detail.vue'),
+ meta: { title: '鏂板缓璇勫垎妯℃澘', hidden: true }
},
{
path: '/rating-scheme/edit/:id',
name: 'RatingSchemeEdit',
- component: () => import('@/views/rating/Form.vue'),
- meta: { title: '缂栬緫璇勫垎妯℃澘', icon: 'Score' }
+ component: () => import('@/views/rating-detail.vue'),
+ meta: { title: '缂栬緫璇勫垎妯℃澘', hidden: true }
},
{
path: '/player',
name: 'Player',
- component: () => import('@/views/player/index.vue'),
- meta: { title: '鎶ュ悕瀹℃牳', icon: 'UserFilled' }
+ component: () => import('@/views/check-list.vue'),
+ meta: { title: '鍙傝禌浜哄憳', icon: 'UserFilled' }
},
{
path: '/player/:id/detail',
name: 'PlayerDetail',
- component: () => import('@/views/player/detail.vue'),
- meta: { title: '鎶ュ悕璇︽儏', icon: 'UserFilled' }
+ component: () => import('@/views/check-detail.vue'),
+ meta: { title: '鍙傝禌浜哄憳璇︽儏' }
},
{
path: '/activity-player/:id/rating',
@@ -94,45 +95,40 @@
{
path: '/employee',
name: 'Employee',
- component: () => import('@/views/employee/index.vue'),
- meta: { title: '鍛樺伐绠＄悊', icon: 'Avatar' }
+ component: () => import('@/views/employee-list.vue'),
+ meta: { title: '鍛樺伐绠＄悊', icon: 'User' }
},
{
path: '/project-review',
name: 'ProjectReview',
- component: () => import('@/views/project-review/index.vue'),
+ component: () => import('@/views/review-list.vue'),
meta: { title: '椤圭洰璇勫', icon: 'View' }
},
{
path: '/project-review/:id/detail',
name: 'ProjectReviewDetail',
- component: () => import('@/views/project-review/detail.vue'),
+ component: () => import('@/views/review-detail.vue'),
meta: { title: '椤圭洰璇勫璇︽儏', hidden: true }
},
{
path: '/review',
name: 'Review',
- component: () => import('@/views/review/index.vue'),
- meta: { title: '椤圭洰璇勫', icon: 'Edit' }
+ component: () => import('@/views/judge-review-list.vue'),
+ meta: { title: '璇勫璇勫', icon: 'Edit' }
},
{
path: '/review/:id/detail',
name: 'ReviewDetail',
- component: () => import('@/views/review/detail.vue'),
- meta: { title: '椤圭洰璇勫璇︽儏', hidden: true }
+ component: () => import('@/views/judge-review-detail.vue'),
+ meta: { title: '璇勫璇勫璇︽儏', hidden: true }
},
{
path: '/competition-promotion',
name: 'CompetitionPromotion',
- component: () => import('@/views/competition-promotion/index.vue'),
+ component: () => import('@/views/next-list.vue'),
meta: { title: '姣旇禌鏅嬬骇', icon: 'Promotion' }
},
- {
- path: '/test/graphql',
- name: 'GraphQLTest',
- component: () => import('@/views/test/graphql-test.vue'),
- meta: { title: 'GraphQL娴嬭瘯', icon: 'Connection' }
- }
+
]
},
{
@@ -152,8 +148,9 @@
router.beforeEach((to, from, next) => {
// 濡傛灉鏄櫥褰曢〉闈紝鐩存帴鏀捐
if (to.path === '/login') {
- // 濡傛灉宸茬粡鐧诲綍锛岄噸瀹氬悜鍒伴椤�
- if (isLoggedIn()) {
+ // 浠呭湪鈥滄湁token涓旀湭杩囨湡涓旀湰鍦板凡璁板綍鐧诲綍淇℃伅鈥濇椂鎵嶄粠鐧诲綍椤佃烦杞埌棣栭〉
+ const t = getToken()
+ if (t && !isTokenExpired(t) && isLoggedIn()) {
next('/')
} else {
next()
@@ -161,9 +158,9 @@
return
}
- // 妫�鏌ユ槸鍚﹀凡鐧诲綍
- if (!isLoggedIn()) {
- // 鏈櫥褰曪紝閲嶅畾鍚戝埌鐧诲綍椤�
+ // 妫�鏌ユ槸鍚﹀凡鐧诲綍涓攖oken鏈繃鏈�
+ const token = getToken()
+ if (!token || isTokenExpired(token) || !isLoggedIn()) {
next('/login')
return
}
--
Gitblit v1.8.0