diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue index 1b223d6..72712db 100644 --- a/src/components/FusionSettings/DensityCorrection.vue +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -120,7 +120,7 @@ - +
{{ $t('confirm delete') }}
@@ -149,7 +149,7 @@
--> - +
{{ $t('Whether to add control points') }}
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue index 161ad4c..5edf7f7 100644 --- a/src/components/FusionSettings/SurfaceCorrection.vue +++ b/src/components/FusionSettings/SurfaceCorrection.vue @@ -61,7 +61,7 @@ - +
{{ $t('confirm delete') }}
@@ -78,7 +78,7 @@ - +
{{ $t('Whether to add control points') }}
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index e26acd3..e8d614a 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -50,10 +50,10 @@
@@ -93,7 +93,7 @@ + @click="$store.commit('setSelectedProjector', '0/0');clear()" /> @@ -167,12 +167,12 @@ - +
{{ $t('Do you confirm the modification') }}
- {{ $t('Do you confirm the modification') }} + {{ dialog_data.type=='resolution'?$t('Whether to modify the resolution to') + options_resolution[dialog_data.parameter].label:$t('Whether to change the projector layout to') + projectorlayout[dialog_data.parameter].label }} @@ -480,6 +480,7 @@ export default defineComponent({ } else { optionsstr.value = "FourPointCalibration"; } + now_selsect_projector.value="0-0" }; /** @@ -623,8 +624,10 @@ export default defineComponent({ now_selsect_projector.value=value } + /** + * 依赖注入 + */ provide("now_selsect_projector",now_selsect_projector); - /** * 设置投影机布局 */ @@ -684,13 +687,18 @@ export default defineComponent({ * 浅拷贝 */ const confirm=ref(false) - let dialog_data:any=null - const dialog=(parameter:any,fun:any)=>{ + let dialog_data:any={parameter:"",fun:"",type:""} + const dialog=(parameter:any,fun:any,type:string)=>{ confirm.value=true - dialog_data={parameter,fun} + dialog_data.parameter=parameter + dialog_data.fun=fun + dialog_data.type=type + console.log("🚀 ~ file: FusionSettingsDialog.vue:696 ~ dialog ~ type:", type) + //dialog_data={parameter,fun,type} } const trigger_dialog=()=>{ dialog_data.fun(dialog_data.parameter) + console.log(dialog_data.fun) } const re_match_data=()=>{ let tmp = JSON.parse($store.state.fusion_configuration); @@ -709,6 +717,7 @@ export default defineComponent({ } } return { + dialog_data, allconfig, now_selsect_projector, re_match_data, diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index 4941719..46e9989 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -500,5 +500,7 @@ export default { "Please enter the square number": "Please enter the square number", "Change projector layout": "Change projector layout", "reset all":"reset all", - "Do you confirm the modification":"Do you confirm the modification" + "Do you confirm the modification":"Do you confirm the modification", + "Whether to modify the resolution to":"Whether to modify the resolution to", + "Whether to change the projector layout to":"Whether to change the projector layout to" }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index 634f544..3a77806 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -767,5 +767,7 @@ export default { "Please enter the square number":"请输入平方数", "Change projector layout":"更改投影机布局", "reset all":"重置所有", - "Do you confirm the modification":"是否确认修改" + "Do you confirm the modification":"是否确认修改", + "Whether to modify the resolution to":"是否将分辨率修改到", + "Whether to change the projector layout to":"是否更改投影机布局为" };