From 6f359b88c62ee17542826de4e5bda675c19ce1c5 Mon Sep 17 00:00:00 2001 From: guoapeng Date: Wed, 11 Jun 2025 23:27:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E8=89=BA=E5=8A=A0=E6=B6=B2?= =?UTF-8?q?=E6=AD=A5=E9=AA=A42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/container/Item/index.vue | 4 +-- src/components/craft/AddCraft/index.vue | 50 +++++++++++++++++++++------------ src/components/craft/TransferRight.vue | 8 +++--- src/components/home/AddLiquid/index.vue | 4 +-- src/views/debug/index.vue | 2 +- src/views/pointDebug/index.vue | 2 +- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/src/components/container/Item/index.vue b/src/components/container/Item/index.vue index 2e5f048..3f52ae3 100644 --- a/src/components/container/Item/index.vue +++ b/src/components/container/Item/index.vue @@ -114,13 +114,13 @@ const onSubmitSolution = () => {
- {{ solutionInfo.capacityTotal }}ml + {{ solutionInfo.capacityTotal }}mL
已用
diff --git a/src/components/craft/AddCraft/index.vue b/src/components/craft/AddCraft/index.vue index 6427f51..2a4b0a2 100644 --- a/src/components/craft/AddCraft/index.vue +++ b/src/components/craft/AddCraft/index.vue @@ -81,8 +81,8 @@ const okHandle = async () => { step.params.description = `${index + 1}.` switch (step.method) { case 'addLiquid': - step.params.description = step.params.list.map(item => `试管[${item.tubeNums.length === 16 ? '全部' : item.tubeNums.join(',')}]: ${ - item.solutionList.map(s => `添加${solutionList.value.find(ss => ss.id === s.solutionId)?.name}- ${s.volume}ml-偏移量${s.offset}ml`).join(';') + step.params.description = step.params.list.map(item => `试管${item.tubeNum}: ${ + item.solutionList.map(s => `添加${solutionList.value.find(ss => ss.id === s.solutionId)?.name}- ${s.volume}mL${s.offset ? `-偏移量${s.offset}mL` : ''}`).join(';') }`).join(';') break case 'startHeating': @@ -185,18 +185,29 @@ const addHandle = async () => { return } console.log(addLiquidForm.value) - // addList.value!.push(addLiquidForm) - const index = form.value.stepList?.findIndex(item => item.method === 'addLiquid') - if (index !== -1) { - form.value.stepList?.[index || 0].params?.list?.push(cloneDeep(addLiquidForm.value)) - } - else { + if (form.value.stepList?.at(-1)?.method !== 'addLiquid') { form.value.stepList?.push({ name: '加液', method: 'addLiquid', - params: { list: [cloneDeep(addLiquidForm.value)] }, - } as CraftTypes.StepItem) + params: { + list: [], + }, + }) } + addLiquidForm.value.tubeNums.forEach((tubeNum: any) => { + const index = form.value.stepList?.at(-1)?.params?.list?.findIndex(item => item.tubeNum === tubeNum) + if (index !== -1) { + form.value.stepList?.at(-1)?.params?.list?.[index].solutionList.push(...cloneDeep(addLiquidForm.value.solutionList)) + } + else { + form.value.stepList?.at(-1)?.params?.list?.push({ + tubeNum, + solutionList: [...cloneDeep(addLiquidForm.value.solutionList)], + }) + } + }) + console.log(form.value) + addLiquidForm.value = { tubeNums: [], solutionList: [ @@ -207,6 +218,7 @@ const addHandle = async () => { }, ], } + activeTube.value = Array.from({ length: 16 }).fill(false) selectVisible.value = false addLiquidFormRef.value.resetFields() @@ -282,7 +294,7 @@ const addHandle = async () => { > @@ -290,14 +302,14 @@ const addHandle = async () => { @@ -333,15 +345,17 @@ const addHandle = async () => {
- 试管: {{ liquid.tubeNums.length === 16 ? '全部' : liquid.tubeNums.join(',') }} + 试管{{ liquid.tubeNum }}
添加 {{ solutionList.find(solution => solution.id === s.solutionId)?.name }} {{ s.volume }} - ml- - 偏移量 - {{ s.offset }} - ml + mL + + -偏移量 + {{ s.offset }} + mL +
diff --git a/src/components/craft/TransferRight.vue b/src/components/craft/TransferRight.vue index bfc3ecf..dbd2454 100644 --- a/src/components/craft/TransferRight.vue +++ b/src/components/craft/TransferRight.vue @@ -79,7 +79,7 @@ const queryContainerList = () => {
- ml + mL
@@ -88,17 +88,17 @@ const queryContainerList = () => {
- 秒 + 秒
加热温度： - °C + °C
加热时间： - 秒 + 秒
diff --git a/src/components/home/AddLiquid/index.vue b/src/components/home/AddLiquid/index.vue index 65491b7..9d9a872 100644 --- a/src/components/home/AddLiquid/index.vue +++ b/src/components/home/AddLiquid/index.vue @@ -172,7 +172,7 @@ const delHandle = (index: number) => { @@ -196,7 +196,7 @@ const delHandle = (index: number) => { {{ solsList.find(sol => sol.id === containerList.find(container => container.id === item.solutionList[0].solutionId)?.solutionId)?.name }} - 添加{{ item.solutionList[0].volume }}ml + 添加{{ item.solutionList[0].volume }}mL diff --git a/src/views/debug/index.vue b/src/views/debug/index.vue index eaf0039..4a3ec28 100644 --- a/src/views/debug/index.vue +++ b/src/views/debug/index.vue @@ -933,7 +933,7 @@ const savePositionVisible = ref(false) diff --git a/src/views/pointDebug/index.vue b/src/views/pointDebug/index.vue index 8f2ce67..4db3c63 100644 --- a/src/views/pointDebug/index.vue +++ b/src/views/pointDebug/index.vue @@ -918,7 +918,7 @@ const savePositionVisible = ref(false)