From 547cf1e1d6c882d839f8310a181b6efc8bc55027 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Mon, 25 Mar 2024 17:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/taskManagement/index.vue | 9 ++++-----
 src/views/wcs/base/AGV/index.vue   | 9 ++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/taskManagement/index.vue b/src/views/taskManagement/index.vue
index 09da4c0..6fc3a72 100644
--- a/src/views/taskManagement/index.vue
+++ b/src/views/taskManagement/index.vue
@@ -267,11 +267,11 @@
 </template>
 
 <script>
-import { queryPointList, getBasePointGroup, queryPointId, getWcsDeviceInfo, updatePoint, addPoint, delPoint } from '@/api/wcs/base/agvPoint.js'
-import { queryWcsDeviceList, getWcsDeviceList } from '@/api/wcs/base/wcsDevice.js'
-import { queryTaskManagement, cancelTask, instantlyTask } from '@/api/wcs/busFunctions/taskManagement.js'
+import { getBasePointGroup, updatePoint, addPoint } from '@/api/wcs/base/agvPoint.js'
+import { getWcsDeviceList } from '@/api/wcs/base/wcsDevice.js'
+import { queryTaskManagement, instantlyTask } from '@/api/wcs/busFunctions/taskManagement.js'
 import moment from 'moment'
-import { getTableHeader } from '@/api/wms/tableHeader/table'
+// import { getTableHeader } from '@/api/wms/tableHeader/table'
 export default {
   name: 'Configuration',
 
@@ -330,7 +330,6 @@ export default {
             } else if (row.taskStatus == '4') {
               return 'a到b任务完成'
             } else {
-              console.log(row.taskStatus)
               return row.taskStatus
             }
           }
diff --git a/src/views/wcs/base/AGV/index.vue b/src/views/wcs/base/AGV/index.vue
index 7a7f06d..91466f8 100644
--- a/src/views/wcs/base/AGV/index.vue
+++ b/src/views/wcs/base/AGV/index.vue
@@ -242,7 +242,14 @@ export default {
         {
           label: '拣货点位',
           prop: 'handshakePoint',
-          istrue: true
+          istrue: true,
+          filter(row) {
+            if (row.handshakePoint == '0') {
+              return '否'
+            } else if (row.handshakePoint == '1') {
+              return '是'
+            }
+          }
         },
         {
           label: '交互点位-回库',