From 367d638f58a5a3bffa08f2780b8a60cfbb44ccf9 Mon Sep 17 00:00:00 2001 From: chiguyong Date: Mon, 13 Apr 2026 08:50:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=209=20=E4=B8=AA=20API?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E7=9A=84=E6=B3=9B=E5=9E=8B=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=20ApiResponse=20=E6=A0=BC=E5=BC=8F=20(49?= =?UTF-8?q?=E5=A4=84=E4=BF=AE=E5=A4=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/equipment-health.ts | 13 +++++------ src/api/equipment.ts | 42 +++++++++++++++++++----------------- src/api/inspection-item.ts | 9 ++++---- src/api/inspection-record.ts | 9 ++++---- src/api/maintenance-plan.ts | 11 +++++----- src/api/maintenance-task.ts | 13 +++++------ src/api/userManagement.ts | 12 +++++------ src/api/work-order.ts | 15 +++++++------ 8 files changed, 66 insertions(+), 58 deletions(-) diff --git a/src/api/equipment-health.ts b/src/api/equipment-health.ts index 28ee59a7..da70d373 100644 --- a/src/api/equipment-health.ts +++ b/src/api/equipment-health.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { ApiResponse } from '@/types' // ==================== 设备健康度类型 ==================== @@ -66,24 +67,24 @@ const BASE_URL = '/api/asset/equipment-health' // 获取设备健康度 export function getEquipmentHealth(equipmentId: string) { - return request.get(`${BASE_URL}/${equipmentId}`) + return request.get>(`${BASE_URL}/${equipmentId}`) } // 获取健康度历史 export function getHealthHistory(equipmentId: string, days: number = 30) { - return request.get(`${BASE_URL}/${equipmentId}/history`, { + return request.get>(`${BASE_URL}/${equipmentId}/history`, { params: { days } }) } // 计算设备健康度 export function calculateHealth(equipmentId: string) { - return request.post(`${BASE_URL}/calculate`, { equipmentId }) + return request.post>(`${BASE_URL}/calculate`, { equipmentId }) } // 获取故障历史列表 export function getFailureHistory(equipmentId: string) { - return request.get(`${BASE_URL}/failure-history/${equipmentId}`) + return request.get>(`${BASE_URL}/failure-history/${equipmentId}`) } // 记录故障 @@ -99,10 +100,10 @@ export function recordFailure(data: { // 获取 MTBF export function getEquipmentMTBF(equipmentId: string) { - return request.get(`${BASE_URL}/mtbf/${equipmentId}`) + return request.get>(`${BASE_URL}/mtbf/${equipmentId}`) } // 获取 MTTR export function getEquipmentMTTR(equipmentId: string) { - return request.get(`${BASE_URL}/mttr/${equipmentId}`) + return request.get>(`${BASE_URL}/mttr/${equipmentId}`) } diff --git a/src/api/equipment.ts b/src/api/equipment.ts index a747e5e4..917230fa 100644 --- a/src/api/equipment.ts +++ b/src/api/equipment.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { ApiResponse } from '@/types' // ==================== 系统类型枚举（8大系统分类）=================== export type SystemType = @@ -243,22 +244,22 @@ export interface FireInfo { // 获取设备列表（按项目） export function getEquipmentList(projectId: string) { - return request.get(`/api/asset/equipment/by-project/${projectId}`) + return request.get>(`/api/asset/equipment/by-project/${projectId}`) } // 获取设备详情 export function getEquipmentDetail(id: string) { - return request.get(`/api/asset/equipment/${id}`) + return request.get>(`/api/asset/equipment/${id}`) } // 获取设备（按位置） export function getEquipmentBySpace(spaceNodeId: string) { - return request.get(`/api/asset/equipment/by-space/${spaceNodeId}`) + return request.get>(`/api/asset/equipment/by-space/${spaceNodeId}`) } // 获取设备（按类型） export function getEquipmentByType(projectId: string, type: EquipmentType) { - return request.get('/api/asset/equipment/by-type', { + return request.get>('/api/asset/equipment/by-type', { params: { projectId, type } }) } @@ -272,7 +273,7 @@ export function getEquipmentByOwnership(projectId: string, ownership: OwnershipT // 创建设备 export function createEquipment(data: EquipmentForm) { - return request.post('/api/asset/equipment', data) + return request.post>('/api/asset/equipment', data) } // 更新设备 @@ -282,19 +283,20 @@ export function updateEquipment(id: string, data: EquipmentForm) { // 删除设备 export function deleteEquipment(id: string) { - return request.delete(`/api/asset/equipment/${id}`) + return request.delete>(`/api/asset/equipment/${id}`) } // 批量删除设备 export function deleteEquipmentBatch(ids: string[]) { - return request.post(`/api/asset/equipment/batch-delete`, ids) + return request.post>(`/api/asset/equipment/batch-delete`, ids) } // 导入设备 export function importEquipment(file: File, projectId: string) { const formData = new FormData() formData.append('file', file) - return request.post<{ successCount: number; failCount: number; failDetails: string[] }>(`/api/asset/equipment/import`, formData, { + formData.append('projectId', projectId) + return request.post>(`/api/asset/equipment/import`, formData, { headers: { 'Content-Type': 'multipart/form-data' } }) } @@ -311,12 +313,12 @@ export function exportEquipment(projectId: string) { // 按类型统计设备 export function getEquipmentStatsByType(projectId: string) { - return request.get(`/api/asset/equipment/stats/by-type/${projectId}`) + return request.get>(`/api/asset/equipment/stats/by-type/${projectId}`) } // 按归属统计设备 export function getEquipmentStatsByOwnership(projectId: string) { - return request.get(`/api/asset/equipment/stats/by-ownership/${projectId}`) + return request.get>(`/api/asset/equipment/stats/by-ownership/${projectId}`) } // 设备总数统计 @@ -328,12 +330,12 @@ export function getEquipmentCountStats(projectId: string) { // 获取所有归属主体 export function getOwnershipEntityList() { - return request.get('/api/asset/ownership-entity') + return request.get>('/api/asset/ownership-entity') } // 按类型获取归属主体 export function getOwnershipEntityByType(type: OwnershipEntityType) { - return request.get('/api/asset/ownership-entity/by-type', { + return request.get>('/api/asset/ownership-entity/by-type', { params: { type } }) } @@ -342,42 +344,42 @@ export function getOwnershipEntityByType(type: OwnershipEntityType) { // 获取电梯扩展信息 export function getElevatorInfo(equipmentId: string) { - return request.get(`/api/asset/equipment/${equipmentId}/elevator`) + return request.get>(`/api/asset/equipment/${equipmentId}/elevator`) } // 更新电梯扩展信息 export function updateElevatorInfo(equipmentId: string, data: ElevatorInfo) { - return request.put(`/api/asset/equipment/${equipmentId}/elevator`, data) + return request.put>(`/api/asset/equipment/${equipmentId}/elevator`, data) } // 获取暖通扩展信息 export function getHvacInfo(equipmentId: string) { - return request.get(`/api/asset/equipment/${equipmentId}/hvac`) + return request.get>(`/api/asset/equipment/${equipmentId}/hvac`) } // 更新暖通扩展信息 export function updateHvacInfo(equipmentId: string, data: HvacInfo) { - return request.put(`/api/asset/equipment/${equipmentId}/hvac`, data) + return request.put>(`/api/asset/equipment/${equipmentId}/hvac`, data) } // 获取能源计量扩展信息 export function getEnergyInfo(equipmentId: string) { - return request.get(`/api/asset/equipment/${equipmentId}/energy`) + return request.get>(`/api/asset/equipment/${equipmentId}/energy`) } // 更新能源计量扩展信息 export function updateEnergyInfo(equipmentId: string, data: EnergyInfo) { - return request.put(`/api/asset/equipment/${equipmentId}/energy`, data) + return request.put>(`/api/asset/equipment/${equipmentId}/energy`, data) } // 获取消防扩展信息 export function getFireInfo(equipmentId: string) { - return request.get(`/api/asset/equipment/${equipmentId}/fire`) + return request.get>(`/api/asset/equipment/${equipmentId}/fire`) } // 更新消防扩展信息 export function updateFireInfo(equipmentId: string, data: FireInfo) { - return request.put(`/api/asset/equipment/${equipmentId}/fire`, data) + return request.put>(`/api/asset/equipment/${equipmentId}/fire`, data) } // ==================== 设备类型映射 ==================== diff --git a/src/api/inspection-item.ts b/src/api/inspection-item.ts index 256c7cc5..dded52be 100644 --- a/src/api/inspection-item.ts +++ b/src/api/inspection-item.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { ApiResponse } from '@/types' // ==================== 巡检标准项类型 ==================== export interface InspectionItem { @@ -29,22 +30,22 @@ export interface InspectionItemForm { // 获取巡检标准项列表 export function getInspectionItems() { - return request.get('/api/mdm/inspection-items') + return request.get>('/api/mdm/inspection-items') } // 创建巡检标准项 export function createInspectionItem(data: InspectionItemForm) { - return request.post('/api/mdm/inspection-items', data) + return request.post>('/api/mdm/inspection-items', data) } // 更新巡检标准项 export function updateInspectionItem(id: string, data: InspectionItemForm) { - return request.put(`/api/mdm/inspection-items/${id}`, data) + return request.put>(`/api/mdm/inspection-items/${id}`, data) } // 删除巡检标准项 export function deleteInspectionItem(id: string) { - return request.delete(`/api/mdm/inspection-items/${id}`) + return request.delete>(`/api/mdm/inspection-items/${id}`) } // ==================== 设备类型和系统类型选项 ==================== diff --git a/src/api/inspection-record.ts b/src/api/inspection-record.ts index cd037120..fd4f5ec8 100644 --- a/src/api/inspection-record.ts +++ b/src/api/inspection-record.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { ApiResponse } from '@/types' // ==================== 巡检记录类型 ==================== export type InspectionStatus = 'NORMAL' | 'WARNING' | 'ABNORMAL' @@ -47,24 +48,24 @@ export interface InspectionRecordForm { // 获取巡检记录列表 export function getInspectionRecords(projectId: string, equipmentId?: string) { - return request.get('/api/mdm/inspection-records', { + return request.get>('/api/mdm/inspection-records', { params: { projectId, equipmentId } }) } // 获取巡检记录详情 export function getInspectionRecord(id: string) { - return request.get(`/api/mdm/inspection-records/${id}`) + return request.get>(`/api/mdm/inspection-records/${id}`) } // 创建巡检记录 export function createInspectionRecord(data: InspectionRecordForm) { - return request.post('/api/mdm/inspection-records', data) + return request.post>('/api/mdm/inspection-records', data) } // 更新巡检记录 export function updateInspectionRecord(id: string, data: InspectionRecordForm) { - return request.put(`/api/mdm/inspection-records/${id}`, data) + return request.put>(`/api/mdm/inspection-records/${id}`, data) } // 完成巡检 diff --git a/src/api/maintenance-plan.ts b/src/api/maintenance-plan.ts index 51468f2e..09d2cef5 100644 --- a/src/api/maintenance-plan.ts +++ b/src/api/maintenance-plan.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { ApiResponse } from '@/types' // ==================== 维保计划类型 ==================== export type PlanType = 'PREVENTIVE' | 'CORRECTIVE' @@ -37,29 +38,29 @@ export interface MaintenancePlanForm { // 获取维保计划列表 export function getMaintenancePlans(projectId: string) { - return request.get(`/api/mdm/maintenance-plans`, { + return request.get>(`/api/mdm/maintenance-plans`, { params: { projectId } }) } // 获取维保计划详情 export function getMaintenancePlan(id: string) { - return request.get(`/api/mdm/maintenance-plans/${id}`) + return request.get>(`/api/mdm/maintenance-plans/${id}`) } // 创建维保计划 export function createMaintenancePlan(data: MaintenancePlanForm) { - return request.post('/api/mdm/maintenance-plans', data) + return request.post>('/api/mdm/maintenance-plans', data) } // 更新维保计划 export function updateMaintenancePlan(id: string, data: MaintenancePlanForm) { - return request.put(`/api/mdm/maintenance-plans/${id}`, data) + return request.put>(`/api/mdm/maintenance-plans/${id}`, data) } // 删除维保计划 export function deleteMaintenancePlan(id: string) { - return request.delete(`/api/mdm/maintenance-plans/${id}`) + return request.delete>(`/api/mdm/maintenance-plans/${id}`) } // ==================== 常量选项 ==================== diff --git a/src/api/maintenance-task.ts b/src/api/maintenance-task.ts index e03472b3..f3984546 100644 --- a/src/api/maintenance-task.ts +++ b/src/api/maintenance-task.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { ApiResponse } from '@/types' // ==================== 维保工单类型 ==================== export type TaskType = 'PREVENTIVE' | 'CORRECTIVE' | 'EMERGENCY' @@ -90,36 +91,36 @@ export interface VerifyTaskData { // 获取维保工单列表 export function getMaintenanceTasks(projectId?: string) { - return request.get(`/api/ops/maintenance-tasks`, { + return request.get>(`/api/ops/maintenance-tasks`, { params: { projectId } }) } // 根据状态获取维保工单列表 export function getMaintenanceTasksByStatus(status: TaskStatus) { - return request.get(`/api/ops/maintenance-tasks`, { + return request.get>(`/api/ops/maintenance-tasks`, { params: { status } }) } // 获取维保工单详情 export function getMaintenanceTask(id: string) { - return request.get(`/api/ops/maintenance-tasks/${id}`) + return request.get>(`/api/ops/maintenance-tasks/${id}`) } // 创建维保工单 export function createMaintenanceTask(data: MaintenanceTaskForm) { - return request.post('/api/ops/maintenance-tasks', data) + return request.post>('/api/ops/maintenance-tasks', data) } // 更新维保工单 export function updateMaintenanceTask(id: string, data: Partial) { - return request.put(`/api/ops/maintenance-tasks/${id}`, data) + return request.put>(`/api/ops/maintenance-tasks/${id}`, data) } // 删除维保工单 export function deleteMaintenanceTask(id: string) { - return request.delete(`/api/ops/maintenance-tasks/${id}`) + return request.delete>(`/api/ops/maintenance-tasks/${id}`) } // 状态流转 API diff --git a/src/api/userManagement.ts b/src/api/userManagement.ts index 6748a0f6..83a4a42b 100644 --- a/src/api/userManagement.ts +++ b/src/api/userManagement.ts @@ -1,19 +1,19 @@ import request from '@/utils/request' -import type { User } from '@/types' +import type { User, ApiResponse, PageResponse } from '@/types' // 获取企业员工列表（用于项目管理添加成员） export const getEnterpriseUsers = (params?: { keyword?: string }) => { - return request.get<{ code: number; message: string; data: User[] }>('/api/auth/users/enterprise', { params }) + return request.get>('/api/auth/users/enterprise', { params }) } // 获取项目成员列表 export const getProjectMembers = (projectId: string, params?: { page?: number; size?: number }) => { - return request.get<{ code: number; message: string; data: { content: User[]; total: number } }>(`/api/auth/projects/${projectId}/members`, { params }) + return request.get>>(`/api/auth/projects/${projectId}/members`, { params }) } // 获取可添加的成员列表（排除已添加的） export const getAvailableMembers = (projectId: string) => { - return request.get<{ code: number; message: string; data: User[] }>(`/api/auth/projects/${projectId}/available-members`) + return request.get>(`/api/auth/projects/${projectId}/available-members`) } // 添加项目成员 @@ -28,7 +28,7 @@ export const removeProjectMember = (projectId: string, userId: string) => { // 获取部门树 export const getDeptTree = () => { - return request.get<{ code: number; message: string; data: DeptTreeNode[] }>('/api/auth/depts/tree') + return request.get>('/api/auth/depts/tree') } // 创建部门 @@ -38,7 +38,7 @@ export const createDept = (data: { deptName: string; deptCode?: string; parentId // 获取部门成员 export const getDeptMembers = (deptId: string) => { - return request.get<{ code: number; message: string; data: User[] }>(`/api/auth/depts/${deptId}/members`) + return request.get>(`/api/auth/depts/${deptId}/members`) } export interface DeptTreeNode { diff --git a/src/api/work-order.ts b/src/api/work-order.ts index d698d47a..0b212531 100644 --- a/src/api/work-order.ts +++ b/src/api/work-order.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { ApiResponse } from '@/types' // ==================== 工单类型 ==================== export type WorkOrderSource = 'OWNER' | 'MAINTENANCE' | 'INSPECTION' | 'FAULT' | 'REGULATORY' | 'MANUAL' @@ -88,23 +89,23 @@ export function getWorkOrders(params?: { status?: WorkOrderStatus assignedTo?: string }) { - return request.get('/api/wo/work-orders', { params }) + return request.get>('/api/wo/work-orders', { params }) } export function getWorkOrder(id: string) { - return request.get(`/api/wo/work-orders/${id}`) + return request.get>(`/api/wo/work-orders/${id}`) } export function createWorkOrder(data: Partial) { - return request.post('/api/wo/work-orders', data) + return request.post>('/api/wo/work-orders', data) } export function updateWorkOrder(id: string, data: Partial) { - return request.put(`/api/wo/work-orders/${id}`, data) + return request.put>(`/api/wo/work-orders/${id}`, data) } export function deleteWorkOrder(id: string) { - return request.delete(`/api/wo/work-orders/${id}`) + return request.delete>(`/api/wo/work-orders/${id}`) } export function assignWorkOrder(id: string, data: { assignedTo: string; assignedVendor?: string; assignedDate?: string }) { @@ -128,11 +129,11 @@ export function cancelWorkOrder(id: string) { } export function getWorkOrderStats() { - return request.get('/api/wo/work-orders/stats') + return request.get>('/api/wo/work-orders/stats') } export function getWorkOrderItems(workOrderId: string) { - return request.get(`/api/wo/work-orders/${workOrderId}/items`) + return request.get>(`/api/wo/work-orders/${workOrderId}/items`) } export function addWorkOrderItems(workOrderId: string, items: WorkOrderItem[]) {