From 323384575fd3f34c7bd134fc55cbf4722179c234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E7=8E=AE?= Date: Fri, 15 Nov 2024 17:30:24 +0800 Subject: [PATCH] init --- src/api/data/detectTaskApi.ts | 82 --- src/api/data/detectTaskItemApi.ts | 82 --- src/api/{system => data}/deviceApi.ts | 6 +- src/api/data/eventApi.ts | 82 --- src/api/data/taskApi.ts | 82 +++ src/api/data/taskLogApi.ts | 82 +++ src/api/data/taskProgressApi.ts | 82 +++ src/api/model/algo.ts | 151 ------ src/api/model/authority.ts | 4 +- src/api/model/baseModel.ts | 4 +- src/api/model/constant.ts | 4 +- src/api/model/detectTaskItem.ts | 71 --- src/api/model/device.ts | 76 +-- src/api/model/event.ts | 111 ---- src/api/model/log.ts | 4 +- src/api/model/storagePlan.ts | 151 ------ src/api/model/{detectTask.ts => task.ts} | 38 +- src/api/model/{region.ts => taskLog.ts} | 38 +- src/api/model/taskProgress.ts | 95 ++++ src/api/model/user.ts | 4 +- src/api/model/userAuthority.ts | 4 +- src/api/system/algoApi.ts | 82 --- src/api/system/authorityApi.ts | 4 +- src/api/system/constantApi.ts | 4 +- src/api/system/logApi.ts | 4 +- src/api/system/regionApi.ts | 82 --- src/api/system/storagePlanApi.ts | 82 --- src/api/system/userApi.ts | 10 +- src/api/system/userAuthorityApi.ts | 4 +- src/assets/{custom.css => custom.scss} | 6 +- src/router/routes/embedded/data.ts | 18 +- src/router/routes/embedded/system.ts | 19 +- src/views/data/detect-task-item/detail.vue | 74 --- src/views/{system => data}/device/detail.vue | 2 +- .../data/{detect-task => device}/drawer.vue | 6 +- src/views/data/device/index.vue | 156 ++++++ src/views/data/device/schema.ts | 197 +++++++ .../detect-task => data/task-log}/detail.vue | 6 +- .../{detect-task-item => task-log}/drawer.vue | 6 +- src/views/data/{event => task-log}/index.vue | 28 +- src/views/data/{event => task-log}/schema.ts | 139 ++--- src/views/data/task-progress/detail.vue | 74 +++ .../task-progress}/drawer.vue | 14 +- .../{detect-task => task-progress}/index.vue | 28 +- .../schema.ts | 66 ++- src/views/data/{event => task}/detail.vue | 6 +- src/views/data/{event => task}/drawer.vue | 6 +- .../detect-task => data/task}/index.vue | 65 +-- .../data/{detect-task => task}/schema.ts | 75 ++- src/views/system/authority/index.vue | 56 +- src/views/system/authority/schema.ts | 4 +- .../constant}/detail.vue | 6 +- src/views/system/constant/drawer.vue | 63 +++ .../constant}/index.vue | 74 +-- .../{detect-task => constant}/schema.ts | 52 +- src/views/system/device/drawer.vue | 173 ------ src/views/system/device/index.vue | 497 ------------------ src/views/system/device/schema.ts | 380 ------------- src/views/system/log/index.vue | 18 +- src/views/system/log/schema.ts | 2 +- src/views/system/user-authority/index.vue | 56 +- src/views/system/user/drawer.vue | 2 +- src/views/system/user/index.vue | 6 +- types/index.d.ts | 2 + 64 files changed, 1236 insertions(+), 2671 deletions(-) delete mode 100644 src/api/data/detectTaskApi.ts delete mode 100644 src/api/data/detectTaskItemApi.ts rename src/api/{system => data}/deviceApi.ts (94%) delete mode 100644 src/api/data/eventApi.ts create mode 100644 src/api/data/taskApi.ts create mode 100644 src/api/data/taskLogApi.ts create mode 100644 src/api/data/taskProgressApi.ts delete mode 100644 src/api/model/algo.ts delete mode 100644 src/api/model/detectTaskItem.ts delete mode 100644 src/api/model/event.ts delete mode 100644 src/api/model/storagePlan.ts rename src/api/model/{detectTask.ts => task.ts} (72%) rename src/api/model/{region.ts => taskLog.ts} (60%) create mode 100644 src/api/model/taskProgress.ts delete mode 100644 src/api/system/algoApi.ts delete mode 100644 src/api/system/regionApi.ts delete mode 100644 src/api/system/storagePlanApi.ts rename src/assets/{custom.css => custom.scss} (99%) delete mode 100644 src/views/data/detect-task-item/detail.vue rename src/views/{system => data}/device/detail.vue (97%) rename src/views/data/{detect-task => device}/drawer.vue (90%) create mode 100644 src/views/data/device/index.vue create mode 100644 src/views/data/device/schema.ts rename src/views/{system/detect-task => data/task-log}/detail.vue (91%) rename src/views/data/{detect-task-item => task-log}/drawer.vue (90%) rename src/views/data/{event => task-log}/index.vue (87%) rename src/views/data/{event => task-log}/schema.ts (61%) create mode 100644 src/views/data/task-progress/detail.vue rename src/views/{system/detect-task => data/task-progress}/drawer.vue (80%) rename src/views/data/{detect-task => task-progress}/index.vue (86%) rename src/views/data/{detect-task-item => task-progress}/schema.ts (73%) rename src/views/data/{event => task}/detail.vue (92%) rename src/views/data/{event => task}/drawer.vue (91%) rename src/views/{system/detect-task => data/task}/index.vue (72%) rename src/views/data/{detect-task => task}/schema.ts (76%) rename src/views/{data/detect-task => system/constant}/detail.vue (90%) create mode 100644 src/views/system/constant/drawer.vue rename src/views/{data/detect-task-item => system/constant}/index.vue (63%) rename src/views/system/{detect-task => constant}/schema.ts (80%) delete mode 100644 src/views/system/device/drawer.vue delete mode 100644 src/views/system/device/index.vue delete mode 100644 src/views/system/device/schema.ts diff --git a/src/api/data/detectTaskApi.ts b/src/api/data/detectTaskApi.ts deleted file mode 100644 index f67e968..0000000 --- a/src/api/data/detectTaskApi.ts +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { defHttp } from '@/utils/http/axios'; -import { - DetectTask, - DetectTaskParams, - DetectTaskPageResult, -} from '../model/detectTask'; - -const baseApi = '/v1/data/detect-task'; - -/** - * 新增 - */ -export const add = (entity: DetectTask) => - defHttp.post({ url: `${baseApi}/`, data: entity }); - -/** - * 更新 - */ -export const update = (entity: DetectTask, updateAllFields = false) => - defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); - -/** - * 删除 - */ -export const remove = (id: any) => - defHttp.delete({ url: `${baseApi}/${id}` }); - -/** - * 分页查询 - */ -export const search = (params?: DetectTaskParams) => - defHttp.get({ url: `${baseApi}/search`, params }); - -/** - * 列表查询 - */ -export const all = (params?: DetectTaskParams) => - defHttp.get({ url: `${baseApi}/all`, params }); - -/** - * 通过主键查询 - */ -export const getById = (id: any) => - defHttp.get({ url: `${baseApi}/${id}` }); - -/** - * 单个查询 - */ -export const getOne = (params?: DetectTaskParams) => - defHttp.get({ url: `${baseApi}/one`, params }); - -/** - * 批量删除 - */ -export const batchRemove = (idList: Array) => - defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); - -/** - * 批量新增 - */ -export const batchAdd = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); - -/** - * 批量更新 - */ -export const batchUpdate = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); - -/** - * 查询数量 - */ -export const count = (params?: DetectTaskParams) => - defHttp.get({ url: `${baseApi}/count`, params }); - - diff --git a/src/api/data/detectTaskItemApi.ts b/src/api/data/detectTaskItemApi.ts deleted file mode 100644 index 5da0e85..0000000 --- a/src/api/data/detectTaskItemApi.ts +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { defHttp } from '@/utils/http/axios'; -import { - DetectTaskItem, - DetectTaskItemParams, - DetectTaskItemPageResult, -} from '../model/detectTaskItem'; - -const baseApi = '/v1/data/detect-task-item'; - -/** - * 新增 - */ -export const add = (entity: DetectTaskItem) => - defHttp.post({ url: `${baseApi}/`, data: entity }); - -/** - * 更新 - */ -export const update = (entity: DetectTaskItem, updateAllFields = false) => - defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); - -/** - * 删除 - */ -export const remove = (id: any) => - defHttp.delete({ url: `${baseApi}/${id}` }); - -/** - * 分页查询 - */ -export const search = (params?: DetectTaskItemParams) => - defHttp.get({ url: `${baseApi}/search`, params }); - -/** - * 列表查询 - */ -export const all = (params?: DetectTaskItemParams) => - defHttp.get({ url: `${baseApi}/all`, params }); - -/** - * 通过主键查询 - */ -export const getById = (id: any) => - defHttp.get({ url: `${baseApi}/${id}` }); - -/** - * 单个查询 - */ -export const getOne = (params?: DetectTaskItemParams) => - defHttp.get({ url: `${baseApi}/one`, params }); - -/** - * 批量删除 - */ -export const batchRemove = (idList: Array) => - defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); - -/** - * 批量新增 - */ -export const batchAdd = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); - -/** - * 批量更新 - */ -export const batchUpdate = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); - -/** - * 查询数量 - */ -export const count = (params?: DetectTaskItemParams) => - defHttp.get({ url: `${baseApi}/count`, params }); - - diff --git a/src/api/system/deviceApi.ts b/src/api/data/deviceApi.ts similarity index 94% rename from src/api/system/deviceApi.ts rename to src/api/data/deviceApi.ts index 3748faa..8bcb536 100644 --- a/src/api/system/deviceApi.ts +++ b/src/api/data/deviceApi.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { defHttp } from '@/utils/http/axios'; @@ -11,7 +11,7 @@ import { DevicePageResult, } from '../model/device'; -const baseApi = '/v1/system/device'; +const baseApi = '/v1/data/device'; /** * 新增 diff --git a/src/api/data/eventApi.ts b/src/api/data/eventApi.ts deleted file mode 100644 index 80ebdd6..0000000 --- a/src/api/data/eventApi.ts +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { defHttp } from '@/utils/http/axios'; -import { - Event, - EventParams, - EventPageResult, -} from '../model/event'; - -const baseApi = '/v1/data/event'; - -/** - * 新增 - */ -export const add = (entity: Event) => - defHttp.post({ url: `${baseApi}/`, data: entity }); - -/** - * 更新 - */ -export const update = (entity: Event, updateAllFields = false) => - defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); - -/** - * 删除 - */ -export const remove = (id: any) => - defHttp.delete({ url: `${baseApi}/${id}` }); - -/** - * 分页查询 - */ -export const search = (params?: EventParams) => - defHttp.get({ url: `${baseApi}/search`, params }); - -/** - * 列表查询 - */ -export const all = (params?: EventParams) => - defHttp.get({ url: `${baseApi}/all`, params }); - -/** - * 通过主键查询 - */ -export const getById = (id: any) => - defHttp.get({ url: `${baseApi}/${id}` }); - -/** - * 单个查询 - */ -export const getOne = (params?: EventParams) => - defHttp.get({ url: `${baseApi}/one`, params }); - -/** - * 批量删除 - */ -export const batchRemove = (idList: Array) => - defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); - -/** - * 批量新增 - */ -export const batchAdd = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); - -/** - * 批量更新 - */ -export const batchUpdate = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); - -/** - * 查询数量 - */ -export const count = (params?: EventParams) => - defHttp.get({ url: `${baseApi}/count`, params }); - - diff --git a/src/api/data/taskApi.ts b/src/api/data/taskApi.ts new file mode 100644 index 0000000..4c72419 --- /dev/null +++ b/src/api/data/taskApi.ts @@ -0,0 +1,82 @@ +/** + * 项目：中核预埋件检测 + * @Author: xiongwei + * @Date: 2024-11-15 11:50:00 + */ + +import { defHttp } from '@/utils/http/axios'; +import { + Task, + TaskParams, + TaskPageResult, +} from '../model/task'; + +const baseApi = '/v1/data/task'; + +/** + * 新增 + */ +export const add = (entity: Task) => + defHttp.post({ url: `${baseApi}/`, data: entity }); + +/** + * 更新 + */ +export const update = (entity: Task, updateAllFields = false) => + defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); + +/** + * 删除 + */ +export const remove = (id: any) => + defHttp.delete({ url: `${baseApi}/${id}` }); + +/** + * 分页查询 + */ +export const search = (params?: TaskParams) => + defHttp.get({ url: `${baseApi}/search`, params }); + +/** + * 列表查询 + */ +export const all = (params?: TaskParams) => + defHttp.get({ url: `${baseApi}/all`, params }); + +/** + * 通过主键查询 + */ +export const getById = (id: any) => + defHttp.get({ url: `${baseApi}/${id}` }); + +/** + * 单个查询 + */ +export const getOne = (params?: TaskParams) => + defHttp.get({ url: `${baseApi}/one`, params }); + +/** + * 批量删除 + */ +export const batchRemove = (idList: Array) => + defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); + +/** + * 批量新增 + */ +export const batchAdd = (entityList: Array) => + defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); + +/** + * 批量更新 + */ +export const batchUpdate = (entityList: Array) => + defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); + +/** + * 查询数量 + */ +export const count = (params?: TaskParams) => + defHttp.get({ url: `${baseApi}/count`, params }); + + diff --git a/src/api/data/taskLogApi.ts b/src/api/data/taskLogApi.ts new file mode 100644 index 0000000..5dfdf34 --- /dev/null +++ b/src/api/data/taskLogApi.ts @@ -0,0 +1,82 @@ +/** + * 项目：中核预埋件检测 + * @Author: xiongwei + * @Date: 2024-11-15 11:50:00 + */ + +import { defHttp } from '@/utils/http/axios'; +import { + TaskLog, + TaskLogParams, + TaskLogPageResult, +} from '../model/taskLog'; + +const baseApi = '/v1/data/task-log'; + +/** + * 新增 + */ +export const add = (entity: TaskLog) => + defHttp.post({ url: `${baseApi}/`, data: entity }); + +/** + * 更新 + */ +export const update = (entity: TaskLog, updateAllFields = false) => + defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); + +/** + * 删除 + */ +export const remove = (id: any) => + defHttp.delete({ url: `${baseApi}/${id}` }); + +/** + * 分页查询 + */ +export const search = (params?: TaskLogParams) => + defHttp.get({ url: `${baseApi}/search`, params }); + +/** + * 列表查询 + */ +export const all = (params?: TaskLogParams) => + defHttp.get({ url: `${baseApi}/all`, params }); + +/** + * 通过主键查询 + */ +export const getById = (id: any) => + defHttp.get({ url: `${baseApi}/${id}` }); + +/** + * 单个查询 + */ +export const getOne = (params?: TaskLogParams) => + defHttp.get({ url: `${baseApi}/one`, params }); + +/** + * 批量删除 + */ +export const batchRemove = (idList: Array) => + defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); + +/** + * 批量新增 + */ +export const batchAdd = (entityList: Array) => + defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); + +/** + * 批量更新 + */ +export const batchUpdate = (entityList: Array) => + defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); + +/** + * 查询数量 + */ +export const count = (params?: TaskLogParams) => + defHttp.get({ url: `${baseApi}/count`, params }); + + diff --git a/src/api/data/taskProgressApi.ts b/src/api/data/taskProgressApi.ts new file mode 100644 index 0000000..b9d715d --- /dev/null +++ b/src/api/data/taskProgressApi.ts @@ -0,0 +1,82 @@ +/** + * 项目：中核预埋件检测 + * @Author: xiongwei + * @Date: 2024-11-15 11:50:00 + */ + +import { defHttp } from '@/utils/http/axios'; +import { + TaskProgress, + TaskProgressParams, + TaskProgressPageResult, +} from '../model/taskProgress'; + +const baseApi = '/v1/data/task-progress'; + +/** + * 新增 + */ +export const add = (entity: TaskProgress) => + defHttp.post({ url: `${baseApi}/`, data: entity }); + +/** + * 更新 + */ +export const update = (entity: TaskProgress, updateAllFields = false) => + defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); + +/** + * 删除 + */ +export const remove = (id: any) => + defHttp.delete({ url: `${baseApi}/${id}` }); + +/** + * 分页查询 + */ +export const search = (params?: TaskProgressParams) => + defHttp.get({ url: `${baseApi}/search`, params }); + +/** + * 列表查询 + */ +export const all = (params?: TaskProgressParams) => + defHttp.get({ url: `${baseApi}/all`, params }); + +/** + * 通过主键查询 + */ +export const getById = (id: any) => + defHttp.get({ url: `${baseApi}/${id}` }); + +/** + * 单个查询 + */ +export const getOne = (params?: TaskProgressParams) => + defHttp.get({ url: `${baseApi}/one`, params }); + +/** + * 批量删除 + */ +export const batchRemove = (idList: Array) => + defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); + +/** + * 批量新增 + */ +export const batchAdd = (entityList: Array) => + defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); + +/** + * 批量更新 + */ +export const batchUpdate = (entityList: Array) => + defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); + +/** + * 查询数量 + */ +export const count = (params?: TaskProgressParams) => + defHttp.get({ url: `${baseApi}/count`, params }); + + diff --git a/src/api/model/algo.ts b/src/api/model/algo.ts deleted file mode 100644 index ea4a5b0..0000000 --- a/src/api/model/algo.ts +++ /dev/null @@ -1,151 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { BasePageParams, PageResult, ApiResponse } from './baseModel'; - -export interface AlgoParams extends BasePageParams { - /** - * ID系统自动生成 - */ - id?: number; - /** - * ID系统自动生成 IN值List - */ - idList?: Array; - /** - * 编码 - */ - code?: string; - /** - * 算法名称 - */ - name?: string; - /** - * 告警等级 - */ - alarmLevel?: string; - /** - * 参数配置 - */ - paramJson?: string; - /** - * 边缘灯光 - */ - edgeFlashing?: number; - /** - * 边缘蜂鸣 - */ - edgeBuzzing?: number; - /** - * 边缘语音 - */ - edgeVoice?: number; - /** - * 边缘语音内容 - */ - edgeVoiceContent?: string; - /** - * PC推送 - */ - pcPush?: number; - /** - * PC推送内容 - */ - pcPushContent?: string; - /** - * create_time - */ - createTime?: Date; - /** - * 下限值(大于等于) - */ - createTimeFrom?: Date; - /** - * 上限值(小于) - */ - createTimeTo?: Date; - /** - * update_time - */ - updateTime?: Date; - /** - * 下限值(大于等于) - */ - updateTimeFrom?: Date; - /** - * 上限值(小于) - */ - updateTimeTo?: Date; - /** - * 其他参数 - */ - [key: string]: any; -} - -export interface Algo { - /** - * ID系统自动生成 - */ - id?: number; - /** - * 编码 - */ - code?: string; - /** - * 算法名称 - */ - name?: string; - /** - * 告警等级 - */ - alarmLevel?: string; - /** - * 参数配置 - */ - paramJson?: string; - /** - * 边缘灯光 - */ - edgeFlashing?: number; - /** - * 边缘蜂鸣 - */ - edgeBuzzing?: number; - /** - * 边缘语音 - */ - edgeVoice?: number; - /** - * 边缘语音内容 - */ - edgeVoiceContent?: string; - /** - * PC推送 - */ - pcPush?: number; - /** - * PC推送内容 - */ - pcPushContent?: string; - /** - * create_time - */ - createTime?: Date; - /** - * update_time - */ - updateTime?: Date; - /** - * 其他参数 - */ - [key: string]: any; -} - -export type AlgoPageResult = PageResult; - -export type AlgoPageResponse = ApiResponse; - -export type AlgoResponse = ApiResponse; diff --git a/src/api/model/authority.ts b/src/api/model/authority.ts index d4dfe00..f22f0dd 100644 --- a/src/api/model/authority.ts +++ b/src/api/model/authority.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; diff --git a/src/api/model/baseModel.ts b/src/api/model/baseModel.ts index 963040d..c6a426d 100644 --- a/src/api/model/baseModel.ts +++ b/src/api/model/baseModel.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ export interface BasePageParams { diff --git a/src/api/model/constant.ts b/src/api/model/constant.ts index 2bd165b..e7fbe4a 100644 --- a/src/api/model/constant.ts +++ b/src/api/model/constant.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; diff --git a/src/api/model/detectTaskItem.ts b/src/api/model/detectTaskItem.ts deleted file mode 100644 index e8bebf3..0000000 --- a/src/api/model/detectTaskItem.ts +++ /dev/null @@ -1,71 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { BasePageParams, PageResult, ApiResponse } from './baseModel'; - -export interface DetectTaskItemParams extends BasePageParams { - /** - * ID系统自动生成 - */ - id?: number; - /** - * ID系统自动生成 IN值List - */ - idList?: Array; - /** - * dat_detect_task.id - */ - detectTaskId?: number; - /** - * sys_algo.id - */ - algoId?: number; - /** - * 参数配置 - */ - paramJson?: string; - /** - * ROI区域设置 - */ - roiJson?: string; - /** - * 其他参数 - */ - [key: string]: any; -} - -export interface DetectTaskItem { - /** - * ID系统自动生成 - */ - id?: number; - /** - * dat_detect_task.id - */ - detectTaskId?: number; - /** - * sys_algo.id - */ - algoId?: number; - /** - * 参数配置 - */ - paramJson?: string; - /** - * ROI区域设置 - */ - roiJson?: string; - /** - * 其他参数 - */ - [key: string]: any; -} - -export type DetectTaskItemPageResult = PageResult; - -export type DetectTaskItemPageResponse = ApiResponse; - -export type DetectTaskItemResponse = ApiResponse; diff --git a/src/api/model/device.ts b/src/api/model/device.ts index 0f0db5d..c6295ce 100644 --- a/src/api/model/device.ts +++ b/src/api/model/device.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; @@ -15,10 +15,6 @@ export interface DeviceParams extends BasePageParams { * ID系统自动生成 IN值List */ idList?: Array; - /** - * sys_region.id - */ - regionId?: number; /** * 设备名称 */ @@ -27,22 +23,6 @@ export interface DeviceParams extends BasePageParams { * 设备IP地址 */ deviceIp?: string; - /** - * 设备端口 - */ - devicePort?: String; - /** - * 用户名 - */ - deviceUsername?: String; - /** - * 密码 - */ - devicePassword?: String; - /** - * 设备类型 - */ - deviceType?: String; /** * 软件版本 */ @@ -59,22 +39,6 @@ export interface DeviceParams extends BasePageParams { * 模型版本 */ modelVersion?: String; - /** - * 相机IP地址 - */ - cameraIp?: string; - /** - * 相机用户名 - */ - cameraUsername?: String; - /** - * 相机密码 - */ - cameraPassword?: String; - /** - * 相机rtsp完整地址 - */ - cameraRtsp?: String; /** * create_time */ @@ -110,10 +74,6 @@ export interface Device { * ID系统自动生成 */ id?: number; - /** - * sys_region.id - */ - regionId?: number; /** * 设备名称 */ @@ -122,22 +82,6 @@ export interface Device { * 设备IP地址 */ deviceIp?: string; - /** - * 设备端口 - */ - devicePort?: String; - /** - * 用户名 - */ - deviceUsername?: String; - /** - * 密码 - */ - devicePassword?: String; - /** - * 设备类型 - */ - deviceType?: String; /** * 软件版本 */ @@ -154,22 +98,6 @@ export interface Device { * 模型版本 */ modelVersion?: String; - /** - * 相机IP地址 - */ - cameraIp?: string; - /** - * 相机用户名 - */ - cameraUsername?: String; - /** - * 相机密码 - */ - cameraPassword?: String; - /** - * 相机rtsp完整地址 - */ - cameraRtsp?: String; /** * create_time */ diff --git a/src/api/model/event.ts b/src/api/model/event.ts deleted file mode 100644 index 3e698be..0000000 --- a/src/api/model/event.ts +++ /dev/null @@ -1,111 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { BasePageParams, PageResult, ApiResponse } from './baseModel'; - -export interface EventParams extends BasePageParams { - /** - * ID系统自动生成 - */ - id?: number; - /** - * ID系统自动生成 IN值List - */ - idList?: Array; - /** - * sys_region.id - */ - regionId?: number; - /** - * sys_device.id - */ - deviceId?: number; - /** - * 算法code sys_algo.code - */ - algoCode?: string; - /** - * 告警等级 - */ - alarmLevel?: string; - /** - * 图片 - */ - imageUrl?: string; - /** - * 视频 - */ - videoUrl?: string; - /** - * 处理信息 - */ - content?: string; - /** - * 发生时间 - */ - eventTime?: Date; - /** - * 发生时间 下限值(大于等于) - */ - eventTimeFrom?: Date; - /** - * 发生时间 上限值(小于) - */ - eventTimeTo?: Date; - /** - * 其他参数 - */ - [key: string]: any; -} - -export interface Event { - /** - * ID系统自动生成 - */ - id?: number; - /** - * sys_region.id - */ - regionId?: number; - /** - * sys_device.id - */ - deviceId?: number; - /** - * 算法code sys_algo.code - */ - algoCode?: string; - /** - * 告警等级 - */ - alarmLevel?: string; - /** - * 图片 - */ - imageUrl?: string; - /** - * 视频 - */ - videoUrl?: string; - /** - * 处理信息 - */ - content?: string; - /** - * 发生时间 - */ - eventTime?: Date; - /** - * 其他参数 - */ - [key: string]: any; -} - -export type EventPageResult = PageResult; - -export type EventPageResponse = ApiResponse; - -export type EventResponse = ApiResponse; diff --git a/src/api/model/log.ts b/src/api/model/log.ts index 6c2d9ad..5cc55cd 100644 --- a/src/api/model/log.ts +++ b/src/api/model/log.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; diff --git a/src/api/model/storagePlan.ts b/src/api/model/storagePlan.ts deleted file mode 100644 index 9af2891..0000000 --- a/src/api/model/storagePlan.ts +++ /dev/null @@ -1,151 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { BasePageParams, PageResult, ApiResponse } from './baseModel'; - -export interface StoragePlanParams extends BasePageParams { - /** - * ID系统自动生成 - */ - id?: number; - /** - * ID系统自动生成 IN值List - */ - idList?: Array; - /** - * sys_region.id - */ - regionId?: number; - /** - * sys_device.id - */ - deviceId?: number; - /** - * 开始时间 - */ - startTime?: Date; - /** - * 开始时间 下限值(大于等于) - */ - startTimeFrom?: Date; - /** - * 开始时间 上限值(小于) - */ - startTimeTo?: Date; - /** - * 结束时间 - */ - endTime?: Date; - /** - * 结束时间 下限值(大于等于) - */ - endTimeFrom?: Date; - /** - * 结束时间 上限值(小于) - */ - endTimeTo?: Date; - /** - * 是否录像 - */ - isVideo?: number; - /** - * 是否抓图 - */ - isCapture?: number; - /** - * 录像时长 - */ - videoDuration?: number; - /** - * 抓图间隔 - */ - captureInterval?: number; - /** - * create_time - */ - createTime?: Date; - /** - * 下限值(大于等于) - */ - createTimeFrom?: Date; - /** - * 上限值(小于) - */ - createTimeTo?: Date; - /** - * update_time - */ - updateTime?: Date; - /** - * 下限值(大于等于) - */ - updateTimeFrom?: Date; - /** - * 上限值(小于) - */ - updateTimeTo?: Date; - /** - * 其他参数 - */ - [key: string]: any; -} - -export interface StoragePlan { - /** - * ID系统自动生成 - */ - id?: number; - /** - * sys_region.id - */ - regionId?: number; - /** - * sys_device.id - */ - deviceId?: number; - /** - * 开始时间 - */ - startTime?: Date; - /** - * 结束时间 - */ - endTime?: Date; - /** - * 是否录像 - */ - isVideo?: number; - /** - * 是否抓图 - */ - isCapture?: number; - /** - * 录像时长 - */ - videoDuration?: number; - /** - * 抓图间隔 - */ - captureInterval?: number; - /** - * create_time - */ - createTime?: Date; - /** - * update_time - */ - updateTime?: Date; - /** - * 其他参数 - */ - [key: string]: any; -} - -export type StoragePlanPageResult = PageResult; - -export type StoragePlanPageResponse = ApiResponse; - -export type StoragePlanResponse = ApiResponse; diff --git a/src/api/model/detectTask.ts b/src/api/model/task.ts similarity index 72% rename from src/api/model/detectTask.ts rename to src/api/model/task.ts index 70e089a..d2e031d 100644 --- a/src/api/model/detectTask.ts +++ b/src/api/model/task.ts @@ -1,12 +1,12 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; -export interface DetectTaskParams extends BasePageParams { +export interface TaskParams extends BasePageParams { /** * ID系统自动生成 */ @@ -19,6 +19,18 @@ export interface DetectTaskParams extends BasePageParams { * 名称 */ name?: string; + /** + * 设备序列号 + */ + deviceSn?: string; + /** + * 任务参数 + */ + paramJson?: string; + /** + * 任务结果 + */ + resultJson?: string; /** * 开始时间 */ @@ -77,7 +89,7 @@ export interface DetectTaskParams extends BasePageParams { [key: string]: any; } -export interface DetectTask { +export interface Task { /** * ID系统自动生成 */ @@ -86,6 +98,18 @@ export interface DetectTask { * 名称 */ name?: string; + /** + * 设备序列号 + */ + deviceSn?: string; + /** + * 任务参数 + */ + paramJson?: string; + /** + * 任务结果 + */ + resultJson?: string; /** * 开始时间 */ @@ -112,8 +136,8 @@ export interface DetectTask { [key: string]: any; } -export type DetectTaskPageResult = PageResult; +export type TaskPageResult = PageResult; -export type DetectTaskPageResponse = ApiResponse; +export type TaskPageResponse = ApiResponse; -export type DetectTaskResponse = ApiResponse; +export type TaskResponse = ApiResponse; diff --git a/src/api/model/region.ts b/src/api/model/taskLog.ts similarity index 60% rename from src/api/model/region.ts rename to src/api/model/taskLog.ts index 5b0b045..91d2f86 100644 --- a/src/api/model/region.ts +++ b/src/api/model/taskLog.ts @@ -1,12 +1,12 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; -export interface RegionParams extends BasePageParams { +export interface TaskLogParams extends BasePageParams { /** * ID系统自动生成 */ @@ -16,13 +16,17 @@ export interface RegionParams extends BasePageParams { */ idList?: Array; /** - * 名称 + * dat_detect_task.id */ - name?: string; + taskId?: number; /** - * 编号 + * 设备序列号 */ - code?: string; + deviceSn?: string; + /** + * 处理信息 + */ + content?: string; /** * create_time */ @@ -53,19 +57,23 @@ export interface RegionParams extends BasePageParams { [key: string]: any; } -export interface Region { +export interface TaskLog { /** * ID系统自动生成 */ id?: number; /** - * 名称 + * dat_detect_task.id */ - name?: string; + taskId?: number; /** - * 编号 + * 设备序列号 */ - code?: string; + deviceSn?: string; + /** + * 处理信息 + */ + content?: string; /** * create_time */ @@ -80,8 +88,8 @@ export interface Region { [key: string]: any; } -export type RegionPageResult = PageResult; +export type TaskLogPageResult = PageResult; -export type RegionPageResponse = ApiResponse; +export type TaskLogPageResponse = ApiResponse; -export type RegionResponse = ApiResponse; +export type TaskLogResponse = ApiResponse; diff --git a/src/api/model/taskProgress.ts b/src/api/model/taskProgress.ts new file mode 100644 index 0000000..a15c1d6 --- /dev/null +++ b/src/api/model/taskProgress.ts @@ -0,0 +1,95 @@ +/** + * 项目：中核预埋件检测 + * @Author: xiongwei + * @Date: 2024-11-15 11:50:00 + */ + +import { BasePageParams, PageResult, ApiResponse } from './baseModel'; + +export interface TaskProgressParams extends BasePageParams { + /** + * ID系统自动生成 + */ + id?: number; + /** + * ID系统自动生成 IN值List + */ + idList?: Array; + /** + * dat_detect_task.id + */ + taskId?: number; + /** + * 设备序列号 + */ + deviceSn?: string; + /** + * 参数配置 + */ + taskDataJson?: string; + /** + * create_time + */ + createTime?: Date; + /** + * 下限值(大于等于) + */ + createTimeFrom?: Date; + /** + * 上限值(小于) + */ + createTimeTo?: Date; + /** + * update_time + */ + updateTime?: Date; + /** + * 下限值(大于等于) + */ + updateTimeFrom?: Date; + /** + * 上限值(小于) + */ + updateTimeTo?: Date; + /** + * 其他参数 + */ + [key: string]: any; +} + +export interface TaskProgress { + /** + * ID系统自动生成 + */ + id?: number; + /** + * dat_detect_task.id + */ + taskId?: number; + /** + * 设备序列号 + */ + deviceSn?: string; + /** + * 参数配置 + */ + taskDataJson?: string; + /** + * create_time + */ + createTime?: Date; + /** + * update_time + */ + updateTime?: Date; + /** + * 其他参数 + */ + [key: string]: any; +} + +export type TaskProgressPageResult = PageResult; + +export type TaskProgressPageResponse = ApiResponse; + +export type TaskProgressResponse = ApiResponse; diff --git a/src/api/model/user.ts b/src/api/model/user.ts index 2327c21..14df393 100644 --- a/src/api/model/user.ts +++ b/src/api/model/user.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; diff --git a/src/api/model/userAuthority.ts b/src/api/model/userAuthority.ts index 1c2fc79..cc14a22 100644 --- a/src/api/model/userAuthority.ts +++ b/src/api/model/userAuthority.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasePageParams, PageResult, ApiResponse } from './baseModel'; diff --git a/src/api/system/algoApi.ts b/src/api/system/algoApi.ts deleted file mode 100644 index 7fff065..0000000 --- a/src/api/system/algoApi.ts +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { defHttp } from '@/utils/http/axios'; -import { - Algo, - AlgoParams, - AlgoPageResult, -} from '../model/algo'; - -const baseApi = '/v1/system/algo'; - -/** - * 新增 - */ -export const add = (entity: Algo) => - defHttp.post({ url: `${baseApi}/`, data: entity }); - -/** - * 更新 - */ -export const update = (entity: Algo, updateAllFields = false) => - defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); - -/** - * 删除 - */ -export const remove = (id: any) => - defHttp.delete({ url: `${baseApi}/${id}` }); - -/** - * 分页查询 - */ -export const search = (params?: AlgoParams) => - defHttp.get({ url: `${baseApi}/search`, params }); - -/** - * 列表查询 - */ -export const all = (params?: AlgoParams) => - defHttp.get({ url: `${baseApi}/all`, params }); - -/** - * 通过主键查询 - */ -export const getById = (id: any) => - defHttp.get({ url: `${baseApi}/${id}` }); - -/** - * 单个查询 - */ -export const getOne = (params?: AlgoParams) => - defHttp.get({ url: `${baseApi}/one`, params }); - -/** - * 批量删除 - */ -export const batchRemove = (idList: Array) => - defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); - -/** - * 批量新增 - */ -export const batchAdd = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); - -/** - * 批量更新 - */ -export const batchUpdate = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); - -/** - * 查询数量 - */ -export const count = (params?: AlgoParams) => - defHttp.get({ url: `${baseApi}/count`, params }); - - diff --git a/src/api/system/authorityApi.ts b/src/api/system/authorityApi.ts index 10f18d4..d1b3a78 100644 --- a/src/api/system/authorityApi.ts +++ b/src/api/system/authorityApi.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { defHttp } from '@/utils/http/axios'; diff --git a/src/api/system/constantApi.ts b/src/api/system/constantApi.ts index 4328607..68ba44c 100644 --- a/src/api/system/constantApi.ts +++ b/src/api/system/constantApi.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { defHttp } from '@/utils/http/axios'; diff --git a/src/api/system/logApi.ts b/src/api/system/logApi.ts index 76fdc2a..75697cc 100644 --- a/src/api/system/logApi.ts +++ b/src/api/system/logApi.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { defHttp } from '@/utils/http/axios'; diff --git a/src/api/system/regionApi.ts b/src/api/system/regionApi.ts deleted file mode 100644 index a6c9627..0000000 --- a/src/api/system/regionApi.ts +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { defHttp } from '@/utils/http/axios'; -import { - Region, - RegionParams, - RegionPageResult, -} from '../model/region'; - -const baseApi = '/v1/system/region'; - -/** - * 新增 - */ -export const add = (entity: Region) => - defHttp.post({ url: `${baseApi}/`, data: entity }); - -/** - * 更新 - */ -export const update = (entity: Region, updateAllFields = false) => - defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); - -/** - * 删除 - */ -export const remove = (id: any) => - defHttp.delete({ url: `${baseApi}/${id}` }); - -/** - * 分页查询 - */ -export const search = (params?: RegionParams) => - defHttp.get({ url: `${baseApi}/search`, params }); - -/** - * 列表查询 - */ -export const all = (params?: RegionParams) => - defHttp.get({ url: `${baseApi}/all`, params }); - -/** - * 通过主键查询 - */ -export const getById = (id: any) => - defHttp.get({ url: `${baseApi}/${id}` }); - -/** - * 单个查询 - */ -export const getOne = (params?: RegionParams) => - defHttp.get({ url: `${baseApi}/one`, params }); - -/** - * 批量删除 - */ -export const batchRemove = (idList: Array) => - defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); - -/** - * 批量新增 - */ -export const batchAdd = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); - -/** - * 批量更新 - */ -export const batchUpdate = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); - -/** - * 查询数量 - */ -export const count = (params?: RegionParams) => - defHttp.get({ url: `${baseApi}/count`, params }); - - diff --git a/src/api/system/storagePlanApi.ts b/src/api/system/storagePlanApi.ts deleted file mode 100644 index 35811e5..0000000 --- a/src/api/system/storagePlanApi.ts +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 项目：视频监控平台 - * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 - */ - -import { defHttp } from '@/utils/http/axios'; -import { - StoragePlan, - StoragePlanParams, - StoragePlanPageResult, -} from '../model/storagePlan'; - -const baseApi = '/v1/system/storage-plan'; - -/** - * 新增 - */ -export const add = (entity: StoragePlan) => - defHttp.post({ url: `${baseApi}/`, data: entity }); - -/** - * 更新 - */ -export const update = (entity: StoragePlan, updateAllFields = false) => - defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); - -/** - * 删除 - */ -export const remove = (id: any) => - defHttp.delete({ url: `${baseApi}/${id}` }); - -/** - * 分页查询 - */ -export const search = (params?: StoragePlanParams) => - defHttp.get({ url: `${baseApi}/search`, params }); - -/** - * 列表查询 - */ -export const all = (params?: StoragePlanParams) => - defHttp.get({ url: `${baseApi}/all`, params }); - -/** - * 通过主键查询 - */ -export const getById = (id: any) => - defHttp.get({ url: `${baseApi}/${id}` }); - -/** - * 单个查询 - */ -export const getOne = (params?: StoragePlanParams) => - defHttp.get({ url: `${baseApi}/one`, params }); - -/** - * 批量删除 - */ -export const batchRemove = (idList: Array) => - defHttp.post({ url: `${baseApi}/batch-delete`, data: idList }); - -/** - * 批量新增 - */ -export const batchAdd = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-save`, data: entityList }); - -/** - * 批量更新 - */ -export const batchUpdate = (entityList: Array) => - defHttp.post({ url: `${baseApi}/batch-update`, data: entityList }); - -/** - * 查询数量 - */ -export const count = (params?: StoragePlanParams) => - defHttp.get({ url: `${baseApi}/count`, params }); - - diff --git a/src/api/system/userApi.ts b/src/api/system/userApi.ts index 86ff7b8..758fa13 100644 --- a/src/api/system/userApi.ts +++ b/src/api/system/userApi.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { defHttp } from '@/utils/http/axios'; @@ -17,19 +17,19 @@ const baseApi = '/v1/system/user'; * 新增 */ export const add = (entity: User) => - defHttp.post({ url: `${baseApi}/add`, data: entity }); + defHttp.post({ url: `${baseApi}/`, data: entity }); /** * 更新 */ export const update = (entity: User, updateAllFields = false) => - defHttp.post({ url: `${baseApi}/update`, data: entity, params: { updateAllFields } }); + defHttp.put({ url: `${baseApi}/`, data: entity, params: { updateAllFields } }); /** * 删除 */ export const remove = (id: any) => - defHttp.get({ url: `${baseApi}/delete`, params: { id } }); + defHttp.delete({ url: `${baseApi}/${id}` }); /** * 分页查询 diff --git a/src/api/system/userAuthorityApi.ts b/src/api/system/userAuthorityApi.ts index f3bc6b5..17791e2 100644 --- a/src/api/system/userAuthorityApi.ts +++ b/src/api/system/userAuthorityApi.ts @@ -1,7 +1,7 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { defHttp } from '@/utils/http/axios'; diff --git a/src/assets/custom.css b/src/assets/custom.scss similarity index 99% rename from src/assets/custom.css rename to src/assets/custom.scss index 2f322d2..bd4e553 100644 --- a/src/assets/custom.css +++ b/src/assets/custom.scss @@ -19,11 +19,7 @@ margin: 10px 20px 2px 10px; } -:deep(.ant-form-item-label) { - width: 10px; -} - -:deep(.ant-form-item-label > label) { +:deep(.ant-form-item-label > label.ant-form-item-no-colon) { font-family: "Noto Sans SC", serif; font-size: 14px; color: white; diff --git a/src/router/routes/embedded/data.ts b/src/router/routes/embedded/data.ts index f06115e..1aa3761 100644 --- a/src/router/routes/embedded/data.ts +++ b/src/router/routes/embedded/data.ts @@ -7,26 +7,26 @@ const data: AppRouteModule = { name: 'Data', component: EMBEDDED_LAYOUT, meta: { - title: "数据管理", + title: '数据管理', orderNo: 100000, ignoreAuth: true, }, children: [ { - path: 'task', - name: 'TaskPage', - component: () => import('/@/views/data/detect-task/index.vue'), + path: 'device', + name: 'DevicePage', + component: () => import('/@/views/data/device/index.vue'), meta: { - title: '任务', + title: '设备管理', ignoreAuth: true, }, }, { - path: 'event', - name: 'EventPage', - component: () => import('/@/views/data/event/index.vue'), + path: 'task', + name: 'TaskPage', + component: () => import('/@/views/data/task/index.vue'), meta: { - title: '事件', + title: '任务', ignoreAuth: true, }, }, diff --git a/src/router/routes/embedded/system.ts b/src/router/routes/embedded/system.ts index 38fd76d..e093144 100644 --- a/src/router/routes/embedded/system.ts +++ b/src/router/routes/embedded/system.ts @@ -7,26 +7,17 @@ const system: AppRouteModule = { name: 'System', component: EMBEDDED_LAYOUT, meta: { - title: "系统设置", + title: '系统设置', orderNo: 100001, ignoreAuth: true, }, children: [ { - path: 'detect-task', - name: 'DetectTaskPage', - component: () => import('/@/views/system/detect-task/index.vue'), + path: 'constant', + name: 'ConstantPage', + component: () => import('/@/views/system/constant/index.vue'), meta: { - title: '任务管理', - ignoreAuth: true, - }, - }, - { - path: 'device', - name: 'DevicePage', - component: () => import('/@/views/system/device/index.vue'), - meta: { - title: '设备管理', + title: '常量管理', ignoreAuth: true, }, }, diff --git a/src/views/data/detect-task-item/detail.vue b/src/views/data/detect-task-item/detail.vue deleted file mode 100644 index b57c7c8..0000000 --- a/src/views/data/detect-task-item/detail.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - diff --git a/src/views/system/device/detail.vue b/src/views/data/device/detail.vue similarity index 97% rename from src/views/system/device/detail.vue rename to src/views/data/device/detail.vue index c4df02a..f8c76b9 100644 --- a/src/views/system/device/detail.vue +++ b/src/views/data/device/detail.vue @@ -31,7 +31,7 @@ import { useAsyncState } from '@vueuse/core'; import { PageHeader, Descriptions, Card } from 'ant-design-vue'; import { descriptionColumns } from './schema'; - import * as DeviceApi from '@/api/system/deviceApi'; + import * as DeviceApi from '@/api/data/deviceApi'; import { Device } from '@/api/model/device'; const route = useRoute(); diff --git a/src/views/data/detect-task/drawer.vue b/src/views/data/device/drawer.vue similarity index 90% rename from src/views/data/detect-task/drawer.vue rename to src/views/data/device/drawer.vue index fbceb79..68da9dd 100644 --- a/src/views/data/detect-task/drawer.vue +++ b/src/views/data/device/drawer.vue @@ -8,11 +8,11 @@ import { BasicForm, useForm } from '@/components/Form/index'; import { formSchema } from './schema'; import { BasicDrawer, useDrawerInner } from '@/components/Drawer'; - import * as DetectTaskApi from '@/api/data/detectTaskApi'; + import * as DeviceApi from '@/api/data/deviceApi'; const emit = defineEmits(['success', 'register']); const isUpdate = ref(true); - const entity = ref(); + const entity = ref(); const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ labelWidth: 120, @@ -42,7 +42,7 @@ const { ...rest } = values; - const action = !unref(isUpdate) ? DetectTaskApi.add : DetectTaskApi.update; + const action = !unref(isUpdate) ? DeviceApi.add : DeviceApi.update; const data = !unref(isUpdate) ? { ...rest, diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue new file mode 100644 index 0000000..296ae7a --- /dev/null +++ b/src/views/data/device/index.vue @@ -0,0 +1,156 @@ + + + diff --git a/src/views/data/device/schema.ts b/src/views/data/device/schema.ts new file mode 100644 index 0000000..e7d8009 --- /dev/null +++ b/src/views/data/device/schema.ts @@ -0,0 +1,197 @@ +/** + * 项目：中核预埋件检测 + * 模型分组：数据管理 + * 模型名称：设备表 + * @Author: xiongwei + * @Date: 2024-11-15 11:50:00 + */ + +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Table'; + + + + +const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } }; +const colPropsInDrawer = { span: 24 }; + +export const schema = { + model: 'Device', + viewInPage: false, + properties: [ + { + field: 'id', + label: 'ID系统自动生成', + defaultValue: undefined, + form: { + componentProps: { + allowClear: false, + placeholder: 'ID系统自动生成', + }, + colProps, + component: 'InputNumber', + rules: [{ required: true, message: '请输入ID系统自动生成！' }], + }, + table: { + }, + }, + { + field: 'name', + label: '设备名称', + defaultValue: undefined, + form: { + componentProps: { + allowClear: false, + placeholder: '设备名称', + }, + colProps, + component: 'Input', + rules: [{ required: true, message: '请输入设备名称！' }], + }, + table: { + }, + }, + { + field: 'deviceSn', + label: '设备序列号', + defaultValue: undefined, + form: { + componentProps: { + allowClear: true, + placeholder: '设备序列号', + }, + colProps, + component: 'Input', + }, + table: { + }, + }, + { + field: 'deviceIp', + label: '设备IP地址', + defaultValue: undefined, + form: { + componentProps: { + allowClear: true, + placeholder: '设备IP地址', + }, + colProps, + component: 'Input', + }, + table: { + }, + }, + { + field: 'createTime', + label: 'CreateTime', + defaultValue: undefined, + form: { + colProps, + componentProps: { + allowClear: false, + placeholder: ['开始时间', '结束时间'], + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + showTime: false, + }, + component: 'RangePicker', + rules: [{ required: true, message: '请输入CreateTime！' }], + }, + table: { + }, + }, + { + field: 'updateTime', + label: 'UpdateTime', + defaultValue: undefined, + form: { + colProps, + componentProps: { + allowClear: false, + placeholder: ['开始时间', '结束时间'], + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + showTime: false, + }, + component: 'RangePicker', + rules: [{ required: true, message: '请输入UpdateTime！' }], + }, + table: { + }, + }, + ], +}; + +const queryFields = ['name','deviceSn','deviceIp']; +const editFields = ['name','deviceSn','deviceIp']; +const tableFields = ['name','deviceSn','deviceIp','createTime','updateTime']; +const descriptionFields = ['name','deviceSn','deviceIp','createTime','updateTime']; + +const queryFieldsIndexMap = new Map(queryFields.map((field, index) => [field, index])); +export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field)) + .map( + ({ field, label, form: { ...formProps } }) => + ({ + field, + label, + defaultValue: undefined, + ...formProps, + required: false, + rules: [{ required: false }], + } as FormSchema), + ) + .sort((a, b) => { + const indexA = queryFieldsIndexMap.get(a.field) as number; + const indexB = queryFieldsIndexMap.get(b.field) as number; + return indexA - indexB; + }); + +const editFieldsIndexMap = new Map(editFields.map((field, index) => [field, index])); +export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field)) + .map( + ({ field, label, defaultValue, form }) => + ({ + field, + label, + defaultValue, + ...form, + colProps: colPropsInDrawer, + } as FormSchema), + ) + .sort((a, b) => { + const indexA = editFieldsIndexMap.get(a.field) as number; + const indexB = editFieldsIndexMap.get(b.field) as number; + return indexA - indexB; + }); + +const tableFieldsIndexMap = new Map(tableFields.map((field, index) => [field, index])); +export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field)) + .map( + ({ field, label, table }) => + ({ + dataIndex: field, + title: label, + ...table, + } as BasicColumn) + ) + .sort((a, b) => { + const indexA = tableFieldsIndexMap.get(a.dataIndex as string) as number; + const indexB = tableFieldsIndexMap.get(b.dataIndex as string) as number; + return indexA - indexB; + }); + +const descriptionFieldsIndexMap = new Map(descriptionFields.map((field, index) => [field, index])); +export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field)) + .map( + ({ field, label, table }) => + ({ + dataIndex: field, + title: label, + ...table, + } as BasicColumn), + ) + .sort((a, b) => { + const indexA = descriptionFieldsIndexMap.get(a.dataIndex as string) as number; + const indexB = descriptionFieldsIndexMap.get(b.dataIndex as string) as number; + return indexA - indexB; + }); diff --git a/src/views/system/detect-task/detail.vue b/src/views/data/task-log/detail.vue similarity index 91% rename from src/views/system/detect-task/detail.vue rename to src/views/data/task-log/detail.vue index dc1360a..b97e9dc 100644 --- a/src/views/system/detect-task/detail.vue +++ b/src/views/data/task-log/detail.vue @@ -31,8 +31,8 @@ import { useAsyncState } from '@vueuse/core'; import { PageHeader, Descriptions, Card } from 'ant-design-vue'; import { descriptionColumns } from './schema'; - import * as RegionApi from '@/api/system/regionApi'; - import { Region } from '@/api/model/region'; + import * as TaskLogApi from '@/api/data/taskLogApi'; + import { TaskLog } from '@/api/model/taskLog'; const route = useRoute(); const id = ref(route.params?.id); @@ -45,7 +45,7 @@ isLoading, execute, } = useAsyncState( - RegionApi.getById(id.value).then((res: Region) => res), + TaskLogApi.getById(id.value).then((res: TaskLog) => res), null, { immediate: false, diff --git a/src/views/data/detect-task-item/drawer.vue b/src/views/data/task-log/drawer.vue similarity index 90% rename from src/views/data/detect-task-item/drawer.vue rename to src/views/data/task-log/drawer.vue index 931377f..2841733 100644 --- a/src/views/data/detect-task-item/drawer.vue +++ b/src/views/data/task-log/drawer.vue @@ -8,11 +8,11 @@ import { BasicForm, useForm } from '@/components/Form/index'; import { formSchema } from './schema'; import { BasicDrawer, useDrawerInner } from '@/components/Drawer'; - import * as DetectTaskItemApi from '@/api/data/detectTaskItemApi'; + import * as TaskLogApi from '@/api/data/taskLogApi'; const emit = defineEmits(['success', 'register']); const isUpdate = ref(true); - const entity = ref(); + const entity = ref(); const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ labelWidth: 120, @@ -42,7 +42,7 @@ const { ...rest } = values; - const action = !unref(isUpdate) ? DetectTaskItemApi.add : DetectTaskItemApi.update; + const action = !unref(isUpdate) ? TaskLogApi.add : TaskLogApi.update; const data = !unref(isUpdate) ? { ...rest, diff --git a/src/views/data/event/index.vue b/src/views/data/task-log/index.vue similarity index 87% rename from src/views/data/event/index.vue rename to src/views/data/task-log/index.vue index 06fce26..d544931 100644 --- a/src/views/data/event/index.vue +++ b/src/views/data/task-log/index.vue @@ -8,7 +8,7 @@ 已选中{{ checkedKeys.length }}条记录 清空 - + diff --git a/src/views/data/event/schema.ts b/src/views/data/task-log/schema.ts similarity index 61% rename from src/views/data/event/schema.ts rename to src/views/data/task-log/schema.ts index ff058e3..38b6ea9 100644 --- a/src/views/data/event/schema.ts +++ b/src/views/data/task-log/schema.ts @@ -1,14 +1,14 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * 模型分组：数据管理 - * 模型名称：事件明细表 + * 模型名称：任务检测日志表 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasicColumn } from '@/components/Table'; import { FormSchema } from '@/components/Table'; -import { uploadApi } from "@/api/sys/upload"; + @@ -16,8 +16,8 @@ const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } }; const colPropsInDrawer = { span: 24 }; export const schema = { - model: 'Event', - viewInPage: true, + model: 'TaskLog', + viewInPage: false, properties: [ { field: 'id', @@ -36,100 +36,32 @@ export const schema = { }, }, { - field: 'regionId', - label: 'sys_region.id', + field: 'taskId', + label: 'dat_detect_task.id', defaultValue: undefined, form: { componentProps: { allowClear: false, - placeholder: 'sys_region.id', + placeholder: 'dat_detect_task.id', }, colProps, component: 'InputNumber', - rules: [{ required: true, message: '请输入sys_region.id！' }], + rules: [{ required: true, message: '请输入dat_detect_task.id！' }], }, table: { }, }, { - field: 'deviceId', - label: 'sys_device.id', - defaultValue: undefined, - form: { - componentProps: { - allowClear: false, - placeholder: 'sys_device.id', - }, - colProps, - component: 'InputNumber', - rules: [{ required: true, message: '请输入sys_device.id！' }], - }, - table: { - }, - }, - { - field: 'algoCode', - label: '算法code', - defaultValue: undefined, - form: { - componentProps: { - allowClear: false, - placeholder: '算法code', - }, - colProps, - component: 'Input', - rules: [{ required: true, message: '请输入算法code！' }], - }, - table: { - }, - }, - { - field: 'alarmLevel', - label: '告警等级', - defaultValue: undefined, - form: { - componentProps: { - allowClear: false, - placeholder: '告警等级', - }, - colProps, - component: 'Input', - rules: [{ required: true, message: '请输入告警等级！' }], - }, - table: { - }, - }, - { - field: 'imageUrl', - label: '图片', - defaultValue: undefined, - form: { - componentProps: { - api: uploadApi, - maxSize: 5, - maxNumber: 1, - multiple: false, - accept: ['png', 'jpg', 'jpeg', 'bmp', 'webp'], - allowClear: true, - placeholder: '图片', - }, - colProps, - component: 'Upload', - }, - table: { - }, - }, - { - field: 'videoUrl', - label: '视频', + field: 'deviceSn', + label: '设备序列号', defaultValue: undefined, form: { componentProps: { allowClear: true, - placeholder: '视频', + placeholder: '设备序列号', }, colProps, - component: 'Upload', + component: 'Input', }, table: { }, @@ -150,20 +82,39 @@ export const schema = { }, }, { - field: 'eventTime', - label: '发生时间', + field: 'createTime', + label: 'CreateTime', defaultValue: undefined, form: { colProps, - component: 'DatePicker', componentProps: { allowClear: false, - placeholder: '发生时间', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - showTime: true, + placeholder: ['开始时间', '结束时间'], + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + showTime: false, }, - rules: [{ required: true, message: '请输入发生时间！' }], + component: 'RangePicker', + rules: [{ required: true, message: '请输入CreateTime！' }], + }, + table: { + }, + }, + { + field: 'updateTime', + label: 'UpdateTime', + defaultValue: undefined, + form: { + colProps, + componentProps: { + allowClear: false, + placeholder: ['开始时间', '结束时间'], + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + showTime: false, + }, + component: 'RangePicker', + rules: [{ required: true, message: '请输入UpdateTime！' }], }, table: { }, @@ -171,10 +122,10 @@ export const schema = { ], }; -const queryFields = ['id','regionId','deviceId','algoCode','alarmLevel','videoUrl','content','eventTime']; -const editFields = ['regionId','deviceId','algoCode','alarmLevel','imageUrl','videoUrl','content','eventTime']; -const tableFields = ['regionId','deviceId','algoCode','alarmLevel','imageUrl','videoUrl','content','eventTime']; -const descriptionFields = ['regionId','deviceId','algoCode','alarmLevel','imageUrl','videoUrl','content','eventTime']; +const queryFields = ['id','taskId','deviceSn','content','createTime','updateTime']; +const editFields = ['taskId','deviceSn','content']; +const tableFields = ['taskId','deviceSn','content','createTime','updateTime']; +const descriptionFields = ['taskId','deviceSn','content','createTime','updateTime']; const queryFieldsIndexMap = new Map(queryFields.map((field, index) => [field, index])); export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field)) diff --git a/src/views/data/task-progress/detail.vue b/src/views/data/task-progress/detail.vue new file mode 100644 index 0000000..786b0e4 --- /dev/null +++ b/src/views/data/task-progress/detail.vue @@ -0,0 +1,74 @@ + + + + diff --git a/src/views/system/detect-task/drawer.vue b/src/views/data/task-progress/drawer.vue similarity index 80% rename from src/views/system/detect-task/drawer.vue rename to src/views/data/task-progress/drawer.vue index 9ef13a3..3338720 100644 --- a/src/views/system/detect-task/drawer.vue +++ b/src/views/data/task-progress/drawer.vue @@ -1,6 +1,6 @@ - - diff --git a/src/views/data/detect-task-item/schema.ts b/src/views/data/task-progress/schema.ts similarity index 73% rename from src/views/data/detect-task-item/schema.ts rename to src/views/data/task-progress/schema.ts index fe3be02..682cb1d 100644 --- a/src/views/data/detect-task-item/schema.ts +++ b/src/views/data/task-progress/schema.ts @@ -1,9 +1,9 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * 模型分组：数据管理 - * 模型名称：任务检测项表 + * 模型名称：任务检测过程数据表 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasicColumn } from '@/components/Table'; @@ -16,7 +16,7 @@ const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } }; const colPropsInDrawer = { span: 24 }; export const schema = { - model: 'DetectTaskItem', + model: 'TaskProgress', viewInPage: false, properties: [ { @@ -36,7 +36,7 @@ export const schema = { }, }, { - field: 'detectTaskId', + field: 'taskId', label: 'dat_detect_task.id', defaultValue: undefined, form: { @@ -52,23 +52,22 @@ export const schema = { }, }, { - field: 'algoId', - label: 'sys_algo.id', + field: 'deviceSn', + label: '设备序列号', defaultValue: undefined, form: { componentProps: { - allowClear: false, - placeholder: 'sys_algo.id', + allowClear: true, + placeholder: '设备序列号', }, colProps, - component: 'InputNumber', - rules: [{ required: true, message: '请输入sys_algo.id！' }], + component: 'Input', }, table: { }, }, { - field: 'paramJson', + field: 'taskDataJson', label: '参数配置', defaultValue: undefined, form: { @@ -83,16 +82,39 @@ export const schema = { }, }, { - field: 'roiJson', - label: 'ROI区域设置', + field: 'createTime', + label: 'CreateTime', defaultValue: undefined, form: { + colProps, componentProps: { - allowClear: true, - placeholder: 'ROI区域设置', + allowClear: false, + placeholder: ['开始时间', '结束时间'], + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + showTime: false, }, - component: 'InputTextArea', - colProps: { span: 24 }, + component: 'RangePicker', + rules: [{ required: true, message: '请输入CreateTime！' }], + }, + table: { + }, + }, + { + field: 'updateTime', + label: 'UpdateTime', + defaultValue: undefined, + form: { + colProps, + componentProps: { + allowClear: false, + placeholder: ['开始时间', '结束时间'], + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + showTime: false, + }, + component: 'RangePicker', + rules: [{ required: true, message: '请输入UpdateTime！' }], }, table: { }, @@ -100,10 +122,10 @@ export const schema = { ], }; -const queryFields = ['id','detectTaskId','algoId']; -const editFields = ['detectTaskId','algoId','paramJson','roiJson']; -const tableFields = ['detectTaskId','algoId','paramJson','roiJson']; -const descriptionFields = ['detectTaskId','algoId','paramJson','roiJson']; +const queryFields = ['id','taskId','deviceSn','createTime','updateTime']; +const editFields = ['taskId','deviceSn','taskDataJson']; +const tableFields = ['taskId','deviceSn','taskDataJson','createTime','updateTime']; +const descriptionFields = ['taskId','deviceSn','taskDataJson','createTime','updateTime']; const queryFieldsIndexMap = new Map(queryFields.map((field, index) => [field, index])); export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field)) diff --git a/src/views/data/event/detail.vue b/src/views/data/task/detail.vue similarity index 92% rename from src/views/data/event/detail.vue rename to src/views/data/task/detail.vue index 4fb92d6..b1af3e3 100644 --- a/src/views/data/event/detail.vue +++ b/src/views/data/task/detail.vue @@ -31,8 +31,8 @@ import { useAsyncState } from '@vueuse/core'; import { PageHeader, Descriptions, Card } from 'ant-design-vue'; import { descriptionColumns } from './schema'; - import * as EventApi from '@/api/data/eventApi'; - import { Event } from '@/api/model/event'; + import * as TaskApi from '@/api/data/taskApi'; + import { Task } from '@/api/model/task'; const route = useRoute(); const id = ref(route.params?.id); @@ -45,7 +45,7 @@ isLoading, execute, } = useAsyncState( - EventApi.getById(id.value).then((res: Event) => res), + TaskApi.getById(id.value).then((res: Task) => res), null, { immediate: false, diff --git a/src/views/data/event/drawer.vue b/src/views/data/task/drawer.vue similarity index 91% rename from src/views/data/event/drawer.vue rename to src/views/data/task/drawer.vue index dd065a8..6579f94 100644 --- a/src/views/data/event/drawer.vue +++ b/src/views/data/task/drawer.vue @@ -8,11 +8,11 @@ import { BasicForm, useForm } from '@/components/Form/index'; import { formSchema } from './schema'; import { BasicDrawer, useDrawerInner } from '@/components/Drawer'; - import * as EventApi from '@/api/data/eventApi'; + import * as TaskApi from '@/api/data/taskApi'; const emit = defineEmits(['success', 'register']); const isUpdate = ref(true); - const entity = ref(); + const entity = ref(); const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ labelWidth: 120, @@ -42,7 +42,7 @@ const { ...rest } = values; - const action = !unref(isUpdate) ? EventApi.add : EventApi.update; + const action = !unref(isUpdate) ? TaskApi.add : TaskApi.update; const data = !unref(isUpdate) ? { ...rest, diff --git a/src/views/system/detect-task/index.vue b/src/views/data/task/index.vue similarity index 72% rename from src/views/system/detect-task/index.vue rename to src/views/data/task/index.vue index ce988e7..0677c8e 100644 --- a/src/views/system/detect-task/index.vue +++ b/src/views/data/task/index.vue @@ -1,12 +1,8 @@ - - diff --git a/src/views/data/detect-task/schema.ts b/src/views/data/task/schema.ts similarity index 76% rename from src/views/data/detect-task/schema.ts rename to src/views/data/task/schema.ts index eabbde9..3ea8c99 100644 --- a/src/views/data/detect-task/schema.ts +++ b/src/views/data/task/schema.ts @@ -1,9 +1,9 @@ /** - * 项目：视频监控平台 + * 项目：中核预埋件检测 * 模型分组：数据管理 * 模型名称：检测任务表 * @Author: xiongwei - * @Date: 2024-09-26 11:50:00 + * @Date: 2024-11-15 11:50:00 */ import { BasicColumn } from '@/components/Table'; @@ -16,8 +16,8 @@ const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } }; const colPropsInDrawer = { span: 24 }; export const schema = { - model: 'DetectTask', - viewInPage: false, + model: 'Task', + viewInPage: true, properties: [ { field: 'id', @@ -51,19 +51,64 @@ export const schema = { table: { }, }, + { + field: 'deviceSn', + label: '设备序列号', + defaultValue: undefined, + form: { + componentProps: { + allowClear: true, + placeholder: '设备序列号', + }, + colProps, + component: 'Input', + }, + table: { + }, + }, + { + field: 'paramJson', + label: '任务参数', + defaultValue: undefined, + form: { + componentProps: { + allowClear: true, + placeholder: '任务参数', + }, + component: 'InputTextArea', + colProps: { span: 24 }, + }, + table: { + }, + }, + { + field: 'resultJson', + label: '任务结果', + defaultValue: undefined, + form: { + componentProps: { + allowClear: true, + placeholder: '任务结果', + }, + component: 'InputTextArea', + colProps: { span: 24 }, + }, + table: { + }, + }, { field: 'startTime', label: '开始时间', defaultValue: undefined, form: { colProps, - component: 'DatePicker', + component: 'RangePicker', componentProps: { allowClear: false, placeholder: '开始时间', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - showTime: true, + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + showTime: false, }, rules: [{ required: true, message: '请输入开始时间！' }], }, @@ -91,16 +136,16 @@ export const schema = { }, { field: 'state', - label: '状态(0.未开始', + label: '状态', defaultValue: undefined, form: { componentProps: { allowClear: false, - placeholder: '状态(0.未开始', + placeholder: '状态', }, colProps, component: 'InputNumber', - rules: [{ required: true, message: '请输入状态(0.未开始！' }], + rules: [{ required: true, message: '请输入状态！' }], }, table: { }, @@ -146,10 +191,10 @@ export const schema = { ], }; -const queryFields = ['id','name','startTime','endTime','state','createTime','updateTime']; -const editFields = ['name','startTime','endTime','state']; -const tableFields = ['name','startTime','endTime','state','createTime','updateTime']; -const descriptionFields = ['name','startTime','endTime','state','createTime','updateTime']; +const queryFields = ['name','deviceSn','startTime','state']; +const editFields = ['name','deviceSn','paramJson','resultJson','startTime','endTime','state']; +const tableFields = ['name','deviceSn','startTime','endTime','state','createTime','updateTime']; +const descriptionFields = ['name','deviceSn','paramJson','resultJson','startTime','endTime','state','createTime','updateTime']; const queryFieldsIndexMap = new Map(queryFields.map((field, index) => [field, index])); export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field)) diff --git a/src/views/system/authority/index.vue b/src/views/system/authority/index.vue index bbb42c6..a3985ea 100644 --- a/src/views/system/authority/index.vue +++ b/src/views/system/authority/index.vue @@ -1,31 +1,8 @@