From e752de53c2f932001acb0c622217103c07eb2b2b Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Wed, 11 Jun 2025 21:59:47 +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=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/craft/AddCraft/index.vue | 10 ++++++----
 src/components/home/Tube/index.vue      |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/craft/AddCraft/index.vue b/src/components/craft/AddCraft/index.vue
index c0344fc..6427f51 100644
--- a/src/components/craft/AddCraft/index.vue
+++ b/src/components/craft/AddCraft/index.vue
@@ -81,7 +81,9 @@ const okHandle = async () => {
         step.params.description = `${index + 1}.`
         switch (step.method) {
           case 'addLiquid':
-            step.params.description = '添加溶液'
+            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(';')
+            }`).join(';')
             break
           case 'startHeating':
             step.params.description = `加热: ${step.params.temperature}度, 保持${step.params.minutes || 0}分${step.params.seconds || 0}秒`
@@ -186,13 +188,13 @@ const addHandle = async () => {
     // addList.value!.push(addLiquidForm)
     const index = form.value.stepList?.findIndex(item => item.method === 'addLiquid')
     if (index !== -1) {
-      form.value.stepList?.[index || 0].params?.push(cloneDeep(addLiquidForm.value))
+      form.value.stepList?.[index || 0].params?.list?.push(cloneDeep(addLiquidForm.value))
     }
     else {
       form.value.stepList?.push({
         name: '加液',
         method: 'addLiquid',
-        params: [cloneDeep(addLiquidForm.value)],
+        params: { list: [cloneDeep(addLiquidForm.value)] },
       } as CraftTypes.StepItem)
     }
     addLiquidForm.value = {
@@ -330,7 +332,7 @@ const addHandle = async () => {
             <div v-for="(item, index) in form.stepList" :key="index" class="step-item">
               <el-form-item :label="`${index + 1}: ${item.name}`">
                 <div v-if="item.method === 'addLiquid'" class="list-box">
-                  <div v-for="(liquid, liquidIndex) in item.params" :key="liquidIndex">
+                  <div v-for="(liquid, liquidIndex) in item.params?.list || []" :key="liquidIndex">
                     <span>试管: {{ liquid.tubeNums.length === 16 ? '全部' : liquid.tubeNums.join(',') }} </span>
                     <div v-for="(s, sIndex) in liquid.solutionList" :key="sIndex">
                       <span>添加</span>
diff --git a/src/components/home/Tube/index.vue b/src/components/home/Tube/index.vue
index 111b333..50bb2af 100644
--- a/src/components/home/Tube/index.vue
+++ b/src/components/home/Tube/index.vue
@@ -145,7 +145,7 @@ defineExpose({
           <ft-button v-if="craft?.state === 'PAUSED'" type="primary" size="small" :click-handle="resumeCraftHandle">
             继续
           </ft-button>
-          <ft-button v-if="!['RUNNING', 'PAUSED'].includes(craft?.state)" size="small" :click-handle="stopCraftHandle">
+          <ft-button v-if="['RUNNING', 'PAUSED'].includes(craft?.state)" size="small" :click-handle="stopCraftHandle">
             停止
           </ft-button>
           <span v-if="craft?.state === 'FINISHED'">请取走托盘</span>
@@ -299,7 +299,7 @@ defineExpose({
     margin-top: auto;
     margin-bottom: 10px;
     display: flex;
-    justify-content: center;
+    justify-content: space-around;
     .ft-button {
       margin-right: 5px;
     }