From ffc6ee786d6e02a7d8a6c91981bde84f342fa38a Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Tue, 15 Jul 2025 14:28:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E9=97=B4=E6=96=AD=E5=96=B7?=
 =?UTF-8?q?=E6=B6=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/index.vue  |  6 +++++-
 src/views/spray/index.vue | 24 +++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/main/index.vue b/src/views/main/index.vue
index 4bbb694..9a2a15c 100644
--- a/src/views/main/index.vue
+++ b/src/views/main/index.vue
@@ -224,6 +224,10 @@ const nozzleSwitch = async () => {
     FtMessage.warning('喷头加热已经关闭')
   }
 }
+
+const backHandle = () => {
+  router.back()
+}
 </script>
 
 <template>
@@ -245,7 +249,7 @@ const nozzleSwitch = async () => {
         <ft-button v-if="systemStore.isDebug" @click="router.push('/debug')">
           调试
         </ft-button>
-        <ft-button v-if="route.path !== '/'" @click="router.push('/')">
+        <ft-button v-if="route.path !== '/'" @click="backHandle">
           返回
         </ft-button>
       </div>
diff --git a/src/views/spray/index.vue b/src/views/spray/index.vue
index c2beca3..43673ed 100644
--- a/src/views/spray/index.vue
+++ b/src/views/spray/index.vue
@@ -41,24 +41,22 @@ const getMatrixList = async () => {
 
 const getSpraying = async () => {
   const res: any = await getSprayStatus()
-  const sprayTaskSprayedList = res.sprayTaskSprayedList
   cmdId = res.cmdId
-
-  // form.value = {
-  //   ...res.sprayParams,
-  //   position: [{ select: false }, { select: false }, { select: false }, { select: false }],
-  // }
+  res.sprayTaskParams.forEach((item: any) => {
+    sprayStore.updateSprayForm(item, item.index)
+  })
   // res.sprayParams.position.forEach((p: any) => {
   //   form.value.position[p.index] = p
   //   nextTick(() => {
   //     sprayRefs.value[p.index].updateSelection(p.x1 * 5, p.y1 * 5, (p.x2 - p.x1) * 5, (p.y2 - p.y1) * 5)
   //   })
   // })
-  sprayTaskSprayedList.forEach((task: any) => {
-    nextTick(() => {
-      drawLine(task.index, { x: task.sprayedPoints.x * 5, y: task.sprayedPoints.y * 5 }, task.number)
+  res.sprayTaskSprayedList
+    .forEach((task: any) => {
+      nextTick(() => {
+        drawLine(task.index, { x: task.sprayedPoints.x * 5, y: task.sprayedPoints.y * 5 }, task.number)
+      })
     })
-  })
 }
 
 const sprayRefs = ref<any>([])
@@ -209,6 +207,10 @@ const ok = async (data: any) => {
   sprayStore.updateSprayForm(data, selectIndex.value)
 }
 
+const sprayParamsCancelHandle = () => {
+  selectCraftVisible.value = false
+}
+
 const selectIndex = ref(0)
 const currentFormData = ref()
 const openSetting = (index: number) => {
@@ -278,7 +280,7 @@ const viewParams = (index: number) => {
       :disabled="sprayParamsDisabled"
       :form-data="currentFormData"
       @ok="ok"
-      @cancel="selectCraftVisible = false"
+      @cancel="sprayParamsCancelHandle"
     />
   </div>
 </template>