From f45addc8009d349e14be209f9279d298a379d76b Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Wed, 25 Sep 2024 17:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0AGV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 6 +- src/api/agvTask.js | 26 +- src/api/inventory.js | 10 +- src/views/business-agvTask/agvTask/index.vue | 427 +++++++++++++++++++ src/views/business-asn/asn/index.vue | 98 ++++- 5 files changed, 537 insertions(+), 30 deletions(-) create mode 100644 src/views/business-agvTask/agvTask/index.vue diff --git a/.env.production b/.env.production index 08b8329..a87b4e9 100644 --- a/.env.production +++ b/.env.production @@ -6,9 +6,9 @@ ENV = 'production' # 如果接口是 http 形式， wss 需要改为 ws #VUE_APP_WS_API = 'wss://eladmin.vip' -VUE_APP_BASE_API = 'http://47.103.100.52:8000' -VUE_APP_WS_API = 'ws://47.103.100.52:8000' -VUE_APP_REPORT_API = 'http://47.103.100.52:8055' +VUE_APP_BASE_API = 'http://101.37.151.105:8077' +VUE_APP_WS_API = 'ws://101.37.151.105:8077' +VUE_APP_REPORT_API = 'http://101.37.151.105:8085' #VUE_APP_BASE_API = 'http://139.196.165.224:8000' #VUE_APP_WS_API = 'ws://139.196.165.224:8000' diff --git a/src/api/agvTask.js b/src/api/agvTask.js index 2f4cb4b..b1161f6 100644 --- a/src/api/agvTask.js +++ b/src/api/agvTask.js @@ -1,13 +1,5 @@ import request from '@/utils/request' -export function queryAgvStatus(params) { - return request({ - url: 'api/queryAgvStatus', - method: 'get', - params - }) -} - export function add(data) { return request({ url: 'api/agvTask', @@ -32,20 +24,4 @@ export function edit(data) { }) } -export function missionStateCallback(data) { - return request({ - url: '/interfaces/api/amr/missionStateCallback', - method: 'post', - data - }) -} - -export function agvTaskCallback(data) { - return request({ - url: '/api/agvTask/agvTaskCallback', - method: 'post', - data - }) -} - -export default { add, edit, del,missionStateCallback,agvTaskCallback } +export default { add, edit, del } diff --git a/src/api/inventory.js b/src/api/inventory.js index c374223..204c48f 100644 --- a/src/api/inventory.js +++ b/src/api/inventory.js @@ -40,4 +40,12 @@ export function downloadXb(data) { }) } -export default { add, edit, del,knywInventory,downloadXb} +export function queryStockShangJia(status) { + return request({ + url: 'api/inventory/queryStockShangJia', + method: 'get', + params: {status} + }) +} + +export default {add, edit, del, knywInventory, downloadXb,queryStockShangJia} diff --git a/src/views/business-agvTask/agvTask/index.vue b/src/views/business-agvTask/agvTask/index.vue new file mode 100644 index 0000000..2a99586 --- /dev/null +++ b/src/views/business-agvTask/agvTask/index.vue @@ -0,0 +1,427 @@ + + + + + diff --git a/src/views/business-asn/asn/index.vue b/src/views/business-asn/asn/index.vue index 35d254a..a9d0e18 100644 --- a/src/views/business-asn/asn/index.vue +++ b/src/views/business-asn/asn/index.vue @@ -37,6 +37,17 @@ > 新增 + + + 容器上架 + + + + + + + + + + + + + 取 消 + 确 定 + + + { + this.stockOptions = res.map(item => item.stock); + // 清空 Map + this.stockOptionsMap.clear(); + // 处理数据并存入 Map + res.forEach(item => { + this.stockOptionsMap.set(item.id, item.stock); + }); + + }) + + }, + getStock(stockOption) { + const invId = this.getKeyByValue(stockOption); + this.stockShangjiaForm.id = invId + }, + getKeyByValue(value) { + for (const [key, val] of this.stockOptionsMap.entries()) { + if (val === value) { + return key; + } + } + return null; + }, + stockShangJiaCof(){ + + }, + stockShangJiaClose(done) { + this.stockShangjiaForm = {}; + // 清空 Map + this.stockOptionsMap.clear(); + done(); + }, + stockShangJiaCel() { + this.stockShangjiaForm = {}; + // 清空 Map + this.stockOptionsMap.clear(); + this.stockShangJiaDialogVisible = false; } } }