Merge branch 'dev' into dev-dictionary

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 ||

src/views/media/Device/Channel/Live/index.vue

@@ -29,8 +29,8 @@
                 >
             </div>
         </div>
-        <div class="media-live" @mouseenter="visibleChange"  @mouseleave="mouseleave">
+        <div class="media-live">
-            <div class="media-live-video">
+            <div class="media-live-video" @mouseenter="visibleChange"  @mouseleave="mouseleave">
                 <div
                     :class="mediaToolClass"
                     @mouseenter="showTool = true"

src/views/media/Device/Channel/Share/index.vue

@@ -7,6 +7,8 @@ import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
 import ShareLive from '../Live/shareLive.vue';
 
+import { useSystem } from '@/store/system';
+const system = useSystem();
 const playData = ref({
     deviceId: '',
     channelId: '',
@@ -18,6 +20,7 @@ const playData = ref({
 const route = useRoute();
 
 watchEffect(() => {
+    system.getSystemConfig()
     const obj: any = unref(route.query) || {};
     playData.value = {
         deviceId: obj?.deviceId || '',