From d52f56865b5ad4802069ae43c3d4432a5724f2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= Date: Mon, 22 Mar 2021 10:07:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auth.json | 2 +- public/index.html | 4 +- src/assets/user.json | 2 +- src/layouts/AsideMenu.vue | 2 +- src/router/index.js | 9 + src/views/checkManage/checkOperation.vue | 303 ++++++++++++++++------- src/views/checkManage/index.vue | 62 ++++- src/views/historyMonitoring/index.vue | 3 + src/views/login.vue | 2 +- src/views/repertoryManage/index.vue | 2 +- 10 files changed, 295 insertions(+), 96 deletions(-) diff --git a/auth.json b/auth.json index fc1a930..ddc8ab0 100644 --- a/auth.json +++ b/auth.json @@ -1,5 +1,5 @@ { - "description": "德马泰克垛机视觉系统", + "description": "垛机视觉系统", "type": -1, "rights": "duojiSystem", "children": [{ diff --git a/public/index.html b/public/index.html index cd219c8..625caa8 100644 --- a/public/index.html +++ b/public/index.html @@ -6,12 +6,12 @@ - 德马泰克垛机视觉系统 + 垛机视觉系统
diff --git a/src/assets/user.json b/src/assets/user.json index be9e3bc..2dbfdb2 100644 --- a/src/assets/user.json +++ b/src/assets/user.json @@ -820,7 +820,7 @@ "parentId": 0, "grade": 1, "rights": "duojiSystem", - "description": "德马泰克垛机视觉系统", + "description": "垛机视觉系统", "reserved": "", "state": 0, "createTime": "2020-08-24T14:04:10", diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue index 540c4f6..8d2ac03 100644 --- a/src/layouts/AsideMenu.vue +++ b/src/layouts/AsideMenu.vue @@ -2,7 +2,7 @@ import('@/views/alarmVideos/index') }, + { + path: 'alarmLog', + name: 'alarmLog', + meta: { + icon: 'alert', + name: '告警日志' + }, + component: () => import('@/views/alarmVideos/alarmLog') + }, { path: 'checkManage', name: 'checkManage', diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 3200e62..33040d0 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -22,90 +22,165 @@ 右货架 - - + + 外 - + 内 -
-
- -
-
-

工单号：{{checkObj.orderNum}}

-
-
- -

操作前照片

+
+
+
+ +
+
+

工单号：{{checkObj.orderNum}}

+
+
+ +
+ 暂无图片 +
+

操作前照片

+
+
+ +
+ 暂无图片 +
+

操作后照片

+
-
- -

操作后照片

+
+
+

系统登记品规：{{checkObj.category}}

+

系统登记数量：{{checkObj.count}}

+
+
+ 未核对 +
+
+ 已核对：核对错误 +
+
+ 已核对：核对正确 +
+
+ 人工复核 + + 核对正确 + +
+
+ 核对错误 + + 核对正确 + +
-
-
-

系统登记品规：{{checkObj.category}}

-

系统登记数量：{{checkObj.count}}

-
-
- 未核对 -
-
- 已核对：核对错误 -
-
- 已核对：核对正确 -
-
- 人工复核 - - 核对正确 - -
-
- 核对错误 - - 核对正确 - -
-
-
-
- ＜上一个 -

{{checkObj.row}}行{{checkObj.column}}列

- 下一个＞ - +
+ ＜上一个 +

{{checkObj.row}}行{{checkObj.column}}列

+ 下一个＞ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

该货位暂无相关记录

+
+