From 6697cd7ab49301d95f4c53ae690d2fbc3a21fc05 Mon Sep 17 00:00:00 2001
From: ZHW <1941286652@qq.com>
Date: Tue, 9 Dec 2025 23:34:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/web/package.json           |   3 +-
 src/main/resources/web/src/App.vue            | 167 +++++++++-
 .../web/src/components/layout/AppSidebar.vue  |   4 +-
 .../resources/web/src/views/LoginView.vue     |   4 +-
 .../web/src/views/equipment/WaterSupplier.vue | 132 ++++----
 .../web/src/views/personnel/Admin.vue         | 120 +++++---
 .../web/src/views/workorder/Pending.vue       | 289 ++++++++++--------
 .../web/src/views/workorder/Processing.vue    | 191 +++++++-----
 8 files changed, 583 insertions(+), 327 deletions(-)

diff --git a/src/main/resources/web/package.json b/src/main/resources/web/package.json
index d2ff925..9d08c5e 100644
--- a/src/main/resources/web/package.json
+++ b/src/main/resources/web/package.json
@@ -2,6 +2,7 @@
   "name": "web",
   "version": "0.0.0",
   "private": true,
+  "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc && vite build",
@@ -18,4 +19,4 @@
     "vite": "^5.1.6",
     "vue-tsc": "^1.8.27"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/web/src/App.vue b/src/main/resources/web/src/App.vue
index b8fefab..401fdbd 100644
--- a/src/main/resources/web/src/App.vue
+++ b/src/main/resources/web/src/App.vue
@@ -1,10 +1,55 @@
-npm<template>
+<template>
   <div id="app">
+    <!-- 全局提示组件（可复用） -->
+    <div v-if="showToast" class="toast" :class="toastType">
+      {{ toastMessage }}
+    </div>
+
+    <!-- 路由视图出口 -->
     <router-view />
   </div>
 </template>
 
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+
+// 全局提示状态管理
+const showToast = ref(false)
+const toastMessage = ref('')
+const toastType = ref<'success' | 'error' | 'warning'>('success')
+
+// 提供全局提示方法
+const showGlobalToast = (message: string, type: 'success' | 'error' | 'warning' = 'success') => {
+  toastMessage.value = message
+  toastType.value = type
+  showToast.value = true
+
+  // 3秒后自动关闭
+  setTimeout(() => {
+    showToast.value = false
+  }, 3000)
+}
+
+// 将提示方法挂载到全局
+const app = document.querySelector('#app')
+if (app) {
+  (app as any).showToast = showGlobalToast
+}
+
+// 路由守卫补充：处理登录状态过期等场景
+const router = useRouter()
+onMounted(() => {
+  router.beforeEach((to, from, next) => {
+    // 已经登录但访问登录页时重定向到首页
+    const isLoggedIn = localStorage.getItem('token') || sessionStorage.getItem('token')
+    if (to.path === '/login' && isLoggedIn) {
+      next('/home')
+    } else {
+      next()
+    }
+  })
+})
 </script>
 
 <style>
@@ -20,19 +65,27 @@ body {
   -moz-osx-font-smoothing: grayscale;
   background-color: #f8f9fa;
   line-height: 1.6;
+  color: #333;
 }
 
 #app {
   min-height: 100vh;
+  display: flex;
+  flex-direction: column;
 }
 
-/* 全局样式 */
+/* 全局组件样式 */
 .card {
   background: white;
   border-radius: 8px;
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
   padding: 20px;
   margin-bottom: 20px;
+  transition: box-shadow 0.3s ease;
+}
+
+.card:hover {
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
 }
 
 .stats-card {
@@ -41,13 +94,15 @@ body {
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
   padding: 20px;
   text-align: center;
-  transition: transform 0.3s ease;
+  transition: transform 0.3s ease, box-shadow 0.3s ease;
 }
 
 .stats-card:hover {
   transform: translateY(-2px);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
 }
 
+/* 提示框样式 */
 .alert-warning {
   background: #fff3cd;
   border: 1px solid #ffeaa7;
@@ -55,5 +110,111 @@ body {
   padding: 12px 16px;
   color: #856404;
   margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+/* 全局提示样式 */
+.toast {
+  position: fixed;
+  top: 20px;
+  right: 20px;
+  padding: 12px 20px;
+  border-radius: 4px;
+  color: white;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  z-index: 9999;
+  transition: all 0.3s ease;
+  animation: slideIn 0.3s forwards;
+}
+
+.toast.success {
+  background-color: #52c41a;
+}
+
+.toast.error {
+  background-color: #f5222d;
+}
+
+.toast.warning {
+  background-color: #faad14;
+}
+
+/* 动画效果 */
+@keyframes slideIn {
+  from {
+    transform: translateX(100%);
+    opacity: 0;
+  }
+  to {
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+/* 基础按钮样式 */
+.btn {
+  padding: 8px 16px;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border: none;
+  font-weight: 500;
+}
+
+.btn-primary {
+  background-color: #42b983;
+  color: white;
+}
+
+.btn-primary:hover {
+  background-color: #359e75;
+}
+
+.btn-secondary {
+  background-color: #f5f5f5;
+  color: #666;
+}
+
+.btn-secondary:hover {
+  background-color: #e8e8e8;
+}
+
+/* 表格基础样式 */
+.base-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 16px;
+}
+
+.base-table th,
+.base-table td {
+  padding: 12px 16px;
+  text-align: left;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.base-table th {
+  background-color: #fafafa;
+  font-weight: 600;
+  color: #666;
+}
+
+.base-table tr:hover {
+  background-color: #f9f9f9;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+  .card, .stats-card {
+    padding: 16px;
+  }
+
+  .toast {
+    width: calc(100% - 40px);
+    text-align: center;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/main/resources/web/src/components/layout/AppSidebar.vue b/src/main/resources/web/src/components/layout/AppSidebar.vue
index 72d2c47..78c109b 100644
--- a/src/main/resources/web/src/components/layout/AppSidebar.vue
+++ b/src/main/resources/web/src/components/layout/AppSidebar.vue
@@ -74,8 +74,8 @@ const menuItems: MenuItem[] = [
   { 
     id: 4, 
     name: '人员管理', 
-    icon: '👥', 
-    // 移除主菜单路由，点击主菜单只展开子菜单
+    icon: '👥',
+    route: '/home/personnel', // 添加一个默认路由
     children: [
       { name: '管理员', route: '/home/personnel/admin' },
       { name: '维修人员', route: '/home/personnel/maintenance' },
diff --git a/src/main/resources/web/src/views/LoginView.vue b/src/main/resources/web/src/views/LoginView.vue
index 172d7fa..14be424 100644
--- a/src/main/resources/web/src/views/LoginView.vue
+++ b/src/main/resources/web/src/views/LoginView.vue
@@ -17,8 +17,8 @@
               :disabled="loading"
               required
           >
-            <option value="user">普通用户</option>
             <option value="admin">管理员</option>
+            <option value="user">普通用户</option>
             <option value="repairer">维修人员</option>
           </select>
         </div>
@@ -84,7 +84,7 @@ const debugInfo = ref('')
 const loginForm = reactive({
   username: '',
   password: '',
-  userType: 'user', // 添加默认用户类型
+  userType: 'admin', // 添加默认用户类型
   rememberMe: false
 })
 
diff --git a/src/main/resources/web/src/views/equipment/WaterSupplier.vue b/src/main/resources/web/src/views/equipment/WaterSupplier.vue
index 930438e..a7047ae 100644
--- a/src/main/resources/web/src/views/equipment/WaterSupplier.vue
+++ b/src/main/resources/web/src/views/equipment/WaterSupplier.vue
@@ -1,4 +1,3 @@
-<!-- src/views/equipment/WaterSupplier.vue -->
 <template>
   <div class="water-supplier-page">
     <!-- 页面标题和面包屑 -->
@@ -10,22 +9,22 @@
     <!-- 操作按钮区 -->
     <div class="action-bar">
       <button class="btn-add">添加供水机</button>
-      
+
       <div class="filters">
         <!-- 搜索框 -->
         <div class="search-box">
-          <input 
-            type="text" 
-            placeholder="搜索设备ID或位置..." 
+          <input
+            type="text"
+            placeholder="搜索设备ID或位置..."
             v-model="searchKeyword"
             @input="handleSearch"
           >
           <button class="search-btn">搜索</button>
         </div>
-        
+
         <!-- 片区筛选 -->
-        <select 
-          v-model="selectedArea" 
+        <select
+          v-model="selectedArea"
           class="filter-select"
           @change="handleSearch"
         >
@@ -33,10 +32,10 @@
           <option value="市区">市区</option>
           <option value="校区">校区</option>
         </select>
-        
+
         <!-- 状态筛选 -->
-        <select 
-          v-model="selectedStatus" 
+        <select
+          v-model="selectedStatus"
           class="filter-select"
           @change="handleSearch"
         >
@@ -88,8 +87,8 @@
 
     <!-- 分页控件 -->
     <div class="pagination">
-      <button 
-        class="page-btn" 
+      <button
+        class="page-btn"
         :disabled="currentPage === 1"
         @click="currentPage--"
       >
@@ -98,8 +97,8 @@
       <span class="page-info">
         第 {{ currentPage }} 页 / 共 {{ totalPages }} 页
       </span>
-      <button 
-        class="page-btn" 
+      <button
+        class="page-btn"
         :disabled="currentPage === totalPages"
         @click="currentPage++"
       >
@@ -110,8 +109,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
+import { DeviceStatusApi } from '@/api/deviceStatus'
 
 // 设备状态类型定义
 type DeviceStatus = 'online' | 'offline' | 'warning' | 'error'
@@ -125,47 +125,8 @@ interface WaterSupplierDevice {
   lastUploadTime: string
 }
 
-// 模拟供水机设备数据
-const waterSupplierDevices: WaterSupplierDevice[] = [
-  {
-    id: 'WS-2023-001',
-    area: '市区',
-    location: '行政中心大楼1楼大厅',
-    status: 'online',
-    lastUploadTime: '2023-10-25 10:15:33'
-  },
-  {
-    id: 'WS-2023-002',
-    area: '校区',
-    location: '研究生公寓3号楼一层',
-    status: 'online',
-    lastUploadTime: '2023-10-25 09:30:22'
-  },
-  {
-    id: 'WS-2023-003',
-    area: '市区',
-    location: '科技园区A座大厅',
-    status: 'warning',
-    lastUploadTime: '2023-10-25 08:45:11'
-  },
-  {
-    id: 'WS-2023-004',
-    area: '校区',
-    location: '留学生公寓1楼',
-    status: 'offline',
-    lastUploadTime: '2023-10-24 23:05:47'
-  },
-  {
-    id: 'WS-2023-005',
-    area: '市区',
-    location: '图书馆新馆2楼',
-    status: 'error',
-    lastUploadTime: '2023-10-25 07:20:35'
-  }
-]
-
 // 响应式数据
-const devices = ref<WaterSupplierDevice[]>(waterSupplierDevices)
+const devices = ref<WaterSupplierDevice[]>([])
 const searchKeyword = ref('')
 const selectedArea = ref('') // 片区筛选值
 const selectedStatus = ref('') // 状态筛选值
@@ -173,16 +134,45 @@ const currentPage = ref(1)
 const pageSize = 10 // 每页显示数量
 const router = useRouter()
 
+// 加载供水机列表
+const loadWaterSuppliers = async () => {
+  try {
+    const params = {
+      status: selectedStatus.value,
+      areaId: selectedArea.value,
+      deviceType: 'water_supply' // 供水机类型
+    }
+
+    const response = await DeviceStatusApi.getDevicesByStatus(
+      params.status || 'all',
+      params.areaId,
+      params.deviceType
+    )
+
+    // 转换后端返回的数据格式
+    devices.value = response.data.map((device: any) => ({
+      id: device.deviceId,
+      area: device.areaId,
+      location: device.installLocation,
+      status: device.status,
+      lastUploadTime: device.lastUpdateTime
+    }))
+  } catch (error) {
+    console.error('加载供水机列表失败:', error)
+    alert('获取供水机列表失败，请检查网络连接')
+  }
+}
+
 // 多条件过滤设备数据
 const filteredDevices = computed(() => {
   return devices.value.filter(device => {
     const keywordMatch = searchKeyword.value.trim() === '' ||
       device.id.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
       device.location.toLowerCase().includes(searchKeyword.value.toLowerCase())
-    
+
     const areaMatch = selectedArea.value === '' || device.area === selectedArea.value
     const statusMatch = selectedStatus.value === '' || device.status === selectedStatus.value
-    
+
     return keywordMatch && areaMatch && statusMatch
   })
 })
@@ -205,13 +195,19 @@ const formatStatus = (status: DeviceStatus): string => {
 
 // 搜索处理
 const handleSearch = () => {
-  currentPage.value = 1 // 重置到第一页
+  currentPage.value = 1 // 搜索后重置到第一页
+  loadWaterSuppliers()
 }
 
 // 查看详情
 const viewDevice = (id: string) => {
   router.push(`/home/equipment/water-supplier/${id}`)
 }
+
+// 页面加载时获取数据
+onMounted(() => {
+  loadWaterSuppliers()
+})
 </script>
 
 <style scoped>
@@ -241,7 +237,7 @@ const viewDevice = (id: string) => {
   justify-content: space-between;
   align-items: center;
   margin-bottom: 16px;
-  flex-wrap: wrap;
+  flex-wrap:wrap;
   gap: 16px;
 }
 
@@ -284,7 +280,7 @@ const viewDevice = (id: string) => {
   border: none;
   padding: 8px 16px;
   border-radius: 4px;
-  cursor: pointer;
+  cursor:pointer;
 }
 
 .filter-select {
@@ -297,7 +293,7 @@ const viewDevice = (id: string) => {
 
 .equipment-table {
   width: 100%;
-  border-collapse: collapse;
+  border-collapse:collapse;
 }
 
 .equipment-table th,
@@ -355,8 +351,8 @@ const viewDevice = (id: string) => {
   padding: 4px 8px;
   border-radius: 4px;
   font-size: 12px;
-  cursor: pointer;
-  border: none;
+  cursor:pointer;
+  border:none;
   transition: opacity 0.3s;
 }
 
@@ -390,7 +386,7 @@ const viewDevice = (id: string) => {
   border: 1px solid #ddd;
   background: white;
   border-radius: 4px;
-  cursor: pointer;
+  cursor:pointer;
 }
 
 .page-btn:disabled {
@@ -399,14 +395,14 @@ const viewDevice = (id: string) => {
 }
 
 /* 响应式调整 */
-@media (max-width: 768px) {
+@media (max-width:  768px) {
   .filters {
     flex-direction: column;
     width: 100%;
   }
-  
+
   .search-box, .filter-select {
     width: 100%;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/main/resources/web/src/views/personnel/Admin.vue b/src/main/resources/web/src/views/personnel/Admin.vue
index efb0218..0203ad2 100644
--- a/src/main/resources/web/src/views/personnel/Admin.vue
+++ b/src/main/resources/web/src/views/personnel/Admin.vue
@@ -1,4 +1,3 @@
-<!-- src/views/personnel/Admin.vue -->
 <template>
   <div class="admin-page">
     <!-- 页面标题和面包屑 -->
@@ -10,11 +9,11 @@
     <!-- 操作按钮区 -->
     <div class="action-bar">
       <button class="btn-add" @click="handleAddAdmin">新增管理员</button>
-      
+
       <div class="search-box">
-        <input 
-          type="text" 
-          placeholder="搜索姓名或账号..." 
+        <input
+          type="text"
+          placeholder="搜索姓名或账号..."
           v-model="searchKeyword"
           @input="handleSearch"
         >
@@ -47,14 +46,14 @@
               </span>
             </td>
             <td class="operation-buttons">
-              <button 
-                class="btn-edit" 
+              <button
+                class="btn-edit"
                 @click="handleEdit(admin.id)"
               >
                 编辑
               </button>
-              <button 
-                class="btn-status" 
+              <button
+                class="btn-status"
                 :class="admin.status === 'active' ? 'btn-disable' : 'btn-enable'"
                 @click="handleStatusChange(admin.id, admin.status)"
               >
@@ -71,8 +70,8 @@
 
     <!-- 分页控件 -->
     <div class="pagination">
-      <button 
-        class="page-btn" 
+      <button
+        class="page-btn"
         :disabled="currentPage === 1"
         @click="currentPage--"
       >
@@ -81,8 +80,8 @@
       <span class="page-info">
         第 {{ currentPage }} 页 / 共 {{ totalPages }} 页
       </span>
-      <button 
-        class="page-btn" 
+      <button
+        class="page-btn"
         :disabled="currentPage === totalPages"
         @click="currentPage++"
       >
@@ -93,8 +92,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
+import axios from 'axios'
 
 // 管理员状态类型
 type AdminStatus = 'active' | 'disabled'
@@ -109,40 +109,58 @@ interface Admin {
   status: AdminStatus
 }
 
-// 模拟管理员数据
-const adminList: Admin[] = [
-  {
-    id: '1',
-    name: '张三',
-    account: 'admin01',
-    phone: '13800138000',
-    role: '超级管理员',
-    status: 'active'
-  },
-  {
-    id: '2',
-    name: '李四',
-    account: 'admin02',
-    phone: '13900139000',
-    role: '设备管理员',
-    status: 'active'
-  },
-  {
-    id: '3',
-    name: '王五',
-    account: 'admin03',
-    phone: '13700137000',
-    role: '系统管理员',
-    status: 'disabled'
-  }
-]
-
 // 响应式数据
-const admins = ref<Admin[]>(adminList)
+const admins = ref<Admin[]>([])
 const searchKeyword = ref('')
 const currentPage = ref(1)
 const pageSize = 10 // 每页显示数量
 const router = useRouter()
+const loading = ref(false)
+
+// 获取管理员列表
+const fetchAdminList = async () => {
+  loading.value = true
+  try {
+    const token = localStorage.getItem('token')
+    if (!token) {
+      console.warn('未登录或缺少令牌')
+      router.push('/login')
+      return
+    }
+
+    // 构建查询参数
+    const params = new URLSearchParams()
+    if (searchKeyword.value.trim()) {
+      params.append('name', searchKeyword.value.trim())
+    }
+
+    const response = await axios.get(`/api/web/admin/list?${params.toString()}`, {
+      headers: {
+        'Authorization': `Bearer ${token}`
+      }
+    })
+
+    if (response.data.code === 200) {
+      // 适配后端返回的数据结构
+      admins.value = response.data.data.map((admin: any) => ({
+        id: admin.id,
+        name: admin.name,
+        account: admin.adminName || admin.account,
+        phone: admin.phone,
+        role: admin.role,
+        status: admin.status || 'active'
+      }))
+    } else {
+      console.error('获取管理员列表失败:', response.data.msg)
+      alert('获取管理员列表失败：' + response.data.msg)
+    }
+  } catch (error) {
+    console.error('请求异常:', error)
+    alert('网络错误，请检查网络连接')
+  } finally {
+    loading.value = false
+  }
+}
 
 // 筛选后的管理员列表
 const filteredAdmins = computed(() => {
@@ -161,13 +179,19 @@ const totalPages = computed(() => {
 
 // 搜索处理
 const handleSearch = () => {
-  currentPage.value = 1 // 重置到第一页
+  currentPage.value = 1
+  fetchAdminList()
 }
 
+// 页面加载时获取数据
+onMounted(() => {
+  fetchAdminList()
+})
+
 // 状态变更处理
 const handleStatusChange = (id: string, currentStatus: AdminStatus) => {
   const newStatus: AdminStatus = currentStatus === 'active' ? 'disabled' : 'active'
-  admins.value = admins.value.map(admin => 
+  admins.value = admins.value.map(admin =>
     admin.id === id ? { ...admin, status: newStatus } : admin
   )
   // 实际项目中这里应该调用API更新状态
@@ -359,13 +383,13 @@ const handleAddAdmin = () => {
     flex-direction: column;
     align-items: flex-start;
   }
-  
+
   .search-box {
     width: 100%;
   }
-  
+
   .search-box input {
     width: 100%;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/main/resources/web/src/views/workorder/Pending.vue b/src/main/resources/web/src/views/workorder/Pending.vue
index 2dcaa6c..907f0a6 100644
--- a/src/main/resources/web/src/views/workorder/Pending.vue
+++ b/src/main/resources/web/src/views/workorder/Pending.vue
@@ -1,4 +1,3 @@
-<!-- src/views/workorder/Pending.vue -->
 <template>
   <div class="order-to-claim-page">
     <!-- 页面标题和面包屑 -->
@@ -12,12 +11,12 @@
       <!-- 工单号/设备ID搜索 -->
       <div class="filter-item search-item">
         <label>搜索：</label>
-        <input 
-          type="text" 
-          v-model="searchKeyword" 
-          class="search-input"
-          placeholder="输入工单号或设备ID搜索"
-          @input="handleSearch"
+        <input
+            type="text"
+            v-model="searchKeyword"
+            class="search-input"
+            placeholder="输入工单号或设备ID搜索"
+            @input="handleSearch"
         >
       </div>
 
@@ -34,11 +33,11 @@
       <!-- 日期筛选 -->
       <div class="filter-item">
         <label>创建日期：</label>
-        <input 
-          type="date" 
-          v-model="filterForm.createDate" 
-          class="filter-input"
-          @change="handleFilter"
+        <input
+            type="date"
+            v-model="filterForm.createDate"
+            class="filter-input"
+            @change="handleFilter"
         >
       </div>
 
@@ -50,60 +49,62 @@
     <div class="card">
       <table class="order-table">
         <thead>
-          <tr>
-            <th>工单号</th>
-            <th>设备</th>
-            <th>片区</th>
-            <th>问题描述</th>
-            <th>状态</th>
-            <th>创建时间</th>
-            <th>操作</th>
-          </tr>
+        <tr>
+          <th>工单号</th>
+          <th>设备</th>
+          <th>片区</th>
+          <th>问题描述</th>
+          <th>状态</th>
+          <th>创建时间</th>
+          <th>操作</th>
+        </tr>
         </thead>
         <tbody>
-          <tr v-for="order in filteredOrders" :key="order.id">
-            <td>{{ order.orderNo }}</td>
-            <td>
-              <div class="device-info">
-                <div class="device-type">{{ order.deviceType }}</div>
-                <div class="device-id">{{ order.deviceId }}</div>
-              </div>
-            </td>
-            <td>{{ order.area }}</td>
-            <td class="desc-cell">{{ order.problemDesc }}</td>
-            <td>
+        <tr v-for="order in paginatedOrders" :key="order.id">
+          <td>{{ order.orderNo }}</td>
+          <td>
+            <div class="device-info">
+              <div class="device-type">{{ order.deviceType }}</div>
+              <div class="device-id">{{ order.deviceId }}</div>
+            </div>
+          </td>
+          <td>{{ order.area }}</td>
+          <td class="desc-cell">{{ order.problemDesc }}</td>
+          <td>
               <span :class="`status-tag ${order.status}`">
                 {{ formatStatus(order.status) }}
               </span>
-            </td>
-            <td>{{ order.createTime }}</td>
-            <td class="operation-buttons">
-              <button class="btn-view" @click="viewOrderDetail(order)">查看详情</button>
-            </td>
-          </tr>
-          <tr v-if="filteredOrders.length === 0">
-            <td colspan="7" class="no-data">暂无待抢单工单</td>
-          </tr>
+          </td>
+          <td>{{ order.createTime }}</td>
+          <td class="operation-buttons">
+            <button class="btn-view" @click="viewOrderDetail(order)">查看详情</button>
+          </td>
+        </tr>
+        <tr v-if="filteredOrders.length === 0">
+          <td colspan="7" class="no-data">
+            {{ loading ? '正在加载数据...' : '暂无待抢单工单' }}
+          </td>
+        </tr>
         </tbody>
       </table>
     </div>
 
     <!-- 分页控件 -->
     <div class="pagination">
-      <button 
-        class="page-btn" 
-        :disabled="currentPage === 1"
-        @click="currentPage--"
+      <button
+          class="page-btn"
+          :disabled="currentPage === 1"
+          @click="currentPage--"
       >
         上一页
       </button>
       <span class="page-info">
-        第 {{ currentPage }} 页 / 共 {{ totalPages }} 页
+        第 {{ currentPage }} 页 / 共 {{ totalPages }} 页 (共 {{ filteredOrders.length }} 条记录)
       </span>
-      <button 
-        class="page-btn" 
-        :disabled="currentPage === totalPages"
-        @click="currentPage++"
+      <button
+          class="page-btn"
+          :disabled="currentPage === totalPages"
+          @click="currentPage++"
       >
         下一页
       </button>
@@ -161,12 +162,13 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted } from 'vue'
+import axios from 'axios'
 
-// 工单状态类型
-type OrderStatus = 'pending' | 'processing' | 'completed' | 'cancelled'
+// 工单状态类型 - 与后端实体保持一致
+type OrderStatus = 'pending' | 'grabbed' | 'processing' | 'completed' | 'closed' | 'timeout'
 
-// 工单数据接口（扩展了位置和最后上传时间字段）
+// 工单数据接口（适配后端WorkOrder实体）
 interface ToClaimOrder {
   id: string
   orderNo: string
@@ -178,64 +180,15 @@ interface ToClaimOrder {
   createTime: string // 创建时间（建单时间）
   lastUploadTime: string // 设备最后上传时间
   location: string // 设备位置
+  description?: string // 详细描述
+  priority?: string // 优先级
 }
 
-// 模拟待抢单工单数据（补充了位置和最后上传时间）
-const orderList: ToClaimOrder[] = [
-  {
-    id: '1',
-    orderNo: 'ORD-20231025-001',
-    deviceType: '制水机',
-    deviceId: 'WM-2023-002',
-    area: '校区',
-    problemDesc: '出水速度慢，水压不足，需要检修水泵',
-    status: 'pending',
-    createTime: '2023-10-25 08:30:15',
-    lastUploadTime: '2023-10-25 08:25:30',
-    location: '教学区A栋一楼大厅'
-  },
-  {
-    id: '2',
-    orderNo: 'ORD-20231025-002',
-    deviceType: '供水机',
-    deviceId: 'WS-2023-005',
-    area: '市区',
-    problemDesc: '设备显示故障代码E12，无法正常出水',
-    status: 'pending',
-    createTime: '2023-10-25 09:15:22',
-    lastUploadTime: '2023-10-25 09:10:05',
-    location: '市区图书馆二楼北侧'
-  },
-  {
-    id: '3',
-    orderNo: 'ORD-20231025-003',
-    deviceType: '制水机',
-    deviceId: 'WM-2023-003',
-    area: '市区',
-    problemDesc: '滤芯更换提醒，需要更换一级滤芯',
-    status: 'pending',
-    createTime: '2023-10-24 16:40:08',
-    lastUploadTime: '2023-10-24 16:35:22',
-    location: '行政楼一楼大厅'
-  },
-  {
-    id: '4',
-    orderNo: 'ORD-20231025-004',
-    deviceType: '供水机',
-    deviceId: 'WS-2023-004',
-    area: '校区',
-    problemDesc: '设备离线，无法上传数据，检查网络连接',
-    status: 'pending',
-    createTime: '2023-10-25 10:05:11',
-    lastUploadTime: '2023-10-25 09:50:45',
-    location: '学生宿舍3号楼一楼'
-  }
-]
-
 // 响应式数据
-const orders = ref<ToClaimOrder[]>(orderList)
+const orders = ref<ToClaimOrder[]>([])
 const currentPage = ref(1)
 const pageSize = 10 // 每页显示数量
+const loading = ref(false)
 
 // 搜索关键词（工单号/设备ID）
 const searchKeyword = ref('')
@@ -250,15 +203,81 @@ const filterForm = ref({
 const showDetailModal = ref(false)
 const currentOrder = ref<ToClaimOrder | null>(null)
 
-// 格式化状态显示
+// 格式化状态显示 - 适配后端状态枚举
 const formatStatus = (status: OrderStatus): string => {
   const statusMap = {
     pending: '待抢单',
+    grabbed: '已抢单',
     processing: '处理中',
     completed: '已完成',
-    cancelled: '已取消'
+    closed: '已关闭',
+    timeout: '超时未抢'
+  }
+  return statusMap[status] || status
+}
+
+// 加载待抢单工单数据
+const loadAvailableOrders = async () => {
+  loading.value = true
+  try {
+    const token = localStorage.getItem('token')
+    if (!token) {
+      console.warn('未登录或缺少令牌')
+      return
+    }
+
+    // 构建查询参数 - 调用 /available 接口获取可抢工单
+    const params = new URLSearchParams()
+    if (filterForm.value.area) {
+      params.append('areaId', filterForm.value.area)
+    }
+
+    // 这里假设当前用户已经登录，需要从用户信息中获取片区ID
+    // 如果当前用户是维修人员，使用其所在片区；如果是管理员，可以使用选择的片区
+    const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
+    const areaId = filterForm.value.area || userInfo.areaId || ''
+
+    if (!areaId) {
+      console.warn('未指定片区ID')
+      orders.value = []
+      return
+    }
+
+    const response = await axios.get(`/api/work-orders/available`, {
+      headers: {
+        'Authorization': `Bearer ${token}`
+      },
+      params: {
+        areaId: areaId
+      }
+    })
+
+    if (response.data.code === 200) {
+      // 适配后端返回的数据结构
+      orders.value = response.data.data.map((order: any) => ({
+        id: order.orderId,
+        orderNo: order.orderId,
+        deviceType: '未知设备', // 需要根据deviceId查询设备信息
+        deviceId: order.deviceId,
+        area: order.areaId,
+        problemDesc: order.description || '暂无描述',
+        status: order.status,
+        createTime: order.createdTime ? new Date(order.createdTime).toLocaleString('zh-CN') : '未知时间',
+        lastUploadTime: order.updatedTime ? new Date(order.updatedTime).toLocaleString('zh-CN') : '未知时间',
+        location: '未知位置', // 需要根据deviceId查询设备位置
+        description: order.description,
+        priority: order.priority
+      }))
+    } else {
+      console.error('获取待抢单工单失败:', response.data.msg)
+      alert('获取待抢单工单失败：' + response.data.msg)
+    }
+  } catch (error) {
+    console.error('请求异常:', error)
+    alert('网络错误，请检查网络连接')
+  } finally {
+    loading.value = false
   }
-  return statusMap[status]
 }
 
 // 筛选后的工单列表
@@ -266,20 +285,27 @@ const filteredOrders = computed(() => {
   return orders.value.filter(order => {
     // 工单号/设备ID搜索匹配
     const keywordMatch = searchKeyword.value.trim() === '' ||
-      order.orderNo.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
-      order.deviceId.toLowerCase().includes(searchKeyword.value.toLowerCase())
-    
+        order.orderNo.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
+        order.deviceId.toLowerCase().includes(searchKeyword.value.toLowerCase())
+
     // 片区筛选
     const areaMatch = filterForm.value.area === '' || order.area === filterForm.value.area
-    
+
     // 日期筛选（匹配日期部分，忽略时间）
-    const dateMatch = filterForm.value.createDate === '' || 
-      order.createTime.split(' ')[0] === filterForm.value.createDate
-    
+    const dateMatch = filterForm.value.createDate === '' ||
+        order.createTime.split(' ')[0] === filterForm.value.createDate
+
     return keywordMatch && areaMatch && dateMatch
   })
 })
 
+// 分页后的工单列表
+const paginatedOrders = computed(() => {
+  const start = (currentPage.value - 1) * pageSize
+  const end = start + pageSize
+  return filteredOrders.value.slice(start, end)
+})
+
 // 分页计算
 const totalPages = computed(() => {
   return Math.ceil(filteredOrders.value.length / pageSize)
@@ -288,11 +314,14 @@ const totalPages = computed(() => {
 // 处理搜索
 const handleSearch = () => {
   currentPage.value = 1 // 搜索后重置到第一页
+  // 如果需要根据搜索关键词调用后端接口，可以在这里添加
+  // 目前是前端筛选，如果数据量大，建议调用后端搜索接口
 }
 
 // 处理筛选（片区/日期）
 const handleFilter = () => {
   currentPage.value = 1 // 筛选后重置到第一页
+  loadAvailableOrders() // 重新加载数据
 }
 
 // 重置筛选条件
@@ -303,6 +332,7 @@ const resetFilter = () => {
     createDate: ''
   }
   currentPage.value = 1
+  loadAvailableOrders()
 }
 
 // 查看工单详情（打开弹窗）
@@ -316,6 +346,11 @@ const closeDetailModal = () => {
   showDetailModal.value = false
   currentOrder.value = null
 }
+
+// 页面加载时获取数据
+onMounted(() => {
+  loadAvailableOrders()
+})
 </script>
 
 <style scoped>
@@ -453,7 +488,7 @@ const closeDetailModal = () => {
   position: relative;
 }
 
-/* 状态标签样式 */
+/* 状态标签样式 - 适配后端状态 */
 .status-tag {
   display: inline-block;
   padding: 4px 8px;
@@ -467,21 +502,31 @@ const closeDetailModal = () => {
   color: #d48806;
 }
 
-.status-tag.processing {
+.status-tag.grabbed {
   background-color: #e6f7ff;
   color: #1890ff;
 }
 
+.status-tag.processing {
+  background-color: #d6e4ff;
+  color: #1677ff;
+}
+
 .status-tag.completed {
   background-color: #e6f7ee;
   color: #00875a;
 }
 
-.status-tag.cancelled {
+.status-tag.closed {
   background-color: #f5f5f5;
   color: #8c8c8c;
 }
 
+.status-tag.timeout {
+  background-color: #ffebe6;
+  color: #cf1322;
+}
+
 /* 操作按钮样式 */
 .operation-buttons {
   display: flex;
@@ -634,11 +679,11 @@ const closeDetailModal = () => {
     flex-direction: column;
     align-items: flex-start;
   }
-  
+
   .filter-item {
     width: 100%;
   }
-  
+
   .search-input, .filter-select, .filter-input {
     width: 100%;
   }
diff --git a/src/main/resources/web/src/views/workorder/Processing.vue b/src/main/resources/web/src/views/workorder/Processing.vue
index 41dd2d1..0ae44a8 100644
--- a/src/main/resources/web/src/views/workorder/Processing.vue
+++ b/src/main/resources/web/src/views/workorder/Processing.vue
@@ -1,4 +1,3 @@
-<!-- src/views/workorder/Processing.vue -->
 <template>
   <div class="order-processing-page">
     <!-- 页面标题和面包屑 -->
@@ -12,9 +11,9 @@
       <!-- 工单号/设备ID搜索 -->
       <div class="filter-item search-item">
         <label>搜索：</label>
-        <input 
-          type="text" 
-          v-model="searchKeyword" 
+        <input
+          type="text"
+          v-model="searchKeyword"
           class="search-input"
           placeholder="输入工单号或设备ID搜索"
           @input="handleSearch"
@@ -34,9 +33,9 @@
       <!-- 日期筛选 -->
       <div class="filter-item">
         <label>创建日期：</label>
-        <input 
-          type="date" 
-          v-model="filterForm.createDate" 
+        <input
+          type="date"
+          v-model="filterForm.createDate"
           class="filter-input"
           @change="handleFilter"
         >
@@ -46,7 +45,7 @@
       <button class="btn-reset" @click="resetFilter">重置筛选</button>
     </div>
 
-    <!-- 工单表格 -->
+    <!-- 工表格 -->
     <div class="card">
       <table class="order-table">
         <thead>
@@ -90,8 +89,8 @@
 
     <!-- 分页控件 -->
     <div class="pagination">
-      <button 
-        class="page-btn" 
+      <button
+        class="page-btn"
         :disabled="currentPage === 1"
         @click="currentPage--"
       >
@@ -100,8 +99,8 @@
       <span class="page-info">
         第 {{ currentPage }} 页 / 共 {{ totalPages }} 页
       </span>
-      <button 
-        class="page-btn" 
+      <button
+        class="page-btn"
         :disabled="currentPage === totalPages"
         @click="currentPage++"
       >
@@ -169,8 +168,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
+import axios from 'axios'
 
 // 工单状态类型
 type OrderStatus = 'timeout' | 'pending' | 'processing' | 'reviewing' | 'completed'
@@ -183,7 +183,7 @@ interface ProcessingOrder {
   deviceId: string // 设备ID
   area: string // 所属片区
   problemDesc: string // 问题描述（警告内容）
-  status: OrderStatus // 工单状态
+  status: OrderStatus // 工单state
   createTime: string // 创建时间（建单时间）
   lastUploadTime: string // 设备最后上传时间
   location: string // 设备位置
@@ -191,42 +191,10 @@ interface ProcessingOrder {
   maintenancePhone: string // 接单师傅电话
 }
 
-// 模拟处理中工单数据（补充完整信息）
-const orderList: ProcessingOrder[] = [
-  {
-    id: '9',
-    orderNo: 'ORD-20231025-007',
-    deviceType: '制水机',
-    deviceId: 'WM-2023-003',
-    area: '市区',
-    problemDesc: '正在更换一级滤芯，预计1小时内完成',
-    status: 'processing',
-    createTime: '2023-10-25 15:10:08',
-    lastUploadTime: '2023-10-25 15:45:22',
-    location: '市区商业广场B区3号柜位',
-    maintenanceName: '李师傅',
-    maintenancePhone: '13800138000'
-  },
-  {
-    id: '10',
-    orderNo: 'ORD-20231025-008',
-    deviceType: '供水机',
-    deviceId: 'WS-2023-004',
-    area: '校区',
-    problemDesc: '正在检查网络连接，设备离线问题排查中',
-    status: 'processing',
-    createTime: '2023-10-25 16:05:11',
-    lastUploadTime: '2023-10-25 13:30:05',
-    location: '校区图书馆2楼大厅',
-    maintenanceName: '王师傅',
-    maintenancePhone: '13900139000'
-  }
-]
-
 // 响应式数据
-const orders = ref<ProcessingOrder[]>(orderList)
+const orders = ref<ProcessingOrder[]>([])
 const currentPage = ref(1)
-const pageSize = 10 // 每页显示数量
+const pageSize = 10 // 每显示数量
 const router = useRouter()
 
 // 搜索关键词（工单号/设备ID）
@@ -242,7 +210,7 @@ const filterForm = ref({
 const showDetailModal = ref(false)
 const currentOrder = ref<ProcessingOrder | null>(null)
 
-// 格式化状态显示
+// 格式化state显示
 const formatStatus = (status: OrderStatus): string => {
   const statusMap = {
     timeout: '超时未抢',
@@ -254,6 +222,59 @@ const formatStatus = (status: OrderStatus): string => {
   return statusMap[status]
 }
 
+// 加载处理中工单列表
+const loadProcessingOrders = async () => {
+  try {
+    const token = localStorage.getItem('token')
+    if (!token) {
+      console.warn('未登录或缺少令牌')
+      return
+    }
+
+    // 构建查询参数
+    const params = new URLSearchParams()
+    if (filterForm.value.area) {
+      params.append('areaId', filterForm.value.area)
+    }
+
+    // 调用后端接口获取处理中工单
+    const response = await axios.get(`/api/work-orders/my`, {
+      headers: {
+        'Authorization': `Bearer ${token}`
+      },
+      params: {
+        status: 'processing',
+        areaId: filterForm.value.area,
+        startDate: filterForm.value.createDate
+      }
+    })
+
+    if (response.data.code === 200) {
+      // 适配后端返回的数据结构
+      orders.value = response.data.data.map((order: any) => ({
+        id: order.orderId,
+        orderNo: order.orderId,
+        deviceType: order.deviceType,
+        deviceId: order.deviceId,
+        area: order.areaId,
+        problemDesc: order.description,
+        status: order.status,
+        createTime: order.createdTime,
+        lastUploadTime: order.updatedTime,
+        location: order.location || '未知位置',
+        maintenanceName: order.assignedRepairmanName || '未分配',
+        maintenancePhone: order.assignedRepairmanPhone || '未知'
+      }))
+    } else {
+      console.error('获取处理中工单失败:', response.data.msg)
+      alert('获取处理中工单失败：' + response.data.msg)
+    }
+  } catch (error) {
+    console.error('请求异常:', error)
+    alert('网络错误，请检查网络连接')
+  }
+}
+
 // 筛选后的工单列表
 const filteredOrders = computed(() => {
   return orders.value.filter(order => {
@@ -261,14 +282,14 @@ const filteredOrders = computed(() => {
     const keywordMatch = searchKeyword.value.trim() === '' ||
       order.orderNo.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
       order.deviceId.toLowerCase().includes(searchKeyword.value.toLowerCase())
-    
+
     // 片区筛选
     const areaMatch = filterForm.value.area === '' || order.area === filterForm.value.area
-    
+
     // 日期筛选（匹配日期部分，忽略时间）
-    const dateMatch = filterForm.value.createDate === '' || 
+    const dateMatch = filterForm.value.createDate === '' ||
       order.createTime.split(' ')[0] === filterForm.value.createDate
-    
+
     return keywordMatch && areaMatch && dateMatch
   })
 })
@@ -281,11 +302,13 @@ const totalPages = computed(() => {
 // 处理搜索
 const handleSearch = () => {
   currentPage.value = 1 // 搜索后重置到第一页
+  loadProcessingOrders()
 }
 
 // 处理筛选（片区/日期）
 const handleFilter = () => {
   currentPage.value = 1 // 筛选后重置到第一页
+  loadProcessingOrders()
 }
 
 // 重置筛选条件
@@ -296,6 +319,7 @@ const resetFilter = () => {
     createDate: ''
   }
   currentPage.value = 1
+  loadProcessingOrders()
 }
 
 // 查看工单详情（打开弹窗）
@@ -306,6 +330,11 @@ const viewOrderDetail = (id: string) => {
     showDetailModal.value = true
   }
 }
+
+// 页面加载时获取数据
+onMounted(() => {
+  loadProcessingOrders()
+})
 </script>
 
 <style scoped>
@@ -318,33 +347,33 @@ const viewOrderDetail = (id: string) => {
 .page-header h2 { font-size: 24px; font-weight: 600; color: #333; margin-bottom: 8px; }
 .breadcrumb { color: #666; font-size: 14px; }
 .filter-bar { display: flex; align-items: center; gap: 20px; padding: 16px; background-color: #f8f9fa; border-radius: 4px; margin-bottom: 16px; flex-wrap: wrap; }
-.filter-item { display: flex; align-items: center; gap: 8px; }
+.filter-item { display: flex;align-items: center; gap: 8px; }
 .filter-item label { font-size: 14px; color: #4e5969; font-weight: 500; }
 .search-input { padding: 8px 12px; border: 1px solid #ddd; border-radius: 4px; font-size: 14px; min-width: 240px; }
 .filter-select, .filter-input { padding: 8px 12px; border: 1px solid #ddd; border-radius: 4px; font-size: 14px; min-width: 160px; }
-.btn-reset { padding: 8px 16px; border: 1px solid #ddd; background-color: white; border-radius: 4px; cursor: pointer; font-size: 14px; color: #666; transition: all 0.3s; }
+.btn-reset { padding: 8px 16px; border: 1px solid #ddd; background-color: white; border-radius: 4px;cursor: pointer;font-size: 14px;color: #666; transition: all 0.3s; }
 .btn-reset:hover { background-color: #f0f0f0; }
 .order-table { width: 100%; border-collapse: collapse; }
-.order-table th, .order-table td { padding: 12px 16px; text-align: left; border-bottom: 1px solid #f0f0f0; }
-.order-table th { background-color: #f8f9fa; font-weight: 600; color: #4e5969; font-size: 14px; }
-.order-table tbody tr:hover { background-color: #f8f9fa; }
-.device-info { display: flex; flex-direction: column; gap: 4px; }
+order-table th, order-table td { padding: 12px 16px;text-align: left;border-bottom: 1px solid #f0f0f0; }
+order-table th { background-color: #f8f9fa; font-weight: 600; color: #4e5969; font-size: 14px; }
+order-table tbody tr:hover { background-color: #f8f9fa; }
+.device-info { display: flex;flex-direction: column;gap: 4px; }
 .device-type { font-weight: 500; color: #333; }
 .device-id { font-size: 12px; color: #666; }
-.desc-cell { max-width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; cursor: pointer; }
-.desc-cell:hover { white-space: normal; overflow: visible; background-color: white; z-index: 10; position: relative; }
-.status-tag { display: inline-block; padding: 4px 8px; border-radius: 4px; font-size: 12px; font-weight: 500; }
+.desc-cell { max-width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;cursor:pointer; }
+.desc-cell:hover { white-space: normal; overflow: visible;background-color: white;z-index: 10;position: relative; }
+.status-tag { display: inline-block;padding: 4px 8px;border-radius: 4px;font-size: 12px;font-weight: 500; }
 .status-tag.timeout { background-color: #ffebe6; color: #cf1322; }
 .status-tag.pending { background-color: #fff7e6; color: #d48806; }
 .status-tag.processing { background-color: #e6f7ff; color: #1890ff; }
 .status-tag.reviewing { background-color: #f6f7ff; color: #667eea; }
 .status-tag.completed { background-color: #e6f7ee; color: #00875a; }
-.operation-buttons { display: flex; gap: 8px; }
-.btn-view { padding: 4px 8px; border-radius: 4px; font-size: 12px; cursor: pointer; border: none; transition: opacity 0.3s; background-color: #e6f7ff; color: #1890ff; }
+.operation-buttons { display:flex; gap: 8px; }
+.btn-view { padding: 4px 8px; border-radius: 4px;font-size: 12px;cursor:pointer;border:none;transition: opacity 0.3s; background-color: #e6f7ff; color: #1890ff; }
 .btn-view:hover { opacity: 0.9; }
 .no-data { text-align: center; padding: 40px 0; color: #8c8c8c; }
-.pagination { display: flex; justify-content: center; align-items: center; gap: 16px; margin-top: 24px; color: #666; font-size: 14px; }
-.page-btn { padding: 4px 12px; border: 1px solid #ddd; background: white; border-radius: 4px; cursor: pointer; }
+.pagination { display:flex;justify-content: center;align-items: center; gap: 16px;margin-top: 24px; color: #666; font-size: 14px; }
+.page-btn { padding: 4px 12px; border: 1px solid #ddd; background: white; border-radius: 4px;cursor:pointer; }
 .page-btn:disabled { opacity: 0.6; cursor: not-allowed; }
 
 /* 弹窗样式 */
@@ -355,7 +384,7 @@ const viewOrderDetail = (id: string) => {
   right: 0;
   bottom: 0;
   background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
+  display:flex;
   justify-content: center;
   align-items: center;
   z-index: 1000;
@@ -372,7 +401,7 @@ const viewOrderDetail = (id: string) => {
 .modal-header {
   padding: 16px 20px;
   border-bottom: 1px solid #eee;
-  display: flex;
+  display:flex;
   justify-content: space-between;
   align-items: center;
 }
@@ -384,10 +413,10 @@ const viewOrderDetail = (id: string) => {
 }
 
 .modal-close {
-  background: none;
-  border: none;
+  background:none;
+  border:none;
   font-size: 20px;
-  cursor: pointer;
+  cursor:pointer;
   color: #999;
   padding: 0;
   line-height: 1;
@@ -403,7 +432,7 @@ const viewOrderDetail = (id: string) => {
 
 .detail-item {
   margin-bottom: 16px;
-  display: flex;
+  display:flex;
   align-items: flex-start;
 }
 
@@ -423,17 +452,17 @@ const viewOrderDetail = (id: string) => {
 .modal-footer {
   padding: 12px 20px;
   border-top: 1px solid #eee;
-  display: flex;
+  display:flex;
   justify-content: flex-end;
 }
 
-.btn-close {
+btn-close {
   padding: 6px 16px;
   background-color: #1890ff;
   color: white;
-  border: none;
+  border:none;
   border-radius: 4px;
-  cursor: pointer;
+  cursor:pointer;
   font-size: 14px;
 }
 
@@ -443,18 +472,18 @@ const viewOrderDetail = (id: string) => {
 
 /* 响应式调整 */
 @media (max-width: 768px) {
-  .filter-bar { flex-direction: column; align-items: flex-start; }
+  .filter-bar { flex-direction: column;align-items: flex-start; }
   .filter-item { width: 100%; }
   .search-input, .filter-select, .filter-input { width: 100%; }
-  
+
   .detail-item {
-    flex-direction: column;
+    flex-direction:column;
   }
-  
+
   .detail-label {
     width: auto;
     margin-bottom: 4px;
     font-weight: 500;
   }
 }
-</style>
\ No newline at end of file
+</style>
-- 
2.34.1


From 6462e81be8c1fefd1ee80fbfab935607d68c8669 Mon Sep 17 00:00:00 2001
From: ZHW <1941286652@qq.com>
Date: Wed, 10 Dec 2025 16:42:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/src/components/layout/AppSidebar.vue  |  2 +-
 .../web/src/views/personnel/Admin.vue         | 73 ++++++++++++++-----
 .../web/src/views/workorder/Pending.vue       | 11 ++-
 3 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/web/src/components/layout/AppSidebar.vue b/src/main/resources/web/src/components/layout/AppSidebar.vue
index 78c109b..a214368 100644
--- a/src/main/resources/web/src/components/layout/AppSidebar.vue
+++ b/src/main/resources/web/src/components/layout/AppSidebar.vue
@@ -75,7 +75,7 @@ const menuItems: MenuItem[] = [
     id: 4, 
     name: '人员管理', 
     icon: '👥',
-    route: '/home/personnel', // 添加一个默认路由
+    route: '/home/personnel/admin', // 添加一个默认路由
     children: [
       { name: '管理员', route: '/home/personnel/admin' },
       { name: '维修人员', route: '/home/personnel/maintenance' },
diff --git a/src/main/resources/web/src/views/personnel/Admin.vue b/src/main/resources/web/src/views/personnel/Admin.vue
index 0203ad2..5f49b21 100644
--- a/src/main/resources/web/src/views/personnel/Admin.vue
+++ b/src/main/resources/web/src/views/personnel/Admin.vue
@@ -95,6 +95,11 @@
 import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import axios from 'axios'
+import { request } from '@/api/request'
+// 1. 导入 useAuthStore
+import { useAuthStore } from '@/stores/auth'
+// 2. 实例化 authStore
+const authStore = useAuthStore()
 
 // 管理员状态类型
 type AdminStatus = 'active' | 'disabled'
@@ -118,50 +123,78 @@ const router = useRouter()
 const loading = ref(false)
 
 // 获取管理员列表
+// 修改 fetchAdminList 函数，移除认证检查部分
+// 修改 fetchAdminList 函数，完善 Token 获取和错误处理
 const fetchAdminList = async () => {
   loading.value = true
   try {
-    const token = localStorage.getItem('token')
+    // 1. 从 Pinia 获取 Token（推荐，与项目登录逻辑一致）
+
+    const token = authStore.token
+
+    // 检查 Token 是否存在
     if (!token) {
-      console.warn('未登录或缺少令牌')
+      console.warn('未获取到 Token，跳转到登录页')
       router.push('/login')
       return
     }
 
-    // 构建查询参数
+    // 2. 构建查询参数
     const params = new URLSearchParams()
     if (searchKeyword.value.trim()) {
       params.append('name', searchKeyword.value.trim())
     }
 
-    const response = await axios.get(`/api/web/admin/list?${params.toString()}`, {
-      headers: {
-        'Authorization': `Bearer ${token}`
-      }
+    // 3. 使用项目封装的 request 工具（而非直接使用 axios）
+
+    const response = await request<{
+      code: number
+      msg: string
+      data: any[]
+    }>(`/api/web/admin/list?${params.toString()}`, {
+      method: 'GET',
+      // 无需手动添加 Authorization 头，request 工具会自动处理
     })
 
-    if (response.data.code === 200) {
-      // 适配后端返回的数据结构
-      admins.value = response.data.data.map((admin: any) => ({
-        id: admin.id,
-        name: admin.name,
-        account: admin.adminName || admin.account,
-        phone: admin.phone,
-        role: admin.role,
-        status: admin.status || 'active'
+    // 4. 处理响应（完善数据适配和错误提示）
+    if (response.code === 200) {
+      // 增加数据容错处理，避免字段不存在导致的错误
+      admins.value = (response.data || []).map((admin: any) => ({
+        id: admin.adminId || '', // 确保有默认值
+        name: admin.adminName || '未知姓名',
+        account: admin.adminName || '',
+        phone: admin.phone || '未知电话',
+        role: admin.role || '未知角色',
+        status: 'active' // 后端无状态字段时使用默认值
       }))
     } else {
-      console.error('获取管理员列表失败:', response.data.msg)
-      alert('获取管理员列表失败：' + response.data.msg)
+      // 明确错误信息，避免 "未知错误"
+      const errorMsg = response.msg || `获取失败（错误码：${response.code}）`
+      console.error('获取管理员列表失败:', errorMsg)
+      alert(`获取管理员列表失败：${errorMsg}`)
     }
-  } catch (error) {
+  } catch (error: any) {
+    // 5. 完善异常捕获（网络错误、Token 无效等）
     console.error('请求异常:', error)
-    alert('网络错误，请检查网络连接')
+    // 区分不同错误类型，给出更明确的提示
+    const errorMsg = error.message.includes('401')
+        ? '登录已过期，请重新登录'
+        : error.message.includes('Network')
+            ? '网络连接失败，请检查网络'
+            : error.message || '获取数据失败，请稍后重试'
+    alert(`获取管理员列表失败：${errorMsg}`)
+
+    // Token 无效时跳转登录页
+    if (error.message.includes('401')) {
+      authStore.logout() // 清除无效 Token
+      router.push('/login')
+    }
   } finally {
     loading.value = false
   }
 }
 
+
 // 筛选后的管理员列表
 const filteredAdmins = computed(() => {
   return admins.value.filter(admin => {
diff --git a/src/main/resources/web/src/views/workorder/Pending.vue b/src/main/resources/web/src/views/workorder/Pending.vue
index 907f0a6..f468bbf 100644
--- a/src/main/resources/web/src/views/workorder/Pending.vue
+++ b/src/main/resources/web/src/views/workorder/Pending.vue
@@ -220,16 +220,21 @@ const formatStatus = (status: OrderStatus): string => {
 const loadAvailableOrders = async () => {
   loading.value = true
   try {
-    const token = localStorage.getItem('token')
+    const token = localStorage.getItem('token') || sessionStorage.getItem('token')
     if (!token) {
       console.warn('未登录或缺少令牌')
+         // 在 Pending.vue 的 loadAvailableOrders 方法中添加更多调试信息
+      console.log('Token:', token);
+      console.log('localStorage:', localStorage.getItem('token'));
+      console.log('sessionStorage:', sessionStorage.getItem('token'));
+
       return
     }
 
     // 构建查询参数 - 调用 /available 接口获取可抢工单
-    const params = new URLSearchParams()
+    const params: any = {}
     if (filterForm.value.area) {
-      params.append('areaId', filterForm.value.area)
+      params.areaId = filterForm.value.area
     }
 
     // 这里假设当前用户已经登录，需要从用户信息中获取片区ID
-- 
2.34.1