From 1115f38adbf69e424250ac3e7c751bfe42dd4386 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Mon, 2 Jun 2025 20:19:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=80=92=E8=AE=A1=E6=97=B6=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/home.ts                        |  4 ++--
 src/components/home/StartHeat/index.vue |  2 +-
 src/components/home/Tube/index.vue      | 22 +++++++++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/apis/home.ts b/src/apis/home.ts
index 61fa6c2..291a15c 100644
--- a/src/apis/home.ts
+++ b/src/apis/home.ts
@@ -9,5 +9,5 @@ export const getTask = (id: number): Promise<Task.Task> => http.get(`${baseUrl}$
 export const taskList = (params: Task.TaskQuery): Promise<Task.Task[]> => http.get(`${baseUrl}list`, { params })
 export const getTaskIng = (): Promise<null> => http.get(`${baseUrl}getIngTask`)
 export const delTask = (params: string): Promise<null> => http.delete(`${baseUrl}${params}`)
-export const trayIn = (): Promise<null> => http.delete('tray/in')
-export const trayOut = (): Promise<null> => http.delete('tray/out')
+export const trayIn = (): Promise<null> => http.post('tray/in')
+export const trayOut = (): Promise<null> => http.post('tray/out')
diff --git a/src/components/home/StartHeat/index.vue b/src/components/home/StartHeat/index.vue
index bff2e7b..cb50293 100644
--- a/src/components/home/StartHeat/index.vue
+++ b/src/components/home/StartHeat/index.vue
@@ -85,7 +85,7 @@ const convertTime = () => {
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item label="保温时间" prop="time">
+      <el-form-item label="保持时间" prop="time">
         <div style="display: flex;width: 100%">
           <el-select v-model="form.minutes" clearable style="width: 100%" placeholder="请选择分钟" @change="convertTime">
             <el-option v-for="item in 60" :key="item" :label="item" :value="item" />
diff --git a/src/components/home/Tube/index.vue b/src/components/home/Tube/index.vue
index 907ae8e..234ef4e 100644
--- a/src/components/home/Tube/index.vue
+++ b/src/components/home/Tube/index.vue
@@ -5,9 +5,10 @@ import errorIcon from 'assets/images/error.svg'
 import ingIcon from 'assets/images/ing.svg'
 import successIcon from 'assets/images/success.svg'
 import waitIcon from 'assets/images/wait.svg'
+import { socket } from 'libs/socket'
 import { useHomeStore } from 'stores/homeStore'
 import { useSystemStore } from 'stores/systemStore'
-import { computed, ref } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 
 const props = withDefaults(defineProps<{ data: System.HeatArea }>(), {
   data: () => ({
@@ -24,10 +25,17 @@ const props = withDefaults(defineProps<{ data: System.HeatArea }>(), {
 
 const emits = defineEmits(['selectChange', 'setTemperature'])
 
-const formatTime = (seconds: number): string => {
-  const minutes = Math.floor(seconds / 60)
-  const secs = seconds % 60
-  return `${String(minutes).padStart(2, '0')}:${String(secs).padStart(2, '0')}`
+onMounted(() => {
+  socket.init(receiveMessage, 'heat_countdown')
+})
+
+onUnmounted(() => {
+  socket.unregisterCallback(receiveMessage, 'heat_countdown')
+})
+
+const numList = ref<{ heatModuleCode: string, countdownStr: string }[]>([])
+const receiveMessage = (data: any) => {
+  numList.value = data
 }
 
 const homeStore = useHomeStore()
@@ -157,8 +165,8 @@ defineExpose({
       <span v-show="data.heating" style="color: #FE0A0A ">加热中</span>
       <span v-show="data.fanOpen" style="color: #14A656 ">降温中</span>
     </div>
-    <div v-if="data.targetTime" style="text-align: center;font-size: 12px;color:#FE0A0A ">
-      {{ formatTime(data.targetTime) }}
+    <div v-if="numList.find(item => item.heatModuleCode === data.moduleCode)?.countdownStr" style="text-align: center;font-size: 12px;color:#FE0A0A ">
+      {{ numList.find(item => item.heatModuleCode === data.moduleCode)?.countdownStr }}
     </div>
     <div class="footer">
       <div class="tem-box">