diff --git a/admin/src/api/system_log_sms.ts b/admin/src/api/system_log_sms.ts index bb84eaa..088b650 100644 --- a/admin/src/api/system_log_sms.ts +++ b/admin/src/api/system_log_sms.ts @@ -24,12 +24,12 @@ export type type_system_log_sms_query = { Content?: string Status?: number Results?: string - SendTime_start?: string - SendTime_end?: string - CreateTime_start?: string - CreateTime_end?: string - UpdateTime_start?: string - UpdateTime_end?: string + SendTimeStart?: string + SendTimeEnd?: string + CreateTimeStart?: string + CreateTimeEnd?: string + UpdateTimeStart?: string + UpdateTimeEnd?: string } // 添加编辑 export type type_system_log_sms_edit = { @@ -58,8 +58,8 @@ export function system_log_sms_list_all(params?: type_system_log_sms_query) { } // 系统短信日志详情 -export function system_log_sms_detail(id: number | string) { - return request.get({ url: '/system_log_sms/detail', params: { id } }) +export function system_log_sms_detail(Id: number | string) { + return request.get({ url: '/system_log_sms/detail', params: { Id } }) } // 系统短信日志新增 @@ -69,16 +69,12 @@ export function system_log_sms_add(data: type_system_log_sms_edit) { // 系统短信日志编辑 export function system_log_sms_edit(data: type_system_log_sms_edit) { - return request.post({ - url: '/system_log_sms/edit', - data: data - // data: clearEmpty(data) - }) + return request.post({ url: '/system_log_sms/edit', data }) } // 系统短信日志删除 -export function system_log_sms_delete(id: number | string) { - return request.post({ url: '/system_log_sms/del', data: { id } }) +export function system_log_sms_delete(Id: number | string) { + return request.post({ url: '/system_log_sms/del', data: { Id } }) } // 系统短信日志导入 diff --git a/admin/src/views/setting/permission/menu/edit.vue b/admin/src/views/setting/permission/menu/edit.vue index 0a75c50..28a5af4 100644 --- a/admin/src/views/setting/permission/menu/edit.vue +++ b/admin/src/views/setting/permission/menu/edit.vue @@ -200,7 +200,7 @@ import { getModulesKey } from '@/router' import { MenuEnum } from '@/enums/appEnums' import Popup from '@/components/popup/index.vue' import feedback from '@/utils/feedback' -import { arrayToTree, treeToArray } from '@/utils/util' +import { arrayToTree } from '@/utils/util' const emit = defineEmits(['success', 'close']) const formRef = shallowRef() @@ -287,9 +287,7 @@ const menuOptions = ref([]) const getMenu = async () => { const data: any = await menuLists() const menu: any = { id: 0, menuName: '顶级', children: [] } - menu.children = arrayToTree( - treeToArray(data).filter((item) => item.menuType != MenuEnum.BUTTON) - ) + menu.children = arrayToTree(data.filter((item) => item.menuType != MenuEnum.BUTTON)) menuOptions.value.push(menu) } function getApiListFn() { diff --git a/admin/src/views/setting/permission/menu/index.vue b/admin/src/views/setting/permission/menu/index.vue index 2d84f3f..7c605ae 100644 --- a/admin/src/views/setting/permission/menu/index.vue +++ b/admin/src/views/setting/permission/menu/index.vue @@ -99,6 +99,7 @@