From b8fd7e86935858adce45be9450993efcdb0fee5f Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 19 Jul 2024 09:13:32 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=82=B9=E5=90=8D?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SafeCampus.WEB/public/static/rtsPlayer.html | 7 +- .../src/api/interface/sys/attendance/index.ts | 15 ++ .../api/interface/sys/attendance/passenger.ts | 31 ++++ SafeCampus.WEB/src/api/interface/sys/index.ts | 1 + .../api/modules/attendance/behaviorTrace.ts | 43 ++++++ .../src/api/modules/attendance/index.ts | 19 +++ .../src/api/modules/attendance/passenger.ts | 50 +++++++ .../src/api/modules/attendance/roolcall.ts | 43 ++++++ .../api/modules/attendance/studentsReturn.ts | 43 ++++++ SafeCampus.WEB/src/api/modules/index.ts | 1 + SafeCampus.WEB/src/utils/index.ts | 16 +++ .../views/attendance/behaviorTrace/index.vue | 34 +++++ .../components/detailForm/form_detail.vue | 47 ++++++ .../passenger/components/detailForm/index.vue | 63 ++++++++ .../passenger/components/form/form_basic.vue | 91 ++++++++++++ .../passenger/components/form/index.vue | 135 ++++++++++++++++++ .../src/views/attendance/passenger/index.vue | 110 ++++++++++++++ .../roolcall/components/nofaceTable/index.vue | 33 +++++ .../src/views/attendance/roolcall/index.vue | 70 +++++++++ .../views/attendance/studentsReturn/index.vue | 34 +++++ 20 files changed, 884 insertions(+), 2 deletions(-) create mode 100644 SafeCampus.WEB/src/api/interface/sys/attendance/index.ts create mode 100644 SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts create mode 100644 SafeCampus.WEB/src/api/modules/attendance/behaviorTrace.ts create mode 100644 SafeCampus.WEB/src/api/modules/attendance/index.ts create mode 100644 SafeCampus.WEB/src/api/modules/attendance/passenger.ts create mode 100644 SafeCampus.WEB/src/api/modules/attendance/roolcall.ts create mode 100644 SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts create mode 100644 SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/form_detail.vue create mode 100644 SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue create mode 100644 SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/passenger/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/roolcall/components/nofaceTable/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/roolcall/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue diff --git a/SafeCampus.WEB/public/static/rtsPlayer.html b/SafeCampus.WEB/public/static/rtsPlayer.html index 555dff8..12a1b40 100644 --- a/SafeCampus.WEB/public/static/rtsPlayer.html +++ b/SafeCampus.WEB/public/static/rtsPlayer.html @@ -1,5 +1,5 @@ - + @@ -27,12 +27,13 @@ // 更多播放器配置请参考 https://player.alicdn.com/aliplayer/index.html let rtsUrl = getUrlParams(location.href)['rtsUrl'] || '' + let height = getUrlParams(location.href)['height'] || "500px" var options = { "id": "player-con", "source": rtsUrl, "rtsFallbackSource": "降级地址，如HLS", "width": "100%", - "height": "500px", + "height": height, "autoplay": true, "isLive": true, "playsinline": true, @@ -65,6 +66,8 @@ // 当RTS拉流成功时触发，通过订阅该事件，可以获取到RTS TraceId player.on('rtsTraceId', function (data) { console.log('[EVENT]rtsTraceId', data.paramData); + let fullscreenBtn = document.querySelector('.prism-controlbar .prism-fullscreen-btn') + if(fullscreenBtn)fullscreenBtn.style.display = 'none' // event.paramData.traceId 拉流的TraceId // event.paramData.source 当前RTS流的播放地址 }) diff --git a/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts b/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts new file mode 100644 index 0000000..630e9d1 --- /dev/null +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts @@ -0,0 +1,15 @@ +/** + * @description + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + * @see https://gitee.com/dotnetmoyu/SimpleAdmin + */ +export * from "./passenger"; diff --git a/SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts b/SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts new file mode 100644 index 0000000..6cd5b62 --- /dev/null +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts @@ -0,0 +1,31 @@ +/** + * @description 用户管理接口 + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + */ + +import { ReqPage } from "@/api"; +/** + * @Description: 客流查询接口 + * @Author: yxq + * @Date: 2023-12-17 15:34:54 + */ + +export namespace AttendancePassenger { + export interface Page extends ReqPage {} + + /** 客流查询表单 */ + export interface PassengerInfo { + fenpianleixing:String, + shijianduan:any, + shexiangtou:any, + } +} diff --git a/SafeCampus.WEB/src/api/interface/sys/index.ts b/SafeCampus.WEB/src/api/interface/sys/index.ts index 663fadb..f218122 100644 --- a/SafeCampus.WEB/src/api/interface/sys/index.ts +++ b/SafeCampus.WEB/src/api/interface/sys/index.ts @@ -21,3 +21,4 @@ export * from "./organization"; export * from "./auth"; export * from "./warn"; export * from "./usermanage"; +export * from "./attendance"; diff --git a/SafeCampus.WEB/src/api/modules/attendance/behaviorTrace.ts b/SafeCampus.WEB/src/api/modules/attendance/behaviorTrace.ts new file mode 100644 index 0000000..3064906 --- /dev/null +++ b/SafeCampus.WEB/src/api/modules/attendance/behaviorTrace.ts @@ -0,0 +1,43 @@ +/** + * @description 单页管理接口 + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + * @see https://gitee.com/dotnetmoyu/SimpleAdmin + */ +import { moduleRequest } from "@/api/request"; +import { ReqId, SysUserPersonnel } from "@/api/interface"; +const http = moduleRequest("/business/dfieldApi/"); + +/** + * @Description: 单页管理 + * @Author: SYY + * @Date: 2023-12-15 15:34:54 + */ +const attendanceBehaviorTrace = { + /** 查询底库列表 */ + page(params: SysUserPersonnel.ClassPage) { + return http.get("page", params); + }, + /** 删除底库 */ + delete(params: ReqId) { + return http.delete("deleteDfieldD", params); + }, + /** 创建底库 */ + add(params: SysUserPersonnel.ClassPage) { + return http.post("createDfieldA", params); + }, + /** 更新底库 */ + update(params: SysUserPersonnel.ClassPage) { + return http.put("updateDfieldU", params); + } +}; + +export { attendanceBehaviorTrace }; diff --git a/SafeCampus.WEB/src/api/modules/attendance/index.ts b/SafeCampus.WEB/src/api/modules/attendance/index.ts new file mode 100644 index 0000000..02fa1a9 --- /dev/null +++ b/SafeCampus.WEB/src/api/modules/attendance/index.ts @@ -0,0 +1,19 @@ +/** + * @description + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + * @see https://gitee.com/dotnetmoyu/SimpleAdmin + */ +export * from "./behaviorTrace"; +export * from "./passenger"; +export * from "./roolcall"; +export * from "./studentsReturn"; + diff --git a/SafeCampus.WEB/src/api/modules/attendance/passenger.ts b/SafeCampus.WEB/src/api/modules/attendance/passenger.ts new file mode 100644 index 0000000..2f97c72 --- /dev/null +++ b/SafeCampus.WEB/src/api/modules/attendance/passenger.ts @@ -0,0 +1,50 @@ +/** + * @description 单页管理接口 + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + * @see https://gitee.com/dotnetmoyu/SimpleAdmin + */ +import { moduleRequest } from "@/api/request"; +import { ReqId, AttendancePassenger } from "@/api/interface"; +const http = moduleRequest("/business/dfieldApi/"); + +/** + * @Description: 单页管理 + * @Author: SYY + * @Date: 2023-12-15 15:34:54 + */ +const attendancePassenger = { + /** 查询列表 */ + page(params: AttendancePassenger.PassengerInfo) { + return http.get("test", params); + }, + /** 删除 */ + delete(params: ReqId) { + return http.delete("test", params); + }, + /** 创建 */ + add(params: AttendancePassenger.PassengerInfo) { + return http.post("test", params); + }, + /** 详情 */ + detail(params: ReqId) { + return http.post("test", params); + }, +}; + +const attendancePassengerBtnCode = { + /** 新增 */ + add: "attendancePassengerBtnCodeAdd", + /** 删除 */ + delete: "attendancePassengerBtnCodeDel" +}; + +export { attendancePassenger,attendancePassengerBtnCode }; diff --git a/SafeCampus.WEB/src/api/modules/attendance/roolcall.ts b/SafeCampus.WEB/src/api/modules/attendance/roolcall.ts new file mode 100644 index 0000000..c9d3e99 --- /dev/null +++ b/SafeCampus.WEB/src/api/modules/attendance/roolcall.ts @@ -0,0 +1,43 @@ +/** + * @description 单页管理接口 + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + * @see https://gitee.com/dotnetmoyu/SimpleAdmin + */ +import { moduleRequest } from "@/api/request"; +import { ReqId, SysUserPersonnel } from "@/api/interface"; +const http = moduleRequest("/business/dfieldApi/"); + +/** + * @Description: 单页管理 + * @Author: SYY + * @Date: 2023-12-15 15:34:54 + */ +const attendanceRoolcall = { + /** 查询底库列表 */ + page(params: SysUserPersonnel.ClassPage) { + return http.get("page", params); + }, + /** 删除底库 */ + delete(params: ReqId) { + return http.delete("deleteDfieldD", params); + }, + /** 创建底库 */ + add(params: SysUserPersonnel.ClassPage) { + return http.post("createDfieldA", params); + }, + /** 更新底库 */ + update(params: SysUserPersonnel.ClassPage) { + return http.put("updateDfieldU", params); + } +}; + +export { attendanceRoolcall }; diff --git a/SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts b/SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts new file mode 100644 index 0000000..ad20333 --- /dev/null +++ b/SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts @@ -0,0 +1,43 @@ +/** + * @description 单页管理接口 + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + * @see https://gitee.com/dotnetmoyu/SimpleAdmin + */ +import { moduleRequest } from "@/api/request"; +import { ReqId, SysUserPersonnel } from "@/api/interface"; +const http = moduleRequest("/business/dfieldApi/"); + +/** + * @Description: 单页管理 + * @Author: SYY + * @Date: 2023-12-15 15:34:54 + */ +const attendanceStudentsReturn = { + /** 查询底库列表 */ + page(params: SysUserPersonnel.ClassPage) { + return http.get("page", params); + }, + /** 删除底库 */ + delete(params: ReqId) { + return http.delete("deleteDfieldD", params); + }, + /** 创建底库 */ + add(params: SysUserPersonnel.ClassPage) { + return http.post("createDfieldA", params); + }, + /** 更新底库 */ + update(params: SysUserPersonnel.ClassPage) { + return http.put("updateDfieldU", params); + } +}; + +export { attendanceStudentsReturn }; diff --git a/SafeCampus.WEB/src/api/modules/index.ts b/SafeCampus.WEB/src/api/modules/index.ts index 0f7fab2..3ac6dc9 100644 --- a/SafeCampus.WEB/src/api/modules/index.ts +++ b/SafeCampus.WEB/src/api/modules/index.ts @@ -20,3 +20,4 @@ export * from "./monitor"; export * from "./sysconfig"; export * from "./statistion"; export * from "./usermanage"; +export * from "./attendance"; \ No newline at end of file diff --git a/SafeCampus.WEB/src/utils/index.ts b/SafeCampus.WEB/src/utils/index.ts index 5419e1a..a0cbdd4 100644 --- a/SafeCampus.WEB/src/utils/index.ts +++ b/SafeCampus.WEB/src/utils/index.ts @@ -323,3 +323,19 @@ export function findItemNested(enumData: any, callValue: any, value: string, chi if (current[children]) return findItemNested(current[children], callValue, value, children); }, null); } + +/** + * @description 时间戳转化为日期 + * */ +export function formatDate(timestamp:number) { + let date = new Date(timestamp); + let year = date.getFullYear(); + let month = "0" + (date.getMonth() + 1); // getMonth返回的月份是从0开始的 + let day = "0" + date.getDate(); + let hours = "0" + date.getHours(); + let minutes = "0" + date.getMinutes(); + let seconds = "0" + date.getSeconds(); + + return year + "-" + month.substr(-2) + "-" + day.substr(-2) + + " " + hours.substr(-2) + ":" + minutes.substr(-2) + ":" + seconds.substr(-2); +} diff --git a/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue new file mode 100644 index 0000000..e5fac1a --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue @@ -0,0 +1,34 @@ + + + + diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/form_detail.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/form_detail.vue new file mode 100644 index 0000000..1f43e69 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/form_detail.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/index.vue new file mode 100644 index 0000000..1cf3255 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/detailForm/index.vue @@ -0,0 +1,63 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue new file mode 100644 index 0000000..d718d74 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue @@ -0,0 +1,91 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue new file mode 100644 index 0000000..094c2cb --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue @@ -0,0 +1,135 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/passenger/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/index.vue new file mode 100644 index 0000000..6146f94 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/passenger/index.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/SafeCampus.WEB/src/views/attendance/roolcall/components/nofaceTable/index.vue b/SafeCampus.WEB/src/views/attendance/roolcall/components/nofaceTable/index.vue new file mode 100644 index 0000000..da60c10 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/roolcall/components/nofaceTable/index.vue @@ -0,0 +1,33 @@ + + + + + + + \ No newline at end of file diff --git a/SafeCampus.WEB/src/views/attendance/roolcall/index.vue b/SafeCampus.WEB/src/views/attendance/roolcall/index.vue new file mode 100644 index 0000000..e3b0969 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/roolcall/index.vue @@ -0,0 +1,70 @@ + + + + diff --git a/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue b/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue new file mode 100644 index 0000000..e5fac1a --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue @@ -0,0 +1,34 @@ + + + + From dd4f2ce60b2cda1093d8808170d1777eb1b3d3ba Mon Sep 17 00:00:00 2001 From: wwp <782568523@qq.com> Date: Fri, 19 Jul 2024 13:11:49 +0800 Subject: [PATCH 02/14] 12 --- SafeCampus.WEB/.env | 2 +- .../src/api/interface/sys/monitor/camera.ts | 7 ++ .../src/api/modules/monitor/live.ts | 8 +++ SafeCampus.WEB/src/enums/formEnum.ts | 10 ++- .../views/monitor/live/components/form.vue | 1 + .../monitor/live/components/userForm.vue | 70 +++++++++++++------ .../src/views/monitor/live/index.vue | 17 ++--- .../src/views/sysconfig/ability/index.vue | 37 +++++++--- 8 files changed, 108 insertions(+), 44 deletions(-) diff --git a/SafeCampus.WEB/.env b/SafeCampus.WEB/.env index 09e5344..329f2b1 100644 --- a/SafeCampus.WEB/.env +++ b/SafeCampus.WEB/.env @@ -1,5 +1,5 @@ # title -VITE_GLOB_APP_TITLE = 校园监控智能分析平台 +VITE_GLOB_APP_TITLE = AI监控预警分析平台 # 本地运行端口号 VITE_PORT = 8848 diff --git a/SafeCampus.WEB/src/api/interface/sys/monitor/camera.ts b/SafeCampus.WEB/src/api/interface/sys/monitor/camera.ts index b5d6743..d5b6b11 100644 --- a/SafeCampus.WEB/src/api/interface/sys/monitor/camera.ts +++ b/SafeCampus.WEB/src/api/interface/sys/monitor/camera.ts @@ -57,4 +57,11 @@ export namespace sysCamera { id: number | string; name: string; } + // 设置推送人 + export interface setGroup { + /** groupId */ + groupId: number | string; + userId: number | string; + ids: number | string[]; + } } diff --git a/SafeCampus.WEB/src/api/modules/monitor/live.ts b/SafeCampus.WEB/src/api/modules/monitor/live.ts index 1227609..b6cee10 100644 --- a/SafeCampus.WEB/src/api/modules/monitor/live.ts +++ b/SafeCampus.WEB/src/api/modules/monitor/live.ts @@ -44,6 +44,14 @@ const monitorLIVEApi = { setGroup(params: sysCamera.setGroup) { return http2.post>("batchSetGroup", params); }, + // 根据分组批量设置推送人 + setPushPerson(params: sysCamera.setGroup) { + return http2.post>("batchSetPushPersonByGroup", params); + }, + // 对摄像头批量设置推送人 + setVideoPushPerson(params: sysCamera.setGroup) { + return http2.post>("batchSetPushPerson", params); + }, // 获取摄像头分组树 groupList(params: sysCamera.Tree) { return http3.get>("getNoPageList"); diff --git a/SafeCampus.WEB/src/enums/formEnum.ts b/SafeCampus.WEB/src/enums/formEnum.ts index 68792e3..c756366 100644 --- a/SafeCampus.WEB/src/enums/formEnum.ts +++ b/SafeCampus.WEB/src/enums/formEnum.ts @@ -22,5 +22,13 @@ export enum FormOptEnum { /** 查看 */ VIEW = "查看", /** 删除 */ - DELETE = "删除" + DELETE = "删除", + // 分组推送人 + GroupPushPerson = "分组推送人", + // 视频推送人 + VideoPushPerson = "视频推送人", + // 移动 + MOVE = "移动", + // 分组 + GROUP = "分组" } diff --git a/SafeCampus.WEB/src/views/monitor/live/components/form.vue b/SafeCampus.WEB/src/views/monitor/live/components/form.vue index f133cdf..744eaf3 100644 --- a/SafeCampus.WEB/src/views/monitor/live/components/form.vue +++ b/SafeCampus.WEB/src/views/monitor/live/components/form.vue @@ -78,6 +78,7 @@ function onOpen(props: FormProps.Base) { visible.value = true; //显示表单 if (props.record.id) { //如果传了id，就去请求api获取record + return; bizOrgApi.detail({ id: props.record.id }).then(res => { orgProps.record = res.data; }); diff --git a/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue b/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue index cb6b623..48ae156 100644 --- a/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue +++ b/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue @@ -15,10 +15,10 @@ label-width="auto" label-suffix=" :" > - + 选择 - {{ - liveUserProps.record.directorInfo?.name + {{ + liveUserProps.record.userInfo?.name }} @@ -32,7 +32,7 @@ + + diff --git a/SafeCampus.WEB/src/views/sysconfig/ability/index.vue b/SafeCampus.WEB/src/views/sysconfig/ability/index.vue index ea59612..95f785b 100644 --- a/SafeCampus.WEB/src/views/sysconfig/ability/index.vue +++ b/SafeCampus.WEB/src/views/sysconfig/ability/index.vue @@ -28,7 +28,7 @@
{{ item.name }} {{ item.cameraId[0] }}
- 设置推送人 + 设置推送人
@@ -59,6 +59,8 @@
+ + @@ -67,6 +69,8 @@ import { ref, watch, provide, onMounted, unref, computed, reactive } from "vue"; import TreeFilter from "@/components/TreeFilter/index.vue"; import { ElMessage } from "element-plus"; import { abilityApi, userManageClassManageApi, monitorLIVEApi } from "@/api"; +import { FormOptEnum, SysDictEnum, MenuTypeDictEnum } from "@/enums"; +import userForm from "./components/userForm.vue"; const value = ref(true); onMounted(() => { @@ -116,6 +120,10 @@ function getwarnGroup() { }); }); } +const userFormRef = ref | null>(null); +function pushPerson(opt: FormOptEnum, record: {} | SysOrg.SysOrgInfo = {}) { + userFormRef.value?.onOpen({ opt: opt, record: record, successful: getwarnGroup }); +} // 开关 function stateChange() { let params: string = JSON.stringify(warnGroupList.value); From 18290868601f655b112901a1b7c2d40ff5eb9fd9 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 19 Jul 2024 14:30:34 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=82=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/interface/sys/attendance/index.ts | 1 + .../api/interface/sys/attendance/passenger.ts | 2 +- .../sys/attendance/studentsReturn.ts | 31 ++ .../api/modules/attendance/studentsReturn.ts | 8 +- .../components/form/form_basic.vue | 191 +++++++++ .../behaviorTrace/components/form/index.vue | 120 ++++++ .../components/formClass/index.vue | 107 +++++ .../components/formTeacher/index.vue | 116 ++++++ .../components/nofaceTable/index.vue | 206 ++++++++++ .../views/attendance/behaviorTrace/index.vue | 364 +++++++++++++++++- .../passenger/components/form/index.vue | 63 +-- .../src/views/attendance/passenger/index.vue | 2 +- .../components/nofaceTable/index.vue | 198 ++++++++++ .../views/attendance/studentsReturn/index.vue | 65 +++- 14 files changed, 1408 insertions(+), 66 deletions(-) create mode 100644 SafeCampus.WEB/src/api/interface/sys/attendance/studentsReturn.ts create mode 100644 SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/form_basic.vue create mode 100644 SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formClass/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formTeacher/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/behaviorTrace/components/nofaceTable/index.vue create mode 100644 SafeCampus.WEB/src/views/attendance/studentsReturn/components/nofaceTable/index.vue diff --git a/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts b/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts index 630e9d1..3c4d78c 100644 --- a/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts @@ -13,3 +13,4 @@ * @see https://gitee.com/dotnetmoyu/SimpleAdmin */ export * from "./passenger"; +export * from "./studentsReturn"; diff --git a/SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts b/SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts index 6cd5b62..198dda8 100644 --- a/SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/passenger.ts @@ -14,7 +14,7 @@ import { ReqPage } from "@/api"; /** - * @Description: 客流查询接口 + * @Description: 客流查询 * @Author: yxq * @Date: 2023-12-17 15:34:54 */ diff --git a/SafeCampus.WEB/src/api/interface/sys/attendance/studentsReturn.ts b/SafeCampus.WEB/src/api/interface/sys/attendance/studentsReturn.ts new file mode 100644 index 0000000..508499e --- /dev/null +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/studentsReturn.ts @@ -0,0 +1,31 @@ +/** + * @description 学生归寝 + * @license Apache License Version 2.0 + * @Copyright (c) 2022-Now 少林寺驻北固山办事处大神父王喇嘛 + * @remarks + * SimpleAdmin 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款: + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改SimpleAdmin源码头部的版权声明。 + * 3.分发源码时候，请注明软件出处 https://gitee.com/dotnetmoyu/SimpleAdmin + * 4.基于本软件的作品，只能使用 SimpleAdmin 作为后台服务，除外情况不可商用且不允许二次分发或开源。 + * 5.请不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为不要删除和修改作者声明。 + * 6.任何基于本软件而产生的一切法律纠纷和责任，均于我司无关 + */ + +import { ReqPage } from "@/api"; +/** + * @Description: 教师点名 + * @Author: yxq + * @Date: 2023-12-17 15:34:54 + */ + +export namespace AttendanceStudentsReturn { + export interface Page extends ReqPage {} + + /** 表单 */ + export interface studentsReturnInfo { + fenpianleixing:String, + shijianduan:any, + shexiangtou:any, + } +} diff --git a/SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts b/SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts index ad20333..22af539 100644 --- a/SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts +++ b/SafeCampus.WEB/src/api/modules/attendance/studentsReturn.ts @@ -24,19 +24,19 @@ const http = moduleRequest("/business/dfieldApi/"); const attendanceStudentsReturn = { /** 查询底库列表 */ page(params: SysUserPersonnel.ClassPage) { - return http.get("page", params); + return http.get("test", params); }, /** 删除底库 */ delete(params: ReqId) { - return http.delete("deleteDfieldD", params); + return http.delete("test", params); }, /** 创建底库 */ add(params: SysUserPersonnel.ClassPage) { - return http.post("createDfieldA", params); + return http.post("test", params); }, /** 更新底库 */ update(params: SysUserPersonnel.ClassPage) { - return http.put("updateDfieldU", params); + return http.put("test", params); } }; diff --git a/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/form_basic.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/form_basic.vue new file mode 100644 index 0000000..abaf000 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/form_basic.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/index.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/index.vue new file mode 100644 index 0000000..4c53baa --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/form/index.vue @@ -0,0 +1,120 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formClass/index.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formClass/index.vue new file mode 100644 index 0000000..1519d3b --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formClass/index.vue @@ -0,0 +1,107 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formTeacher/index.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formTeacher/index.vue new file mode 100644 index 0000000..bb94ca5 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/formTeacher/index.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/nofaceTable/index.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/nofaceTable/index.vue new file mode 100644 index 0000000..135cd65 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/nofaceTable/index.vue @@ -0,0 +1,206 @@ + + + + + + + \ No newline at end of file diff --git a/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue index e5fac1a..36b0e82 100644 --- a/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue @@ -1,34 +1,374 @@ - diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue index 094c2cb..d4614cd 100644 --- a/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue @@ -5,23 +5,23 @@ --> diff --git a/SafeCampus.WEB/src/views/attendance/roolcall/index.vue b/SafeCampus.WEB/src/views/attendance/roolcall/index.vue index 7e6d370..5ad34d9 100644 --- a/SafeCampus.WEB/src/views/attendance/roolcall/index.vue +++ b/SafeCampus.WEB/src/views/attendance/roolcall/index.vue @@ -22,8 +22,7 @@
- - +