From bf4f9348dfbf4742ee5185354c8c67fe55d81cf2 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 19 Aug 2025 16:35:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=AC=AC=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 8 +- .env.prod | 4 +- public/favicon.ico | Bin 4286 -> 1996 bytes src/api/door/doorRecord.ts | 22 +++ src/layout/logo/index.vue | 12 +- src/views/alarm/setting/car/car-setting.vue | 144 +++++++++++++++ src/views/alarm/setting/door/door-setting.vue | 173 ++++++++++++++++++ src/views/alarm/setting/index.vue | 135 +++----------- src/views/car/carAlarm/index.vue | 21 ++- src/views/car/carRecord/index.vue | 2 +- .../car/carTimes/carTimesTableDialog.vue | 2 +- .../doorTableDialog.vue} | 6 +- src/views/door/doorAlarm/index.vue | 12 +- src/views/door/doorBeLate/index.vue | 168 +++++++++++++++++ src/views/door/doorRecord/index.vue | 8 +- src/views/door/doorReign/index.vue | 144 +++++++++++++++ src/views/door/doorTimes/index.vue | 12 +- src/views/login/component/control.vue | 21 +-- src/views/login/component/password.vue | 61 +++--- src/views/login/index.vue | 33 ++-- src/views/report/door/index.vue | 8 +- 21 files changed, 775 insertions(+), 221 deletions(-) create mode 100644 src/views/alarm/setting/car/car-setting.vue create mode 100644 src/views/alarm/setting/door/door-setting.vue rename src/views/door/{doorTimes/doorTimesTableDialog.vue => components/doorTableDialog.vue} (97%) create mode 100644 src/views/door/doorBeLate/index.vue create mode 100644 src/views/door/doorReign/index.vue 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 df36fcfb72584e00488330b560ebcf34a41c64c2..30504e2a876249544261c255268959ba2f009369 100644 GIT binary patch literal 1996 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 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 @@ - +