From f8986580ac51585eef6a6ce0932ac4331f9ab90b Mon Sep 17 00:00:00 2001 From: guoapeng Date: Sat, 14 Jun 2025 10:11:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BE=E7=89=87=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F;=E5=B7=A5=E8=89=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E6=97=B6;=E5=9B=BE=E7=89=87=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/craft/AddCraft/index.vue | 33 ++++++++++++++++++++++++--------- src/components/home/Photo/index.vue | 1 + src/components/home/SavePhoto/index.vue | 2 ++ src/views/home/index.vue | 1 + src/views/taskLog/index.vue | 5 ++++- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/components/craft/AddCraft/index.vue b/src/components/craft/AddCraft/index.vue index 0cc4bf7..6b9b3eb 100644 --- a/src/components/craft/AddCraft/index.vue +++ b/src/components/craft/AddCraft/index.vue @@ -32,11 +32,13 @@ onMounted(async () => { form.value = { ...props.sourceData, stepList: JSON.parse(props.sourceData.steps || '[]') } form.value.stepList?.forEach((step: CraftTypes.StepItem) => { if (step.params.second) { - step.params.minutes = Math.floor(step.params.second / 60) || undefined + step.params.hours = Math.floor(step.params.second / 3600) || undefined + step.params.minutes = Math.floor(step.params.second % 3600 / 60) || undefined step.params.seconds = step.params.second % 60 || undefined } if (step.params.coolingSecond) { - step.params.coolingMinutes = Math.floor(step.params.coolingSecond / 60) || undefined + step.params.coolingHours = Math.floor(step.params.coolingSecond / 3600) || undefined + step.params.coolingMinutes = Math.floor(step.params.coolingSecond % 3600 / 60) || undefined step.params.coolingSeconds = step.params.coolingSecond % 60 || undefined } }) @@ -82,11 +84,11 @@ const okHandle = async () => { } if (['startHeating', 'shaking', 'delay'].includes(step.method)) { - if (step.params.minutes || step.params.seconds) { - step.params.second = (step.params.minutes || 0) * 60 + (step.params.seconds || 0) || undefined + if (step.params.hours || step.params.minutes || step.params.seconds) { + step.params.second = (step.params.hours || 0) * 3600 + (step.params.minutes || 0) * 60 + (step.params.seconds || 0) || undefined } - if (step.params.coolingMinutes || step.params.coolingSeconds) { - step.params.coolingSecond = (step.params.coolingMinutes || 0) * 60 + (step.params.coolingSeconds || 0) || undefined + if (step.params.coolingHours || step.params.coolingMinutes || step.params.coolingSeconds) { + step.params.coolingSecond = (step.params.coolingHours || 0) * 3600 + (step.params.coolingMinutes || 0) * 60 + (step.params.coolingSeconds || 0) || undefined } } step.params.description = `${index + 1}.` @@ -97,13 +99,13 @@ const okHandle = async () => { }`).join(';') break case 'startHeating': - step.params.description = `加热: ${step.params.temperature}度, 保持${step.params.minutes || 0}分${step.params.seconds || 0}秒` + step.params.description = `加热: ${step.params.temperature}度, 保持${step.params.hours || 0}小时${step.params.minutes || 0}分${step.params.seconds || 0}秒` break case 'shaking': - step.params.description = `摇匀: ${step.params.second}秒` + step.params.description = `摇匀: ${step.params.hours || 0}小时${step.params.minutes || 0}分${step.params.seconds || 0}秒` break case 'delay': - step.params.description = `等待: ${step.params.second}秒` + step.params.description = `等待: ${step.params.hours || 0}小时${step.params.minutes || 0}分${step.params.seconds || 0}秒` break case 'takePhoto': step.params.description = `拍照` @@ -425,9 +427,14 @@ const addHandle = async () => {
保持时间 + + + + 小时 + @@ -436,6 +443,10 @@ const addHandle = async () => {
冷却时间 + + + + 小时 @@ -447,6 +458,10 @@ const addHandle = async () => {