From d29ca4c6dd4f5e964cc0d8ccc007972fb81f90cb Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 23 Feb 2023 19:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=9E=8D=E5=90=88=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=95=8C=E9=9D=A2=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 6 +-----
 src/components/FusionSettingsDialog.vue        | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index f0f1300..8516039 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -398,10 +398,6 @@ export default defineComponent({
       }, 100);
       })
       if(sessionStorage.FusionLocale_async)auto_sync.value=sessionStorage.FusionLocale_async=='true'
-      console.log("🚀 ~ file: FusionLocale.vue:401 ~ onMounted ~ sessionStorage.FusionLocale_async:", sessionStorage.FusionLocale_async)
-
-
-
     }),
       onBeforeUnmount(() => {
         sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
@@ -553,7 +549,7 @@ export default defineComponent({
       let tmpobjall = JSON.parse($store.state.fusion_configuration)
       if ($store.getters.GetTheCurrentlySelectedCamera[1] == 0) {
 
-        let tmp = set_cache.value[1].array == null ? tmpobjall.projectors[1].params : JSON.parse(set_cache.value[1]).array;
+        let tmp = set_cache.value[1] == null ? tmpobjall.projectors[1].params : JSON.parse(set_cache.value[1]);
         let set_cache_tmp: any = []
         if (tmp[1].hasOwnProperty("power")) {
           for (let index = 0; index < 4; index++) {
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 45cd13f..6a0efdc 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -172,7 +172,7 @@
           <div class="text-h6">{{ $t('Do you confirm the modification') }}</div>
         </q-card-section>
         <q-card-section class="q-pt-none">
-          {{ $t('Whether to delete') + name_to_be_deleted }}
+          {{ $t('Do you confirm the modification') }}
         </q-card-section>
         <q-card-actions align="right" class="bg-white text-teal">
           <q-btn flat :label="$t('Cancel')" @click="re_match_data" color="primary" v-close-popup />
@@ -470,7 +470,7 @@ export default defineComponent({
       if (config.value.col == 1 && config.value.row == 1) {
         optionsstr.value = "FourPointCalibration"
       } else {
-        optionsstr.value = "FusionLocale";
+        optionsstr.value = "FourPointCalibration";
       }
     };