diff --git a/src/api/warehouse/warehouse-area-setup.js b/src/api/warehouse/warehouse-area-setup.js new file mode 100644 index 00000000..b347597e --- /dev/null +++ b/src/api/warehouse/warehouse-area-setup.js @@ -0,0 +1,76 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 16:20:15 + * @LastEditors: zwq + * @LastEditTime: 2024-08-09 09:55:56 + * @Description: + */ +import request from '@/utils/request' + +// 创建库区设置 +export function createWarehouseArea(data) { + return request({ + url: '/extend/warehouse-area/create', + method: 'post', + data: data + }) +} + +// 更新库区设置 +export function updateWarehouseArea(data) { + return request({ + url: '/extend/warehouse-area/update', + method: 'put', + data: data + }) +} + +// 删除库区设置 +export function deleteWarehouseArea(id) { + return request({ + url: '/extend/warehouse-area/delete?id=' + id, + method: 'delete' + }) +} + +// 获得库区设置 +export function getWarehouseArea(id) { + return request({ + url: '/extend/warehouse-area/get?id=' + id, + method: 'get' + }) +} + +// 获得库区设置列表 +export function getWarehouseAreaList(id) { + return request({ + url: '/extend/warehouse-area/listAll?warehouseId=' + id, + method: 'get' + }) +} + +// 获得库区设置分页 +export function getWarehouseAreaPage(query) { + return request({ + url: '/extend/warehouse-area/page', + method: 'get', + params: query, + }) +} + +// 获得code +export function getCode() { + return request({ + url: '/extend/warehouse-area/getCode', + method: 'get' + }) +} +// 导出库区设置 Excel +export function exportWarehouseAreaExcel(query) { + return request({ + url: '/extend/warehouse-area/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouse-location-setup.js b/src/api/warehouse/warehouse-location-setup.js new file mode 100644 index 00000000..ab75d29f --- /dev/null +++ b/src/api/warehouse/warehouse-location-setup.js @@ -0,0 +1,84 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 16:20:15 + * @LastEditors: zwq + * @LastEditTime: 2024-08-08 15:56:30 + * @Description: + */ +import request from '@/utils/request' + +// 创建库位设置 +export function createWarehouseLocation(data) { + return request({ + url: '/extend/warehouse-location/create', + method: 'post', + data: data + }) +} + +// 更新库位设置 +export function updateWarehouseLocation(data) { + return request({ + url: '/extend/warehouse-location/update', + method: 'put', + data: data + }) +} + +// 删除库位设置 +export function deleteWarehouseLocation(id) { + return request({ + url: '/extend/warehouse-location/delete?id=' + id, + method: 'delete' + }) +} + +// 获得库位设置 +export function getWarehouseLocation(id) { + return request({ + url: '/extend/warehouse-location/get?id=' + id, + method: 'get' + }) +} + +// 获得库位设置列表 +export function getWarehouseLocationTree() { + return request({ + url: '/extend/warehouse-location/getTree', + method: 'get' + }) +} + +// 获得库位设置列表 +export function getWarehouseLocationList() { + return request({ + url: '/extend/warehouse-location/listAll', + method: 'get' + }) +} + +// 获得库位设置分页 +export function getWarehouseLocationPage(data) { + return request({ + url: '/extend/warehouse-location/page', + method: 'POST', + data: data + }) +} + +// 获得code +export function getCode() { + return request({ + url: '/extend/warehouse-location/getCode', + method: 'get' + }) +} +// 导出库位设置 Excel +export function exportWarehouseLocationExcel(query) { + return request({ + url: '/extend/warehouse-location/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouse-setup.js b/src/api/warehouse/warehouse-setup.js new file mode 100644 index 00000000..aa3f38e0 --- /dev/null +++ b/src/api/warehouse/warehouse-setup.js @@ -0,0 +1,84 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 16:20:15 + * @LastEditors: zwq + * @LastEditTime: 2024-07-30 14:14:48 + * @Description: + */ +import request from '@/utils/request' + +// 创建仓库设置 +export function createWarehouse(data) { + return request({ + url: '/extend/warehouse/create', + method: 'post', + data: data + }) +} + +// 更新仓库设置 +export function updateWarehouse(data) { + return request({ + url: '/extend/warehouse/update', + method: 'put', + data: data + }) +} + +// 删除仓库设置 +export function deleteWarehouse(id) { + return request({ + url: '/extend/warehouse/delete?id=' + id, + method: 'delete' + }) +} + +// 获得仓库设置 +export function getWarehouse(id) { + return request({ + url: '/extend/warehouse/get?id=' + id, + method: 'get' + }) +} + +// 获得仓库设置列表 +export function getWarehouseList() { + return request({ + url: '/extend/warehouse/listAll', + method: 'get' + }) +} + +// 获得仓库首页统计信息 +export function getWarehouseAllInfo() { + return request({ + url: '/extend/warehouse/getAllInfo', + method: 'get' + }) +} + +// 获得仓库设置分页 +export function getWarehousePage(query) { + return request({ + url: '/extend/warehouse/page', + method: 'get', + params: query, + }) +} + +// 获得code +export function getCode() { + return request({ + url: '/extend/warehouse/getCode', + method: 'get' + }) +} +// 导出仓库设置 Excel +export function exportWarehouseExcel(query) { + return request({ + url: '/extend/warehouse/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouseLocation.js b/src/api/warehouse/warehouseLocation.js index f1b41f6c..8b15838f 100644 --- a/src/api/warehouse/warehouseLocation.js +++ b/src/api/warehouse/warehouseLocation.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-11-02 14:31:42 * @LastEditors: zwq - * @LastEditTime: 2023-11-04 14:56:10 + * @LastEditTime: 2024-08-02 15:51:37 * @Description: */ import request from '@/utils/request' @@ -41,10 +41,11 @@ export function getWarehouseLocation(id) { }) } // 获得库位列表(通过仓库id) -export function listByWarehouse(id) { +export function listByWarehouse(query) { return request({ - url: '/extend/warehouse-location/listByWarehouse?warehouseId=' + id, - method: 'get' + url: '/extend/warehouse-location/listByWarehouse', + method: 'get', + params: query, }) } // 获得库位列表(All) diff --git a/src/api/warehouse/warehouseRealtimeLocation.js b/src/api/warehouse/warehouseRealtimeLocation.js index af525c30..082243ea 100644 --- a/src/api/warehouse/warehouseRealtimeLocation.js +++ b/src/api/warehouse/warehouseRealtimeLocation.js @@ -25,6 +25,22 @@ export function outWarehouseRealtimeLocation(data) { data: data }) } +// 出入库-有库位 > 移库操作 +export function moveWarehouseRealtimeLocation(data) { + return request({ + url: '/extend/warehouse-realtime-location/move', + method: 'post', + data: data + }) +} +// 出入库-有库位 > 批量出库操作 +export function outWarehouseRealtimeLocationList(data) { + return request({ + url: '/extend/warehouse-realtime-location/outList', + method: 'post', + data: data + }) +} // 出入库-有库位 > 入库操作 export function inWarehouseRealtimeLocation(data) { @@ -68,7 +84,16 @@ export function getWarehouseRealtimeLocationPage(data) { // 获得出入库历史-有库位分页 export function getWarehouseLocationHisPage(data) { return request({ - url: '/extend/warehouse-location-his/page', + url: '/extend/warehouse-location-his/inAndOutPage', + method: 'post', + data: data + }) +} + +// 获得移库历史-有库位分页 +export function getMoveHisPage(data) { + return request({ + url: '/extend/warehouse-location-his/movePage', method: 'post', data: data }) diff --git a/src/assets/icons/svg/alarm-home.svg b/src/assets/icons/svg/alarm-home.svg new file mode 100644 index 00000000..49e49a48 --- /dev/null +++ b/src/assets/icons/svg/alarm-home.svg @@ -0,0 +1,12 @@ + + + 切片 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/alarm.svg b/src/assets/icons/svg/alarm.svg new file mode 100644 index 00000000..bf0448e3 --- /dev/null +++ b/src/assets/icons/svg/alarm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-alarm-white.svg b/src/assets/icons/svg/home-alarm-white.svg new file mode 100644 index 00000000..f1eb9020 --- /dev/null +++ b/src/assets/icons/svg/home-alarm-white.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-device-alarm.svg b/src/assets/icons/svg/home-device-alarm.svg new file mode 100644 index 00000000..9aae4e56 --- /dev/null +++ b/src/assets/icons/svg/home-device-alarm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-device-menu.svg b/src/assets/icons/svg/home-device-menu.svg new file mode 100644 index 00000000..b0427dde --- /dev/null +++ b/src/assets/icons/svg/home-device-menu.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-device.svg b/src/assets/icons/svg/home-device.svg new file mode 100644 index 00000000..3da9be44 --- /dev/null +++ b/src/assets/icons/svg/home-device.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-order-menu.svg b/src/assets/icons/svg/home-order-menu.svg new file mode 100644 index 00000000..09c4d4ca --- /dev/null +++ b/src/assets/icons/svg/home-order-menu.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-order-monitor.svg b/src/assets/icons/svg/home-order-monitor.svg new file mode 100644 index 00000000..712ef780 --- /dev/null +++ b/src/assets/icons/svg/home-order-monitor.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-produce.svg b/src/assets/icons/svg/home-produce.svg new file mode 100644 index 00000000..8123f2f2 --- /dev/null +++ b/src/assets/icons/svg/home-produce.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-quality-menu.svg b/src/assets/icons/svg/home-quality-menu.svg new file mode 100644 index 00000000..16c618a9 --- /dev/null +++ b/src/assets/icons/svg/home-quality-menu.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-store-menu.svg b/src/assets/icons/svg/home-store-menu.svg new file mode 100644 index 00000000..b0065389 --- /dev/null +++ b/src/assets/icons/svg/home-store-menu.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-work-menu.svg b/src/assets/icons/svg/home-work-menu.svg new file mode 100644 index 00000000..7f1d512b --- /dev/null +++ b/src/assets/icons/svg/home-work-menu.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/menuIcon.svg b/src/assets/icons/svg/menuIcon.svg new file mode 100644 index 00000000..d85e2067 --- /dev/null +++ b/src/assets/icons/svg/menuIcon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/alarm-bg.png b/src/assets/img/alarm-bg.png new file mode 100644 index 00000000..8c788654 Binary files /dev/null and b/src/assets/img/alarm-bg.png differ diff --git a/src/assets/img/home-bg.png b/src/assets/img/home-bg.png new file mode 100644 index 00000000..5ef3977f Binary files /dev/null and b/src/assets/img/home-bg.png differ diff --git a/src/assets/img/home-progress-bg.png b/src/assets/img/home-progress-bg.png new file mode 100644 index 00000000..39ddb5ef Binary files /dev/null and b/src/assets/img/home-progress-bg.png differ diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 2b0ec69d..24b024d2 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -80,7 +80,7 @@ .submenu-title-noDropdown, .el-submenu__title { &:hover { - background-color: rgba(0, 0, 0, 0.06) !important; + background-color: #0b58ff !important; } } diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 28b8b66e..72bc6296 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -37,18 +37,18 @@ $base-sub-menu-hover:#001528; */ $base-menu-color: #fff; $base-menu-color-active:#fff; -$base-menu-background:#001529; +$base-menu-background:#1E1651; $base-logo-title-color: #ffffff; $base-menu-light-color:rgba(0,0,0,.70); $base-menu-light-background:#ffffff; $base-logo-light-title-color: #001529; -$base-sub-menu-background:#0B253F; +$base-sub-menu-background:#15063C; $base-sub-menu-hover:#0b50ff; -$base-sidebar-width: 248px; +$base-sidebar-width: 282px; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index 02ca003d..b5f44046 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -1,188 +1,265 @@ + diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 15c86487..615e077b 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,66 +1,66 @@ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c23172b9..66596faa 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,204 +1,174 @@ diff --git a/src/layout/components/NavbarRight.vue b/src/layout/components/NavbarRight.vue index 228cde89..6b727aa1 100644 --- a/src/layout/components/NavbarRight.vue +++ b/src/layout/components/NavbarRight.vue @@ -1,120 +1,142 @@ - \ No newline at end of file + diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index be3285df..30873bd5 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -17,7 +17,9 @@ export default { const vnodes = [] if (icon) { - vnodes.push() + vnodes.push() + } else { + vnodes.push() } if (title) { diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 1e58cd7f..420f3d76 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -4,7 +4,7 @@ :class="{ collapse: collapse }" :style="{ backgroundColor: - sideTheme === 'theme-dark' ? '#1f2d3d' : variables.menuLightBackground, + sideTheme === 'theme-dark' ? '#1E1651' : variables.menuLightBackground, }"> - - - - - - - diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index bac19f28..ead3a7bc 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -1,6 +1,7 @@