diff --git a/dist.zip b/dist.zip deleted file mode 100644 index e1473f9..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/public/index.html b/public/index.html index fe2c68b..2313cf1 100644 --- a/public/index.html +++ b/public/index.html @@ -10,12 +10,12 @@ - 昆船垛机视觉系统 + 堆垛机视觉系统 diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index 2216346..05813fa 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -66,6 +66,16 @@ export default { url: "/realTime/allCameras", name: "获取全部球机" }, + allCamerasByArea:{ + method: "GET", + url: "/realTime/allCamerasByArea", + name: "根据库区查询球机" + }, + getAllAreas:{ + method: "GET", + url: "/realTime/allAreas", + name: "获取全部库区" + }, getWallStyle:{ method: "GET", url: "/realTime/wallStyle", @@ -227,6 +237,11 @@ export default { url: '/ScanAndCheck', name: '盘点操作里参数', method: 'GET' + }, + clearStock: { + url: '/stock/clearStock', + name: '清空盘点', + method: 'GET' } } diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 3816502..a5bd234 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -10,6 +10,7 @@ > {{ getRandom(latticeRow + 1 -index, latticeRow, nums.row, total.row) }} + @@ -48,7 +49,8 @@ {{ getRandom(index, latticeColumn, nums.column, total.column) }} - + + @@ -217,7 +219,7 @@ export default { getStatusBg(row,column,status) { var dom = document.getElementById(this.direction+"-"+this.side+"-"+row+'-'+column); - var color = status == 1 ?'#d81e06': (status == 2|| status == 3) ? '#1afa29': '#bfbfbf'; + var color = status == 1 ?'#d81e06': (status == 2 ||status == 3 ) ? '#1afa29': (status == 0)?'#f9e182':'#bfbfbf'; dom.style.background = color }, diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 9715c9f..fa37bac 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -39,30 +39,18 @@ style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;"> 暂无图片 -

盘点图

+

盘点顶部图

- - - - -
- 暂无图片 -
-

操作前照片

-
-
- - - - - + + +
暂无图片
-

操作后照片

+

盘点侧面图

@@ -120,11 +108,17 @@ export default { label:'盘点任务号', key: 'checkNum' }, - - { label:'盘点时间', key: 'exportTime' + }, + { + label:'wms条码', + key: 'wmsCode' + }, + { + label:'扫描条码', + key: 'trayCode' }, ], diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 371ace1..66b5907 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -1,6 +1,17 @@