diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 25eeaf7..62e96fb 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -240,15 +240,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); @@ -483,11 +485,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")