From a0e46a7dff33bd3e8cf51d54bea67408d88a5962 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Fri, 28 Apr 2023 15:45:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E4=BD=BF=E7=94=A8=E6=8F=92=E4=BB=B6=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Product/Detail/DeviceAccess/index.vue | 17 +++++++++++++++-- vite.config.ts | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue index fd0e1672..6f4ebf47 100644 --- a/src/views/device/Product/Detail/DeviceAccess/index.vue +++ b/src/views/device/Product/Detail/DeviceAccess/index.vue @@ -686,7 +686,7 @@ const getData = async (accessId?: string) => { productTypes.value = resp.result.map(item => { if (pluginRes?.result?.externalId === item.id) { productData.id = pluginRes?.result?.externalId - productData.metadata = JSON.stringify(item.metadata || {}) + productData.metadata = item.metadata } return { ...item, label: item.name, value: item.id } }) @@ -724,7 +724,20 @@ const submitDevice = async () => { const id = productStore.current?.id; // 该产品是否有物模型,有则弹窗进行处理 const _metadata = JSON.parse(productStore.current?.metadata || '{}') - if (_metadata.properties?.length || _metadata.events?.length || _metadata.functions?.length || _metadata.tags?.length) { + console.log(_metadata.properties, productData.metadata) + if ( + (_metadata.properties?.length || + _metadata.events?.length || + _metadata.functions?.length || + _metadata.tags?.length + ) && + ( + productData.metadata?.properties?.length || + productData.metadata?.events?.length || + productData.metadata?.functions?.length || + productData.metadata?.tags?.length + ) + ) { metadataModalCacheData.value = { id, values, diff --git a/vite.config.ts b/vite.config.ts index 4f292d21..8aae6161 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -92,7 +92,7 @@ export default defineConfig(({ mode}) => { proxy: { [env.VITE_APP_BASE_API]: { - // target: 'http://192.168.32.226:8844', + // target: 'http://192.168.32.70:8844', // target: 'http://192.168.32.244:8881', target: 'http://120.77.179.54:8844', // 120测试 // target: 'http://192.168.33.46:8844', // 本地开发环境