From 6ada829bb8c5f31c05c539c31878e7ccf1f90f95 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Wed, 23 Oct 2024 14:29:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83-=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/element.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index 9a26696..fd50f6b 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -436,7 +436,7 @@ .dialog-small{ .el-dialog__body{ - max-height: 240px; + max-height: 260px; } } .dialog-middle{ From 32c7436b81f35f7b4516a6488879ab63bc286be9 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 23 Oct 2024 16:08:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/system/dict/dictExample.ts | 139 ++++++++++ frontend/src/api/system/dict/index.ts | 70 +++++ .../src/api/system/dict/interface/index.ts | 43 +++ frontend/src/routers/modules/staticRouter.ts | 24 +- frontend/src/views/system/dict/data.vue | 250 ++++++++++++++++++ frontend/src/views/system/dict/index.vue | 224 ++++++++++++++++ 6 files changed, 745 insertions(+), 5 deletions(-) create mode 100644 frontend/src/api/system/dict/dictExample.ts create mode 100644 frontend/src/api/system/dict/index.ts create mode 100644 frontend/src/api/system/dict/interface/index.ts create mode 100644 frontend/src/views/system/dict/data.vue create mode 100644 frontend/src/views/system/dict/index.vue diff --git a/frontend/src/api/system/dict/dictExample.ts b/frontend/src/api/system/dict/dictExample.ts new file mode 100644 index 0000000..bee602d --- /dev/null +++ b/frontend/src/api/system/dict/dictExample.ts @@ -0,0 +1,139 @@ +import { type Dict } from "@/api/system/dict/interface"; + +export const dictTypeList: Dict.ResDictType[] = [ + { + id: "1", + name: "用户性别", + code: "EXAMPLE_CODE1", + sort: 1, + openLevel: 1, + openDescribe: 1, + remark: "示例描述1221", + state: 1, + createBy: "admin", + createTime: "2023-10-01 12:00:00", + updateBy: "admin", + updateTime: "2023-10-12 14:40:00", + }, + { + id: "231", + name: "菜单状态", + code: "EXAMPLE_CODE2", + sort: 1, + openLevel: 1, + openDescribe: 1, + remark: "示例描述11133", + state: 0, + createBy: "admin", + createTime: "2023-10-01 12:00:00", + updateBy: "admin", + updateTime: "2023-10-10 12:00:00", + }, + { + id: "33", + name: "系统开关", + code: "EXAMPLE_CODE3", + sort: 1, + openLevel: 1, + openDescribe: 1, + remark: "示例描述111344", + state: 1, + createBy: "admin", + createTime: "2023-10-01 12:00:00", + updateBy: "admin", + updateTime: "2023-10-10 12:00:00", + }, +]; + +export const dictDataList: Dict.ResDictData[] = [ + { + id: "210", + typeId: "101", + name: "字典项1", + code: "EXAMPLE_00111", + sort: 1, + level: 1, + algoDescribe: null, + value: "字典值1", + state: 1, + createBy: "admin", + createTime: "2023-10-01 12:00:00", + updateBy: "admin", + updateTime: "2023-10-01 14:43:03", + }, + { + id: "2210", + typeId: "101", + name: "字典项2", + code: "EXAMPLE_00121", + sort: 1, + level: 2, + algoDescribe: null, + value: "字典值2", + state: 1, + createBy: "admin", + createTime: "2023-10-03 12:00:00", + updateBy: "admin", + updateTime: "2023-10-05 14:43:03", + }, + { + id: "212", + typeId: "101", + name: "字典项3", + code: "EXAMPLE_00141", + sort: 1, + level: 3, + algoDescribe: null, + value: "字典值3", + state: 0, + createBy: "admin", + createTime: "2023-10-01 11:00:00", + updateBy: "admin", + updateTime: "2023-10-05 16:43:03", + }, + { + id: "210", + typeId: "101", + name: "字典项4", + code: "EXAMPLE_00311", + sort: 1, + level: null, + algoDescribe: null, + value: "字典值4", + state: 0, + createBy: "admin", + createTime: "2023-10-03 12:40:00", + updateBy: "admin", + updateTime: "2023-10-04 14:43:03", + }, + { + id: "217", + typeId: "101", + name: "字典项5", + code: "EXAMPLE_00341", + sort: 1, + level: undefined, + algoDescribe: null, + value: "字典值5", + state: 1, + createBy: "admin", + createTime: "2023-10-06 12:45:03", + updateBy: "admin", + updateTime: "2023-10-07 19:37:03", + }, + { + id: "237", + typeId: "101", + name: "字典项6", + code: "EXAMPLE_00318", + sort: 1, + level: 0, + algoDescribe: null, + value: "字典值6", + state: 1, + createBy: "admin", + createTime: "2023-10-16 10:45:03", + updateBy: "admin", + updateTime: "2023-10-17 19:37:03", + }, +]; diff --git a/frontend/src/api/system/dict/index.ts b/frontend/src/api/system/dict/index.ts new file mode 100644 index 0000000..9e42def --- /dev/null +++ b/frontend/src/api/system/dict/index.ts @@ -0,0 +1,70 @@ +import http from "@/api"; +import { ADMIN as rePrefix } from "@/api/config/serviceName"; +import { type Dict } from "@/api/system/dict/interface"; + +//获取字典类型 +export const getDictTypeList = (params: Dict.ReqDictTypeParams) => { + return http.post(`${rePrefix}/dict/list`, params); +}; + +//添加字典类型 +export const addDictType = (params: Dict.ReqDictTypeParams) => { + return http.post(`${rePrefix}/dict/add`,params); +}; + +//删除字典类型 +export const deleteDictType = (params: { id: string[] }) => { + return http.post(`${rePrefix}/dict/delete`, { data: params }); +}; + +//编辑字典类型 +export const updateDictType = (params: Dict.ReqDictTypeParams) => { + return http.post(`${rePrefix}/dict/update`, params); +}; + +//导出字典类型 +export const exportDictType = (params: Dict.ResDictType) => { + return http.download(`${rePrefix}/dict/export`, params); +}; + +//批量添加字典类型 +export const batchAddDictType = (params: FormData) => { + return http.post(`${rePrefix}/dict/import`, params); +}; + + + + + +//获取字典数据 +export const getDictDataList = (params: Dict.ReqDictDataParams) => { + return http.post(`${rePrefix}/dict-data/list`, params); +}; + +//添加字典数据 +export const addDictData = (params: Dict.ReqDictDataParams) => { + return http.post(`${rePrefix}/dict-data/add`, params); +}; + +//删除字典数据 +export const deleteDictData = (params: { id: string[] }) => { + return http.post(`${rePrefix}/dict-data/delete`, { data: params }); +}; + +//编辑字典数据 +export const updateDictData = (params: Dict.ReqDictDataParams) => { + return http.post(`${rePrefix}/dict-data/update`, params); +}; + +//导出字典数据 +export const exportDictData = (params: Dict.ResDictData) => { + return http.download(`${rePrefix}/dict-data/export`, params); +}; + +//批量添加字典数据 +export const batchAddDictData = (params: FormData) => { + return http.post(`${rePrefix}/dict-data/import`, params); +}; + + + diff --git a/frontend/src/api/system/dict/interface/index.ts b/frontend/src/api/system/dict/interface/index.ts new file mode 100644 index 0000000..ecc8d5a --- /dev/null +++ b/frontend/src/api/system/dict/interface/index.ts @@ -0,0 +1,43 @@ +import type { ReqPage } from "@/api/interface"; + +export namespace Dict { + + export interface ResDictType { + id: string; // 字典类型表Id + name: string; // 名称 + code: string; // 编码 + sort: number; // 排序 + openLevel: number; // 开启等级:0-不开启;1-开启,默认不开启 + openDescribe: number; // 开启描述:0-不开启;1-开启,默认不开启 + remark?: string | null; // 描述 + state: number; // 状态:0-删除 1-正常 + createBy?: string | null; // 创建用户 + createTime?: string | null; // 创建时间 + updateBy?: string | null; // 更新用户 + updateTime?: string | null; // 更新时间 + } + + export interface ReqDictTypeParams extends ReqPage{ + + } + + export interface ResDictData { + id: string; // 字典数据表Id + typeId: string; // 字典类型表Id + name: string; // 名称 + code: string; // 编码 + sort: number; // 排序 + level?: number | null; // 事件等级:0-普通;1-中等;2-严重 (默认为0) + algoDescribe?: number | null; // 与高级算法内部Id描述对应 + value?: string | null; // 字典针对电压等级 + state: number; // 状态:0-删除 1-正常 + createBy?: string | null; // 创建用户 + createTime?: string | null; // 创建时间 + updateBy?: string | null; // 更新用户 + updateTime?: string | null; // 更新时间 + } + + export interface ReqDictDataParams extends ReqPage{ + + } +} diff --git a/frontend/src/routers/modules/staticRouter.ts b/frontend/src/routers/modules/staticRouter.ts index c090b47..8f0d911 100644 --- a/frontend/src/routers/modules/staticRouter.ts +++ b/frontend/src/routers/modules/staticRouter.ts @@ -25,12 +25,12 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/plan", name: "plan", - redirect:"/plan/planList", + redirect: "/plan/planList", children: [ { path: "/plan/planList", name: "planList", - component:()=> import("@/views/plan/planList/index.vue"), + component: () => import("@/views/plan/planList/index.vue"), meta: { title: "检测计划列表", icon: "List", @@ -44,7 +44,7 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/plan/singlePlanList", name: "singlePlanList", - component:()=> import("@/views/plan/singlePlanList/index.vue"), + component: () => import("@/views/plan/singlePlanList/index.vue"), meta: { title: "单个计划列表", icon: "List", @@ -58,7 +58,7 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/plan/preTest", name: "preTest", - component:()=> import("@/views/plan/preTest/index.vue"), + component: () => import("@/views/plan/preTest/index.vue"), meta: { title: "预检测", icon: "List", @@ -72,7 +72,7 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/plan/autoTest", name: "autoTest", - component:()=> import("@/views/plan/autoTest/index.vue"), + component: () => import("@/views/plan/autoTest/index.vue"), meta: { title: "自动检测", icon: "List", @@ -115,6 +115,20 @@ export const staticRouter: RouteRecordRaw[] = [ }, ], }, + { + path: "/system/dict-data/:code/:id(\\d+)", + name: "dictData", + component: () => import("@/views/system/dict/data.vue"), + meta: { + title: "字典数据", + icon: "List", + isLink: "", + isHide: false, + isFull: false, + isAffix: false, + isKeepAlive: false, + }, + } ], }, ]; diff --git a/frontend/src/views/system/dict/data.vue b/frontend/src/views/system/dict/data.vue new file mode 100644 index 0000000..23a624c --- /dev/null +++ b/frontend/src/views/system/dict/data.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/frontend/src/views/system/dict/index.vue b/frontend/src/views/system/dict/index.vue new file mode 100644 index 0000000..9606fdb --- /dev/null +++ b/frontend/src/views/system/dict/index.vue @@ -0,0 +1,224 @@ + + + + + From a4dd154a3b5057a448b680490eb6a1e620fd5865 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Wed, 23 Oct 2024 19:16:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/element.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index fd50f6b..a3c7f5b 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -331,7 +331,7 @@ .el-dialog__body { // height: 200px; // max-height: 60vh; - min-height: 200px; + //min-height: 200px; overflow-y: auto; padding: 10px 15px;