From f069fd9deef0a4a17d25e2c6b1e8450b9d364011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Thu, 3 Jul 2025 21:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=AF=92=E8=AE=BE=E7=BD=AE=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=97=B6=E6=94=B9=E4=B8=BA=E8=BF=90=E8=A1=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=88=87=E4=B8=94=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=85=8D?= =?UTF-8?q?=E6=96=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/formula/FormulaConfig.vue | 3 ++- src/components/home/HomeSetting.vue | 11 ++++++----- src/components/home/config.vue | 2 +- src/router/routes.ts | 5 +++++ src/views/formula/index.vue | 2 +- src/views/home/chart.vue | 4 ++-- src/views/setting/index.vue | 2 +- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/components/formula/FormulaConfig.vue b/src/components/formula/FormulaConfig.vue index 15483fc..3a93546 100644 --- a/src/components/formula/FormulaConfig.vue +++ b/src/components/formula/FormulaConfig.vue @@ -19,6 +19,7 @@ import { useFormulaStore } from '@/stores/formulaStore' const props = defineProps<{ type: string + formulaNameVisible: boolean }>() const nameLeng = 10 @@ -391,7 +392,7 @@ defineExpose({
- + { const deviceState = computed(() => { return disinfectionState.value.state === 'idle' || disinfectionState.value.state === 'finished' }) - +const disinfectFormulaTitle = ref('消毒设置') /** * @function 打开消毒设置对话框 * @desc 根据当前选中配方或默认配方初始化设置 */ -const onDisinfectConfig = () => { +const onDisinfectConfig = (title: string) => { formulaStore.updateSelectedFormulaDataByList(selectedByFormulas.value || cloneDeep(formulaStore.defaultFormulaInfo)) disinfectFormulaVisible.value = true + disinfectFormulaTitle.value = title } /** @@ -260,7 +261,7 @@ const settingWidth = computed(() => { :width="settingWidth" text-color="#1989fa" height="3rem" - @click="onDisinfectConfig" + @click="onDisinfectConfig('消毒设置')" /> { :width="settingWidth" text-color="#1989fa" height="3rem" - @click="onDisinfectConfig" + @click="onDisinfectConfig('运行参数')" />
- +
diff --git a/src/components/home/config.vue b/src/components/home/config.vue index 5a1de43..e9e8ce9 100644 --- a/src/components/home/config.vue +++ b/src/components/home/config.vue @@ -135,7 +135,7 @@ const onDefaultFormula = () => {
- +
{ return item.name !== 'liquid' }) } + /* else { // 管道式 + authRoutes.value = authRoutes.value.filter((item) => { + return item.name !== 'liquid' + }) + } */ }, 2000) }) diff --git a/src/views/formula/index.vue b/src/views/formula/index.vue index d0b8b55..019e2dd 100644 --- a/src/views/formula/index.vue +++ b/src/views/formula/index.vue @@ -43,7 +43,7 @@ const selectedIndexRest = () => {
- +
diff --git a/src/views/home/chart.vue b/src/views/home/chart.vue index 0284cb5..535f365 100644 --- a/src/views/home/chart.vue +++ b/src/views/home/chart.vue @@ -87,7 +87,7 @@ const onClose = () => {
{ />
- +
diff --git a/src/views/setting/index.vue b/src/views/setting/index.vue index 148cd1e..5c3e8fa 100644 --- a/src/views/setting/index.vue +++ b/src/views/setting/index.vue @@ -38,7 +38,7 @@ const selectItem = (menuCode: string) => {
- +