fix: 首页状态添加

src/apis/home.ts

@@ -3,3 +3,4 @@ import http from 'libs/http'
 export const setTargetTemperature = (params: Home.SetTargetTemperatureParams): Promise<null> => http.post('/heat/target-temperature', params)
 export const trayIn = (): Promise<null> => http.post('/tray/in')
 export const trayOut = (): Promise<null> => http.post('/tray/out')
+export const trayTube = (params: Home.TrayTubeParams): Promise<null> => http.post('/tray/out', params)

src/assets/styles/element.scss

@@ -4,7 +4,7 @@
 
 
 
-   --el-color-primary:  #26509C;
+   --el-color-primary:  #1989fa;
   //--el-button-active-bg-color: linear-gradient(90deg, #0657C0 24%, #096AE0 101%);
   --text-color-primary: #17213c;
   //--el-color-success: rgba(88, 162, 95, 1);

src/components/home/AddLiquid/index.vue

@@ -2,17 +2,32 @@
 import { getSolsList } from 'apis/solution'
 import emptyIcon from 'assets/images/empty.svg'
 import { FtMessage } from 'libs/message'
+import { socket } from 'libs/socket'
 import { useHomeStore } from 'stores/homeStore'
-import { onMounted, ref } from 'vue'
+import { useSystemStore } from 'stores/systemStore'
+import { onMounted, onUnmounted, ref } from 'vue'
 
 const emits = defineEmits(['ok', 'cancel'])
 
 const homeStore = useHomeStore()
+const systemStore = useSystemStore()
 
 onMounted(() => {
   getSols()
+  socket.init(receiveMessage, 'cmd_debug')
+  socket.init(receiveMessage, 'cmd_response')
 })
 
+onUnmounted(() => {
+  socket.unregisterCallback(receiveMessage, 'cmd_debug')
+  socket.unregisterCallback(receiveMessage, 'cmd_response')
+})
+
+let currentCommandId = ''
+const receiveMessage = (data: Socket.cmdData) => {
+  data.commandId === currentCommandId && systemStore.pushSystemList(data)
+}
+
 const form = ref<{
   tubeNum: number
   solutionId: number
@@ -77,16 +92,15 @@ const okHandle = async () => {
     return
   }
   console.log(mergeAddList())
-
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'solution_add',
     params: {
       dataList: mergeAddList(),
     },
   }
   await homeStore.sendControl(params)
-  // await debugStore.sendControl(params)
   emits('ok')
 }
 const cancel = () => {

src/components/home/Tube/index.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { pauseCraft, resumeCraft, stopCraft } from 'apis/crafts'
+import { trayTube } from 'apis/home'
 import errorIcon from 'assets/images/error.svg'
 import ingIcon from 'assets/images/ing.svg'
 import successIcon from 'assets/images/success.svg'
@@ -23,7 +24,7 @@ const emits = defineEmits(['selectChange', 'setTemperature'])
 
 const homeStore = useHomeStore()
 const systemStore = useSystemStore()
-const mousedownHandle = (e: Event) => {
+const mousedownHandle = async (e: Event) => {
   let event
   if ('touches' in e) {
     event = (e.touches as TouchList)[0]
@@ -32,11 +33,19 @@ const mousedownHandle = (e: Event) => {
     event = e
   }
   if (event.target!.classList!.contains('tube-inner')) {
-    activeTubeNum.value = event.target!.getAttribute('index')
+    const num = event.target!.getAttribute('index')
+    await trayTube({
+      trayUuid: tray.value!.uuid,
+      tubes: [
+        {
+          tubeNum: Number(num),
+          exists: !tray.value?.tubes.find(t => t.tubeNum === Number(num))?.exists,
+        },
+      ],
+    })
   }
 }
 
-const activeTubeNum = ref(0)
 const activeTubeBox = ref(false)
 
 const tubeSelect = () => {
@@ -51,6 +60,10 @@ const craft = computed(() => {
   return systemStore.systemStatus.tray.find(item => item.heatModuleId === props.data.moduleCode)?.crafts
 })
 
+const tray = computed(() => {
+  return systemStore.systemStatus.tray.find(item => item.heatModuleId === props.data.moduleCode)
+})
+
 const setTemperature = () => {
   emits('setTemperature', props.data.moduleCode)
 }
@@ -73,6 +86,25 @@ const stopCraftHandle = async () => {
   })
 }
 
+const tubes = [
+  { tubeNum: 13 },
+  { tubeNum: 14 },
+  { tubeNum: 15 },
+  { tubeNum: 16 },
+  { tubeNum: 9 },
+  { tubeNum: 10 },
+  { tubeNum: 11 },
+  { tubeNum: 12 },
+  { tubeNum: 5 },
+  { tubeNum: 6 },
+  { tubeNum: 7 },
+  { tubeNum: 8 },
+  { tubeNum: 1 },
+  { tubeNum: 2 },
+  { tubeNum: 3 },
+  { tubeNum: 4 },
+]
+
 defineExpose({
   activeTubeBox,
 })
@@ -106,7 +138,7 @@ defineExpose({
         <ft-button v-if="craft?.state === 'PAUSED'" type="primary" size="small" :click-handle="resumeCraftHandle">
           继续
         </ft-button>
-        <ft-button v-if="craft?.state === 'RUNNING'" size="small" :click-handle="stopCraftHandle">
+        <ft-button v-if="craft?.state !== 'READY'" size="small" :click-handle="stopCraftHandle">
           停止
         </ft-button>
       </div>
@@ -117,9 +149,9 @@ defineExpose({
       <span v-show="data.trayStatus === 1">已放置</span>
       <span v-show="data.trayStatus === 2">已抬起</span>
     </div>
-    <div class="tube-item" @mousedown.prevent="mousedownHandle" @touchstart.prevent="mousedownHandle">
+    <div class="tube-item" @click.prevent="mousedownHandle" @touch.prevent="mousedownHandle">
       <div v-if="data.trayStatus === 0" class="tube-disable" />
-      <span v-for="item in 16" :key="item" class="tube-inner" :class="{ 'tube-inner-active': item <= activeTubeNum }" />
+      <span v-for="item in tubes" :key="item.tubeNum" class="tube-inner" :class="{ 'tube-inner-active': tray?.tubes.find(tu => tu.tubeNum === item.tubeNum)?.exists }" :index="item.tubeNum" />
     </div>
     <div v-if="data.targetTemperature" class="temperature-box" @click="setTemperature">
       <span>

src/stores/systemStore.ts

@@ -4,7 +4,7 @@ export const useSystemStore = defineStore('system', {
   state: (): System.SystemStore => ({
     systemStatus: {
       virtual: false,
-      initComplete: false,
+      initComplete: true,
       selfTest: true,
       emergencyStop: false,
       door: {
@@ -13,7 +13,7 @@ export const useSystemStore = defineStore('system', {
       gantryArm: {
         idle: true,
       },
-      solutionArea: {
+      solutionModule: {
         idle: true,
         shaking: false,
         trayStatus: 0,
@@ -127,12 +127,13 @@ export const useSystemStore = defineStore('system', {
       ],
       tray: [
         {
-          uuid: '',
+          uuid: '111',
           heatModuleId: 'heat_module_01',
           inSolutionArea: false,
           inHeatModule: true,
           tubes: [
             {
+              tubeNum: 1,
               addSolution: true,
               exists: true,
             },
@@ -148,6 +149,7 @@ export const useSystemStore = defineStore('system', {
           inHeatModule: true,
           tubes: [
             {
+              tubeNum: 1,
               addSolution: true,
               exists: true,
             },
@@ -163,18 +165,19 @@ export const useSystemStore = defineStore('system', {
         },
         {
           uuid: '',
-          heatModuleId: 'heat_module_03',
+          heatModuleId: 'heat_module_04',
           inSolutionArea: false,
           inHeatModule: true,
           tubes: [
             {
+              tubeNum: 1,
               addSolution: true,
               exists: true,
             },
           ],
-          crafts: {
-            state: 'ERROR',
-          },
+          // crafts: {
+          //   state: 'ERROR',
+          // },
         },
       ],
     },

src/types/home.d.ts

@@ -11,4 +11,12 @@ declare namespace Home {
     moduleCode: string
     temperature: number
   }
+  interface TrayTubeParams {
+    trayUuid: string
+    tubes: {
+      tubeNum: number
+      addSolution?: boolean
+      exists: boolean
+    }[]
+  }
 }

src/types/system.d.ts

@@ -16,12 +16,12 @@ declare namespace System {
     selfTest: boolean
     emergencyStop: boolean
     door: {
-      status: boolean
+      open: boolean
     }
     gantryArm: {
       idle: boolean
     }
-    solutionArea: {
+    solutionModule: {
       idle: boolean
       shaking: boolean
       trayStatus: 0 | 1
@@ -29,25 +29,25 @@ declare namespace System {
       pumping: boolean
     }
     heatModule: HeatArea[]
-    tray: Tray[]
+    tray?: Tray[]
   }
   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
     inHeatModule: boolean
-    tubes: [
-      {
-        addSolution: boolean
-        exists: boolean
-      },
-    ]
-    crafts: {
+    tubes: Tubes[]
+    crafts?: {
       state: 'READY' | 'RUNNING' | 'PAUSED' | 'STOPPED' | 'ERROR' | 'FINISHED'
       craft?: CraftTypes.Craft
       currentIndex?: number
     }
   }
+  interface Tubes {
+    tubeNum: number
+    addSolution: boolean
+    exists: boolean
+  }
   interface HeatArea {
     moduleCode: 'heat_module_01' | 'heat_module_02' | 'heat_module_03' | 'heat_module_04' | 'heat_module_05' | 'heat_module_06'
     trayStatus: 0 | 1 | 2

src/views/home/index.vue

@@ -8,13 +8,29 @@ import StartExperiment from 'components/home/StartExperiment/index.vue'
 import Tube from 'components/home/Tube/index.vue'
 import { ElMessageBox } from 'element-plus'
 import { FtMessage } from 'libs/message'
+import { socket } from 'libs/socket'
 import { useHomeStore } from 'stores/homeStore'
 import { useSystemStore } from 'stores/systemStore'
-import { ref } from 'vue'
+import { onMounted, onUnmounted, ref } from 'vue'
 
 const homeStore = useHomeStore()
 const systemStore = useSystemStore()
 
+onMounted(() => {
+  socket.init(receiveMessage, 'cmd_debug')
+  socket.init(receiveMessage, 'cmd_response')
+})
+
+onUnmounted(() => {
+  socket.unregisterCallback(receiveMessage, 'cmd_debug')
+  socket.unregisterCallback(receiveMessage, 'cmd_response')
+})
+
+let currentCommandId = ''
+const receiveMessage = (data: Socket.cmdData) => {
+  data.commandId === currentCommandId && systemStore.pushSystemList(data)
+}
+
 const startVisible = ref(false)
 
 // const startExperimentHandle = () => {
@@ -56,17 +72,21 @@ const setTemperature = (id: string) => {
 
 const addLiquidVisible = ref(false)
 const addLiquid = () => {
-  const count = homeStore.heatAreaList.filter(item => item.selected).length
-  if (!count) {
-    FtMessage.warning('请选择加热区')
+  if (!systemStore.systemStatus.solutionModule.trayStatus) {
+    FtMessage.warning('加液区无托盘')
     return
   }
   addLiquidVisible.value = true
 }
 
 const door_open = async () => {
+  if (systemStore.systemStatus.door.open) {
+    FtMessage.warning('门已经是开启状态了')
+    return
+  }
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'door_open',
     params: { },
   }
@@ -86,8 +106,13 @@ const door_open = async () => {
 }
 
 const door_close = async () => {
+  if (!systemStore.systemStatus.door.open) {
+    FtMessage.warning('门已经是关闭状态了')
+    return
+  }
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'door_close',
     params: { },
   }
@@ -107,13 +132,19 @@ const door_close = async () => {
 }
 
 const move_to_heat_area = async () => {
+  if (systemStore.systemStatus.solutionModule.trayStatus === 0) {
+    FtMessage.warning('加液区无托盘')
+    return
+  }
   const selectedHeatAreas = homeStore.heatAreaList.filter(item => item.selected)
   if (!selectedHeatAreas.length || selectedHeatAreas.length > 1) {
     FtMessage.warning('请选择一个加热区')
     return
   }
+
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'move_to_heat_area',
     params: {
       heatId: selectedHeatAreas[0].value,
@@ -128,8 +159,13 @@ const move_to_solution_area = async () => {
     FtMessage.warning('请选择一个加热区')
     return
   }
+  if (systemStore.systemStatus.solutionModule.trayStatus === 1) {
+    FtMessage.warning('加液区有托盘')
+    return
+  }
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'move_to_solution_area',
     params: {
       heatId: selectedHeatAreas[0].value,
@@ -148,8 +184,9 @@ const heat_start = async () => {
     FtMessage.warning('请先设置温度')
     return
   }
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'heat_start',
     params: {
       heatId: selectedHeatAreas[0].value,
@@ -165,8 +202,9 @@ const heat_stop = async () => {
     FtMessage.warning('请选择一个加热区')
     return
   }
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'heat_stop',
     params: {
       heatId: selectedHeatAreas[0].value,
@@ -181,8 +219,9 @@ const tray_up = async () => {
     FtMessage.warning('请选择一个加热区')
     return
   }
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'tray_up',
     params: {
       heatId: selectedHeatAreas[0].value,
@@ -197,8 +236,9 @@ const tray_down = async () => {
     FtMessage.warning('请选择一个加热区')
     return
   }
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'tray_down',
     params: {
       heatId: selectedHeatAreas[0].value,
@@ -208,8 +248,9 @@ const tray_down = async () => {
 }
 
 const shake_start = async () => {
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'shake_start',
     params: {
     },
@@ -218,8 +259,9 @@ const shake_start = async () => {
 }
 
 const shake_stop = async () => {
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'shake_stop',
     params: {
     },
@@ -228,8 +270,9 @@ const shake_stop = async () => {
 }
 
 const take_photo = async () => {
+  currentCommandId = Date.now().toString()
   const params = {
-    commandId: Date.now().toString(),
+    commandId: currentCommandId,
     command: 'take_photo',
     params: {
     },