From f7641f6439b02a969fd769f45a65c4f1bb6c0532 Mon Sep 17 00:00:00 2001
From: "Mr.j" <2221464500@qq.com>
Date: Fri, 8 Aug 2025 16:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A1=E6=89=B9=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/equipment/approval.ts                | 49 +++++++++++-----
 .../components/HeaderRightBar/index.vue       | 56 +++++++++++++++----
 src/types/auto-imports.d.ts                   |  1 +
 src/types/env.d.ts                            |  1 +
 4 files changed, 81 insertions(+), 26 deletions(-)

diff --git a/src/apis/equipment/approval.ts b/src/apis/equipment/approval.ts
index 7867d6e..8ce061b 100644
--- a/src/apis/equipment/approval.ts
+++ b/src/apis/equipment/approval.ts
@@ -1,49 +1,70 @@
 import http from '@/utils/http'
-import type { EquipmentApprovalReq, EquipmentApprovalResp, EquipmentApprovalListReq } from './type'
+import type { EquipmentApprovalListReq, EquipmentApprovalResp } from './type'
 
 /**
- * 设备审批管理API
+ * 设备审批API
  */
 export const equipmentApprovalApi = {
   /**
    * 分页查询待审批的设备采购申请
    */
-  getPendingApprovals: (params: EquipmentApprovalListReq) => {
-    return http.get<ApiRes<PageRes<EquipmentApprovalResp>>>('/equipment/approval/pending', { params })
+  getPendingApprovals(params: EquipmentApprovalListReq) {
+    return http.get<EquipmentApprovalResp[]>('/equipment/approval/pending', params)
   },
 
   /**
    * 分页查询已审批的设备采购申请
    */
-  getApprovedApprovals: (params: EquipmentApprovalListReq) => {
-    return http.get<ApiRes<PageRes<EquipmentApprovalResp>>>('/equipment/approval/approved', { params })
+  getApprovedApprovals(params: EquipmentApprovalListReq) {
+    return http.get<EquipmentApprovalResp[]>('/equipment/approval/approved', params)
   },
 
   /**
    * 审批通过
    */
-  approve: (approvalId: string, data: EquipmentApprovalReq) => {
-    return http.post<ApiRes<null>>(`/equipment/approval/${approvalId}/approve`, data)
+  approve(approvalId: string, data: any) {
+    return http.post(`/equipment/approval/${approvalId}/approve`, data)
   },
 
   /**
    * 审批拒绝
    */
-  reject: (approvalId: string, data: EquipmentApprovalReq) => {
-    return http.post<ApiRes<null>>(`/equipment/approval/${approvalId}/reject`, data)
+  reject(approvalId: string, data: any) {
+    return http.post(`/equipment/approval/${approvalId}/reject`, data)
   },
 
   /**
    * 获取审批详情
    */
-  getApprovalDetail: (approvalId: string) => {
-    return http.get<ApiRes<EquipmentApprovalResp>>(`/equipment/approval/${approvalId}`)
+  getApprovalDetail(approvalId: string) {
+    return http.get<EquipmentApprovalResp>(`/equipment/approval/${approvalId}`)
   },
 
   /**
    * 获取审批统计信息
    */
-  getApprovalStats: () => {
-    return http.get<ApiRes<unknown>>('/equipment/approval/stats')
+  getApprovalStats() {
+    return http.get('/equipment/approval/stats')
+  },
+
+  /**
+   * 提交采购申请
+   */
+  submitProcurementApplication(data: any) {
+    return http.post('/equipment/approval/procurement/apply', data)
+  },
+
+  /**
+   * 获取我的采购申请
+   */
+  getMyProcurementApplications(params: EquipmentApprovalListReq) {
+    return http.get<EquipmentApprovalResp[]>('/equipment/approval/procurement/my-applications', params)
+  },
+
+  /**
+   * 撤回采购申请
+   */
+  withdrawProcurementApplication(approvalId: string) {
+    return http.post(`/equipment/approval/procurement/${approvalId}/withdraw`)
   }
 }
diff --git a/src/layout/components/HeaderRightBar/index.vue b/src/layout/components/HeaderRightBar/index.vue
index ecc4a36..d1b57ae 100644
--- a/src/layout/components/HeaderRightBar/index.vue
+++ b/src/layout/components/HeaderRightBar/index.vue
@@ -74,9 +74,9 @@
 </template>
 
 <script setup lang="ts">
-import { Modal } from '@arco-design/web-vue'
+import { Modal, Notification } from '@arco-design/web-vue'
 import { useFullscreen } from '@vueuse/core'
-import { onMounted, ref, nextTick } from 'vue'
+import { onMounted, ref, nextTick, onBeforeUnmount } from 'vue'
 import Message from './Message.vue'
 import SettingDrawer from './SettingDrawer.vue'
 import Search from './Search.vue'
@@ -116,29 +116,61 @@ const initWebSocket = (token: string) => {
     }
     
     try {
-      socket = new WebSocket(`${import.meta.env.VITE_API_WS_URL}/websocket?token=${token}`)
+      const wsUrl = import.meta.env.VITE_API_WS_URL || 'ws://localhost:8888'
+      console.log('正在连接WebSocket:', `${wsUrl}/websocket?token=${token}`)
+      
+      socket = new WebSocket(`${wsUrl}/websocket?token=${token}`)
       
       socket.onopen = () => {
-        // console.log('WebSocket connection opened')
+        console.log('WebSocket连接成功')
       }
 
       socket.onmessage = (event) => {
-        const count = Number.parseInt(event.data)
-        if (!isNaN(count)) {
-          unreadMessageCount.value = count
+        console.log('收到WebSocket消息:', event.data)
+        try {
+          const data = JSON.parse(event.data)
+          
+          // 处理通知消息
+          if (data.type && data.title && data.content) {
+            console.log('处理通知消息:', data)
+            // 显示通知
+            Notification.info({
+              title: data.title,
+              content: data.content,
+              duration: 5000,
+              closable: true,
+              position: 'topRight'
+            })
+            
+            // 增加未读消息计数
+            unreadMessageCount.value++
+          } else {
+            // 处理简单的数字消息（兼容旧版本）
+            const count = Number.parseInt(event.data)
+            if (!isNaN(count)) {
+              unreadMessageCount.value = count
+            }
+          }
+        } catch (error) {
+          console.error('解析WebSocket消息失败:', error)
+          // 尝试解析为数字（兼容旧版本）
+          const count = Number.parseInt(event.data)
+          if (!isNaN(count)) {
+            unreadMessageCount.value = count
+          }
         }
       }
 
-      socket.onerror = () => {
-        // console.error('WebSocket error:', error)
+      socket.onerror = (error) => {
+        console.error('WebSocket连接错误:', error)
       }
 
-      socket.onclose = () => {
-        // console.log('WebSocket connection closed')
+      socket.onclose = (event) => {
+        console.log('WebSocket连接关闭:', event.code, event.reason)
         socket = null
       }
     } catch (error) {
-      console.error('Failed to create WebSocket connection:', error)
+      console.error('创建WebSocket连接失败:', error)
     }
     
     initTimer = null
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index 9026869..369aad4 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -57,6 +57,7 @@ declare global {
   const useCssVars: typeof import('vue')['useCssVars']
   const useId: typeof import('vue')['useId']
   const useLink: typeof import('vue-router')['useLink']
+  const useModel: typeof import('vue')['useModel']
   const useRoute: typeof import('vue-router')['useRoute']
   const useRouter: typeof import('vue-router')['useRouter']
   const useSlots: typeof import('vue')['useSlots']
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index acbbf80..61bb774 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -4,6 +4,7 @@
 interface ImportMetaEnv {
   readonly VITE_API_PREFIX: string
   readonly VITE_API_BASE_URL: string
+  readonly VITE_API_WS_URL: string
   readonly VITE_BASE: string
   readonly VITE_APP_SETTING: string
   readonly VITE_CLIENT_ID: string