From 939397922a992d7f40dc00e49e6680950705e370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 19 Jun 2024 21:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diamagnetic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dept/index.ts | 80 ++++++++++++ src/api/dept/model.ts | 72 +++++++++++ src/api/dict/index.ts | 149 ++++++++++++++++++++++ src/api/dict/model.ts | 143 +++++++++++++++++++++ src/api/file/index.ts | 37 ++++++ src/api/file/model.ts | 8 ++ src/api/menu/index.ts | 67 ++++++---- src/api/role/index.ts | 108 ++++++++++++++++ src/api/role/model.ts | 79 ++++++++++++ src/views/manage/calculate/edit.vue | 4 +- src/views/manage/calculate/index.vue | 14 +- src/views/manage/calculateParam/index.vue | 14 +- src/views/manage/datas/index.vue | 14 +- src/views/manage/equipment/edit1.vue | 0 src/views/manage/equipment/edit2.vue | 0 src/views/manage/equipment/index.vue | 16 +-- src/views/manage/otherTool/edit.vue | 12 +- src/views/manage/otherTool/index.vue | 10 +- 18 files changed, 762 insertions(+), 65 deletions(-) create mode 100644 src/api/dept/index.ts create mode 100644 src/api/dept/model.ts create mode 100644 src/api/dict/index.ts create mode 100644 src/api/dict/model.ts create mode 100644 src/api/file/index.ts create mode 100644 src/api/file/model.ts create mode 100644 src/api/role/index.ts create mode 100644 src/api/role/model.ts delete mode 100644 src/views/manage/equipment/edit1.vue delete mode 100644 src/views/manage/equipment/edit2.vue diff --git a/src/api/dept/index.ts b/src/api/dept/index.ts new file mode 100644 index 0000000..45f689a --- /dev/null +++ b/src/api/dept/index.ts @@ -0,0 +1,80 @@ +import request from "@/utils/request"; +import { DeptForm, DeptQuery, DeptVO } from "./model"; + +class DeptAPI { + /** + * 部门树形表格 + * + * @param queryParams + */ + static getList(queryParams?: DeptQuery) { + return request({ + url: "/api/v1/dept", + method: "get", + params: queryParams, + }); + } + + /** + * 部门下拉列表 + */ + static getOptions() { + return request({ + url: "/api/v1/dept/options", + method: "get", + }); + } + + /** + * 获取部门详情 + * + * @param id + */ + static getFormData(id: number) { + return request({ + url: "/api/v1/dept/" + id + "/form", + method: "get", + }); + } + + /** + * 新增部门 + * + * @param data + */ + static add(data: DeptForm) { + return request({ + url: "/api/v1/dept", + method: "post", + data: data, + }); + } + + /** + * 修改部门 + * + * @param id + * @param data + */ + static update(id: number, data: DeptForm) { + return request({ + url: "/api/v1/dept/" + id, + method: "put", + data: data, + }); + } + + /** + * 删除部门 + * + * @param ids + */ + static deleteByIds(ids: string) { + return request({ + url: "/api/v1/dept/" + ids, + method: "delete", + }); + } +} + +export default DeptAPI; diff --git a/src/api/dept/model.ts b/src/api/dept/model.ts new file mode 100644 index 0000000..67614af --- /dev/null +++ b/src/api/dept/model.ts @@ -0,0 +1,72 @@ +/** + * 部门查询参数 + */ +export interface DeptQuery { + keywords?: string; + status?: number; + } + + /** + * 部门类型 + */ + export interface DeptVO { + /** + * 子部门 + */ + children?: DeptVO[]; + /** + * 创建时间 + */ + createTime?: Date; + /** + * 部门ID + */ + id?: number; + /** + * 部门名称 + */ + name?: string; + /** + * 父部门ID + */ + parentId?: number; + /** + * 排序 + */ + sort?: number; + /** + * 状态(1:启用；0:禁用) + */ + status?: number; + /** + * 修改时间 + */ + updateTime?: Date; + } + + /** + * 部门表单类型 + */ + export interface DeptForm { + /** + * 部门ID(新增不填) + */ + id?: number; + /** + * 部门名称 + */ + name?: string; + /** + * 父部门ID + */ + parentId: number; + /** + * 排序 + */ + sort?: number; + /** + * 状态(1:启用；0：禁用) + */ + status?: number; + } + \ No newline at end of file diff --git a/src/api/dict/index.ts b/src/api/dict/index.ts new file mode 100644 index 0000000..adef210 --- /dev/null +++ b/src/api/dict/index.ts @@ -0,0 +1,149 @@ +import request from "@/utils/request"; +import { + DictTypeQuery, + DictTypePageResult, + DictTypeForm, + DictQuery, + DictForm, + DictPageResult, +} from "./model"; + +class DictAPI { + /** + * 字典类型分页列表 + * + * @param queryParams + */ + static getDictTypePage(queryParams: DictTypeQuery) { + return request({ + url: "/api/v1/dict/types/page", + method: "get", + params: queryParams, + }); + } + + /** + * 字典类型表单数据 + * + * @param id + */ + static getDictTypeForm(id: number) { + return request>({ + url: "/api/v1/dict/types/" + id + "/form", + method: "get", + }); + } + + /** + * 新增字典类型 + * + * @param data + */ + static addDictType(data: DictTypeForm) { + return request({ + url: "/api/v1/dict/types", + method: "post", + data: data, + }); + } + + /** + * 修改字典类型 + * + * @param id + * @param data + */ + static updateDictType(id: number, data: DictTypeForm) { + return request({ + url: "/api/v1/dict/types/" + id, + method: "put", + data: data, + }); + } + + /** + * 删除字典类型 + */ + static deleteDictTypes(ids: string) { + return request({ + url: "/api/v1/dict/types/" + ids, + method: "delete", + }); + } + + /** + * 获取字典类型的数据项 + * + * @param typeCode 字典类型编码 + */ + static getDictOptions(typeCode: string) { + return request({ + url: "/api/v1/dict/" + typeCode + "/options", + method: "get", + }); + } + + /** + * 字典分页列表 + */ + static getDictPage(queryParams: DictQuery) { + return request({ + url: "/api/v1/dict/page", + method: "get", + params: queryParams, + }); + } + + /** + * 获取字典表单数据 + * + * @param id + */ + static getDictFormData(id: number) { + return request({ + url: "/api/v1/dict/" + id + "/form", + method: "get", + }); + } + + /** + * 新增字典 + * + * @param data + */ + static addDict(data: DictForm) { + return request({ + url: "/api/v1/dict", + method: "post", + data: data, + }); + } + + /** + * 修改字典项 + * + * @param id + * @param data + */ + static updateDict(id: number, data: DictForm) { + return request({ + url: "/api/v1/dict/" + id, + method: "put", + data: data, + }); + } + + /** + * 删除字典 + * + * @param ids 字典项ID，多个以英文逗号(,)分割 + */ + static deleteDictByIds(ids: string) { + return request({ + url: "/api/v1/dict/" + ids, + method: "delete", + }); + } +} + +export default DictAPI; diff --git a/src/api/dict/model.ts b/src/api/dict/model.ts new file mode 100644 index 0000000..efba9d1 --- /dev/null +++ b/src/api/dict/model.ts @@ -0,0 +1,143 @@ +/** + * 字典类型查询参数 + */ +export interface DictTypeQuery extends PageQuery { + /** + * 关键字(字典类型名称/编码) + */ + keywords?: string; + } + + /** + * 字典类型分页对象 + */ + export interface DictTypePageVO { + /** + * 字典类型ID + */ + id: number; + /** + * 类型编码 + */ + code: string; + /** + * 类型名称 + */ + name: string; + /** + * 状态(1:启用;0:禁用) + */ + status?: number; + /** + * 备注 + */ + remark?: string; + } + + /** + * 字典分页项类型声明 + */ + export type DictTypePageResult = PageResult; + + /** + * 字典表单类型声明 + */ + export interface DictTypeForm { + /** + * 字典类型ID + */ + id?: number; + /** + * 类型名称 + */ + name?: string; + /** + * 类型编码 + */ + code?: string; + /** + * 类型状态：1:启用;0:禁用 + */ + status: number; + /** + * 备注 + */ + remark?: string; + } + + /** + * 字典查询参数 + */ + export interface DictQuery extends PageQuery { + /** + * 字典项名称 + */ + name?: string; + /** + * 字典类型编码 + */ + typeCode?: string; + } + + /** + * 字典分页对象 + */ + export interface DictPageVO { + /** + * 字典ID + */ + id?: number; + /** + * 字典名称 + */ + name?: string; + /** + * 状态(1:启用;0:禁用) + */ + status?: number; + /** + * 字典值 + */ + value?: string; + } + + /** + * 字典分页 + */ + export type DictPageResult = PageResult; + + /** + * 字典表单 + */ + export interface DictForm { + /** + * 字典ID + */ + id?: number; + /** + * 字典名称 + */ + name?: string; + /** + * 排序 + */ + sort?: number; + /** + * 状态(1:启用;0:禁用) + */ + status?: number; + /** + * 类型编码 + */ + typeCode?: string; + /** + * 值 + */ + value?: string; + + /** + * 备注 + */ + remark?: string; + } + \ No newline at end of file diff --git a/src/api/file/index.ts b/src/api/file/index.ts new file mode 100644 index 0000000..8236462 --- /dev/null +++ b/src/api/file/index.ts @@ -0,0 +1,37 @@ +import request from "@/utils/request"; +import { FileInfo } from "./model"; + +class FileAPI { + /** + * 上传文件 + * + * @param file + */ + static upload(file: File) { + const formData = new FormData(); + formData.append("file", file); + return request({ + url: "/api/v1/files", + method: "post", + data: formData, + headers: { + "Content-Type": "multipart/form-data", + }, + }); + } + + /** + * 删除文件 + * + * @param filePath 文件完整路径 + */ + static deleteByPath(filePath?: string) { + return request({ + url: "/api/v1/files", + method: "delete", + params: { filePath: filePath }, + }); + } +} + +export default FileAPI; diff --git a/src/api/file/model.ts b/src/api/file/model.ts new file mode 100644 index 0000000..119d1c7 --- /dev/null +++ b/src/api/file/model.ts @@ -0,0 +1,8 @@ +/** + * 文件API类型声明 + */ +export interface FileInfo { + name: string; + url: string; + } + \ No newline at end of file diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts index 267e64a..63e1b5b 100644 --- a/src/api/menu/index.ts +++ b/src/api/menu/index.ts @@ -146,7 +146,7 @@ class MenuAPI { { path: "/operatorLibrary", component: "Layout", - redirect: "/operatorLibrary/index", + redirect: "/operatorLibrary/calculate", name: "/operatorLibrary", meta: { title: "算子库管理", @@ -175,7 +175,6 @@ class MenuAPI { name: "calculateEdit", meta: { title: "算子编辑", - icon: "user", hidden: true, roles: ["ADMIN", "GUEST"], keepAlive: true, @@ -201,7 +200,6 @@ class MenuAPI { name: "calculateParamEdit", meta: { title: "算子参数编辑", - icon: "user", hidden: true, roles: ["ADMIN", "GUEST"], keepAlive: true, @@ -213,10 +211,10 @@ class MenuAPI { { path: "/dataMgr", component: "Layout", - redirect: "/dataMgr/user", + redirect: "/dataMgr/datas", name: "/dataMgr", meta: { - title: "数据管理", + title: "数据集管理", icon: "db", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], @@ -224,11 +222,11 @@ class MenuAPI { }, children: [ { - path: "user", - component: "system/user/index", - name: "User", + path: "datas", + component: "manage/datas/index", + name: "datas", meta: { - title: "数据管理1", + title: "数据集管理", icon: "user", hidden: false, roles: ["ADMIN", "GUEST"], @@ -237,13 +235,12 @@ class MenuAPI { }, }, { - path: "role", - component: "system/role/index", - name: "Role", + path: "datasEdit", + component: "manage/datas/edit", + name: "datasEdit", meta: { - title: "数据管理2", - icon: "role", - hidden: false, + title: "数据集编辑", + hidden: true, roles: ["ADMIN6", "GUEST", "ADMIN"], keepAlive: true, alwaysShow: false, @@ -265,11 +262,11 @@ class MenuAPI { }, children: [ { - path: "user", - component: "system/user/index", - name: "User", + path: "equipment", + component: "manage/equipment/index", + name: "equipment", meta: { - title: "算法测试仪管理1", + title: "计算设备管理", icon: "user", hidden: false, roles: ["ADMIN", "GUEST"], @@ -278,11 +275,23 @@ class MenuAPI { }, }, { - path: "role", - component: "system/role/index", - name: "Role", + path: "equipmentEdit", + component: "manage/equipment/edit", + name: "equipmentEdit", meta: { - title: "算法算法测试仪管理2", + title: "计算设备编辑", + hidden: true, + roles: ["ADMIN", "GUEST"], + keepAlive: true, + alwaysShow: false, + }, + }, + { + path: "otherTool", + component: "manage/otherTool/index", + name: "otherTool", + meta: { + title: "第三方工具管理", icon: "role", hidden: false, roles: ["ADMIN6", "GUEST", "ADMIN"], @@ -290,6 +299,18 @@ class MenuAPI { alwaysShow: false, }, }, + { + path: "otherToolEdit", + component: "manage/otherTool/edit", + name: "otherToolEdit", + meta: { + title: "第三方工具编辑", + hidden: true, + roles: ["ADMIN6", "GUEST", "ADMIN"], + keepAlive: true, + alwaysShow: false, + } + }, ], }, { diff --git a/src/api/role/index.ts b/src/api/role/index.ts new file mode 100644 index 0000000..148a251 --- /dev/null +++ b/src/api/role/index.ts @@ -0,0 +1,108 @@ +import request from "@/utils/request"; +import { RoleQuery, RolePageResult, RoleForm } from "./model"; + +class RoleAPI { + /** + * 获取角色分页数据 + * + * @param queryParams + */ + static getPage(queryParams?: RoleQuery) { + return request({ + url: "/api/v1/roles/page", + method: "get", + params: queryParams, + }); + } + + /** + * 获取角色下拉数据源 + * + * @param queryParams + */ + static getOptions(queryParams?: RoleQuery) { + return request({ + url: "/api/v1/roles/options", + method: "get", + params: queryParams, + }); + } + + /** + * 获取角色的菜单ID集合 + * + * @param queryParams + */ + static getRoleMenuIds(roleId: number) { + return request({ + url: "/api/v1/roles/" + roleId + "/menuIds", + method: "get", + }); + } + + /** + * 分配菜单权限给角色 + * + * @param queryParams + */ + static updateRoleMenus(roleId: number, data: number[]) { + return request({ + url: "/api/v1/roles/" + roleId + "/menus", + method: "put", + data: data, + }); + } + + /** + * 获取角色表单数据 + * + * @param id + */ + static getFormData(id: number) { + return request({ + url: "/api/v1/roles/" + id + "/form", + method: "get", + }); + } + + /** + * 添加角色 + * + * @param data + */ + static add(data: RoleForm) { + return request({ + url: "/api/v1/roles", + method: "post", + data: data, + }); + } + + /** + * 更新角色 + * + * @param id + * @param data + */ + static update(id: number, data: RoleForm) { + return request({ + url: "/api/v1/roles/" + id, + method: "put", + data: data, + }); + } + + /** + * 批量删除角色，多个以英文逗号(,)分割 + * + * @param ids + */ + static deleteByIds(ids: string) { + return request({ + url: "/api/v1/roles/" + ids, + method: "delete", + }); + } +} + +export default RoleAPI; diff --git a/src/api/role/model.ts b/src/api/role/model.ts new file mode 100644 index 0000000..0796a18 --- /dev/null +++ b/src/api/role/model.ts @@ -0,0 +1,79 @@ +/** + * 角色查询参数 + */ +export interface RoleQuery extends PageQuery { + keywords?: string; + } + + /** + * 角色分页对象 + */ + export interface RolePageVO { + /** + * 角色编码 + */ + code?: string; + + /** + * 角色ID + */ + id?: number; + /** + * 角色名称 + */ + name?: string; + /** + * 排序 + */ + sort?: number; + /** + * 角色状态 + */ + status?: number; + /** + * 创建时间 + */ + createTime?: Date; + /** + * 修改时间 + */ + updateTime?: Date; + } + + /** + * 角色分页 + */ + export type RolePageResult = PageResult; + + /** + * 角色表单对象 + */ + export interface RoleForm { + /** + * 角色ID + */ + id?: number; + + /** + * 角色编码 + */ + code: string; + /** + * 数据权限 + */ + dataScope?: number; + + /** + * 角色名称 + */ + name: string; + /** + * 排序 + */ + sort?: number; + /** + * 角色状态(1-正常；0-停用) + */ + status?: number; + } + \ No newline at end of file diff --git a/src/views/manage/calculate/edit.vue b/src/views/manage/calculate/edit.vue index 5ccec4a..b283244 100644 --- a/src/views/manage/calculate/edit.vue +++ b/src/views/manage/calculate/edit.vue @@ -95,8 +95,8 @@ >算子参数 - - + +