diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue index aa86ce7..69160aa 100644 --- a/src/components/FusionSettings/FourPointCalibration.vue +++ b/src/components/FusionSettings/FourPointCalibration.vue @@ -207,7 +207,6 @@ import { useStore } from "src/store"; import { useI18n } from "vue-i18n"; import ClientConnection from "src/common/ClientConnection"; import GlobalData from "src/common/GlobalData"; -import { json } from "body-parser"; export default defineComponent({ name: "ComponentFourPointCalibration", @@ -513,7 +512,7 @@ export default defineComponent({ isactivearray.value[index] = false; } }; - //手动同步 + //手动同步 const set_point_x = () => { let x = Math.ceil(four[0].x / Proportion.value.x); let y = Math.ceil((config.height - four[0].y) / Proportion.value.y); diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue index 4067013..59f4aac 100644 --- a/src/components/FusionSettings/FusionLocale.vue +++ b/src/components/FusionSettings/FusionLocale.vue @@ -190,6 +190,7 @@ export default defineComponent({ default: break; } + save_set_cache() } const reduce = (type: string) => { let tmp: Number; @@ -341,8 +342,7 @@ export default defineComponent({ array[arr[index]].isshow = config.params[index].enable; array[arr[index]].value = Number(config.params[index].size); } - if (sessionStorage.FusionLocale) - set_cache.value = JSON.parse(sessionStorage.FusionLocale); + if (sessionStorage.FusionLocale)set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache(); setnowindex(); }; diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 9a6a359..2726173 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -84,13 +84,50 @@
+ - + @click="$store.commit('setSelectedProjector', '0/0');" /> + + + + +
{{ $t('Whether to save the configuration') }}
+
+ + + + + + + + +
+
+ + + + + +
{{ $t('read saved configuration') }}
+
+ + + + + + + +
+
+ + + @@ -145,10 +182,12 @@ export default defineComponent({ let $q = useQuasar(); let $t = useI18n(); let show_dialog = ref(false); - const save_name=ref("") + const save_name = ref("") const showDialog = async () => { show_dialog.value = true; }; + const select_configuration = ref(false) + const select_configuration_name = ref("") const send_hide_desktop = () => { set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0"); }; @@ -211,7 +250,7 @@ export default defineComponent({ $store.commit("setfusion_configuration", res?.config); }); $store.commit("setSelectedProjector", "0/0"); - medium.value=true + medium.value = true }; const getconfig = () => { try { @@ -272,10 +311,13 @@ export default defineComponent({ }); }, 1000); }); - const save_cover_name=ref(" ") - const plan_list= [ - 'Google', 'Facebook', 'Twitter', 'Apple', 'Oracle' - ] + const save_cover_name = ref(" ") + const plan_list = [ + 'Google', 'Facebook', 'Twitter', 'Apple', 'Oracle' + ] + const apply_the_selected_configuration = () => { + //这里根据选择的配置 应用 + } return { send_hide_desktop, hide_desktop_value, @@ -295,7 +337,10 @@ export default defineComponent({ medium, save_name, save_cover_name, - plan_list + plan_list, + select_configuration, + select_configuration_name, + apply_the_selected_configuration }; }, diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index e47a08f..8b1eeb7 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -431,5 +431,12 @@ export default { "line color":"line color", "center line color":"center line color", "center circle color":"center circle color", - "Whether to operate synchronously":"Whether to operate synchronously" + "Whether to operate synchronously":"Whether to operate synchronously", + "Select saved configuration":"Select saved configuration", + "read saved configuration":"read saved configuration", + "please choose":"please choose", + "save":"save", + "Whether to save the configuration":"Whether to save the configuration", + "New Please enter a name":"New Please enter a name", + "Please select an override":"Please select an override" }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index e2e839d..8b11266 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -700,5 +700,12 @@ export default { "line color":"线条颜色", "center line color":"中心线颜色", "center circle color":"中心圆颜色", - "Whether to operate synchronously":"是否同步操作" + "Whether to operate synchronously":"是否同步操作", + "Select saved configuration":"选择保存的配置", + "read saved configuration":"读取保存的配置", + "please choose":"请选择", + "save":"保存", + "Whether to save the configuration":"是否保存配置", + "New Please enter a name":"新建 请输入名称", + "Please select an override":"请选择覆盖" };