From 740f175b69fa28fafbff9ea8474eb3328e68f16a Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 17 Feb 2023 17:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0=E4=B8=8D?=
 =?UTF-8?q?=E5=B8=A6=E5=88=86=E8=BE=A8=E7=8E=87=E9=80=89=E6=8B=A9=E6=97=B6?=
 =?UTF-8?q?=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index b7fb86b..3b9202e 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -243,15 +243,17 @@ export default defineComponent({
     /**
      * 模拟数据完成dom渲染再次获取真实后台数据
      */
-    let allconfig = JSON.parse("{\"resolution\": [{\"width\": 1024,\"height\": 768}]}");
+    let allconfig = JSON.parse("{\"resolution\": [{\"width\": 1920,\"height\": 1080}]}");
     const options_resolution = computed(() => {
       let tmp=[];
+      if(allconfig.resolution){
       for (let index = 0; index < allconfig.resolution.length; index++) {
         tmp.push({
           label: `${allconfig.resolution[index].width}*${allconfig.resolution[index].height}`,
           value: index,
         })
       }
+    }
       return tmp
     })
     const child :any = ref(null);
@@ -486,11 +488,16 @@ export default defineComponent({
           config.value.row = tmp.row;
           $store.commit("setfusion_configuration", res?.config);
           allconfig = JSON.parse($store.state.fusion_configuration);
+          if(allconfig.resolution){
           for (let index = 0; index < allconfig.resolution.length; index++) {
             if(allconfig.resolution.width==allconfig.projector_width&&allconfig.resolution.height==allconfig.projector_height){
               now_resolution.value=index
             }
           }
+        }else{
+          allconfig = {resolution: [{width: tmp.projector_width,height: tmp.projector_height}]};
+          now_resolution.value=0
+        }
         });
         get_scenes()
         set?.SetBlendingOption("blending_grids_select_ui", "blending")