From 0ae864f40ca7732dd11580f62369405a81bd11db Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Sun, 23 Mar 2025 01:58:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=87=AA=E6=A3=80=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/Check/index.vue      | 37 +++++++++++++++++++++-----------
 src/components/spray/trayGraph/index.vue | 11 ++++++----
 src/libs/utils.ts                        |  1 -
 src/views/spray/index.vue                |  2 +-
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/components/home/Check/index.vue b/src/components/home/Check/index.vue
index fe2d768..c89612d 100644
--- a/src/components/home/Check/index.vue
+++ b/src/components/home/Check/index.vue
@@ -22,9 +22,14 @@ const okHandle = () => {
 const list = ['x轴是否在原点', 'y轴是否在原点', 'z轴是否在原点']
 const status = ref<any>({})
 onMounted(async () => {
+  socket.init(receiveMessage, 'cmd_response')
+  await change()
+})
+
+const change = async () => {
   let num = 0
   await nextTick(() => {
-    buttonCloseRef.value.setLoading(true)
+    buttonCloseRef.value?.setLoading(true)
   })
   status.value = await getDeviceSelfTest()
 
@@ -36,22 +41,28 @@ onMounted(async () => {
     }
   }
   await interval()
-  buttonCloseRef.value.setLoading(false)
+  buttonCloseRef.value?.setLoading(false)
   closeVisible.value = false
-
-  socket.init(receiveMessage, 'cmd_response')
-})
+}
 
 const receiveMessage = (data: any) => {
-  if (data.cmdId === cmdId && data.status === 'success') {
-    for (let i = 0; i < checkList.value.length; i++) {
-      checkList.value[i].result = 'padding'
-      setTimeout(() => {
-        checkList.value[i].result = 'success'
-      }, 500)
+  if (data.cmdId === cmdId) {
+    if (data.status === 'success') {
+      for (let i = 0; i < checkList.value.length; i++) {
+        checkList.value[i].result = 'padding'
+        setTimeout(() => {
+          checkList.value[i].result = 'success'
+        }, 500)
+      }
+      buttonRef.value.setLoading(false)
+      closeVisible.value = true
+    }
+    else if (data.status === 'fail') {
+      FtMessage.error('自检失败')
+      change()
+      buttonRef.value.setLoading(false)
+      closeVisible.value = false
     }
-    buttonRef.value.setLoading(false)
-    closeVisible.value = true
   }
 }
 
diff --git a/src/components/spray/trayGraph/index.vue b/src/components/spray/trayGraph/index.vue
index 075a80d..d7f6599 100644
--- a/src/components/spray/trayGraph/index.vue
+++ b/src/components/spray/trayGraph/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Konva from 'konva'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 
 const props = defineProps({
   container: {
@@ -176,9 +176,12 @@ const updateLine = (point: { x: number, y: number }, index: number, stroke: stri
   if (!lines.value[index]) {
     addLine(stroke)
   }
-  const currentLine = lines.value[index]
-  currentLine.points([...currentLine.points(), point.x, point.y])
-  currentLine.getLayer()!.batchDraw() // 批量重绘提升性能
+  nextTick(() => {
+    const currentLine = lines.value[index]
+    console.log(currentLine, currentLine.points())
+    currentLine.points([...currentLine.points(), point.x, point.y])
+    currentLine.getLayer()!.batchDraw() // 批量重绘提升性能
+  })
 }
 
 // 新增方法：清除所有 line
diff --git a/src/libs/utils.ts b/src/libs/utils.ts
index a309857..e30be42 100644
--- a/src/libs/utils.ts
+++ b/src/libs/utils.ts
@@ -109,4 +109,3 @@ const rgbToHex = (r: number, g: number, b: number): string => {
 }
 
 export const colors = generateColors(100)
-console.log(colors)
diff --git a/src/views/spray/index.vue b/src/views/spray/index.vue
index 28a96ce..88a66f3 100644
--- a/src/views/spray/index.vue
+++ b/src/views/spray/index.vue
@@ -408,7 +408,7 @@ const addCraft = () => {
               <p class="tray-name">
                 玻片{{ index + 1 }}
               </p>
-              <TrayGraph ref="sprayRefs" :container="`spray-${index + 1}`" :select="p.select" />
+              <TrayGraph ref="sprayRefs" :key="index" :container="`spray-${index + 1}`" :select="p.select" />
               <el-checkbox v-model="p.select" />
             </div>
           </div>