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/public/static/rtsPlayer.html b/SafeCampus.WEB/public/static/rtsPlayer.html index 555dff8..c3df404 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,9 @@ // 当RTS拉流成功时触发，通过订阅该事件，可以获取到RTS TraceId player.on('rtsTraceId', function (data) { console.log('[EVENT]rtsTraceId', data.paramData); + player.setVolume(0) + 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/behaviorTrace.ts b/SafeCampus.WEB/src/api/interface/sys/attendance/behaviorTrace.ts new file mode 100644 index 0000000..10ed98a --- /dev/null +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/behaviorTrace.ts @@ -0,0 +1,28 @@ +/** + * @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 AttendanceBehaviorTrace { + export interface Page extends ReqPage {} + + /** 表单 */ + export interface behaviorTraceInfo { + } +} 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..c3d7733 --- /dev/null +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/index.ts @@ -0,0 +1,17 @@ +/** + * @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"; +export * from "./studentsReturn"; +export * from "./behaviorTrace"; 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..198dda8 --- /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/attendance/studentsReturn.ts b/SafeCampus.WEB/src/api/interface/sys/attendance/studentsReturn.ts new file mode 100644 index 0000000..f516f96 --- /dev/null +++ b/SafeCampus.WEB/src/api/interface/sys/attendance/studentsReturn.ts @@ -0,0 +1,28 @@ +/** + * @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 { + } +} diff --git a/SafeCampus.WEB/src/api/interface/sys/index.ts b/SafeCampus.WEB/src/api/interface/sys/index.ts index 0c7974e..4a16809 100644 --- a/SafeCampus.WEB/src/api/interface/sys/index.ts +++ b/SafeCampus.WEB/src/api/interface/sys/index.ts @@ -22,3 +22,4 @@ export * from "./auth"; export * from "./warn"; export * from "./usermanage"; export * from "./monitor"; +export * from "./attendance"; \ No newline at end of file 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/attendance/behaviorTrace.ts b/SafeCampus.WEB/src/api/modules/attendance/behaviorTrace.ts new file mode 100644 index 0000000..0bebc18 --- /dev/null +++ b/SafeCampus.WEB/src/api/modules/attendance/behaviorTrace.ts @@ -0,0 +1,47 @@ +/** + * @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("test", params); + }, + /** 删除底库 */ + delete(params: ReqId) { + return http.delete("test", params); + }, + /** 创建底库 */ + add(params: SysUserPersonnel.ClassPage) { + return http.post("test", params); + }, + /** 更新底库 */ + update(params: SysUserPersonnel.ClassPage) { + return http.put("test", params); + }, + /** 轨迹详情 */ + detail(params: SysUserPersonnel.ClassPage) { + return http.get("test", 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..fa61d0f --- /dev/null +++ b/SafeCampus.WEB/src/api/modules/attendance/roolcall.ts @@ -0,0 +1,49 @@ +/** + * @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"; +const http = moduleRequest("/business/classRoomCallApi/"); +/** + * @Description: 教师点名 + * @Author: SYY + * @Date: 2023-12-15 15:34:54 + */ +const attendanceRoolcallApi = { + // 获取列表 + page(params: any) { + return http.get("getPageList", params); + }, + /** 查询点名任务列表 */ + getTaskPageList(params: any) { + return http.get("getTaskPageList", params); + }, + /** 删除点名任务（删除关联点名数据） */ + delete(params: any) { + return http.delete("delete", params); + }, + /** 删除点名任务（只可删除待处理的任务） */ + remove(params: any) { + return http.delete("remove", params); + }, + /** 点名任务下发 */ + add(params: any) { + return http.post("taskSubmit", params); + }, + /** 修改点名任务 */ + update(params: any) { + return http.post("update", params); + } +}; + +export { attendanceRoolcallApi }; 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..9ef470e --- /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("test", params); + }, + /** 删除底库 */ + delete(params: ReqId) { + return http.delete("test", params); + }, + /** 创建底库 */ + add(params: SysUserPersonnel.ClassPage) { + return http.post("test", params); + }, + /** 更新底库 */ + update(params: SysUserPersonnel.ClassPage) { + return http.put("test", 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/api/modules/monitor/live.ts b/SafeCampus.WEB/src/api/modules/monitor/live.ts index 1227609..7df33f7 100644 --- a/SafeCampus.WEB/src/api/modules/monitor/live.ts +++ b/SafeCampus.WEB/src/api/modules/monitor/live.ts @@ -44,6 +44,18 @@ 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); + }, + // 对摄像头批量设置推送人 + setWarningPushPerson(params: sysCamera.setGroup) { + return http2.post>("batchSetPushPersonByWarn", params); + }, // 获取摄像头分组树 groupList(params: sysCamera.Tree) { return http3.get>("getNoPageList"); diff --git a/SafeCampus.WEB/src/components/Form/SButton/index.vue b/SafeCampus.WEB/src/components/Form/SButton/index.vue index fe8a93d..1051cdf 100644 --- a/SafeCampus.WEB/src/components/Form/SButton/index.vue +++ b/SafeCampus.WEB/src/components/Form/SButton/index.vue @@ -18,7 +18,8 @@ import { FormOptEnum } from "@/enums"; //接口 interface Props { /** 操作 */ - opt?: FormOptEnum; + // opt?: FormOptEnum; + opt?: any; /** 前缀 */ prefix?: string; /** 标题 */ diff --git a/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue b/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue index be7e850..6ea1b03 100644 --- a/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue +++ b/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue @@ -82,7 +82,7 @@ function getOrgTree() { function changeOrg(value: number | string) { valueOrg.value = value; //更新当前选中的组织名称 emit("update:orgValue", value); //更新父组件数据 - emit("change", treeRef.value.getCurrentNode().path); //触发change事件 + emit("change", treeRef.value.getCurrentNode().path, treeRef.value.getCurrentNode()); //触发change事件 } 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/routers/modules/staticRouter.ts b/SafeCampus.WEB/src/routers/modules/staticRouter.ts index 15b8bff..7c2f2e1 100644 --- a/SafeCampus.WEB/src/routers/modules/staticRouter.ts +++ b/SafeCampus.WEB/src/routers/modules/staticRouter.ts @@ -37,7 +37,16 @@ export const staticRouter: RouteRecordRaw[] = [ component: () => import("@/layouts/index.vue"), // component: () => import("@/layouts/indexAsync.vue"), redirect: HOME_URL, - children: [] + children: [ + { + meta: { + title: "学生点名详情" + }, + name: "学生点名详情", + path: "/roolcall/detail", + component: () => import("@/views/attendance/roolcall/detail.vue") + } + ] } ]; diff --git a/SafeCampus.WEB/src/typings/props.d.ts b/SafeCampus.WEB/src/typings/props.d.ts index 6875428..62ea201 100644 --- a/SafeCampus.WEB/src/typings/props.d.ts +++ b/SafeCampus.WEB/src/typings/props.d.ts @@ -29,6 +29,7 @@ declare namespace FormProps { inline?: boolean; // 树数据 treeAllData?: Array; + records: Array; /** 表单布局 */ successful?: () => void; } 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/components/traceShow/index.vue b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/traceShow/index.vue new file mode 100644 index 0000000..7c8153b --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/components/traceShow/index.vue @@ -0,0 +1,148 @@ + + + + + + + \ 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 new file mode 100644 index 0000000..1a7e0a4 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/behaviorTrace/index.vue @@ -0,0 +1,139 @@ + + + + diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/detailTable/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/detailTable/index.vue new file mode 100644 index 0000000..8242cbf --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/detailTable/index.vue @@ -0,0 +1,79 @@ + + + + + + + \ No newline at end of file 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..d4614cd --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue @@ -0,0 +1,112 @@ + + + + + + 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..96c856d --- /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/form/index.vue b/SafeCampus.WEB/src/views/attendance/roolcall/components/form/index.vue new file mode 100644 index 0000000..7d104d7 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/roolcall/components/form/index.vue @@ -0,0 +1,160 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/attendance/roolcall/detail.vue b/SafeCampus.WEB/src/views/attendance/roolcall/detail.vue new file mode 100644 index 0000000..d666480 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/roolcall/detail.vue @@ -0,0 +1,191 @@ + + + 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..5ad34d9 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/roolcall/index.vue @@ -0,0 +1,159 @@ + + + + diff --git a/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnConfirm/index.vue b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnConfirm/index.vue new file mode 100644 index 0000000..410f26d --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnConfirm/index.vue @@ -0,0 +1,184 @@ + + + + + + + \ No newline at end of file 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..e9589d8 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue @@ -0,0 +1,96 @@ + + + + diff --git a/SafeCampus.WEB/src/views/monitor/live/components/form.vue b/SafeCampus.WEB/src/views/monitor/live/components/form.vue index f133cdf..eb72793 100644 --- a/SafeCampus.WEB/src/views/monitor/live/components/form.vue +++ b/SafeCampus.WEB/src/views/monitor/live/components/form.vue @@ -15,17 +15,20 @@ label-width="auto" label-suffix=" :" > - - + + - - + + - - + + - - + + + + + + + diff --git a/SafeCampus.WEB/src/views/sysconfig/ability/index.vue b/SafeCampus.WEB/src/views/sysconfig/ability/index.vue index cc6c9d8..802862e 100644 --- a/SafeCampus.WEB/src/views/sysconfig/ability/index.vue +++ b/SafeCampus.WEB/src/views/sysconfig/ability/index.vue @@ -5,16 +5,32 @@ !-->