From 91a2fcb743970bc93cb6c7123b28ea026ea4e4c8 Mon Sep 17 00:00:00 2001 From: yangsy Date: Mon, 15 Dec 2025 12:46:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=AE=8C=E6=95=B4=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/request/biz/all/ndm-devices.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/apis/request/biz/all/ndm-devices.ts b/src/apis/request/biz/all/ndm-devices.ts index 709b657..039d573 100644 --- a/src/apis/request/biz/all/ndm-devices.ts +++ b/src/apis/request/biz/all/ndm-devices.ts @@ -1,4 +1,4 @@ -import { ndmClient, userClient, type StationDevices } from '@/apis'; +import { initStationDevices, ndmClient, userClient, type StationDevices } from '@/apis'; export const getAllDevicesApi = async (options?: { stationCode?: string; signal?: AbortSignal }) => { const { stationCode, signal } = options ?? {}; @@ -9,5 +9,9 @@ export const getAllDevicesApi = async (options?: { stationCode?: string; signal? const [err, data] = resp; if (err) throw err; if (!data) throw new Error(`${data}`); - return data; + // 由于各线路后端版本不一致,接口返回的设备类型可能不够完整,需要做一次合并 + return { + ...initStationDevices(), + ...data, + }; };