From 2606220fa84825f16fb6b00ee996f8e3b28489ab Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Mon, 10 Jul 2023 11:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js         | 11 +++++++++++
 src/components/Excel.vue | 12 +++---------
 src/pages/index.vue      | 24 +++++++++++++++++++++---
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 9f936bb..5624f6c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -20,3 +20,14 @@ export const breakOffAutoCheckApi = id => {
     method: 'GET',
   })
 }
+
+export const saveCheckResult = (checkNumber, currentTaskId) => {
+  return request({
+    url: `/check/save`,
+    method: 'POST',
+    data: {
+      checkNumber,
+      taskId: currentTaskId,
+    },
+  })
+}
diff --git a/src/components/Excel.vue b/src/components/Excel.vue
index a5a9cba..849dd89 100644
--- a/src/components/Excel.vue
+++ b/src/components/Excel.vue
@@ -18,15 +18,9 @@ import { useImageStore, useTaskStore, useCheckStore } from '@/store'
 const imageStore = useImageStore()
 const taskStore = useTaskStore()
 const checkStore = useCheckStore()
-const props = defineProps({
-  excelData: {
-    type: Array,
-    default: [],
-  },
-})
 
 const showCoreDetail = index => {
-  const arr = props.excelData.filter(item => item.num == index)
+  const arr = taskStore.excelData.filter(item => item.num == index)
   if (checkStore.manualCheck) {
     if (arr?.length > 0) {
       const item = arr[0]
@@ -46,7 +40,7 @@ const showCoreDetail = index => {
 
 const getClass = index => {
   // 需要用item 获取真正实体
-  const arr = props.excelData.filter(item => item.num == index)
+  const arr = taskStore.excelData.filter(item => item.num == index)
   if (arr?.length > 0) {
     const item = arr[0]
     if (item.result == 1) {
@@ -84,7 +78,7 @@ const canClick = item => {
 }
 
 const getLine = (index, position) => {
-  const arr = props.excelData.filter(item => item.num == index)
+  const arr = taskStore.excelData.filter(item => item.num == index)
   if (arr?.length > 0) {
     const obj = arr[0]
     if (obj.secondSign && obj.firstSign) {
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 6d2e707..6c2c3ad 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -195,7 +195,7 @@
     <div class="main_content" v-if="accountStore.activePage == 0">
       <div class="two_content_container">
         <Image />
-        <Excel :excelData="taskStore.excelData" />
+        <Excel />
       </div>
       <div
         class="bottom_operation_container"
@@ -365,6 +365,7 @@ import {
 } from '@/store'
 import socket from '@/utils/websocket'
 import Cookie from '@/utils/cookie'
+import { MessagePlugin } from 'tdesign-vue-next'
 import { ref, onMounted, computed } from 'vue'
 import Excel from 'cpns/Excel'
 import Nuclear from 'cpns/Nuclear'
@@ -374,7 +375,7 @@ import Publish from 'cpns/Publish'
 import User from 'cpns/User'
 import DetailTable from 'cpns/DetailTable'
 import Debug from 'cpns/Debug'
-import { startAutoCheckApi, breakOffAutoCheckApi } from '@/api'
+import { startAutoCheckApi, breakOffAutoCheckApi, saveCheckResult } from '@/api'
 import { getProcessTaskInfoApi, getNextCoordApi } from '@/api/task'
 const accountStore = useAccountStore()
 const taskStore = useTaskStore()
@@ -499,6 +500,11 @@ const preBtn = async () => {
   const currentTaskId = taskStore.currentTaskId
   const res = await getNextCoordApi(checkNumber, currentTaskId, '0')
   if (res?.code == 200) {
+    if (!res?.data?.result) {
+      MessagePlugin('error', { content: '已到达检测边缘' })
+      return
+    }
+    checkStore.updateCheckNumber(res?.data?.result)
   }
 }
 
@@ -507,14 +513,24 @@ const nextBtn = async () => {
   const currentTaskId = taskStore.currentTaskId
   const res = await getNextCoordApi(checkNumber, currentTaskId, '1')
   if (res?.code == 200) {
+    if (!res?.data?.result) {
+      MessagePlugin('error', { content: '已到达检测边缘' })
+      return
+    }
     checkStore.updateCheckNumber(res?.data?.result)
   }
 }
 
-const check = () => {
+const check = async () => {
   const checkNumber = checkStore.checkNumber
   const currentTaskId = taskStore.currentTaskId
   // 检查当前坐标点的结果是否正确
+  // 获取到结果后，传到后端保存
+  const res = await saveCheckResult(checkNumber, currentTaskId)
+  if (res?.code == 200) {
+    // 核查成功后请求新数据
+    // 更新exceldata
+  }
 }
 
 onMounted(async () => {
@@ -522,6 +538,8 @@ onMounted(async () => {
   websocket.value.WebSocketSet(getSocketdata)
   getInitData()
 })
+
+// websocket 客户端 直接发送核查并获取结果
 </script>
 
 <style lang="scss" scoped>