From c9439b7e787cc66ad94680439cb200d44905620e Mon Sep 17 00:00:00 2001 From: fangxiang Date: Thu, 1 Dec 2022 14:35:36 +0800 Subject: [PATCH] =?UTF-8?q?System=E5=AF=B9=E8=AF=9D=E6=A1=86=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DSpecialVideo=E4=B8=8BOutputBoard=E5=8F=AF=E8=A7=81?= =?UTF-8?q?=E7=9A=84BUG=20System=E5=AF=B9=E8=AF=9D=E6=A1=86=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DSpecialVideo=E4=B8=8BClean=20Browser=20Cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/boot/i18n.ts | 1 + src/components/SignalSourceTree.vue | 9 ++++++++- src/components/SystemSettingDialog.vue | 19 ++++++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/boot/i18n.ts b/src/boot/i18n.ts index 9a7a085..a6e7113 100644 --- a/src/boot/i18n.ts +++ b/src/boot/i18n.ts @@ -27,6 +27,7 @@ Cookies.set("language", language, { (window).currnet_use_language = language; const i18n = createI18n({ + legacy: false, locale: language, messages, }); diff --git a/src/components/SignalSourceTree.vue b/src/components/SignalSourceTree.vue index 483af09..2fdf227 100644 --- a/src/components/SignalSourceTree.vue +++ b/src/components/SignalSourceTree.vue @@ -9,7 +9,7 @@ :draggable=" prop.node.uuid != '' && $store.state.power_state && - !prop.node.item_data.system_default + (!prop.node.item_data.system_default || !prop.node.is_group) " @dragstart="(evt) => onDragStart(evt, prop.node)" @dragover="(evt) => onDragOver(evt, prop.node)" @@ -319,6 +319,9 @@ export default defineComponent({ (item) => item && (item as any).uuid == uuid ); if (signal_source_group) { + if (signal_source_group.system_default) { + return; + } if ( signal_source_group.parent_uuid == node.item_data.uuid ) { @@ -340,6 +343,10 @@ export default defineComponent({ (item) => item && (item as any).uuid == uuid ); if (signal_source) { + if (signal_source.system_default) { + return; + } + if (signal_source.group_uuid == node.item_data.uuid) { return; } diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index f4b43ea..f5d4d40 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -81,18 +81,12 @@ :label="$t('timing task')" :disable="loading" /> - + - +