diff --git a/.env.development b/.env.development index 7903d2b..8a258ab 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # 接口地址 # 许镇-本地服地址 -#VUE_APP_BASE_API = 'http://192.168.99.67:12010' -VUE_APP_BASE_API = 'http://192.168.99.86:12010' +VUE_APP_BASE_API = 'http://192.168.99.72:12010' +#VUE_APP_BASE_API = 'http://192.168.99.86:12010' #VUE_APP_BASE_API = 'http://27.19.205.234:17070' diff --git a/src/api/stockTask/index.js b/src/api/stockTask/index.js index e30ed0e..c4dd0de 100644 --- a/src/api/stockTask/index.js +++ b/src/api/stockTask/index.js @@ -156,4 +156,12 @@ export function FetchMoveBills(data) { }) } -export default { add, edit, del, FetchUpdateStockTaskStatus, FetchInitSuggestTilting, FetchInitSetting, FetchEditSetting, FetchInitHomeInfo, FetchInitStockInfo, FetchInitHotBookList, FetchInitHotShelfList, FetchInitBookDetailsByGrids, FetchAITerminalStatusQuery, FetchBillByShelfIdAndGridShelf, FetchIsGoodcutByBillNoAndGridId, FetchInitErrorProbaDesc, FetchShowByBillIdAndShelfIdAndGridShelf, FetchStartStopBookAIService, FetchMoveBills } +// 根据层架位id获取最新盘点信息 +export function FetchNewBillByGridId(params) { + return request({ + url: 'api/stocktask-task/getNewBillByGridId' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export default { add, edit, del, FetchUpdateStockTaskStatus, FetchInitSuggestTilting, FetchInitSetting, FetchEditSetting, FetchInitHomeInfo, FetchInitStockInfo, FetchInitHotBookList, FetchInitHotShelfList, FetchInitBookDetailsByGrids, FetchAITerminalStatusQuery, FetchBillByShelfIdAndGridShelf, FetchIsGoodcutByBillNoAndGridId, FetchInitErrorProbaDesc, FetchShowByBillIdAndShelfIdAndGridShelf, FetchStartStopBookAIService, FetchMoveBills, FetchNewBillByGridId } diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 5fe12a0..2a9e520 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -33,9 +33,19 @@
盘点层位 +
+ + + +
+
+ 盘点关闭 +
+ +
@@ -50,6 +60,12 @@ +
+ 离线设备 +
+ +
+
@@ -150,4 +166,11 @@ export default { } } } + +.error-data{ + font-size: 24px; + font-weight: bold; + color: #ED4A41; + margin: 10px 0 0 0; +} diff --git a/src/views/home.vue b/src/views/home.vue index 4c9b073..754df5f 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -188,7 +188,9 @@ export default { regionCount: 0, shelfCount: 0, gridCount: 0, - deviceCount: 0 + deviceCount: 0, + noStockGridCount: 0, + deviceErrorCount: 0 }, taskStockLogData: [], echartsTimer: null, @@ -342,7 +344,9 @@ export default { regionCount: data.regionCount, shelfCount: data.shelfCount, gridCount: data.gridCount, - deviceCount: data.deviceCount + deviceCount: data.deviceCount, + noStockGridCount: data.noStockGridCount, + deviceErrorCount: data.deviceErrorCount } }) }, diff --git a/src/views/visualCheck/checkManage/bookSearch/index.vue b/src/views/visualCheck/checkManage/bookSearch/index.vue index f719224..7b192df 100644 --- a/src/views/visualCheck/checkManage/bookSearch/index.vue +++ b/src/views/visualCheck/checkManage/bookSearch/index.vue @@ -13,10 +13,10 @@