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 @@
- @@ -216,7 +216,7 @@ export default { getStatusBg(row,column,status) { var dom = document.getElementById(this.shelveId+"-"+row+'-'+column); - var color = status == 1 ?'#d81e06': status == 2 ? '#1afa29': '#bfbfbf'; + var color = status == 1 ?'#d81e06': (status == 2|| status == 3) ? '#1afa29': '#bfbfbf'; dom.style.background = color }, getStatusTab(tab,status,rowColumn){ diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 0863030..a548050 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -152,7 +152,7 @@ export default { }, ], - statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"核对正确"} + statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"} } }, diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue index 29ba53f..872facf 100644 --- a/src/views/historyCheck/index.vue +++ b/src/views/historyCheck/index.vue @@ -124,7 +124,7 @@ export default { name: "historyCheck", data() { return { - statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"核对正确"}, + statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"}, queryParam: { lotnum: '', shelveId:'', diff --git a/src/views/stockLog/Subsection.vue b/src/views/stockLog/Subsection.vue new file mode 100644 index 0000000..d0c63b3 --- /dev/null +++ b/src/views/stockLog/Subsection.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/src/views/stockLog/index.vue b/src/views/stockLog/index.vue new file mode 100644 index 0000000..8ce5c78 --- /dev/null +++ b/src/views/stockLog/index.vue @@ -0,0 +1,261 @@ + + + diff --git a/src/views/stockLog/logPage.vue b/src/views/stockLog/logPage.vue new file mode 100644 index 0000000..32a900f --- /dev/null +++ b/src/views/stockLog/logPage.vue @@ -0,0 +1,267 @@ + + +