diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java index f1cbdf0c..47366be9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java @@ -20,6 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.cnadmin.common.base.BaseEnum; +import top.charles7c.cnadmin.common.constant.UIConsts; /** * 启用/禁用状态枚举 @@ -32,11 +33,12 @@ import top.charles7c.cnadmin.common.base.BaseEnum; public enum DisEnableStatusEnum implements BaseEnum { /** 启用 */ - ENABLE(1, "启用"), + ENABLE(1, "启用", UIConsts.COLOR_SUCCESS), /** 禁用 */ - DISABLE(2, "禁用"),; + DISABLE(2, "禁用", UIConsts.COLOR_ERROR),; private final Integer value; private final String description; + private final String color; } diff --git a/continew-admin-tool/src/main/resources/templates/generator/index.ftl b/continew-admin-tool/src/main/resources/templates/generator/index.ftl index 3c223b4f..49bc6b20 100644 --- a/continew-admin-tool/src/main/resources/templates/generator/index.ftl +++ b/continew-admin-tool/src/main/resources/templates/generator/index.ftl @@ -261,7 +261,7 @@ import checkPermission from '@/utils/permission'; const { proxy } = getCurrentInstance() as any; - // const { DisEnableStatusEnum } = proxy.useDict('DisEnableStatusEnum'); + // const { dis_enable_status_enum } = proxy.useDict('dis_enable_status_enum'); const dataList = ref([]); const dataDetail = ref({ diff --git a/continew-admin-ui/src/api/common/dashboard.ts b/continew-admin-ui/src/api/common/dashboard.ts index 22cfae44..c481000e 100644 --- a/continew-admin-ui/src/api/common/dashboard.ts +++ b/continew-admin-ui/src/api/common/dashboard.ts @@ -27,7 +27,7 @@ export interface DashboardGeoDistributionRecord { } export interface DashboardAnnouncementRecord { - id: string; + id: number; title: string; type: number; } diff --git a/continew-admin-ui/src/api/monitor/log.ts b/continew-admin-ui/src/api/monitor/log.ts index db123833..8d764ce3 100644 --- a/continew-admin-ui/src/api/monitor/log.ts +++ b/continew-admin-ui/src/api/monitor/log.ts @@ -4,7 +4,7 @@ import qs from 'query-string'; const BASE_URL = '/monitor/log'; export interface LogRecord { - id?: string; + id?: number; clientIp: string; location: string; browser: string; @@ -102,6 +102,6 @@ export function listSystemLog(params: SystemLogParam) { }); } -export function getSystemLog(id: string) { +export function getSystemLog(id: number) { return axios.get(`${BASE_URL}/system/${id}`); } diff --git a/continew-admin-ui/src/api/system/announcement.ts b/continew-admin-ui/src/api/system/announcement.ts index b52e7a15..5efa6ac3 100644 --- a/continew-admin-ui/src/api/system/announcement.ts +++ b/continew-admin-ui/src/api/system/announcement.ts @@ -4,7 +4,7 @@ import qs from 'query-string'; const BASE_URL = '/system/announcement'; export interface DataRecord { - id?: string; + id?: number; title?: string; content?: string; status?: number; @@ -42,7 +42,7 @@ export function list(params: ListParam) { }); } -export function get(id: string) { +export function get(id: number) { return axios.get(`${BASE_URL}/${id}`); } @@ -50,10 +50,10 @@ export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function update(req: DataRecord, id: string) { +export function update(req: DataRecord, id: number) { return axios.put(`${BASE_URL}/${id}`, req); } -export function del(ids: string | Array) { +export function del(ids: number | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/api/system/dept.ts b/continew-admin-ui/src/api/system/dept.ts index c541b31d..53ddc774 100644 --- a/continew-admin-ui/src/api/system/dept.ts +++ b/continew-admin-ui/src/api/system/dept.ts @@ -4,9 +4,9 @@ import qs from 'query-string'; const BASE_URL = '/system/dept'; export interface DataRecord { - id?: string; + id?: number; name: string; - parentId?: string; + parentId?: number; description?: string; sort: number; status?: number; @@ -34,7 +34,7 @@ export function list(params: ListParam) { }); } -export function get(id: string) { +export function get(id: number) { return axios.get(`${BASE_URL}/${id}`); } @@ -42,10 +42,10 @@ export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function update(req: DataRecord, id: string) { +export function update(req: DataRecord, id: number) { return axios.put(`${BASE_URL}/${id}`, req); } -export function del(ids: string | Array) { +export function del(ids: number | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/api/system/menu.ts b/continew-admin-ui/src/api/system/menu.ts index 9a2a3d47..d11d67d1 100644 --- a/continew-admin-ui/src/api/system/menu.ts +++ b/continew-admin-ui/src/api/system/menu.ts @@ -4,9 +4,9 @@ import qs from 'query-string'; const BASE_URL = '/system/menu'; export interface DataRecord { - id?: string; + id?: number; title: string; - parentId?: string; + parentId?: number; type: number; path?: string; name?: string; @@ -40,7 +40,7 @@ export function list(params: ListParam) { }); } -export function get(id: string) { +export function get(id: number) { return axios.get(`${BASE_URL}/${id}`); } @@ -48,10 +48,10 @@ export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function update(req: DataRecord, id: string) { +export function update(req: DataRecord, id: number) { return axios.put(`${BASE_URL}/${id}`, req); } -export function del(ids: string | Array) { +export function del(ids: number | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/api/system/role.ts b/continew-admin-ui/src/api/system/role.ts index 55f0adf5..7d5ae62f 100644 --- a/continew-admin-ui/src/api/system/role.ts +++ b/continew-admin-ui/src/api/system/role.ts @@ -4,14 +4,14 @@ import qs from 'query-string'; const BASE_URL = '/system/role'; export interface DataRecord { - id?: string; + id?: number; name: string; code?: string; sort?: number; description?: string; - menuIds?: Array; + menuIds?: Array; dataScope: number; - deptIds?: Array; + deptIds?: Array; status?: number; type?: number; createUserString?: string; @@ -43,7 +43,7 @@ export function list(params: ListParam) { }); } -export function get(id: string) { +export function get(id: number) { return axios.get(`${BASE_URL}/${id}`); } @@ -51,10 +51,10 @@ export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function update(req: DataRecord, id: string) { +export function update(req: DataRecord, id: number) { return axios.put(`${BASE_URL}/${id}`, req); } -export function del(ids: string | Array) { +export function del(ids: number | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/api/system/user.ts b/continew-admin-ui/src/api/system/user.ts index aee53473..4f89f12a 100644 --- a/continew-admin-ui/src/api/system/user.ts +++ b/continew-admin-ui/src/api/system/user.ts @@ -4,7 +4,7 @@ import qs from 'query-string'; const BASE_URL = '/system/user'; export interface DataRecord { - id?: string; + id?: number; username: string; nickname: string; gender: number; @@ -18,9 +18,9 @@ export interface DataRecord { createTime?: string; updateUserString?: string; updateTime?: string; - deptId?: string; + deptId?: number; deptName?: string; - roleIds?: Array; + roleIds?: Array; roleNames?: Array; disabled?: boolean; } @@ -48,7 +48,7 @@ export function list(params: ListParam) { }); } -export function get(id: string) { +export function get(id: number) { return axios.get(`${BASE_URL}/${id}`); } @@ -56,22 +56,22 @@ export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function update(req: DataRecord, id: string) { +export function update(req: DataRecord, id: number) { return axios.put(`${BASE_URL}/${id}`, req); } -export function del(ids: string | Array) { +export function del(ids: number | Array) { return axios.delete(`${BASE_URL}/${ids}`); } -export function resetPassword(id: string) { +export function resetPassword(id: number) { return axios.patch(`${BASE_URL}/${id}/password`); } export interface UpdateUserRoleReq { - roleIds?: Array; + roleIds?: Array; } -export function updateUserRole(req: UpdateUserRoleReq, id: string) { +export function updateUserRole(req: UpdateUserRoleReq, id: number) { return axios.patch(`${BASE_URL}/${id}/role`, req); } diff --git a/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue b/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue index cd8e9275..64ce6836 100644 --- a/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue +++ b/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue @@ -110,7 +110,7 @@ * * @param id ID */ - const toDetail = async (id: string) => { + const toDetail = async (id: number) => { if (detailLoading.value) return; detailLoading.value = true; detailVisible.value = true; diff --git a/continew-admin-ui/src/views/dashboard/workplace/components/popular-module.vue b/continew-admin-ui/src/views/dashboard/workplace/components/popular-module.vue index 2b5b212e..4bedc7b3 100644 --- a/continew-admin-ui/src/views/dashboard/workplace/components/popular-module.vue +++ b/continew-admin-ui/src/views/dashboard/workplace/components/popular-module.vue @@ -21,7 +21,7 @@ {{ rowIndex + 1 }} - +