From 0af7b62f2e54b2fb814629e933124fbde5167346 Mon Sep 17 00:00:00 2001
From: luoyuehang <2830398107@qq.com>
Date: Wed, 10 Dec 2025 09:16:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?app1=E5=B7=A5=E5=8D=95=E6=8A=A2=E5=8D=95=20?=
 =?UTF-8?q?/=20=E6=8B=92=E5=8D=95=20/=20=E6=8F=90=E4=BA=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zzz/src/services/workOrderService.js      |  52 ++++
 .../zzz/src/views/WorkOrderDetail.vue         | 250 +++++++++++++-----
 .../resources/zzz/src/views/WorkOrderList.vue | 207 +++++++++++----
 3 files changed, 389 insertions(+), 120 deletions(-)

diff --git a/src/main/resources/zzz/src/services/workOrderService.js b/src/main/resources/zzz/src/services/workOrderService.js
index c1419b2..cc7de73 100644
--- a/src/main/resources/zzz/src/services/workOrderService.js
+++ b/src/main/resources/zzz/src/services/workOrderService.js
@@ -10,5 +10,57 @@ export const workOrderService = {
     } catch (error) {
       throw error.response?.data || error.message
     }
+  },
+
+  // 获取可抢工单
+  async getAvailableOrders(areaId) {
+    try {
+      const response = await api.get(`/api/app/repairman/available-orders?areaId=${areaId}`)
+      return response.data
+    } catch (error) {
+      throw error.response?.data || error.message
+    }
+  },
+
+  // 抢单
+  async grabOrder(orderId, repairmanId) {
+    try {
+      const response = await api.post('/api/app/repairman/grab-order', {
+        orderId,
+        repairmanId
+      })
+      return response.data
+    } catch (error) {
+      throw error.response?.data || error.message
+    }
+  },
+
+  // 拒单
+  async rejectOrder(orderId, repairmanId, reason) {
+    try {
+      const response = await api.post('/api/app/repairman/reject-order', {
+        orderId,
+        repairmanId,
+        reason
+      })
+      return response.data
+    } catch (error) {
+      throw error.response?.data || error.message
+    }
+  },
+
+  // 提交维修结果
+  async submitRepairResult(orderId, repairmanId, dealNote, imgUrl = null) {
+    try {
+      const response = await api.post('/api/app/repairman/submit-result', {
+        orderId,
+        repairmanId,
+        dealNote,
+        imgUrl
+      })
+      return response.data
+    } catch (error) {
+      throw error.response?.data || error.message
+    }
   }
 }
diff --git a/src/main/resources/zzz/src/views/WorkOrderDetail.vue b/src/main/resources/zzz/src/views/WorkOrderDetail.vue
index 5e57f2e..ec85ac7 100644
--- a/src/main/resources/zzz/src/views/WorkOrderDetail.vue
+++ b/src/main/resources/zzz/src/views/WorkOrderDetail.vue
@@ -1,3 +1,4 @@
+<!-- src/views/WorkOrderDetail.vue -->
 <template>
   <div class="work-order-detail">
     <!-- 顶部标题栏 -->
@@ -11,34 +12,34 @@
 
     <!-- 主要内容区域 -->
     <div class="main-content">
-      <div class="detail-container">
+      <div class="detail-container" v-if="currentOrder">
         <!-- 工单信息 -->
         <div class="detail-section">
           <div class="section-title">工单信息</div>
           <div class="detail-grid">
             <div class="detail-item">
               <div class="item-label">工单ID</div>
-              <div class="item-value">1001</div>
+              <div class="item-value">{{ currentOrder.orderId }}</div>
             </div>
             <div class="detail-item">
               <div class="item-label">设备ID</div>
-              <div class="item-value">供水机#A105</div>
+              <div class="item-value">{{ currentOrder.deviceId }}</div>
             </div>
             <div class="detail-item">
               <div class="item-label">告警项目</div>
-              <div class="item-value">水位异常</div>
+              <div class="item-value">{{ getOrderTypeName(currentOrder.orderType) }}</div>
             </div>
             <div class="detail-item">
               <div class="item-label">工单类型</div>
-              <div class="item-value">系统报修</div>
+              <div class="item-value">{{ getOrderPriorityName(currentOrder.priority) }}</div>
             </div>
             <div class="detail-item">
               <div class="item-label">上报时间</div>
-              <div class="item-value">2023-10-28 13:20</div>
+              <div class="item-value">{{ formatDate(currentOrder.createdTime) }}</div>
             </div>
             <div class="detail-item">
               <div class="item-label">安装位置</div>
-              <div class="item-value">A区教学楼 2楼走廊</div>
+              <div class="item-value">{{ getOrderLocation(currentOrder.deviceId) }}</div>
             </div>
           </div>
         </div>
@@ -49,11 +50,11 @@
           <div class="alert-content">
             <div class="alert-item">
               <div class="alert-label">告警内容</div>
-              <div class="alert-value">水位低于设定下限值，连续24小时低水位</div>
+              <div class="alert-value">{{ currentOrder.description }}</div>
             </div>
             <div class="alert-item">
               <div class="alert-label">处理建议</div>
-              <div class="alert-value">检查供水系统</div>
+              <div class="alert-value">请根据实际情况进行处理</div>
             </div>
           </div>
         </div>
@@ -64,7 +65,7 @@
           <div class="repair-content">
             <div class="repair-item">
               <div class="repair-label">报修项目</div>
-              <div class="repair-value">更换传感器</div>
+              <div class="repair-value">{{ currentOrder.description }}</div>
             </div>
 
             <!-- 标准维护项目选择 -->
@@ -133,20 +134,20 @@
         </div>
 
         <!-- 根据工单状态显示不同操作区域 -->
-        <div v-if="orderStatus === 'pending'" class="action-buttons">
+        <div v-if="currentOrder.status === 'pending' && !showRepairForm" class="action-buttons">
           <button class="action-btn grab" @click="grabOrder">
             抢单
           </button>
-          <button class="action-btn reject" @click="rejectOrder">
+          <button class="action-btn reject" @click="showRejectModal = true">
             拒单
           </button>
         </div>
 
-        <div v-if="orderStatus === 'processing' && !showRepairForm" class="action-buttons">
+        <div v-if="currentOrder.status === 'processing' && !showRepairForm" class="action-buttons">
           <button class="action-btn process" @click="startRepair">
             开始维修
           </button>
-          <button class="action-btn complete" @click="completeWithoutRepair">
+          <button class="action-btn complete" @click="showCompleteConfirm = true">
             直接完成
           </button>
         </div>
@@ -161,6 +162,30 @@
         </div>
       </div>
 
+      <!-- 拒单弹窗 -->
+      <div v-if="showRejectModal" class="confirm-modal">
+        <div class="modal-content">
+          <div class="modal-header">
+            <div class="modal-title">拒单</div>
+          </div>
+          <div class="modal-body">
+            <div class="form-group">
+              <label class="form-label">拒单原因</label>
+              <textarea
+                v-model="rejectReason"
+                class="form-textarea"
+                placeholder="请输入拒单原因..."
+                rows="3"
+              ></textarea>
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button class="modal-btn cancel" @click="showRejectModal = false">取消</button>
+            <button class="modal-btn confirm" @click="rejectOrder">确定</button>
+          </div>
+        </div>
+      </div>
+
       <!-- 维修完成确认弹窗 -->
       <div v-if="showCompleteConfirm" class="confirm-modal">
         <div class="modal-content">
@@ -171,7 +196,7 @@
             <div class="modal-message">确定直接完成此工单吗？此操作将跳过维修记录填写。</div>
           </div>
           <div class="modal-footer">
-            <button class="modal-btn cancel" @click="cancelComplete">取消</button>
+            <button class="modal-btn cancel" @click="showCompleteConfirm = false">取消</button>
             <button class="modal-btn confirm" @click="confirmComplete">确定</button>
           </div>
         </div>
@@ -188,6 +213,11 @@
           </button>
         </div>
       </div>
+
+      <!-- 加载状态 -->
+      <div v-if="loading" class="loading">
+        加载中...
+      </div>
     </div>
 
     <!-- 底部导航栏 -->
@@ -203,21 +233,29 @@
 <script setup>
 import { ref, onMounted, computed } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
+import { useAuthStore } from '@/stores/auth'
+import { useDeviceStore } from '@/stores/device'
+import { workOrderService } from '@/services/workOrderService'
 
 const router = useRouter()
 const route = useRoute()
+const authStore = useAuthStore()
+const deviceStore = useDeviceStore()
 
-// 从路由参数获取工单状态
-const orderStatus = ref(route.query.status || 'pending')
+// 状态
+const loading = ref(false)
+const currentOrder = ref(null)
 const showRepairForm = ref(false)
 const submitting = ref(false)
 const showSuccessModal = ref(false)
 const showCompleteConfirm = ref(false)
+const showRejectModal = ref(false)
 
 // 表单数据
 const selectedStandardItem = ref('')
 const selectedActualItem = ref('')
 const repairNotes = ref('')
+const rejectReason = ref('')
 const uploadedPhotos = ref([])
 const fileInput = ref(null)
 
@@ -244,17 +282,43 @@ const goToProfile = () => {
 }
 
 // 抢单
-const grabOrder = () => {
-  console.log('抢单')
-  showRepairForm.value = true
-  orderStatus.value = 'processing'
+const grabOrder = async () => {
+  try {
+    const repairmanId = authStore.getRepairmanId
+    await workOrderService.grabOrder(currentOrder.value.orderId, repairmanId)
+
+    // 更新本地状态
+    currentOrder.value.status = 'processing'
+    showRepairForm.value = true
+
+    alert('抢单成功')
+  } catch (error) {
+    console.error('抢单失败:', error)
+    alert('抢单失败: ' + (error.message || '未知错误'))
+  }
 }
 
 // 拒单
-const rejectOrder = () => {
-  if (confirm('确定要拒单吗？')) {
-    console.log('拒单')
+const rejectOrder = async () => {
+  if (!rejectReason.value.trim()) {
+    alert('请输入拒单原因')
+    return
+  }
+
+  try {
+    const repairmanId = authStore.getRepairmanId
+    await workOrderService.rejectOrder(
+      currentOrder.value.orderId,
+      repairmanId,
+      rejectReason.value
+    )
+
+    showRejectModal.value = false
+    alert('拒单成功')
     router.push('/work-orders')
+  } catch (error) {
+    console.error('拒单失败:', error)
+    alert('拒单失败: ' + (error.message || '未知错误'))
   }
 }
 
@@ -264,36 +328,24 @@ const startRepair = () => {
 }
 
 // 直接完成工单
-const completeWithoutRepair = () => {
-  showCompleteConfirm.value = true
-}
-
-// 确认直接完成
 const confirmComplete = async () => {
   try {
-    console.log('直接完成工单')
-
-    // 模拟API调用
-    await new Promise(resolve => setTimeout(resolve, 1000))
+    const repairmanId = authStore.getRepairmanId
+    await workOrderService.submitRepairResult(
+      currentOrder.value.orderId,
+      repairmanId,
+      '直接完成工单'
+    )
 
-    alert('工单已完成')
     showCompleteConfirm.value = false
-    // 返回工单列表，切换到历史标签
-    router.push({
-      path: '/work-orders',
-      query: { tab: 'history' }
-    })
+    alert('工单已完成')
+    router.push('/work-orders')
   } catch (error) {
     console.error('完成失败:', error)
-    alert('操作失败，请重试')
+    alert('操作失败: ' + (error.message || '未知错误'))
   }
 }
 
-// 取消直接完成
-const cancelComplete = () => {
-  showCompleteConfirm.value = false
-}
-
 // 取消维修
 const cancelRepair = () => {
   if (confirm('确定要取消维修吗？未保存的内容将丢失')) {
@@ -317,22 +369,20 @@ const submitRepair = async () => {
   submitting.value = true
 
   try {
-    // 模拟API调用
-    await new Promise(resolve => setTimeout(resolve, 1500))
-
-    console.log('提交维修结果:', {
-      standardItem: selectedStandardItem.value,
-      actualItem: selectedActualItem.value,
-      notes: repairNotes.value,
-      photos: uploadedPhotos.value.length
-    })
+    const repairmanId = authStore.getRepairmanId
+    // 注意：这里简化了图片上传逻辑，实际应用中需要上传图片并获取URL
+    await workOrderService.submitRepairResult(
+      currentOrder.value.orderId,
+      repairmanId,
+      repairNotes.value,
+      null // 图片URL，实际应用中需要处理
+    )
 
     // 显示成功弹窗
     showSuccessModal.value = true
-
   } catch (error) {
     console.error('提交失败:', error)
-    alert('提交失败，请重试')
+    alert('提交失败: ' + (error.message || '未知错误'))
   } finally {
     submitting.value = false
   }
@@ -341,11 +391,7 @@ const submitRepair = async () => {
 // 关闭成功弹窗
 const closeSuccessModal = () => {
   showSuccessModal.value = false
-  // 返回工单列表，切换到历史标签
-  router.push({
-    path: '/work-orders',
-    query: { tab: 'history' }
-  })
+  router.push('/work-orders')
 }
 
 // 照片上传
@@ -385,17 +431,84 @@ const resetForm = () => {
 
 // 根据工单状态显示标题
 const pageTitle = computed(() => {
-  return orderStatus.value === 'processing' ? '处理工单' : '工单详情'
+  if (!currentOrder.value) return '工单详情'
+  return currentOrder.value.status === 'processing' ? '处理工单' : '工单详情'
 })
 
+// 获取订单类型名称
+const getOrderTypeName = (type) => {
+  const types = {
+    repair: '维修',
+    maintenance: '保养',
+    inspection: '巡检'
+  }
+  return types[type] || type
+}
+
+// 获取优先级名称
+const getOrderPriorityName = (priority) => {
+  const priorities = {
+    low: '低',
+    medium: '中',
+    high: '高',
+    urgent: '紧急'
+  }
+  return priorities[priority] || priority
+}
+
+// 获取订单位置信息
+const getOrderLocation = (deviceId) => {
+  const device = deviceStore.getWaterSupplierById(deviceId)
+  return device ? device.location : '未知位置'
+}
+
+// 格式化日期显示
+const formatDate = (dateStr) => {
+  if (!dateStr) return '未知时间'
+  return new Date(dateStr).toLocaleString('zh-CN')
+}
+
+// 加载工单详情
+const loadOrderDetail = async (orderId) => {
+  loading.value = true
+  try {
+    // 在实际应用中，这里应该调用获取单个工单详情的API
+    // 目前我们模拟从工单列表中找到对应工单
+    const myOrdersRes = await workOrderService.getMyOrders(authStore.getRepairmanId)
+    const order = myOrdersRes.data.find(o => o.orderId === orderId)
+
+    if (order) {
+      currentOrder.value = order
+    } else {
+      // 如果在我的工单中找不到，则尝试从可抢工单中查找
+      const availableRes = await workOrderService.getAvailableOrders('A') // 这里应该使用实际区域
+      const availableOrder = availableRes.data.find(o => o.orderId === orderId)
+      if (availableOrder) {
+        currentOrder.value = availableOrder
+      } else {
+        throw new Error('工单不存在')
+      }
+    }
+  } catch (error) {
+    console.error('加载工单详情失败:', error)
+    alert('加载工单详情失败: ' + (error.message || '未知错误'))
+    router.push('/work-orders')
+  } finally {
+    loading.value = false
+  }
+}
+
 onMounted(() => {
   const orderId = route.params.id
-  const status = route.query.status
-
-  console.log('加载工单详情，工单ID:', orderId, '状态:', status)
+  if (orderId) {
+    loadOrderDetail(orderId)
+  } else {
+    router.push('/work-orders')
+  }
 })
 </script>
 
+
 <style scoped>
 .work-order-detail {
   width: 100%;
@@ -928,4 +1041,11 @@ onMounted(() => {
 .nav-item:hover {
   color: #1890ff;
 }
+
+/* 添加加载状态样式 */
+.loading {
+  text-align: center;
+  padding: 20px;
+  color: #1890ff;
+}
 </style>
diff --git a/src/main/resources/zzz/src/views/WorkOrderList.vue b/src/main/resources/zzz/src/views/WorkOrderList.vue
index b335aee..8626e75 100644
--- a/src/main/resources/zzz/src/views/WorkOrderList.vue
+++ b/src/main/resources/zzz/src/views/WorkOrderList.vue
@@ -40,82 +40,84 @@
     <div class="main-content">
       <!-- 待抢单工单列表 -->
       <div v-if="activeTab === 'pending'" class="order-list">
-        <div class="order-item" @click="viewOrderDetail('1001')">
+        <div
+          class="order-item"
+          v-for="order in availableOrders"
+          :key="order.orderId"
+          @click="viewOrderDetail(order.orderId)"
+        >
           <div class="order-content">
-            <div class="order-title">制水机#A105 - TDS超标</div>
+            <div class="order-title">{{ order.description }}</div>
             <div class="order-info">
-              <span class="order-location">A区教学楼</span>
-              <span class="order-time">10分钟前</span>
+              <span class="order-location">{{ getOrderLocation(order.deviceId) }}</span>
+              <span class="order-time">{{ formatTime(order.createdTime) }}</span>
             </div>
           </div>
-          <button class="order-btn grab" @click.stop="grabOrder('1001')">
+          <button class="order-btn grab" @click.stop="grabOrder(order.orderId)">
             抢单
           </button>
         </div>
 
-        <div class="order-item" @click="viewOrderDetail('1002')">
-          <div class="order-content">
-            <div class="order-title">供水机#B105 - 水位异常</div>
-            <div class="order-info">
-              <span class="order-location">B区图书馆</span>
-              <span class="order-time">25分钟前</span>
-            </div>
-          </div>
-          <button class="order-btn grab" @click.stop="grabOrder('1002')">
-            抢单
-          </button>
+        <div v-if="availableOrders.length === 0" class="empty-state">
+          暂无待抢单工单
         </div>
       </div>
 
       <!-- 处理中工单列表 -->
       <div v-if="activeTab === 'processing'" class="order-list">
-        <div class="order-item" @click="viewOrderDetail('1002')">
+        <div
+          class="order-item"
+          v-for="order in processingOrders"
+          :key="order.orderId"
+          @click="viewOrderDetail(order.orderId)"
+        >
           <div class="order-content">
-            <div class="order-title">供水机#B105 - 水位异常</div>
+            <div class="order-title">{{ order.description }}</div>
             <div class="order-info">
-              <span class="order-location">B区图书馆</span>
-              <span class="order-time">抢单时间: 25分钟前</span>
+              <span class="order-location">{{ getOrderLocation(order.deviceId) }}</span>
+              <span class="order-time">抢单时间: {{ formatTime(order.grabbedTime) }}</span>
             </div>
             <div class="order-status">
               <span class="status-badge processing">处理中</span>
             </div>
           </div>
-          <button class="order-btn process" @click.stop="startProcessOrder('1002')">
+          <button class="order-btn process" @click.stop="startProcessOrder(order.orderId)">
             继续处理
           </button>
         </div>
 
-        <div class="order-item" @click="viewOrderDetail('1003')">
-          <div class="order-content">
-            <div class="order-title">制水机#A102 - TDS超标</div>
-            <div class="order-info">
-              <span class="order-location">A区教学楼</span>
-              <span class="order-time">抢单时间: 15分钟前</span>
-            </div>
-            <div class="order-status">
-              <span class="status-badge pending">待处理</span>
-            </div>
-          </div>
-          <button class="order-btn process" @click.stop="startProcessOrder('1003')">
-            开始处理
-          </button>
+        <div v-if="processingOrders.length === 0" class="empty-state">
+          暂无处理中的工单
         </div>
       </div>
 
       <!-- 历史工单列表 -->
       <div v-if="activeTab === 'history'" class="order-list">
-        <div class="order-item">
+        <div
+          class="order-item"
+          v-for="order in completedOrders"
+          :key="order.orderId"
+        >
           <div class="order-content">
-            <div class="order-title">供水机#B105 - 滤芯损坏</div>
+            <div class="order-title">{{ order.description }}</div>
             <div class="order-info">
-              <span class="order-location">B区图书馆</span>
-              <span class="order-time">2023-10-04</span>
+              <span class="order-location">{{ getOrderLocation(order.deviceId) }}</span>
+              <span class="order-time">{{ formatDate(order.completedTime) }}</span>
             </div>
           </div>
           <button class="order-btn completed">
-            已结款
+            已完成
           </button>
         </div>
+
+        <div v-if="completedOrders.length === 0" class="empty-state">
+          暂无历史工单
+        </div>
+      </div>
+
+      <!-- 加载状态 -->
+      <div v-if="loading" class="loading">
+        加载中...
       </div>
 
       <!-- 抢单成功弹窗 -->
@@ -142,13 +144,25 @@
   </div>
 </template>
 
-<script setup>
-import { ref } from 'vue'
+<script setup>import { ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
+import { useAuthStore } from '@/stores/auth'
+import { workOrderService } from '@/services/workOrderService'
+import { useDeviceStore } from '@/stores/device'
 
 const router = useRouter()
+const authStore = useAuthStore()
+const deviceStore = useDeviceStore()
+
 const activeTab = ref('pending')
 const showGrabSuccess = ref(false)
+const loading = ref(false)
+
+// 工单数据
+const allOrders = ref([])
+const availableOrders = ref([])
+const processingOrders = ref([])
+const completedOrders = ref([])
 
 // 切换标签页
 const switchTab = (tab) => {
@@ -172,7 +186,7 @@ const goToInspection = () => {
 const goToWorkOrders = () => {
   // 如果已经在工单页面，则刷新
   if (router.currentRoute.value.path === '/work-orders') {
-    activeTab.value = 'pending'
+    loadOrders()
   } else {
     router.push('/work-orders')
   }
@@ -188,22 +202,28 @@ const viewOrderDetail = (orderId) => {
 }
 
 // 抢单
-const grabOrder = (orderId) => {
-  console.log(`抢单 ${orderId}`)
-  // 模拟抢单成功
-  showGrabSuccess.value = true
-  // 3秒后自动关闭弹窗
-  setTimeout(() => {
-    showGrabSuccess.value = false
-    // 抢单成功后，该工单应该从待抢单列表移除，添加到处理中列表
-    switchTab('processing')
-  }, 3000)
+const grabOrder = async (orderId) => {
+  try {
+    const repairmanId = authStore.getRepairmanId
+    await workOrderService.grabOrder(orderId, repairmanId)
+
+    // 显示成功提示
+    showGrabSuccess.value = true
+
+    // 重新加载数据
+    setTimeout(async () => {
+      showGrabSuccess.value = false
+      await loadOrders()
+      switchTab('processing')
+    }, 2000)
+  } catch (error) {
+    console.error('抢单失败:', error)
+    alert('抢单失败: ' + (error.message || '未知错误'))
+  }
 }
 
 // 开始处理工单
 const startProcessOrder = (orderId) => {
-  console.log(`开始处理工单 ${orderId}`)
-  // 跳转到处理页面，传递工单ID和状态
   router.push({
     path: `/work-orders/${orderId}`,
     query: { status: 'processing' }
@@ -214,6 +234,68 @@ const startProcessOrder = (orderId) => {
 const closeGrabSuccess = () => {
   showGrabSuccess.value = false
 }
+
+// 获取订单位置信息
+const getOrderLocation = (deviceId) => {
+  const device = deviceStore.getWaterSupplierById(deviceId)
+  return device ? device.location : '未知位置'
+}
+
+// 格式化时间显示
+const formatTime = (timeStr) => {
+  if (!timeStr) return '未知时间'
+
+  const date = new Date(timeStr)
+  const now = new Date()
+  const diffMs = now - date
+  const diffMins = Math.floor(diffMs / 60000)
+  const diffHours = Math.floor(diffMins / 60)
+  const diffDays = Math.floor(diffHours / 24)
+
+  if (diffMins < 1) return '刚刚'
+  if (diffMins < 60) return `${diffMins}分钟前`
+  if (diffHours < 24) return `${diffHours}小时前`
+  return `${diffDays}天前`
+}
+
+// 格式化日期显示
+const formatDate = (dateStr) => {
+  if (!dateStr) return '未知日期'
+  return new Date(dateStr).toLocaleDateString('zh-CN')
+}
+
+// 加载工单数据
+const loadOrders = async () => {
+  loading.value = true
+  try {
+    // 获取我的工单
+    const myOrders = await workOrderService.getMyOrders(authStore.getRepairmanId)
+
+    // 分类工单
+    allOrders.value = myOrders.data || []
+    processingOrders.value = allOrders.value.filter(order =>
+      order.status === 'processing'
+    )
+    completedOrders.value = allOrders.value.filter(order =>
+      order.status === 'completed'
+    )
+
+    // 获取可抢工单
+    // 注意：这里需要根据维修人员所在区域获取，暂时使用默认值
+    const available = await workOrderService.getAvailableOrders('A')
+    availableOrders.value = available.data || []
+  } catch (error) {
+    console.error('加载工单失败:', error)
+    alert('加载工单失败: ' + (error.message || '未知错误'))
+  } finally {
+    loading.value = false
+  }
+}
+
+// 初始化时加载数据
+onMounted(() => {
+  loadOrders()
+})
 </script>
 
 <style scoped>
@@ -263,6 +345,21 @@ const closeGrabSuccess = () => {
   color: #096dd9;
 }
 
+/* 添加空状态样式 */
+.empty-state {
+  text-align: center;
+  padding: 40px 20px;
+  color: #999;
+  font-size: 14px;
+}
+
+/* 添加加载状态样式 */
+.loading {
+  text-align: center;
+  padding: 20px;
+  color: #1890ff;
+}
+
 /* 标签切换 */
 .tab-container {
   background: white;
-- 
2.34.1


From 4fee4e7c0b613f37794528c90be1c230b8780dc7 Mon Sep 17 00:00:00 2001
From: luoyuehang <2830398107@qq.com>
Date: Wed, 10 Dec 2025 17:25:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?app1=E5=B7=A5=E5=8D=95=E6=8A=A2=E5=8D=95=20?=
 =?UTF-8?q?/=20=E6=8B=92=E5=8D=95=20/=20=E6=8F=90=E4=BA=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/zzz/src/stores/auth.js       | 14 ++++++++++----
 src/main/resources/zzz/src/views/LoginPage.vue  |  4 +++-
 .../resources/zzz/src/views/WorkOrderDetail.vue | 17 ++++++++++++-----
 .../resources/zzz/src/views/WorkOrderList.vue   | 12 +++++++++---
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/zzz/src/stores/auth.js b/src/main/resources/zzz/src/stores/auth.js
index fa8910e..74851a6 100644
--- a/src/main/resources/zzz/src/stores/auth.js
+++ b/src/main/resources/zzz/src/stores/auth.js
@@ -35,11 +35,15 @@ export const useAuthStore = defineStore('auth', () => {
     return user.value?.userType || localStorage.getItem('userType')
   })
 
- // 获取维修人员ID
-const getRepairmanId = computed(() => {
-  return user.value?.userId || localStorage.getItem('userId') // 使用userId而不是repairmanId
-})
+  // 获取维修人员ID
+  const getRepairmanId = computed(() => {
+    return user.value?.userId || localStorage.getItem('userId') // 使用userId而不是repairmanId
+  })
 
+  // 获取区域ID
+  const getAreaId = computed(() => {
+    return user.value?.areaId || localStorage.getItem('areaId')
+  })
 
   // 登出
   const logout = () => {
@@ -53,6 +57,7 @@ const getRepairmanId = computed(() => {
     localStorage.removeItem('repairmanId')
     localStorage.removeItem('userId')
     localStorage.removeItem('username')
+    localStorage.removeItem('areaId') // 移除 areaId
 
     // 跳转到登录页
     router.push('/')
@@ -75,6 +80,7 @@ const getRepairmanId = computed(() => {
     isAuthenticated,
     getUserType,
     getRepairmanId,
+    getAreaId, // 导出 getAreaId
     login,
     logout,
     getUserInfo,
diff --git a/src/main/resources/zzz/src/views/LoginPage.vue b/src/main/resources/zzz/src/views/LoginPage.vue
index e39b8a5..114c304 100644
--- a/src/main/resources/zzz/src/views/LoginPage.vue
+++ b/src/main/resources/zzz/src/views/LoginPage.vue
@@ -42,7 +42,8 @@ const handleLogin = async () => {
         username: result.data.username,
         userType: result.data.userType,
         userId: result.data.userId,
-        repairmanId: result.data.userId
+        repairmanId: result.data.userId,
+        areaId: result.data.areaId
       }, result.data.token);
 
       // 保存到本地存储
@@ -51,6 +52,7 @@ const handleLogin = async () => {
       localStorage.setItem('username', result.data.username);
       localStorage.setItem('userType', result.data.userType);
       localStorage.setItem('repairmanId', result.data.userId);
+      localStorage.setItem('areaId', result.data.areaId);
 
       alert('登录成功！');
       router.push('/home');
diff --git a/src/main/resources/zzz/src/views/WorkOrderDetail.vue b/src/main/resources/zzz/src/views/WorkOrderDetail.vue
index ec85ac7..8578c47 100644
--- a/src/main/resources/zzz/src/views/WorkOrderDetail.vue
+++ b/src/main/resources/zzz/src/views/WorkOrderDetail.vue
@@ -481,12 +481,18 @@ const loadOrderDetail = async (orderId) => {
       currentOrder.value = order
     } else {
       // 如果在我的工单中找不到，则尝试从可抢工单中查找
-      const availableRes = await workOrderService.getAvailableOrders('A') // 这里应该使用实际区域
-      const availableOrder = availableRes.data.find(o => o.orderId === orderId)
-      if (availableOrder) {
-        currentOrder.value = availableOrder
+      // 使用存储的 areaId 而不是默认值 'A'
+      const areaId = authStore.getAreaId
+      if (areaId) {
+        const availableRes = await workOrderService.getAvailableOrders(areaId)
+        const availableOrder = availableRes.data.find(o => o.orderId === orderId)
+        if (availableOrder) {
+          currentOrder.value = availableOrder
+        } else {
+          throw new Error('工单不存在')
+        }
       } else {
-        throw new Error('工单不存在')
+        throw new Error('未找到区域ID，无法获取工单信息')
       }
     }
   } catch (error) {
@@ -498,6 +504,7 @@ const loadOrderDetail = async (orderId) => {
   }
 }
 
+
 onMounted(() => {
   const orderId = route.params.id
   if (orderId) {
diff --git a/src/main/resources/zzz/src/views/WorkOrderList.vue b/src/main/resources/zzz/src/views/WorkOrderList.vue
index 8626e75..64513b3 100644
--- a/src/main/resources/zzz/src/views/WorkOrderList.vue
+++ b/src/main/resources/zzz/src/views/WorkOrderList.vue
@@ -281,9 +281,14 @@ const loadOrders = async () => {
     )
 
     // 获取可抢工单
-    // 注意：这里需要根据维修人员所在区域获取，暂时使用默认值
-    const available = await workOrderService.getAvailableOrders('A')
-    availableOrders.value = available.data || []
+    const areaId = authStore.getAreaId // 从认证存储中获取 areaId
+    if (areaId) {
+      const available = await workOrderService.getAvailableOrders(areaId)
+      availableOrders.value = available.data || []
+    } else {
+      console.warn('未找到区域ID，无法获取可抢工单')
+      availableOrders.value = []
+    }
   } catch (error) {
     console.error('加载工单失败:', error)
     alert('加载工单失败: ' + (error.message || '未知错误'))
@@ -292,6 +297,7 @@ const loadOrders = async () => {
   }
 }
 
+
 // 初始化时加载数据
 onMounted(() => {
   loadOrders()
-- 
2.34.1