From 1e0e2a529cf422ccd81693cbd9ce7f38baa8859a Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 14:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BC=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6=E7=BC=93?=
=?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/FusionLocale.vue | 15 +-
.../FusionSettings/GridSettings.vue | 47 ++-
src/components/FusionSettingsDialog.vue | 348 +++++++++---------
3 files changed, 217 insertions(+), 193 deletions(-)
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 80ddd9c..4067013 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -61,7 +61,8 @@
(val > -1 && val < 1920) || $t('Please enter 0-100'),
]" />
-
{{$t('Whether to operate synchronously')}}
+ {{ $t('Whether to operate synchronously') }}
@@ -163,7 +164,7 @@ export default defineComponent({
{ alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
{ alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
]);
- const auto_sync=ref(false)
+ const auto_sync = ref(false)
//正确的 索引编号
let arr = [1, 0, 2, 3];
let serverconfig = JSON.parse($store.state.fusion_configuration);
@@ -386,7 +387,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
- if(auto_sync.value)left_right_auto_add(newVal-oldVal);
+ if (auto_sync.value) left_right_auto_add(newVal - oldVal);
save_set_cache();
},
{ deep: true }
@@ -402,7 +403,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
- if(auto_sync.value)left_right_auto_add(newVal-oldVal);
+ if (auto_sync.value) left_right_auto_add(newVal - oldVal);
save_set_cache();
},
{ deep: true }
@@ -450,7 +451,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
- if(auto_sync.value)left_right_auto_add(0);
+ if (auto_sync.value) left_right_auto_add(0);
save_set_cache();
},
{ deep: true }
@@ -466,7 +467,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
- if(auto_sync.value)left_right_auto_add(0);
+ if (auto_sync.value) left_right_auto_add(0);
save_set_cache();
},
{ deep: true }
@@ -547,7 +548,7 @@ export default defineComponent({
if (ste_status.value == 0) {
set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
set_cache_tmp[2].isshow = array[1].isshow
- set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow , Number(set_cache_tmp[2].value));
+ set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow, Number(set_cache_tmp[2].value));
set_cache.value[0] = JSON.stringify(set_cache_tmp);
}
}
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 539170e..38dcb58 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -26,7 +26,8 @@
{{ $t('line color') }}
-
+
@@ -37,7 +38,8 @@
{{ $t('background color') }}
-
+
@@ -75,17 +77,18 @@