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.js b/src/lang/i18n.js index b655161..ede62a3 100644 --- a/src/lang/i18n.js +++ b/src/lang/i18n.js @@ -115,6 +115,10 @@ export default { design: { zh: '设计', en: 'Design' + }, + refresh: { + zh: '刷新', + en: 'Refresh' } }, navbar: { diff --git a/src/lang/i18n/en/module/dashboard.js b/src/lang/i18n/en/module/dashboard.js index 47a849f..84aba43 100644 --- a/src/lang/i18n/en/module/dashboard.js +++ b/src/lang/i18n/en/module/dashboard.js @@ -1,8 +1,8 @@ /* * @Author: gtz * @Date: 2022-03-15 16:42:34 - * @LastEditors: zwq - * @LastEditTime: 2022-03-16 08:57:49 + * @LastEditors: gtz + * @LastEditTime: 2022-03-16 20:01:32 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js */ @@ -12,5 +12,12 @@ export default { second: 'Second Row', title: 'WMS Inventory Information', pageHeader: 'No.', - pageFooter: ' Page' + pageFooter: ' Page', + isEmpty: 'Is Empty', + status: 'Status', + storageBoxCode: 'Cassette Code', + name: 'Location Name', + attribute: 'Location Attribute', + cassetteStatus: 'Cassette Status', + workOrderNo: 'Work Order Number' } diff --git a/src/lang/i18n/zh/module/dashboard.js b/src/lang/i18n/zh/module/dashboard.js index 6b4bdb9..7a24d29 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 20:01:27 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js */ @@ -12,5 +12,12 @@ export default { second: '第二排', title: 'WMS库存信息', pageHeader: '第', - pageFooter: '页' + pageFooter: '页', + isEmpty: '是否为空', + status: '状态', + storageBoxCode: '存储箱编码', + name: '库位名', + attribute: '库位属性', + cassetteStatus: '存储箱状态', + workOrderNo: '工单号' } diff --git a/src/views/basicData/Warehouse/components/processStorageLink.vue b/src/views/basicData/Warehouse/components/processStorageLink.vue index 34a2fd4..81ac54c 100644 --- a/src/views/basicData/Warehouse/components/processStorageLink.vue +++ b/src/views/basicData/Warehouse/components/processStorageLink.vue @@ -1,10 +1,10 @@ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5def9bf..18ef2fb 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 20:07:40 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue --> @@ -23,20 +23,21 @@ {{ item.name }} - + - + - -
-
- {{ 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 +49,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 +76,45 @@ +