feat: 工艺绑定

src/components/home/selectCraft/index.vue

@@ -34,9 +34,33 @@ const handleCheckAllChange = (val: CheckboxValueType, type: number) => {
 
 const tubeCrafts = ref([])
 
+const selectChange = (val: any) => {
+  const selectTubes = trayTubes1.value.concat(trayTubes2.value)
+  selectTubes.forEach((item) => {
+    const tube = tubeCrafts.value.find((tube: any) => tube.tubeNum === item)
+    if (tube) {
+      tube.craftsId = val
+    }
+    else {
+      tubeCrafts.value.push({
+        tubeNum: item,
+        craftsId: val,
+      })
+    }
+  })
+}
+
 const close = () => {
   emits('close')
 }
+
+const findCraftName = (id: number) => {
+  const craft = tubeCrafts.value.find((item: any) => item.tubeNum === id)
+  if (craft) {
+    return craftList.value.find(c => c.tubeNum === craft.craftsId)?.name
+  }
+  return undefined
+}
 </script>
 
 <template lang="pug">
@@ -50,6 +74,7 @@ const close = () => {
               div.tube-item
                 span.serial-number {{item.toString().padStart(2, '0')}}
                 el-checkbox(:value="item")
+              p {{findCraftName(item) || ''}}
       el-card
         el-checkbox(v-model="checkAll2" :indeterminate="isIndeterminate2" @change="val => handleCheckAllChange(val, 2)") 全选
         el-checkbox-group(v-model="trayTubes2" )
@@ -58,10 +83,10 @@ const close = () => {
               div.tube-item
                 span.serial-number {{(item+16).toString().padStart(2, '0')}}
                 el-checkbox(:value="item+16")
-              p 加热位打发过分沙发斯蒂芬
+              p {{findCraftName(item+16) || ''}}
     div.select-box
       p 选择工艺
-      el-select(style="width: 200px")
+      el-select(style="width: 200px" @change="selectChange")
         el-option(v-for="item in craftList" :key="item.id" :label="item.name" :value="item.id")
     template(#footer)
       ft-button(type="primary" :click-handle="start")

src/layouts/default.vue

@@ -61,7 +61,7 @@ const receiveMessage = async (data: any) => {
 
 watch (() => isClose.value, async (newVal) => {
   if (newVal) {
-    await checkCraft()
+    // await checkCraft()
   }
 })
 
@@ -83,15 +83,15 @@ onMounted(async () => {
   if (!systemStore.systemStatus.selfTest && systemStore.systemStatus.currentUser && systemStore.systemStatus.currentUser?.username !== 'test') {
     isCheck.value = true
   }
-  await checkCraft()
+  // await checkCraft()
 })
 
 const checkCraftVisible = ref(false)
-const checkCraft = async () => {
-  const res = await craftList()
-  systemStore.errorCraft = res && res.length > 0
-  systemStore.errCraftList = res
-}
+// const checkCraft = async () => {
+//   const res = await craftList()
+//   systemStore.errorCraft = res && res.length > 0
+//   systemStore.errCraftList = res
+// }
 
 // meta的isDefault=true 并且 当isDebug=true时,把debug路由的页面也显示
 const menuList = computed(() => {

src/views/home/index.vue

@@ -13,7 +13,7 @@ import { FtMessage } from 'libs/message'
 import { socket } from 'libs/socket'
 import { useHomeStore } from 'stores/homeStore'
 import { useSystemStore } from 'stores/systemStore'
-import { onMounted, ref, watch } from 'vue'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 
 const option = ref({
   grid: {
@@ -38,6 +38,16 @@ const option = ref({
   ],
 })
 
+onMounted(() => {
+  socket.init(receiveMessage, 'log')
+})
+onUnmounted(() => {
+  socket.unregisterCallback(receiveMessage, 'log')
+})
+const receiveMessage = async (data: any) => {
+  homeStore.insertLog(data)
+}
+
 const chartBox = ref(null)
 
 const systemStore = useSystemStore()
@@ -129,13 +139,8 @@ const heatList = computed(() => {
 const titrationList = computed(() => {
   return systemStore.systemStatus.titrationModule
 })
-onMounted(() => {
-  socket.init(receiveMessage, 'log')
-})
-const receiveMessage = async (data: any) => {
-  homeStore.insertLog(data)
-}
-const list = homeStore.logList
+
+const list = computed(() => homeStore.logList)
 </script>
 
 <template lang="pug">
@@ -164,6 +169,7 @@ const list = homeStore.logList
                   template(#default)
                     div.operation-box
                       ft-button(type="primary" :click-handle="() => addTube(item + 16)") 放入试管
+                      ft-button(type="primary" :click-handle="() => delTube(item+ 16)") 取出试管
                       //ft-button(type="primary" :click-handle="() => tubeMoveHandle(item + 16)") 移至加热位
                       ft-button(type="primary" :click-handle="() => tubeMoveHandle(item + 16)") 移至滴定位
                   template(#reference)