diff --git a/src/api/system/notice/index.ts b/src/api/system/notice/index.ts index f0f5d7e9..62bf5259 100644 --- a/src/api/system/notice/index.ts +++ b/src/api/system/notice/index.ts @@ -1,7 +1,7 @@ import request from '@/config/axios' export interface NoticeVO { - id: number + id: number | undefined title: string type: number content: string @@ -11,32 +11,27 @@ export interface NoticeVO { createTime: Date } -export interface NoticePageReqVO extends PageParam { - title?: string - status?: number -} - // 查询公告列表 -export const getNoticePageApi = (params: NoticePageReqVO) => { +export const getNoticePage = (params: PageParam) => { return request.get({ url: '/system/notice/page', params }) } // 查询公告详情 -export const getNoticeApi = (id: number) => { +export const getNotice = (id: number) => { return request.get({ url: '/system/notice/get?id=' + id }) } // 新增公告 -export const createNoticeApi = (data: NoticeVO) => { +export const createNotice = (data: NoticeVO) => { return request.post({ url: '/system/notice/create', data }) } // 修改公告 -export const updateNoticeApi = (data: NoticeVO) => { +export const updateNotice = (data: NoticeVO) => { return request.put({ url: '/system/notice/update', data }) } // 删除公告 -export const deleteNoticeApi = (id: number) => { +export const deleteNotice = (id: number) => { return request.delete({ url: '/system/notice/delete?id=' + id }) } diff --git a/src/api/system/sms/smsLog/index.ts b/src/api/system/sms/smsLog/index.ts index 52594b90..863eabb6 100644 --- a/src/api/system/sms/smsLog/index.ts +++ b/src/api/system/sms/smsLog/index.ts @@ -53,5 +53,5 @@ export const getSmsLogPageApi = (params: SmsLogPageReqVO) => { // 导出短信日志 export const exportSmsLogApi = (params: SmsLogExportReqVO) => { - return request.download({ url: '/system/sms-log/export', params }) + return request.download({ url: '/system/sms-log/export-excel', params }) } diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue index 97a3e384..f5be8d3a 100644 --- a/src/components/Icon/src/IconSelect.vue +++ b/src/components/Icon/src/IconSelect.vue @@ -45,17 +45,22 @@ const tabsList = [ const pageList = computed(() => { if (currentPage.value === 1) { return copyIconList[currentActiveType.value] - .filter((v) => v.includes(filterValue.value)) + ?.filter((v) => v.includes(filterValue.value)) .slice(currentPage.value - 1, pageSize.value) } else { return copyIconList[currentActiveType.value] - .filter((v) => v.includes(filterValue.value)) + ?.filter((v) => v.includes(filterValue.value)) .slice( pageSize.value * (currentPage.value - 1), pageSize.value * (currentPage.value - 1) + pageSize.value ) } }) +const iconCount = computed(() => { + return copyIconList[currentActiveType.value] == undefined + ? 0 + : copyIconList[currentActiveType.value].length +}) const iconItemStyle = computed((): ParameterCSSProperties => { return (item) => { @@ -159,7 +164,7 @@ watch( { proxyForm = true options.formConfig = { enabled: true, - titleWidth: 100, + titleWidth: 180, titleAlign: 'right', items: allSchemas.searchSchema } diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue index e16857ec..a14b0b60 100644 --- a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue +++ b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue @@ -1,6 +1,6 @@