From 5dcba5e4aaf96334b810a63c06c08f2851e7b992 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Thu, 27 Apr 2023 10:43:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/link/plugin.ts | 7 +++++++ .../Instance/Detail/Info/components/InklingModal/index.vue | 6 +----- src/views/device/Instance/Detail/Info/index.vue | 3 +-- src/views/device/Product/Detail/DeviceAccess/index.vue | 4 ++-- .../device/Product/Detail/DeviceAccess/metadataModal.vue | 2 +- src/views/device/Product/Detail/MetadataMap/index.vue | 3 +-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/api/link/plugin.ts b/src/api/link/plugin.ts index b7fcce6d..a23f2cab 100644 --- a/src/api/link/plugin.ts +++ b/src/api/link/plugin.ts @@ -21,6 +21,13 @@ export const detail = (id: string) => get(`/plugin/driver/${id}`) */ export const getProductsById = (id: string) => get(`/plugin/driver/${id}/products`) +/** + * + * @param type product：产品;device：设备 + * @param pluginId 设备接入id + * @param internalId 产品或者设备id + * @param externalId 映射id + */ export const savePluginData = (type: string, pluginId: string, internalId: string, externalId: string ) => patch(`/plugin/mapping/${type}/${pluginId}/${internalId}`, externalId, { headers: {'Content-Type': "text/plain"}}) export const getPluginData = (type: string, pluginId: string, internalId: string ) => get(`/plugin/mapping/${type}/${pluginId}/${internalId}`) diff --git a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue index 971f35e1..bfccbc2d 100644 --- a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue +++ b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue @@ -30,10 +30,6 @@ const props = defineProps({ type: String, default: undefined }, - channelId: { - type: String, - default: undefined - }, id: { type: String, default: undefined @@ -49,7 +45,7 @@ const handleOk = async () => { if (checkKey.value) { const res = await savePluginData( 'device', - props.channelId!, + props.accessId!, route.params.id as string, checkKey.value ).catch(() => ({ success: false })) diff --git a/src/views/device/Instance/Detail/Info/index.vue b/src/views/device/Instance/Detail/Info/index.vue index c9879798..943820ec 100644 --- a/src/views/device/Instance/Detail/Info/index.vue +++ b/src/views/device/Instance/Detail/Info/index.vue @@ -110,7 +110,6 @@ { queryPluginAccessDetail(instanceStore.current?.accessId).then(async res => { if (res.success) { channelId.value = res.result.channelId - const pluginRes = await getPluginData('device', res.result.channelId, instanceStore.current?.id) + const pluginRes = await getPluginData('device',instanceStore.current?.accessId, instanceStore.current?.id) if (pluginRes.success) { inklingDeviceId.value = pluginRes.result?.externalId } diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue index e56572ff..d216cdb4 100644 --- a/src/views/device/Product/Detail/DeviceAccess/index.vue +++ b/src/views/device/Product/Detail/DeviceAccess/index.vue @@ -680,7 +680,7 @@ const getData = async (accessId?: string) => { if (productStore.current?.accessProvider === 'plugin_gateway') { queryPluginAccessDetail(_accessId).then(async res => { // if (res.success) { - const pluginRes = await getPluginData('product', res.result.channelId, productStore.current?.id) + const pluginRes = await getPluginData('product', _accessId, productStore.current?.id) const resp = await getProductByPluginId(res.result.channelId).catch(() => ({ success: false, result: []})) if (resp.success) { productTypes.value = resp.result.map(item => { @@ -761,7 +761,7 @@ const updateAccessData = async (id: string, values: any) => { if (access.value?.provider === "plugin_gateway") { await savePluginData( 'product', - access.value?.channelId, + access.value?.id, productStore.current.id, productData.id ).catch(() => ({})) diff --git a/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue b/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue index 30059d76..05af91a0 100644 --- a/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue +++ b/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue @@ -136,7 +136,7 @@ const updateAccessData = async (id: string, values: any, metadata: string) => { if (props.access?.provider === 'plugin_gateway') { await savePluginData( 'product', - props.access.channelId, + props.access.id, props.data.id, props.data.productTypeId ).catch(() => ({})) diff --git a/src/views/device/Product/Detail/MetadataMap/index.vue b/src/views/device/Product/Detail/MetadataMap/index.vue index 59ea1ff1..ff8c16ec 100644 --- a/src/views/device/Product/Detail/MetadataMap/index.vue +++ b/src/views/device/Product/Detail/MetadataMap/index.vue @@ -124,7 +124,6 @@ const getMetadataMapData = () => { } const search = (value: string) => { - console.log(value) if (value) { dataSource.value = dataSourceCache.value.filter((item: any) => { return !!item.name?.includes(value) @@ -161,7 +160,7 @@ const getPluginMetadata = (): Promise<{ properties: any[]}> => { queryPluginAccessDetail(productDetail.value?.accessId!).then(async res => { if (res.success) { const _channelId = (res.result as any)!.channelId - const pluginRes = await getPluginData('product', _channelId, productDetail.value?.id).catch(() => ({ success: false, result: {}})) + const pluginRes = await getPluginData('product', productDetail.value?.accessId, productDetail.value?.id).catch(() => ({ success: false, result: {}})) const resp = await getProductByPluginId(_channelId).catch(() => ({ success: false, result: []})) if (resp.success) { const _item = (resp.result as any[])?.find((item: any) => item.id === (pluginRes?.result as any)?.externalId)