From 3ddd62c4c3044623e93ad0e5973f0f20430dcbc1 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Thu, 5 Jun 2025 10:35:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E8=89=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.vue                        |  4 ++--
 src/components/home/Tube/index.vue |  8 ++++----
 src/stores/systemStore.ts          |  8 ++++----
 src/types/craft.d.ts               |  4 ++--
 src/types/system.d.ts              | 16 +++++++++++-----
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/app.vue b/src/app.vue
index 1a9b861..9f69a44 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -9,13 +9,13 @@ onMounted(async () => {
   const res = await getStatus()
   console.log(res)
   console.log(systemStore.systemStatus)
-  systemStore.updateSystemStatus(res)
+  // systemStore.updateSystemStatus(res)
   startProgress()
 })
 
 socket.init((data: System.SystemStatus) => {
   console.log(data)
-  systemStore.updateSystemStatus(data)
+  // systemStore.updateSystemStatus(data)
 }, 'status')
 
 const progress = ref(0)
diff --git a/src/components/home/Tube/index.vue b/src/components/home/Tube/index.vue
index a928a8e..2479fa9 100644
--- a/src/components/home/Tube/index.vue
+++ b/src/components/home/Tube/index.vue
@@ -166,10 +166,10 @@ defineExpose({
         <span>{{ data.temperature || '--' }}</span>
         <span>℃</span>
       </span>
-      <span v-show="data.heatingType === 'warm_up'" style="color: #FF4500 ">预热中</span>
-      <span v-show="data.heatingType === 'thermostatic'" style="color: #FF4500 ">加热中</span>
-      <span v-show="data.heatingType === 'constant'" style="color: #F0E5DE ">恒温中</span>
-      <span v-show="data.fanOpen" style="color: #6CD3FF ">降温中</span>
+      <span v-show="data.heatingType === 'warm_up'" style="color: #FF4500;font-weight: bold ">预热中</span>
+      <span v-show="data.heatingType === 'thermostatic'" style="color: #FF4500;;font-weight: bold ">加热中</span>
+      <span v-show="data.heatingType === 'constant'" style="color: #eccbb6;font-weight: bold ">恒温中</span>
+      <span v-show="data.fanOpen" style="color: #6CD3FF;font-weight: bold ">降温中</span>
     </div>
     <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 }}
diff --git a/src/stores/systemStore.ts b/src/stores/systemStore.ts
index 0b98076..a42b34f 100644
--- a/src/stores/systemStore.ts
+++ b/src/stores/systemStore.ts
@@ -146,7 +146,7 @@ export const useSystemStore = defineStore('system', {
         {
           uuid: '111',
           heatModuleId: 'heat_module_01',
-          inSolutionArea: false,
+          inSolutionModule: false,
           inHeatModule: true,
           tubes: [
             {
@@ -167,7 +167,7 @@ export const useSystemStore = defineStore('system', {
         {
           uuid: '',
           heatModuleId: 'heat_module_03',
-          inSolutionArea: false,
+          inSolutionModule: false,
           inHeatModule: true,
           tubes: [
             {
@@ -180,7 +180,7 @@ export const useSystemStore = defineStore('system', {
         {
           uuid: '',
           heatModuleId: 'heat_module_04',
-          inSolutionArea: false,
+          inSolutionModule: false,
           inHeatModule: true,
           tubes: [
             {
@@ -201,7 +201,7 @@ export const useSystemStore = defineStore('system', {
         {
           uuid: '',
           heatModuleId: 'heat_module_05',
-          inSolutionArea: false,
+          inSolutionModule: false,
           inHeatModule: true,
           tubes: [
             {
diff --git a/src/types/craft.d.ts b/src/types/craft.d.ts
index 77c815d..fb3c10a 100644
--- a/src/types/craft.d.ts
+++ b/src/types/craft.d.ts
@@ -79,8 +79,8 @@ declare namespace CraftTypes {
     name?: string
     steps?: string
     oresId?: number
-    createTime?: string
-    updatetime?: string
+    createTime?: string | number
+    updateTime?: string | number
   }
   interface craftStatus {
     showDialog: () => void
diff --git a/src/types/system.d.ts b/src/types/system.d.ts
index 567f99a..8ff676c 100644
--- a/src/types/system.d.ts
+++ b/src/types/system.d.ts
@@ -20,8 +20,8 @@ declare namespace System {
     initComplete: boolean
     selfTest: boolean
     emergencyStop: boolean
-    currentUser: User.User | null
-    currentTasks: Task.Task[] | null
+    currentUser?: User.User | null
+    currentTasks?: Task.Task[] | null
     door: {
       open: boolean
     }
@@ -40,13 +40,14 @@ declare namespace System {
   }
   interface Tray {
     uuid: string
-    heatModuleId: 'heat_module_01' | 'heat_module_02' | 'heat_module_03' | 'heat_module_04' | 'heat_module_05' | 'heat_module_06'
-    inSolutionArea: boolean
+    heatModuleId?: 'heat_module_01' | 'heat_module_02' | 'heat_module_03' | 'heat_module_04' | 'heat_module_05' | 'heat_module_06'
+    inSolutionModule: boolean
     inHeatModule: boolean
     tubes: Tubes[]
     crafts?: {
       state: 'READY' | 'RUNNING' | 'PAUSED' | 'STOPPED' | 'ERROR' | 'FINISHED'
       craft?: CraftTypes.Craft
+      ores?: any
       currentIndex?: number
     }
   }
@@ -61,13 +62,18 @@ declare namespace System {
     trayStatus: 0 | 1
     heatingType: 'stop' | 'warm_up' | 'thermostatic' | 'constant'
     fanOpen: boolean
+    heating?: boolean
     capExist: boolean
     temperature: number
-    targetTemperature: number
+    heatTemperature?: number
+    startHeatTime?: number
+    targetTemperature?: number
     targetTime?: number
   }
   interface SolutionContainer {
     id: number
+    containerCode?: string
+    filledSolution?: boolean
     type: 'solution' | 'neutralization'
     empty: boolean
     full: boolean