diff --git a/.env b/.env index 4250b81..dc0dca0 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ # 网站主标题 -VITE_GLOBAL_TITLE= 'PIGX ADMIN' +VITE_GLOBAL_TITLE= '智慧安防平台' # footer -VITE_FOOTER_TITLE= '©2025 pig4cloud.com' +VITE_FOOTER_TITLE= '' # 是否是微服务架构(重要) VITE_IS_MICRO= true @@ -38,13 +38,13 @@ VITE_VERIFY_IMAGE_ENABLE = false VITE_WEBSOCKET_ENABLE = false # 是否开启注册 -VITE_REGISTER_ENABLE = true +VITE_REGISTER_ENABLE = false # 是否开启租户自动选择 (根据租户域名) VITE_AUTO_TENANT = false # 是否开启多语言切换 -VITE_I18N_ENABLE = true +VITE_I18N_ENABLE = false # 是否开启暗黑模式切换 VITE_DARK_MODE_ENABLE = true diff --git a/.env.prod b/.env.prod index 7a603b7..e01ec94 100644 --- a/.env.prod +++ b/.env.prod @@ -8,10 +8,10 @@ VITE_OPEN = true ENV = 'prod' # ADMIN 服务地址 -# VITE_ADMIN_PROXY_PATH = http://127.0.0.1:36588 +VITE_ADMIN_PROXY_PATH = http://127.0.0.1:36588 # 本地 -VITE_ADMIN_PROXY_PATH = http://172.20.10.2:36588 +# VITE_ADMIN_PROXY_PATH = http://172.20.10.2:36588 # 图片访问基础地址 VITE_IMAGE_BASE_PATH = http://123.157.250.162:36588/api diff --git a/public/favicon.ico b/public/favicon.ico index df36fcf..30504e2 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/door/doorRecord.ts b/src/api/door/doorRecord.ts index a696fc7..a65234a 100644 --- a/src/api/door/doorRecord.ts +++ b/src/api/door/doorRecord.ts @@ -1,5 +1,27 @@ import request from "/@/utils/request" +/** + * 加入考勤的人员在位数量分页 + */ +export function reignCount(data: any) { + return request({ + url: '/admin/door/total/reignCount', + method: 'post', + data, + }) +} + +/** + * 迟到、早退数量统计 + */ +export function beLateCount(data: any) { + return request({ + url: '/admin/door/total/beLateCount', + method: 'post', + data, + }) +} + export function fetchList(query?: Object) { return request({ url: '/admin/door/doorRecord/page', diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue index 284e39c..81d67ea 100644 --- a/src/layout/logo/index.vue +++ b/src/layout/logo/index.vue @@ -1,29 +1,29 @@ \ No newline at end of file diff --git a/src/views/alarm/setting/door/door-setting.vue b/src/views/alarm/setting/door/door-setting.vue new file mode 100644 index 0000000..6663038 --- /dev/null +++ b/src/views/alarm/setting/door/door-setting.vue @@ -0,0 +1,173 @@ + + + \ No newline at end of file diff --git a/src/views/alarm/setting/index.vue b/src/views/alarm/setting/index.vue index bb2cea9..3f4500c 100644 --- a/src/views/alarm/setting/index.vue +++ b/src/views/alarm/setting/index.vue @@ -4,61 +4,14 @@ -
- - -
- - - - -
- 请输入人闸报警频次 - - - - - -
- -
-
-
-
-
- - - - - - - - -
-
-
+
+
+ +
+
+ +
+
保存配置 @@ -68,16 +21,11 @@ \ No newline at end of file diff --git a/src/views/car/carAlarm/index.vue b/src/views/car/carAlarm/index.vue index 05d50b8..229811a 100644 --- a/src/views/car/carAlarm/index.vue +++ b/src/views/car/carAlarm/index.vue @@ -35,7 +35,7 @@ - +