From 6d4594b338a9b7750ef40001daf0b754e194f2c0 Mon Sep 17 00:00:00 2001 From: gtz217 <535262213@qq.com> Date: Wed, 16 Mar 2022 19:14:00 +0800 Subject: [PATCH] update --- src/api/dashboard.js | 27 + src/lang/i18n/en/module/dashboard.js | 12 +- src/lang/i18n/zh/module/dashboard.js | 12 +- src/views/dashboard/components/PortDetail.vue | 79 ++ src/views/dashboard/index.vue | 67 +- src/views/dashboard/testdata.js | 767 +++++++++--------- 6 files changed, 557 insertions(+), 407 deletions(-) create mode 100644 src/api/dashboard.js create mode 100644 src/views/dashboard/components/PortDetail.vue diff --git a/src/api/dashboard.js b/src/api/dashboard.js new file mode 100644 index 0000000..45ec4f8 --- /dev/null +++ b/src/api/dashboard.js @@ -0,0 +1,27 @@ +/* + * @Author: gtz + * @Date: 2022-03-16 16:08:06 + * @LastEditors: gtz + * @LastEditTime: 2022-03-16 16:45:41 + * @Description: file content + * @FilePath: \mt-ck-wms-ui\src\api\dashboard.js + */ +import request from '@/utils/request' + +// 获取菜单列表 +export function getPortList(data) { + return request({ + url: '/api/wms/location/shelfList', + method: 'post', + data + }) +} + +// 获取菜单详情 +export function getPortDetail(id) { + return request({ + url: '/api/wms/storage/box/circ/info/getByLocationId', + method: 'post', + data: { id } + }) +} diff --git a/src/lang/i18n/en/module/dashboard.js b/src/lang/i18n/en/module/dashboard.js index 2029cf6..00b6fbb 100644 --- a/src/lang/i18n/en/module/dashboard.js +++ b/src/lang/i18n/en/module/dashboard.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-03-15 16:42:34 * @LastEditors: gtz - * @LastEditTime: 2022-03-15 16:58:26 + * @LastEditTime: 2022-03-16 19:08:39 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js */ @@ -12,5 +12,13 @@ export default { second: 'Second Row', title: 'WMS Inventory Information', pageHeader: 'No.', - pageFooter: ' Page' + pageFooter: ' Page', + currLocation: 'Current Location', + isEmpty: 'Is Empty', + status: 'Status', + storageBoxCode: 'Cassette Code', + empty: 'Empty', + notEmpty: 'Not Empty', + initialize: 'Initialize', + finish: 'Finish' } diff --git a/src/lang/i18n/zh/module/dashboard.js b/src/lang/i18n/zh/module/dashboard.js index 6b4bdb9..c00db54 100644 --- a/src/lang/i18n/zh/module/dashboard.js +++ b/src/lang/i18n/zh/module/dashboard.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-03-15 16:42:34 * @LastEditors: gtz - * @LastEditTime: 2022-03-15 16:58:30 + * @LastEditTime: 2022-03-16 19:08:19 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js */ @@ -12,5 +12,13 @@ export default { second: '第二排', title: 'WMS库存信息', pageHeader: '第', - pageFooter: '页' + pageFooter: '页', + currLocation: '当前库位', + isEmpty: '是否为空', + status: '状态', + storageBoxCode: '存储箱编码', + empty: '空箱', + notEmpty: '有货', + initialize: '初始化', + finish: '完成' } diff --git a/src/views/dashboard/components/PortDetail.vue b/src/views/dashboard/components/PortDetail.vue new file mode 100644 index 0000000..a441313 --- /dev/null +++ b/src/views/dashboard/components/PortDetail.vue @@ -0,0 +1,79 @@ + + + + + + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5def9bf..af4cd8f 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-03-03 09:16:10 * @LastEditors: gtz - * @LastEditTime: 2022-03-15 16:47:57 + * @LastEditTime: 2022-03-16 19:12:35 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue --> @@ -28,15 +28,15 @@ - + - + - -
-
- {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }} + +
+
+ {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
@@ -48,22 +48,22 @@ - + - - - -
-
- {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }} + + + +
+
+ {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
- -
-
- {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }} + +
+
+ {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
@@ -75,24 +75,51 @@ +