From 4fba2f322e10f9be52edb28f184ac0ab3babc6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Thu, 1 Feb 2024 17:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hw-ui/src/api/board/firstFloor.js | 26 + hw-ui/src/api/board/index.js | 10 + hw-ui/src/views/board/firstFloor/index.vue | 445 ++++++---- .../views/board/fourthFloor/laserLight.vue | 834 ++++++++++++++++++ hw-ui/vue.config.js | 3 +- 5 files changed, 1168 insertions(+), 150 deletions(-) create mode 100644 hw-ui/src/api/board/firstFloor.js create mode 100644 hw-ui/src/api/board/index.js create mode 100644 hw-ui/src/views/board/fourthFloor/laserLight.vue diff --git a/hw-ui/src/api/board/firstFloor.js b/hw-ui/src/api/board/firstFloor.js new file mode 100644 index 0000000..1677d98 --- /dev/null +++ b/hw-ui/src/api/board/firstFloor.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + + +export function getMaterialBoms(query) { + return request({ + url: '/mes/api/getMaterialBoms', + method: 'get', + params: query + }) +} + +export function getWarehouses(query) { + return request({ + url: '/wms/api/getWarehouses', + method: 'get', + params: query + }) +} + +export function applyRawOutstock(query) { + return request({ + url: '/wms/api/applyRawOutstock', + method: 'post', + data: query + }) +} diff --git a/hw-ui/src/api/board/index.js b/hw-ui/src/api/board/index.js new file mode 100644 index 0000000..0c94995 --- /dev/null +++ b/hw-ui/src/api/board/index.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询设备BOM信息列表 +export function listBom(query) { + return request({ + url: '/dms/bom/list', + method: 'get', + params: query + }) +} diff --git a/hw-ui/src/views/board/firstFloor/index.vue b/hw-ui/src/views/board/firstFloor/index.vue index e7c79c2..9cb748f 100644 --- a/hw-ui/src/views/board/firstFloor/index.vue +++ b/hw-ui/src/views/board/firstFloor/index.vue @@ -5,68 +5,70 @@
派工信息
- - - - - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + +
@@ -80,76 +82,78 @@
计划明细
- + - - - - - - - - - - - - + + + + + + + + + + + + +
@@ -170,14 +174,86 @@ - 这是一段信息 - - 取 消 - 确 定 - + width="40%"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 申请领料 +
@@ -185,6 +261,7 @@ diff --git a/hw-ui/vue.config.js b/hw-ui/vue.config.js index a6084e2..5b9d77e 100644 --- a/hw-ui/vue.config.js +++ b/hw-ui/vue.config.js @@ -36,7 +36,8 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://175.27.215.92:7080`, - target: `http://localhost:7080`, + // target: `http://localhost:7080`, + target: `http://10.11.40.120:7080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''