From 1fdad09f88efee7cffc73cd4795dd235e3786a31 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Thu, 20 Mar 2025 23:22:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=96=B7=E6=B6=82=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E8=A7=84=E5=88=92=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/spray/trayGraph/index.vue |   6 +-
 src/libs/utils.ts                        |  13 ++-
 src/views/clean/index.vue                |  37 +++++---
 src/views/home/index.vue                 |  29 ------
 src/views/main/index.vue                 |  26 ++++++
 src/views/spray/index.vue                |   4 +
 src/views/spraySet/index.vue             | 150 +++++++++++++++----------------
 vite.config.ts                           |   4 +-
 8 files changed, 143 insertions(+), 126 deletions(-)

diff --git a/src/components/spray/trayGraph/index.vue b/src/components/spray/trayGraph/index.vue
index 31fa178..b876a26 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 { onMounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 
 const props = defineProps({
   container: {
@@ -166,9 +166,9 @@ const updateLine = (point: { x: number, y: number }) => {
 }
 
 // 新增方法：判断是否已添加了 line
-const hasLine = () => {
+const hasLine = computed(() => {
   return line.value !== undefined && line.value !== null
-}
+})
 
 watch(
   () => props.select,
diff --git a/src/libs/utils.ts b/src/libs/utils.ts
index c4610c4..fb3b3e2 100644
--- a/src/libs/utils.ts
+++ b/src/libs/utils.ts
@@ -41,18 +41,23 @@ export const sendControl = async (params: any, type?: string) => {
     FtMessage.error('当前不可以暂停')
     return
   }
-
-  if (systemStatus.cleaningSyringePipeline && (type === 'debug' || ['nozzle_pipeline_wash', 'matrix_spray_start', 'matrix_prefill'].includes(params.cmdCode))) {
+  const PipelineDisableCmd = [
+    'syringe_pipeline_wash',
+    'nozzle_pipeline_wash',
+    'matrix_spray_start',
+    'matrix_prefill',
+  ]
+  if (systemStatus.cleaningSyringePipeline && (type === 'debug' || PipelineDisableCmd.includes(params.cmdCode))) {
     FtMessage.error('正在清洗注射器管路, 无法执行')
     return
   }
 
-  if (systemStatus.cleaningNozzlePipeline && (type === 'debug' || ['syringe_pipeline_wash', 'matrix_spray_start', 'matrix_prefill'].includes(params.cmdCode))) {
+  if (systemStatus.cleaningNozzlePipeline && (type === 'debug' || PipelineDisableCmd.includes(params.cmdCode))) {
     FtMessage.error('正在清洗喷嘴管路, 无法执行')
     return
   }
 
-  if (systemStatus.prefilling && (type === 'debug' || ['nozzle_pipeline_wash', 'syringe_pipeline_wash', 'matrix_spray_start'].includes(params.cmdCode))) {
+  if (systemStatus.prefilling && (type === 'debug' || PipelineDisableCmd.includes(params.cmdCode))) {
     FtMessage.error('正在预充管路, 无法执行')
     return
   }
diff --git a/src/views/clean/index.vue b/src/views/clean/index.vue
index 969c089..0056de3 100644
--- a/src/views/clean/index.vue
+++ b/src/views/clean/index.vue
@@ -5,6 +5,8 @@ import { sendControl } from 'libs/utils'
 import { h, ref } from 'vue'
 
 const clearSpeed = ref()
+
+const syringePipelineWashRef = ref()
 const syringePipelineWash = () => {
   if (!clearSpeed.value) {
     FtMessage.error('请输入清洗速度')
@@ -20,7 +22,8 @@ const syringePipelineWash = () => {
     cancelButtonText: '取消',
     showCancelButton: true,
     showClose: false,
-  }).then(() => {
+  }).then(async () => {
+    syringePipelineWashRef.value.setLoading(true)
     const params = {
       cmdCode: 'syringe_pipeline_wash',
       cmdId: '',
@@ -28,12 +31,16 @@ const syringePipelineWash = () => {
         speed: clearSpeed,
       },
     }
-    sendControl(params)
-  }).catch(() => {
-    FtMessage.error('取消清洗')
+    try {
+      await sendControl(params)
+    }
+    finally {
+      syringePipelineWashRef.value.setLoading(false)
+    }
   })
 }
 
+const nozzlePipelineWashRef = ref()
 const nozzlePipelineWash = () => {
   if (!clearSpeed.value) {
     FtMessage.error('请输入清洗速度')
@@ -49,7 +56,8 @@ const nozzlePipelineWash = () => {
     cancelButtonText: '取消',
     showCancelButton: true,
     showClose: false,
-  }).then(() => {
+  }).then(async () => {
+    nozzlePipelineWashRef.value.setLoading(true)
     const params = {
       cmdCode: 'nozzle_pipeline_wash',
       cmdId: '',
@@ -57,19 +65,22 @@ const nozzlePipelineWash = () => {
         speed: clearSpeed,
       },
     }
-    sendControl(params)
-  }).catch(() => {
-    FtMessage.error('取消清洗')
+    try {
+      await sendControl(params)
+    }
+    finally {
+      nozzlePipelineWashRef.value.setLoading(false)
+    }
   })
 }
 
-const syringePipelineWashStop = () => {
+const syringePipelineWashStop = async () => {
   const params = {
     cmdCode: 'syringe_pipeline_wash_stop',
     cmdId: '',
     params: {},
   }
-  sendControl(params)
+  await sendControl(params)
 }
 </script>
 
@@ -80,13 +91,13 @@ const syringePipelineWashStop = () => {
       <el-input v-model="clearSpeed" type="number" style="width: 100px;margin:0 10px" />
       <span>uL/min</span>
     </div>
-    <FtButton type="primary" @click="syringePipelineWash">
+    <FtButton ref="syringePipelineWashRef" type="primary" @click="syringePipelineWash">
       清洗注射器管路
     </FtButton>
-    <FtButton type="primary" @click="nozzlePipelineWash">
+    <FtButton ref="nozzlePipelineWashRef" type="primary" @click="nozzlePipelineWash">
       清洗喷嘴管路
     </FtButton>
-    <FtButton @click="syringePipelineWashStop">
+    <FtButton :click-handle="syringePipelineWashStop">
       结束清洗
     </FtButton>
   </div>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index db6a0ed..9600c7d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,35 +1,7 @@
 <script setup lang="ts">
-import { getDeviceStatus } from 'apis/system'
-import Check from 'components/home/Check/index.vue'
-import { ElMessageBox } from 'element-plus'
-import { useSystemStore } from 'stores/useSystemStore'
-import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 
-const systemStore = useSystemStore()
 const router = useRouter()
-
-const checkVisible = ref(false)
-const ok = () => {
-  checkVisible.value = false
-}
-
-getDeviceStatus().then((res: any) => {
-  systemStore.updateSystemStatus(res)
-  if (!systemStore.systemStatus.selfTestCompleted) {
-    ElMessageBox.confirm('检测到您还未完成自检,是否开始自检？', '提示', {
-      type: 'warning',
-      confirmButtonText: '确定',
-      showCancelButton: false,
-      showClose: false,
-      closeOnClickModal: false,
-      closeOnPressEscape: false,
-      closeOnHashChange: false,
-    }).then(() => {
-      checkVisible.value = true
-    })
-  }
-})
 </script>
 
 <template>
@@ -60,7 +32,6 @@ getDeviceStatus().then((res: any) => {
         <p>坐标管理</p>
       </div>
     </div>
-    <Check v-if="checkVisible" @ok="ok" @cancel="checkVisible = false" />
   </div>
 </template>
 
diff --git a/src/views/main/index.vue b/src/views/main/index.vue
index 7509325..fe945b9 100644
--- a/src/views/main/index.vue
+++ b/src/views/main/index.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
+import { getDeviceStatus } from 'apis/system'
 import FtStream from 'components/common/FTStream/index.vue'
+import Check from 'components/home/Check/index.vue'
 import Stop from 'components/home/stop/index.vue'
+import { ElMessageBox } from 'element-plus'
 import { isClose, socket } from 'libs/socket'
 import { sendControl } from 'libs/utils'
 import { useSystemStore } from 'stores/useSystemStore' // 引入 systemStore
@@ -11,6 +14,28 @@ const route = useRoute()
 const router = useRouter()
 const systemStore = useSystemStore() // 使用 systemStore
 
+const checkVisible = ref(false)
+
+getDeviceStatus().then((res: any) => {
+  systemStore.updateSystemStatus(res)
+  if (!systemStore.systemStatus.selfTestCompleted) {
+    ElMessageBox.confirm('检测到您还未完成自检,是否开始自检？', '提示', {
+      type: 'warning',
+      confirmButtonText: '确定',
+      showCancelButton: false,
+      showClose: false,
+      closeOnClickModal: false,
+      closeOnPressEscape: false,
+      closeOnHashChange: false,
+    }).then(() => {
+      checkVisible.value = true
+    })
+  }
+})
+
+const ok = () => {
+  checkVisible.value = false
+}
 const statusMessage = (data: any) => {
   // 更新 systemStore 的 systemStatus
   console.log(data)
@@ -140,6 +165,7 @@ const slideTrayOut = async () => {
     </el-footer>
     <FtStream :visible="systemStore.streamVisible" />
     <Stop v-if="systemStore.systemStatus.stopPressed" />
+    <Check v-if="checkVisible" @ok="ok" @cancel="checkVisible = false" />
   </el-container>
 </template>
 
diff --git a/src/views/spray/index.vue b/src/views/spray/index.vue
index 6bf959e..10a904f 100644
--- a/src/views/spray/index.vue
+++ b/src/views/spray/index.vue
@@ -46,6 +46,10 @@ const infoVisible = ref(false)
 
 onMounted(() => {
   getMatrixList()
+  // nextTick(() => {
+  //   currentSpeed = 1
+  //   sprayPointReceiveMessage({ index: 0, currentPoint: { x: 1, y: 1 }, nextPoint: { x: 10, y: 1 } })
+  // })
 })
 
 const matrixList = ref([])
diff --git a/src/views/spraySet/index.vue b/src/views/spraySet/index.vue
index 6592e03..824a29b 100644
--- a/src/views/spraySet/index.vue
+++ b/src/views/spraySet/index.vue
@@ -50,20 +50,22 @@ const dehumidifierStart = () => {
     cancelButtonText: '取消',
     showCancelButton: true,
     showClose: false,
-  }).then(async () => {
-    dehumidifierStartRef.value.setLoading(true)
-    const params = {
-      cmdCode: 'dehumidifier_start',
-      cmdId: '',
-      params: {
-        humidity: humidity.value,
-      },
-    }
-    await sendControl(params)
-    dehumidifierStartRef.value.setLoading(false)
-  }).catch(() => {
-    FtMessage.error('取消除湿')
   })
+    .then(async () => {
+      dehumidifierStartRef.value.setLoading(true)
+      const params = {
+        cmdCode: 'dehumidifier_start',
+        cmdId: '',
+        params: {
+          humidity: humidity.value,
+        },
+      }
+      await sendControl(params)
+      dehumidifierStartRef.value.setLoading(false)
+    })
+    .catch(() => {
+      FtMessage.error('取消除湿')
+    })
 }
 
 const syringePipelineWashRef = ref()
@@ -74,29 +76,28 @@ const syringePipelineWash = async () => {
   }
   ElMessageBox({
     title: '提示',
-    message: h('div', null, [
-      h('p', null, '请检查废液瓶是否已满 '),
-      h('p', null, '请检查设备内是否有异物'),
-    ]),
+    message: h('div', null, [h('p', null, '请检查废液瓶是否已满 '), h('p', null, '请检查设备内是否有异物')]),
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     showCancelButton: true,
     showClose: false,
-  }).then(async () => {
-    syringePipelineWashRef.value.setLoading(true)
-    const params = {
-      cmdCode: 'syringe_pipeline_wash',
-      cmdId: '',
-      params: {
-        speed: clearSpeed.value,
-      },
-    }
-    console.log('sendControl', params)
-    await sendControl(params)
-    syringePipelineWashRef.value.setLoading(false)
-  }).catch(() => {
-    FtMessage.error('取消清洗')
   })
+    .then(async () => {
+      syringePipelineWashRef.value.setLoading(true)
+      const params = {
+        cmdCode: 'syringe_pipeline_wash',
+        cmdId: '',
+        params: {
+          speed: clearSpeed.value,
+        },
+      }
+      console.log('sendControl', params)
+      await sendControl(params)
+      syringePipelineWashRef.value.setLoading(false)
+    })
+    .catch(() => {
+      FtMessage.error('取消清洗')
+    })
 }
 
 const nozzlePipelineWashRef = ref()
@@ -107,28 +108,28 @@ const nozzlePipelineWash = () => {
   }
   ElMessageBox({
     title: '提示',
-    message: h('div', null, [
-      h('p', null, '请检查废液瓶是否已满 '),
-      h('p', null, '请检查设备内是否有异物'),
-    ]),
+    message: h('div', null, [h('p', null, '请检查废液瓶是否已满 '), h('p', null, '请检查设备内是否有异物')]),
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     showCancelButton: true,
     showClose: false,
-  }).then(async () => {
-    nozzlePipelineWashRef.value.setLoading(true)
-    const params = {
-      cmdCode: 'nozzle_pipeline_wash',
-      cmdId: '',
-      params: {
-        speed: clearSpeed.value,
-      },
-    }
-    await sendControl(params)
-    nozzlePipelineWashRef.value.setLoading(false)
-  }).catch(() => {
-    FtMessage.error('取消清洗')
   })
+    .then(async () => {
+      nozzlePipelineWashRef.value.setLoading(true)
+      const params = {
+        cmdCode: 'nozzle_pipeline_wash',
+        cmdId: '',
+        params: {
+          speed: clearSpeed.value,
+        },
+      }
+      try {
+        await sendControl(params)
+      }
+      finally {
+        nozzlePipelineWashRef.value.setLoading(false)
+      }
+    })
 }
 
 const matrixPrefillRef = ref()
@@ -139,28 +140,27 @@ const matrixPrefill = () => {
   }
   ElMessageBox({
     title: '提示',
-    message: h('div', null, [
-      h('p', null, '请检查废液瓶是否已满 '),
-      h('p', null, '请检查设备内是否有异物'),
-    ]),
+    message: h('div', null, [h('p', null, '请检查废液瓶是否已满 '), h('p', null, '请检查设备内是否有异物')]),
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     showCancelButton: true,
     showClose: false,
-  }).then(async () => {
-    matrixPrefillRef.value.setLoading(true)
-    const params = {
-      cmdCode: 'matrix_prefill',
-      cmdId: '',
-      params: {
-        speed: speed.value,
-      },
-    }
-    await sendControl(params)
-    matrixPrefillRef.value.setLoading(false)
-  }).catch(() => {
-    FtMessage.error('取消预充')
   })
+    .then(async () => {
+      matrixPrefillRef.value.setLoading(true)
+      const params = {
+        cmdCode: 'matrix_prefill',
+        cmdId: '',
+        params: {
+          speed: speed.value,
+        },
+      }
+      await sendControl(params)
+      matrixPrefillRef.value.setLoading(false)
+    })
+    .catch(() => {
+      FtMessage.error('取消预充')
+    })
 }
 
 const pipelineWashStop = async () => {
@@ -199,10 +199,10 @@ const dehumidifierStop = async () => {
           <span> 清洗管道</span>
         </div>
       </template>
-      <div style="display: flex;align-items: center;margin-top: 20px">
-        <div style="display: flex;align-items: center;width: fit-content;margin-right: 30px">
+      <div style="display: flex; align-items: center; margin-top: 20px">
+        <div style="display: flex; align-items: center; width: fit-content; margin-right: 30px">
           <span>清洗速度</span>
-          <el-input v-model="clearSpeed" type="number" style="width: 100px;margin:0 10px" />
+          <el-input v-model="clearSpeed" type="number" style="width: 100px; margin: 0 10px" />
           <span>uL/min</span>
         </div>
         <ft-button ref="syringePipelineWashRef" type="primary" :click-handle="syringePipelineWash">
@@ -225,10 +225,10 @@ const dehumidifierStop = async () => {
           <span> 预充管道</span>
         </div>
       </template>
-      <div style="display: flex;align-items: center;margin-top: 20px">
-        <div style="display: flex;align-items: center;width: fit-content;margin-right: 30px">
+      <div style="display: flex; align-items: center; margin-top: 20px">
+        <div style="display: flex; align-items: center; width: fit-content; margin-right: 30px">
           <span>预充速度</span>
-          <el-input v-model="speed" type="number" style="width: 100px;margin:0 10px" />
+          <el-input v-model="speed" type="number" style="width: 100px; margin: 0 10px" />
           <span>uL/min</span>
         </div>
         <ft-button ref="matrixPrefillRef" type="primary" :click-handle="matrixPrefill">
@@ -249,15 +249,15 @@ const dehumidifierStop = async () => {
           <span> 环境设置</span>
         </div>
       </template>
-      <div style="display: flex;align-items: center;margin-top: 20px">
-        <div style="display: flex;align-items: center;width: fit-content;margin-right: 30px">
+      <div style="display: flex; align-items: center; margin-top: 20px">
+        <div style="display: flex; align-items: center; width: fit-content; margin-right: 30px">
           <span>当前湿度</span>
           <span class="num-text">{{ systemStore.systemSensor.humidity }}</span>
           <span>%RH</span>
         </div>
-        <div style="display: flex;align-items: center;width: fit-content;margin-right: 30px">
+        <div style="display: flex; align-items: center; width: fit-content; margin-right: 30px">
           <span>要求湿度</span>
-          <el-input v-model="humidity" type="number" style="width: 100px;margin:0 10px" />
+          <el-input v-model="humidity" type="number" style="width: 100px; margin: 0 10px" />
           <span>%RH</span>
         </div>
         <ft-button ref="dehumidifierStartRef" type="primary" :click-handle="dehumidifierStart">
diff --git a/vite.config.ts b/vite.config.ts
index 3488468..6cd72a9 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -76,8 +76,8 @@ export default defineConfig({
     host: '0.0.0.0',
     proxy: {
       '/api': {
-        // target: 'http://192.168.1.199:8080',
-        target: 'http://192.168.1.200:8080',
+        target: 'http://192.168.1.199:8080',
+        // target: 'http://192.168.1.200:8080',
         // secure: false,
         changeOrigin: true, // 是否跨域
         rewrite: path => path.replace(/^\/api/, 'api'),