From b982b66a311722d8bd38bdd582b52cdb4ed079f7 Mon Sep 17 00:00:00 2001 From: shefengchun <1077478963@qq.com> Date: Fri, 13 Jan 2023 11:07:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=9E=8D=E5=90=88=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FusionSettings/DensityCorrection.vue | 40 +++++++++---------- .../FusionSettings/FourPointCalibration.vue | 8 ++-- .../FusionSettings/FusionLocale.vue | 25 +++++++----- .../FusionSettings/SurfaceCorrection.vue | 32 ++++++++------- src/components/FusionSettingsDialog.vue | 32 +++++---------- src/pages/TopToolBar.vue | 2 +- 6 files changed, 68 insertions(+), 71 deletions(-) diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue index 31f0034..d986cba 100644 --- a/src/components/FusionSettings/DensityCorrection.vue +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -7,43 +7,43 @@
{{ $t('point') }}1 + :isResizable="false" @moveHandler="moveHandler($event, 0)">v1 {{ $t('point') }}2 + :isResizable="false" @moveHandler="moveHandler($event, 1)">v2 {{ $t('point') }}3 + :isResizable="false" @moveHandler="moveHandler($event, 2)">v3 {{ $t('point') }}4 + :isResizable="false" @moveHandler="moveHandler($event, 3)">v4 {{ $t('point') }}5 + :isResizable="false" @moveHandler="moveHandler($event, 4)">v5 {{ $t('point') }}6 + :isResizable="false" @moveHandler="moveHandler($event, 5)">h6 {{ $t('point') }}7 + :isResizable="false" @moveHandler="moveHandler($event, 6)">h7 {{ $t('point') }}8 + :isResizable="false" @moveHandler="moveHandler($event, 7)">h8 {{ $t('point') }}9 + :isResizable="false" @moveHandler="moveHandler($event, 8)">h9 {{ $t('point') }}10 + :isResizable="false" @moveHandler="moveHandler($event, 9)">h10
@@ -56,7 +56,7 @@
- +
@@ -65,7 +65,7 @@
- +
@@ -74,7 +74,7 @@
- +
@@ -83,7 +83,7 @@
- +
@@ -92,7 +92,7 @@
- +
@@ -103,27 +103,27 @@
- +
- +
- +
- +
- +
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue index b072b48..e958c77 100644 --- a/src/components/FusionSettings/FourPointCalibration.vue +++ b/src/components/FusionSettings/FourPointCalibration.vue @@ -5,7 +5,7 @@ @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules /> - +
@@ -15,7 +15,7 @@ v-model="four[1].x" label="x" lazy-rules /> - +
@@ -48,7 +48,7 @@ v-model="four[2].x" label="x" lazy-rules /> - +
@@ -58,7 +58,7 @@ v-model="four[3].x" label="x" lazy-rules /> - +
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue index 698e93a..1899253 100644 --- a/src/components/FusionSettings/FusionLocale.vue +++ b/src/components/FusionSettings/FusionLocale.vue @@ -12,8 +12,9 @@
-
-
-
- { }) + set?.GetBlendingConfig("").then((res) => { }) set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); }) } catch (error) { @@ -254,7 +259,7 @@ export default defineComponent({ array[index].value = Number(config.params[index].size) } if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache() - + setnowindex() } const use_server_config = () => { diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue index 49927a5..f4c6c51 100644 --- a/src/components/FusionSettings/SurfaceCorrection.vue +++ b/src/components/FusionSettings/SurfaceCorrection.vue @@ -7,7 +7,7 @@ :dense="true" v-model="nine[0].x" label="x" lazy-rules /> - +
@@ -19,14 +19,14 @@ :dense="true" v-model="nine[1].x" label="x" lazy-rules /> - +
- +
@@ -37,7 +37,7 @@ :dense="true" v-model="nine[2].x" label="x" lazy-rules /> - + @@ -49,7 +49,7 @@ :dense="true" v-model="nine[3].x" label="x" lazy-rules /> - + @@ -93,7 +93,7 @@ :dense="true" v-model="nine[5].x" label="x" lazy-rules /> - + @@ -106,7 +106,7 @@ :dense="true" v-model="nine[6].x" label="x" lazy-rules /> - + @@ -118,7 +118,7 @@ :dense="true" v-model="nine[7].x" label="x" lazy-rules /> - + @@ -130,7 +130,7 @@ :dense="true" v-model="nine[8].x" label="x" lazy-rules /> - + @@ -255,7 +255,6 @@ export default defineComponent({ if (set_cache.value[selectedprojector.value] != null) { let tmp = JSON.parse(set_cache.value[selectedprojector.value]); deepcopy(nine, tmp) - } syncpoint() }; @@ -306,7 +305,8 @@ export default defineComponent({ defaultnine.value[index].y = config.point9[index].def_y } setninepostion(); - syncpoint() + //syncpoint() + use_set_cache() setTimeout(() => { ste_status.value = 0; }, 100); @@ -326,7 +326,8 @@ export default defineComponent({ defaultnine.value[index].y = config.point9[index].def_y } setninepostion(); - syncpoint() + //syncpoint() + use_set_cache() setTimeout(() => { ste_status.value = 0; }, 100); @@ -380,7 +381,7 @@ export default defineComponent({ defaultnine.value[index].x = nine[index].x defaultnine.value[index].y = nine[index].y } - if (sessionStorage.SurfaceCorrection && sessionStorage.SurfaceCorrection.length > 0) { + if (sessionStorage.SurfaceCorrection) { set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection); use_set_cache() } else { @@ -394,6 +395,8 @@ export default defineComponent({ defaultninepostion.value[index].y = ninepostion.value[index].y; defaultnine.value[index].x = nine[index].x defaultnine.value[index].y = nine[index].y + nine[index].x = config.point9[index].x + nine[index].y = config.point9[index].y } } const reset = (index: number) => { @@ -537,7 +540,8 @@ export default defineComponent({ reset, isshowarray, isactivearray, - activeMouseDown + activeMouseDown, + set_cache }; }, }); diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index f6b4dce..03b730a 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -26,7 +26,7 @@ - +

{{ $t("Projector") }}

@@ -62,7 +62,7 @@ ]" />
- +
@@ -71,7 +71,7 @@ - + @@ -133,18 +133,8 @@ export default defineComponent({ const showDialog = async () => { show_dialog.value = true; }; - const resize = ref(true) - // //窗口变动重新渲染 - // onMounted(() => { - // //监听窗口变化 - // window.onresize = () => { - // return (() => { - // resize.value = false; setTimeout(() => { - // resize.value = true - // }, 100); - // })(); - // }; - // }); + + //投影机数量 @@ -183,6 +173,7 @@ export default defineComponent({ show_dialog.value = false clear() set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); }) + $store.commit('setSelectedProjector','0/0'); } const getconfig=()=>{ try { @@ -194,14 +185,12 @@ export default defineComponent({ } const clear = () => { - - sessionStorage.removeItem('DensityCorrection') - sessionStorage.removeItem('FourPointCalibration') - - sessionStorage.removeItem('SurfaceCorrection') - + $store.commit('setSelectedProjector','0/0'); setTimeout(() => { sessionStorage.removeItem('FusionLocale') + sessionStorage.removeItem('SurfaceCorrection') + sessionStorage.removeItem('DensityCorrection') + sessionStorage.removeItem('FourPointCalibration') }, 500) getconfig() } @@ -222,7 +211,6 @@ export default defineComponent({ }, 1000); }) return { - resize, clear, show_dialog, options, diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index 52151ba..1a648a7 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -598,7 +598,7 @@ export default defineComponent({ ); const getconfig=()=>{ try { - set?.GetBlendingConfig("").then((res)=>{}) + set?.GetBlendingConfig("").then((res)=>{console.log(res)}) set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); }) } catch (error) {