From 8c7b3ed2efeee1a3ab3af3dfdf8ca43d1bb41bbd Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 30 Jun 2023 15:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=97=A5=E5=BF=97/=E9=80=9A?=
=?UTF-8?q?=E9=81=93=E9=97=A8=E6=97=A5=E5=BF=97/3D=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/home/accessDoor/accessDoor.js | 10 ++
src/views/components/AccessDoor.vue | 136 +++++++++++++++
src/views/components/SecurityDoor.vue | 15 +-
.../warehouse3D/archivesStorage/index.vue | 6 +-
.../warehouse3D/destroyedFileRoom/index.vue | 2 +-
src/views/storeManage/warehouse3D/index.vue | 5 +
.../warehouse3D/infoRoom/index.vue | 2 +-
.../system/logManage/accessDoorLog/index.vue | 158 ++++++++++++++++++
src/views/system/logManage/doorLog/index.vue | 35 ++--
src/views/system/logManage/index.vue | 10 +-
10 files changed, 352 insertions(+), 27 deletions(-)
create mode 100644 src/api/home/accessDoor/accessDoor.js
create mode 100644 src/views/components/AccessDoor.vue
create mode 100644 src/views/system/logManage/accessDoorLog/index.vue
diff --git a/src/api/home/accessDoor/accessDoor.js b/src/api/home/accessDoor/accessDoor.js
new file mode 100644
index 0000000..29f66fa
--- /dev/null
+++ b/src/api/home/accessDoor/accessDoor.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+export function accessDoor(params) {
+ return request({
+ url: 'api/securitydoor/initSecurityDoorLog',
+ method: 'get',
+ params
+ })
+}
+export default { accessDoor }
diff --git a/src/views/components/AccessDoor.vue b/src/views/components/AccessDoor.vue
new file mode 100644
index 0000000..f1ae038
--- /dev/null
+++ b/src/views/components/AccessDoor.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+ 通道门记录
+
+
+
+
+
+ {{ scope.row.createTime | parseTime }}
+
+
+
+
+ {{ scope.row.deviceName }}
+
+
+
+
+
+
+
+
diff --git a/src/views/components/SecurityDoor.vue b/src/views/components/SecurityDoor.vue
index f833e24..a4a8ca8 100644
--- a/src/views/components/SecurityDoor.vue
+++ b/src/views/components/SecurityDoor.vue
@@ -8,17 +8,22 @@
-
+
- {{ scope.row.createTime | parseTime }}
+ {{ scope.row.his_time | parseTime }}
-
+
- {{ scope.row.deviceName }}
+ {{ scope.row.door_name }}
+
+
+
+
+ 进
+ 出
-
diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
index a988f4d..b597430 100644
--- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue
+++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
@@ -73,7 +73,7 @@
-->
-
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 异常
+ 正常
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | parseTime }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/logManage/doorLog/index.vue b/src/views/system/logManage/doorLog/index.vue
index 881db0f..59f63c1 100644
--- a/src/views/system/logManage/doorLog/index.vue
+++ b/src/views/system/logManage/doorLog/index.vue
@@ -36,21 +36,27 @@
@selection-change="selectionChangeHandler"
>
-
-
+
+
+
+
+
+
+
- 异常
- 正常
+ 进门
+ 出门
-
-
-
-
-
-
+
- {{ scope.row.createTime | parseTime }}
+ {{ scope.row.his_time | parseTime }}
+
+
+
+
+
+ {{ scope.row.create_time | parseTime }}
-
@@ -24,6 +24,7 @@ import loginLog from './loginLog/index.vue'
import operateLog from './operateLog/index.vue'
import warnLog from './warnLog/index.vue'
import doorLog from './doorLog/index.vue'
+import accessDoorLog from './accessDoorLog/index.vue'
import portLog from './portLog/index.vue'
export default {
@@ -33,7 +34,8 @@ export default {
operateLog,
warnLog,
doorLog,
- portLog
+ portLog,
+ accessDoorLog
},
data() {
return {
@@ -49,6 +51,8 @@ export default {
} else if (this.activeIndex === 2) {
return 'warnLog'
} else if (this.activeIndex === 3) {
+ return 'accessDoorLog'
+ } else if (this.activeIndex === 4) {
return 'doorLog'
}
// else if (this.activeIndex === 4) {