diff --git a/frontend/src/views/collect-address/CollectAddressListPage.vue b/frontend/src/views/collect-address/CollectAddressListPage.vue index 873bbce..9909dcc 100644 --- a/frontend/src/views/collect-address/CollectAddressListPage.vue +++ b/frontend/src/views/collect-address/CollectAddressListPage.vue @@ -34,7 +34,7 @@ b.id === brandId)?.brandName ?? '' const rAll: any = await request.get('/admin/machine', {params: {brandName, pageSize: 999}}) const allMachines = rAll.data?.items ?? [] - // 未关联任何采集地址的机床ID - const freeMachines = allMachines.filter((m: any) => !m.collectAddressId || m.collectAddressId === 0) - const freeIds = new Set(freeMachines.map((m: any) => m.id)) // 当前地址已关联的机床 - let ownIds = new Set() if(addressId){ - const rOwn: any = await request.get(`/admin/collect-address/${addressId}/machines`) - const items = rOwn.data?.items ?? [] - ownIds = new Set(items.map((m: any) => m.machineId)) - form.machineIds = items.map((m: any) => m.machineId) + try{ + const rOwn: any = await request.get(`/admin/collect-address/${addressId}/machines`) + const items = rOwn.data?.items ?? [] + form.machineIds = items.map((m: any) => m.machineId) + }catch{} } transferMachines.value = allMachines - .filter((m: any) => freeIds.has(m.id) || ownIds.has(m.id)) .map((m: any) => ({ id: m.id, name: m.name, label: m.name, deviceCode: m.deviceCode, isOnline: m.isOnline, isEnabled: m.isEnabled })) }catch{ transferMachines.value=[] } }