diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index 29c40ee..f3702ce 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -168,6 +168,11 @@ export default { name: '复核页面的核对信息', method: 'POST' }, + getStockPage: { + url: '/stockLog', + name: '获取随性历史', + method: 'POST' + }, getStatusByRowColumn: { url: '/stock/statusByRowColumn', name: '行列的库存状态', diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue index da50f2c..be956a0 100644 --- a/src/layouts/AsideMenu.vue +++ b/src/layouts/AsideMenu.vue @@ -92,7 +92,7 @@ export default { recursionRoute(parents); }else { parents = this.$router.options.routes[0].children.filter(item => { - return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel") && !item.name.startsWith("plcStatus") && !item.name.startsWith("cameraManageModel") && !item.name.startsWith("checkOperation"); + return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel") && !item.name.startsWith("plcStatus") && !item.name.startsWith("cameraManageModel") && !item.name.startsWith("checkOperation") && !item.name.startsWith("stockLog") ; }); } this.routes = parents; diff --git a/src/router/index.js b/src/router/index.js index 12e162a..da79056 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,7 +42,7 @@ const routes = [{ path: 'realTimeMonitoring', name: 'realTimeMonitoring', meta: { - icon: 'desktop', + icon: 'video-camera', name: '实时视频流' }, component: () => import('@/views/realTimeMonitoring/index'), @@ -88,11 +88,28 @@ const routes = [{ path: 'checkHistory', name: 'checkHistory', meta: { - icon: 'form', + icon: 'tag', name: '盘点历史', }, component: () => import('@/views/historyCheck/index'), }, + { + path: 'stockHistory', + name: 'stockHistory', + meta: { + icon: 'file-excel', + name: '库位历史', + }, + component: () => import('@/views/stockLog/index'), + }, + { + path: 'stockLogDetail', + name: 'stockLogDetail', + meta: { + name: '库位历史详情', + }, + component: () => import('@/views/stockLog/logPage'), + }, { path: 'roadwayManage', name: 'roadwayManage', @@ -106,7 +123,7 @@ const routes = [{ path: 'cameraManage', name: 'cameraManage', meta: { - icon: 'video-camera', + icon: 'camera', name: '球机管理' }, component: () => import('@/views/cameraManage/index') diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 342b9b9..552a41d 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -26,7 +26,7 @@