diff --git a/SafeCampus.WEB/components.d.ts b/SafeCampus.WEB/components.d.ts index 09bffd5..84a8379 100644 --- a/SafeCampus.WEB/components.d.ts +++ b/SafeCampus.WEB/components.d.ts @@ -24,7 +24,6 @@ declare module 'vue' { ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCol: typeof import('element-plus/es')['ElCol'] ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElContainer: typeof import('element-plus/es')['ElContainer'] ElDialog: typeof import('element-plus/es')['ElDialog'] @@ -43,13 +42,10 @@ declare module 'vue' { ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] ElSpace: typeof import('element-plus/es')['ElSpace'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] @@ -59,6 +55,8 @@ declare module 'vue' { ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] + ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ESign: typeof import('./src/components/ESign/index.vue')['default'] FormContainer: typeof import('./src/components/Form/FormContainer/index.vue')['default'] Grid: typeof import('./src/components/Grid/index.vue')['default'] diff --git a/SafeCampus.WEB/index.html b/SafeCampus.WEB/index.html index da93951..89f7a8f 100644 --- a/SafeCampus.WEB/index.html +++ b/SafeCampus.WEB/index.html @@ -2,7 +2,7 @@ - + <%- title %> diff --git a/SafeCampus.WEB/src/api/interface/index.ts b/SafeCampus.WEB/src/api/interface/index.ts index be0c48c..016fab3 100644 --- a/SafeCampus.WEB/src/api/interface/index.ts +++ b/SafeCampus.WEB/src/api/interface/index.ts @@ -51,6 +51,11 @@ export interface ReqId { /** id */ id: number | string; } +/** id请求参数 */ +export interface ReqPersonId { + /** id */ + personId: number | string; +} /** id请求参数 */ export interface ReqstartId { @@ -68,7 +73,6 @@ export interface ReqstopId { } export interface setWarn { - configJson: string; } diff --git a/SafeCampus.WEB/src/api/modules/monitor/live.ts b/SafeCampus.WEB/src/api/modules/monitor/live.ts index bda1510..e5bbb47 100644 --- a/SafeCampus.WEB/src/api/modules/monitor/live.ts +++ b/SafeCampus.WEB/src/api/modules/monitor/live.ts @@ -36,5 +36,22 @@ const monitorLIVEApi = { }, }; +/** + * @Description: 监控管理按钮权限码 + * @Author: huguodong + * @Date: 2024-02-20 09:51:15 + */ +const monitorLiveButtonCode = { + /** 新增监控 */ + add: "monitorLiveAdd", + /** 编辑监控 */ + edit: "monitorLiveEdit", + /** 删除监控 */ + delete: "monitorLiveDelete", + /** 批量删除监控 */ + batchDelete: "monitorLiveBatchDelete", + /** 复制监控 */ + copy: "monitorLiveCopy" +}; -export { monitorLIVEApi }; +export { monitorLIVEApi, monitorLiveButtonCode }; diff --git a/SafeCampus.WEB/src/assets/images/home/carame.png b/SafeCampus.WEB/src/assets/images/home/carame.png new file mode 100644 index 0000000..710e8b4 Binary files /dev/null and b/SafeCampus.WEB/src/assets/images/home/carame.png differ diff --git a/SafeCampus.WEB/src/assets/images/home/handle.png b/SafeCampus.WEB/src/assets/images/home/handle.png new file mode 100644 index 0000000..13068fb Binary files /dev/null and b/SafeCampus.WEB/src/assets/images/home/handle.png differ diff --git a/SafeCampus.WEB/src/assets/images/home/participation.png b/SafeCampus.WEB/src/assets/images/home/participation.png new file mode 100644 index 0000000..92fb42f Binary files /dev/null and b/SafeCampus.WEB/src/assets/images/home/participation.png differ diff --git a/SafeCampus.WEB/src/assets/images/home/warn.png b/SafeCampus.WEB/src/assets/images/home/warn.png new file mode 100644 index 0000000..db7e259 Binary files /dev/null and b/SafeCampus.WEB/src/assets/images/home/warn.png differ diff --git a/SafeCampus.WEB/src/layouts/components/Footer/index.vue b/SafeCampus.WEB/src/layouts/components/Footer/index.vue index 4422281..565b87c 100644 --- a/SafeCampus.WEB/src/layouts/components/Footer/index.vue +++ b/SafeCampus.WEB/src/layouts/components/Footer/index.vue @@ -1,7 +1,7 @@ + diff --git a/SafeCampus.WEB/src/views/monitor/live/index.scss b/SafeCampus.WEB/src/views/monitor/live/index.scss new file mode 100644 index 0000000..00728b8 --- /dev/null +++ b/SafeCampus.WEB/src/views/monitor/live/index.scss @@ -0,0 +1,38 @@ +.filter { + box-sizing: border-box; + width: 280px; + height: 100%; + padding: 18px; + margin-right: 10px; + .title { + margin: 0 0 15px; + font-size: 18px; + font-weight: bold; + color: var(--el-color-info-dark-2); + letter-spacing: 0.5px; + } + .el-input { + margin: 0 0 15px; + } + .el-scrollbar { + :deep(.el-tree) { + height: 80%; + overflow: auto; + .el-tree-node__content { + height: 33px; + } + } + :deep(.el-tree--highlight-current) { + .el-tree-node.is-current > .el-tree-node__content { + background-color: var(--el-color-primary); + .el-tree-node__label, + .el-tree-node__expand-icon { + color: white; + } + .is-leaf { + color: transparent; + } + } + } + } +} diff --git a/SafeCampus.WEB/src/views/monitor/live/index.vue b/SafeCampus.WEB/src/views/monitor/live/index.vue index f999c36..2b923b5 100644 --- a/SafeCampus.WEB/src/views/monitor/live/index.vue +++ b/SafeCampus.WEB/src/views/monitor/live/index.vue @@ -4,66 +4,135 @@ * @Date: 2023-12-15 15:44:05 !-->