From 325bd2979d3c270922cb575280afab32a61ed5b5 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sun, 1 Dec 2024 13:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=B7=AF=E7=94=B1=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=BB=E5=8A=A1=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=8C=89=E9=92=AE=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=20=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/api.config.js       |  4 +-
 src/layout/Layout.vue          | 13 ++---
 src/router/index.js            | 70 +++++++++++++-----------
 src/views/ConfigView.vue       | 99 +++++++++++++++++++++-------------
 src/views/TaskManagement.vue   | 17 ++++++
 src/views/visitor/TaskList.vue | 17 ++++++
 6 files changed, 144 insertions(+), 76 deletions(-)

diff --git a/src/config/api.config.js b/src/config/api.config.js
index f9d54b6..cce4408 100644
--- a/src/config/api.config.js
+++ b/src/config/api.config.js
@@ -5,4 +5,6 @@ export const API_ENDPOINTS = {
     LIST: '/Management/GetTaskList',
     PROCESS: (id) => `/Management/${id}/process`,
   }
-} 
\ No newline at end of file
+} 
+
+export const ADMIN_ROUTE_BASE = "/admin"
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 36d2a31..05411f0 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -13,26 +13,26 @@
         text-color="rgba(255,255,255,0.65)"
         active-text-color="#fff"
         :collapse="isCollapse">
-        <el-menu-item index="/dashboard">
+        <el-menu-item :index="`${ADMIN_ROUTE_BASE}/dashboard`">
           <el-icon><DataLine /></el-icon>
           <span>概览面板</span>
         </el-menu-item>
         <template v-if="userRole === 'admin'">
-          <el-menu-item index="/tasks">
+          <el-menu-item :index="`${ADMIN_ROUTE_BASE}/tasks`">
             <el-icon><List /></el-icon>
             <span>任务管理</span>
           </el-menu-item>
-          <el-menu-item index="/config">
+          <el-menu-item :index="`${ADMIN_ROUTE_BASE}/config`">
             <el-icon><Setting /></el-icon>
             <span>系统配置</span>
           </el-menu-item>
           <template v-if="userInfo.mask === 2">
-            <el-menu-item index="/users">
+            <el-menu-item :index="`${ADMIN_ROUTE_BASE}/users`">
               <el-icon><User /></el-icon>
               <span>用户管理</span>
             </el-menu-item>
           </template>
-          <el-menu-item index="/events">
+          <el-menu-item :index="`${ADMIN_ROUTE_BASE}/events`">
             <el-icon><List /></el-icon>
             <span>事件记录</span>
           </el-menu-item>
@@ -59,7 +59,7 @@
             </span>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item @click="router.push('/profile')">
+                <el-dropdown-item @click="router.push(`${ADMIN_ROUTE_BASE}/profile`)">
                   <el-icon><User /></el-icon>个人信息
                 </el-dropdown-item>
                 <el-dropdown-item divided @click="handleLogout">
@@ -81,6 +81,7 @@
 import { ref, computed, onUnmounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { DataLine, List, Expand, Fold, Setting, User, SwitchButton } from '@element-plus/icons-vue'
+import { ADMIN_ROUTE_BASE } from '@/config/api.config'
 
 const router = useRouter()
 const userRole = computed(() => localStorage.getItem('userRole'))
diff --git a/src/router/index.js b/src/router/index.js
index 6cd0e47..16ad7be 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,8 +2,13 @@ import { createRouter, createWebHistory } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import Layout from '../layout/Layout.vue'
 import { UserAPI } from '../api/user'
+import { ADMIN_ROUTE_BASE } from '@/config/api.config'
 
 const routes = [
+  {
+    path: '/',
+    redirect: '/visitor'
+  },
   {
     path: '/login',
     name: 'Login',
@@ -15,9 +20,9 @@ const routes = [
     component: () => import('../views/RegisterView.vue')
   },
   {
-    path: '/',
+    path: ADMIN_ROUTE_BASE,
     component: Layout,
-    redirect: '/dashboard',
+    redirect: `${ADMIN_ROUTE_BASE}/dashboard`,
     children: [
       {
         path: 'dashboard',
@@ -109,56 +114,57 @@ router.beforeEach(async (to, from, next) => {
     return
   }
 
-  const token = localStorage.getItem('token')
-  const isAuthenticated = localStorage.getItem('isAuthenticated')
-  const userRole = localStorage.getItem('userRole')
-  
-  // 登录页和注册页可以直接访问
+  // 如果是登录页和注册页可以直接访问
   if (to.path === '/login' || to.path === '/register') {
+    const isAuthenticated = localStorage.getItem('isAuthenticated')
     if (isAuthenticated) {
-      next('/dashboard')
+      next('/admin/dashboard')
     } else {
       next()
     }
     return
   }
 
-  if (!isAuthenticated) {
-    next('/login')
-    return
-  }
+  // 如果是管理后台页面
+  if (to.path.startsWith(ADMIN_ROUTE_BASE)) {
+    const token = localStorage.getItem('token')
+    const isAuthenticated = localStorage.getItem('isAuthenticated')
+    const userRole = localStorage.getItem('userRole')
+    
+    if (!isAuthenticated) {
+      next('/login')
+      return
+    }
 
-  // 如果是管理员但没有用户信息，尝试获取
-  if (userRole === 'admin' && token) {
-    try {
-      const response = await UserAPI.getUserInfo()
-      if (response.retcode !== 0) {
-        // 用户信息获取失败，清除登录状态
+    // 如果是管理员但没有用户信息，尝试获取
+    if (userRole === 'admin' && token) {
+      try {
+        const response = await UserAPI.getUserInfo()
+        if (response.retcode !== 0) {
+          localStorage.clear()
+          next('/login')
+          return
+        }
+      } catch (error) {
         localStorage.clear()
         next('/login')
         return
       }
-    } catch (error) {
-      localStorage.clear()
-      next('/login')
+    }
+
+    // 检查权限
+    if (to.meta.roles && !to.meta.roles.includes(userRole)) {
+      ElMessage.error('没有访问权限')
+      next('/admin/dashboard')
       return
     }
-  }
 
-  // 如果是公开页面，直接放行
-  if (to.meta.public) {
     next()
     return
   }
 
-  // 检查权限
-  if (to.meta.roles && !to.meta.roles.includes(userRole)) {
-    ElMessage.error('没有访问权限')
-    next('/dashboard')
-    return
-  }
-
-  next()
+  // 其他未匹配的路由重定向到访客页面
+  next('/visitor')
 })
 
 // 添加全局路由守卫来更新标题
diff --git a/src/views/ConfigView.vue b/src/views/ConfigView.vue
index dd54539..fb46493 100644
--- a/src/views/ConfigView.vue
+++ b/src/views/ConfigView.vue
@@ -4,7 +4,7 @@
       <template #header>
         <div class="card-header">
           <span class="title">系统配置</span>
-          <el-button type="primary" @click="handleRefresh">
+          <el-button type="primary" @click="handleRefresh" class="refresh-btn">
             <el-icon><Refresh /></el-icon>刷新配置
           </el-button>
         </div>
@@ -12,7 +12,7 @@
 
       <el-tabs type="border-card">
         <el-tab-pane label="下载配置">
-          <el-descriptions :column="2" border>
+          <el-descriptions :column="isMobile ? 1 : 2" border>
             <el-descriptions-item label="临时文件位置">
               {{ config.Download.savePath }}
             </el-descriptions-item>
@@ -127,7 +127,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, computed, onMounted, onUnmounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Refresh, InfoFilled } from '@element-plus/icons-vue'
 import { TaskAPI } from '../api/task'
@@ -198,6 +198,24 @@ const handleRefresh = async () => {
   }
 }
 
+// 添加移动端检测
+const isMobile = computed(() => {
+  return window.innerWidth <= 768
+})
+
+// 监听窗口大小变化
+onMounted(() => {
+  window.addEventListener('resize', () => {
+    isMobile.value = window.innerWidth <= 768
+  })
+})
+
+onUnmounted(() => {
+  window.removeEventListener('resize', () => {
+    isMobile.value = window.innerWidth <= 768
+  })
+})
+
 onMounted(() => {
   fetchConfig()
 })
@@ -245,7 +263,7 @@ onMounted(() => {
   margin: 4px;
 }
 
-/* 添加响应式样式 */
+/* 移动端样式 */
 @media screen and (max-width: 768px) {
   .config-view {
     padding: 10px;
@@ -260,43 +278,36 @@ onMounted(() => {
     font-size: 14px;
   }
 
-  /* 调整描述列表在移动端的显示 */
-  :deep(.el-descriptions) {
-    .el-descriptions__label {
-      width: 100px;
-      min-width: 100px;
-      font-size: 12px;
-    }
-
-    .el-descriptions__content {
-      font-size: 12px;
-      word-break: break-all;
-    }
-
-    .el-descriptions__cell {
-      padding: 12px !important;
-    }
-  }
-
-  /* 调整标签在移动端的显示 */
-  :deep(.el-tag) {
-    margin: 2px;
-    font-size: 11px;
-  }
-
-  /* 调整选项卡在移动端的显示 */
-  :deep(.el-tabs__item) {
-    font-size: 13px;
-    padding: 0 10px;
-  }
-
-  /* 调整刷新按钮 */
-  .card-header .el-button {
+  .refresh-btn {
     width: 100%;
   }
+
+  :deep(.el-descriptions) {
+    margin-top: 12px;
+  }
+
+  :deep(.el-descriptions__label) {
+    width: 100px;
+    min-width: 100px;
+    font-size: 12px;
+  }
+
+  :deep(.el-descriptions__content) {
+    font-size: 12px;
+    word-break: break-all;
+  }
+
+  :deep(.el-descriptions__cell) {
+    padding: 12px !important;
+  }
+
+  :deep(.el-tag) {
+    font-size: 11px;
+    padding: 0 4px;
+  }
 }
 
-/* 平板端样式调整 */
+/* 平板端样式 */
 @media screen and (min-width: 769px) and (max-width: 1024px) {
   .config-view {
     padding: 15px;
@@ -306,4 +317,18 @@ onMounted(() => {
     width: 120px;
   }
 }
+
+/* 优化标签显示 */
+:deep(.el-tag) {
+  white-space: nowrap;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 优化按钮图标对齐 */
+:deep(.el-button .el-icon) {
+  margin-right: 4px;
+  vertical-align: middle;
+}
 </style> 
\ No newline at end of file
diff --git a/src/views/TaskManagement.vue b/src/views/TaskManagement.vue
index f0a40c9..a0dbc1f 100644
--- a/src/views/TaskManagement.vue
+++ b/src/views/TaskManagement.vue
@@ -970,4 +970,21 @@ onUnmounted(() => {
     }
   }
 }
+
+/* 优化对话框内容在移动端的显示 */
+:deep(.el-dialog) {
+  @media screen and (max-width: 768px) {
+    .details-actions {
+      display: grid;
+      grid-template-columns: 1fr;
+      gap: 8px;
+      padding: 0 20px;
+    }
+
+    .el-button {
+      margin: 0;
+      width: 100%;
+    }
+  }
+}
 </style> 
\ No newline at end of file
diff --git a/src/views/visitor/TaskList.vue b/src/views/visitor/TaskList.vue
index a019ef5..c06eb2b 100644
--- a/src/views/visitor/TaskList.vue
+++ b/src/views/visitor/TaskList.vue
@@ -207,4 +207,21 @@ onMounted(() => {
     padding: 8px;
   }
 }
+
+/* 优化对话框内容在移动端的显示 */
+:deep(.task-details-dialog) {
+  @media screen and (max-width: 768px) {
+    .details-actions {
+      display: grid;
+      grid-template-columns: 1fr;
+      gap: 8px;
+      padding: 0 20px;
+    }
+
+    .el-button {
+      margin: 0;
+      width: 100%;
+    }
+  }
+}
 </style> 
\ No newline at end of file