diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue index f269e46c..9be84aad 100644 --- a/src/views/device/components/Metadata/Import/index.vue +++ b/src/views/device/components/Metadata/Import/index.vue @@ -510,17 +510,10 @@ const beforeUpload: UploadProps['beforeUpload'] = (file) => { reader.onload = (json) => { if(json.target?.result){ const data = JSON.parse(json.target?.result); - Object.keys(data).forEach((i:any)=>{ - const map = new Map() - data[i].forEach((item:any)=>( - map.set(item.id,item) - )) - data[i] = [...map.values()] - }) let check = formModel.metadata === 'jetlinks' ? requiredCheck(data) : aliCheck(data) if(!check){ onlyMessage('操作成功!') - formModel.import = JSON.stringify(data); + formModel.import = json.target?.result; } } else { onlyMessage('文件内容不能为空', 'error') @@ -587,7 +580,13 @@ const handleImport = async () => { if (data.metadata === 'alink') { try { const _import = JSON.parse(data.import); - + Object.keys(_import).forEach((i:any)=>{ + const map = new Map() + _import[i].forEach((item:any)=>( + map.set(item.id,item) + )) + _import[i] = [...map.values()] + }) loading.value = true; const res = await convertMetadata( 'from', @@ -638,7 +637,15 @@ const handleImport = async () => { data[data?.type === 'copy' ? 'copy' : 'import'] || '{}', ); - + if(data?.type === 'import'){ + Object.keys(_object).forEach((i:any)=>{ + const map = new Map() + _object[i].forEach((item:any)=>( + map.set(item.id,item) + )) + _object[i] = [...map.values()] + }) + } if ( !( !!_object?.properties || diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue index 66688ebe..bb2c06fa 100644 --- a/src/views/media/Device/Channel/Live/index.vue +++ b/src/views/media/Device/Channel/Live/index.vue @@ -29,8 +29,8 @@ > -
-
+
+
{ + system.getSystemConfig() const obj: any = unref(route.query) || {}; playData.value = { deviceId: obj?.deviceId || '',