From 9142c4eab3e2a124bf0209c7d3099b898f8841e3 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Fri, 21 Mar 2025 04:25:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=A1=E9=AA=8C=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E5=96=B7=E6=B6=82=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/Check/index.vue      |  7 +++++-
 src/components/martix/Edit/index.vue     |  2 +-
 src/components/spray/trayGraph/index.vue | 13 +++++++++++
 src/views/spray/index.vue                | 38 +++++++++++++++++++++++++++-----
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/components/home/Check/index.vue b/src/components/home/Check/index.vue
index 8ef4da9..fe2d768 100644
--- a/src/components/home/Check/index.vue
+++ b/src/components/home/Check/index.vue
@@ -139,8 +139,10 @@ const addTextToCheckList = async (text: string, id: number) => {
 .mask-box {
   display: flex;
   font-size: 35px;
+  align-items: center;
+  margin-bottom:  40px;
   .el-tag {
-    margin: 0 20px 10px 0;
+  margin-right: 20px;
     width: 100%;
   }
 }
@@ -158,4 +160,7 @@ const addTextToCheckList = async (text: string, id: number) => {
 .el-icon.el-icon--loading {
   animation: spin 1s linear infinite; // 确保 Loading 图标应用 spin 动画
 }
+:deep(.el-tag) {
+  padding:  30px 0;
+}
 </style>
diff --git a/src/components/martix/Edit/index.vue b/src/components/martix/Edit/index.vue
index 839517f..76cf185 100644
--- a/src/components/martix/Edit/index.vue
+++ b/src/components/martix/Edit/index.vue
@@ -58,7 +58,7 @@ const cancel = () => {
 <template>
   <FtDialog visible :title="form.id ? '编辑基质' : '新增基质'" width="40%" @ok="okHandle" @cancel="cancel">
     <el-form ref="formRef" label-width="120" :model="form" :rules="rules">
-      <el-form-item label="基质名称">
+      <el-form-item label="基质名称" prop="name">
         <el-input v-model="form.name" placeholder="" />
       </el-form-item>
     </el-form>
diff --git a/src/components/spray/trayGraph/index.vue b/src/components/spray/trayGraph/index.vue
index 8442dca..09c7034 100644
--- a/src/components/spray/trayGraph/index.vue
+++ b/src/components/spray/trayGraph/index.vue
@@ -140,6 +140,18 @@ const getSelection = () => {
   return null
 }
 
+// 新增方法：更新矩形选区位置
+const updateSelection = (x: number, y: number, width: number, height: number) => {
+  if (rect.value) {
+    rect.value.position({ x, y })
+    rect.value.width(width)
+    rect.value.height(height)
+    newWidth = width
+    newHeight = height
+    layer.value.draw()
+  }
+}
+
 const formatNum = (num: number) => {
   return Math.round(num * 100) / 100
 }
@@ -195,6 +207,7 @@ defineExpose({
   hasLines, // 修改: 曝露新方法
   hasLine,
   clearLines, // 修改: 曝露清除所有 line 的方法
+  updateSelection, // 新增: 曝露更新选区的方法
 })
 </script>
 
diff --git a/src/views/spray/index.vue b/src/views/spray/index.vue
index bddd96e..07e5d32 100644
--- a/src/views/spray/index.vue
+++ b/src/views/spray/index.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { list as listMatrix } from 'apis/matrix'
 import { getListByMatrixId, update } from 'apis/matrixCraft'
+import { getDeviceStatus, getSprayStatus } from 'apis/system'
 import route from 'assets/images/route.png'
 import route_active from 'assets/images/route_active.png'
 import route_horizontal_active from 'assets/images/route_horizontal2.png'
@@ -47,14 +48,41 @@ const submitParam = async () => {
 
 const infoVisible = ref(false)
 
-onMounted(() => {
-  getMatrixList()
-  systemStore.systemStatus.spraying && getSpraying()
+onMounted(async () => {
+  await getMatrixList()
+  console.log(222, systemStore.systemStatus.spraying)
+  await getDeviceStatus().then((res: any) => {
+    systemStore.updateSystemStatus(res)
+    if (systemStore.systemStatus.spraying) {
+      getSpraying()
+    }
+  })
 })
 
 const getSpraying = async () => {
-  // const res = await getSprayStatus()
-  // const sprayTaskSprayedList = res.sprayTaskSprayedList
+  const res = await getSprayStatus()
+  const sprayTaskSprayedList = res.sprayTaskSprayedList
+  form.value = res.sprayParams
+  form.value.position = [{ select: false }, { select: false }, { select: false }, { select: false }]
+  sprayTaskSprayedList.forEach((item: any) => {
+    form.value.position[item.index] = {
+      select: true,
+      x1: item.x1,
+      y1: item.y1,
+      x2: item.x2,
+      y2: item.y2,
+      index: item.index,
+    }
+    nextTick(() => {
+      sprayRefs.value[item.index].updateSelection(item.x1 * 5, item.y1 * 5, (item.x1 + item.x2) * 5, (item.y1 + item.y2) * 5)
+    })
+    sprayTaskSprayedList.forEach((task: any) => {
+      nextTick(() => {
+        drawLine(task.index, { x: task.sprayedPoints.x * 5, y: task.sprayedPoints.y * 5 }, task.number)
+      })
+    })
+    socket.init(sprayPointReceiveMessage, 'spray_point')
+  })
 }
 
 const matrixList = ref([])