diff --git a/public/index.html b/public/index.html index fe2c68b..cc6311a 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..b18bc32 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -227,6 +227,16 @@ export default { url: '/ScanAndCheck', name: '盘点操作里参数', method: 'GET' - } + }, + getCheckSummary: { + url: '/checkSummary', + name: '盘点统计', + method: 'POST' + }, + getStreetSummary: { + url: '/checkSummary/street/task', + name: '获取巷道的统计', + method: 'GET' + }, } diff --git a/src/router/index.js b/src/router/index.js index 79362cf..a312d66 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -67,6 +67,15 @@ const routes = [{ }, component: () => import('@/views/alarmVideos/alarmLog') }, + { + path: 'checkSummary', + name: 'checkSummary', + meta: { + icon: 'eye', + name: '盘点统计' + }, + component: () => import('@/views/checkSummary/index') + }, { path: 'checkManage', name: 'checkManage', diff --git a/src/views/checkSummary/index.vue b/src/views/checkSummary/index.vue new file mode 100644 index 0000000..9fb15c2 --- /dev/null +++ b/src/views/checkSummary/index.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/plcStatus.vue b/src/views/plcStatus.vue index 4298650..d6ee84c 100644 --- a/src/views/plcStatus.vue +++ b/src/views/plcStatus.vue @@ -2,7 +2,6 @@
this.pageSize = pageSize // 改变每页数量时更新显示 }, - loading: false, columns, - visible: false, - modelType: '', - modelData: [], }; }, computed: {}, @@ -96,9 +91,7 @@ export default { pagination.total = res.data.total; this.data = res.data; this.pagination = pagination; - res.data.list.forEach((value, index) => { - value.pageNumber = this.pagination.current - }); + }).catch(err => { }); diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue index 19b085c..c37d0d6 100644 --- a/src/views/roadwayManage/index.vue +++ b/src/views/roadwayManage/index.vue @@ -103,17 +103,10 @@ const columns = [ scopedSlots: { customRender: 'lightSourceIp' } }, { - title: 'plc', + title: '客户端', scopedSlots: { customRender: 'plc' } }, - { - title: 'RFID', - scopedSlots: { customRender: 'RFID' } - }, - { - title: '扫码枪', - scopedSlots: { customRender: 'sensorGun' } - }, + { title: '左货架类型', dataIndex: 'leftType', diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue index b8d4c05..a78e07e 100644 --- a/src/views/roadwayManage/model.vue +++ b/src/views/roadwayManage/model.vue @@ -27,12 +27,12 @@
- + - + @@ -50,18 +50,7 @@ />
-
- - - - - - -
+
@@ -99,18 +88,7 @@
-
- - - - - - -
+ @@ -147,18 +125,7 @@ /> -
- - - - - - -
+