diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts index 38680cc..2593bac 100644 --- a/src/api/workbench/workbench.ts +++ b/src/api/workbench/workbench.ts @@ -36,6 +36,16 @@ data, }) } + +// 工作台顶部工作提醒和待办信息条数 +export function getWorkbenchMessageCount(data: { remindDeptId: string; remindId: string }) { + return request({ + url: '/workbench/approvalMessage/count', + method: 'post', + data, + }) +} + // -----------------------------------------日历------------------------------------------ // 新增日程 export function addSchedule(data: object) { diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts index 38680cc..2593bac 100644 --- a/src/api/workbench/workbench.ts +++ b/src/api/workbench/workbench.ts @@ -36,6 +36,16 @@ data, }) } + +// 工作台顶部工作提醒和待办信息条数 +export function getWorkbenchMessageCount(data: { remindDeptId: string; remindId: string }) { + return request({ + url: '/workbench/approvalMessage/count', + method: 'post', + data, + }) +} + // -----------------------------------------日历------------------------------------------ // 新增日程 export function addSchedule(data: object) { diff --git a/src/views/workbench.vue b/src/views/workbench.vue index af23b17..d15e456 100644 --- a/src/views/workbench.vue +++ b/src/views/workbench.vue @@ -24,8 +24,8 @@ const blockWidth = ref(400) // 计算工作台区域高度 - 顶部-面包屑-边距 const benchDivHeight = ref() -function calcBlockSize() { - const bodyHeight = document.body.clientHeight - 60 - 20 - 50 +function calcBlockSize() { // 36是消息滚动栏的高度 + const bodyHeight = document.body.clientHeight - 60 - 20 - 50 - 36 bigBlockHeight.value = bodyHeight blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300 blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3 diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts index 38680cc..2593bac 100644 --- a/src/api/workbench/workbench.ts +++ b/src/api/workbench/workbench.ts @@ -36,6 +36,16 @@ data, }) } + +// 工作台顶部工作提醒和待办信息条数 +export function getWorkbenchMessageCount(data: { remindDeptId: string; remindId: string }) { + return request({ + url: '/workbench/approvalMessage/count', + method: 'post', + data, + }) +} + // -----------------------------------------日历------------------------------------------ // 新增日程 export function addSchedule(data: object) { diff --git a/src/views/workbench.vue b/src/views/workbench.vue index af23b17..d15e456 100644 --- a/src/views/workbench.vue +++ b/src/views/workbench.vue @@ -24,8 +24,8 @@ const blockWidth = ref(400) // 计算工作台区域高度 - 顶部-面包屑-边距 const benchDivHeight = ref() -function calcBlockSize() { - const bodyHeight = document.body.clientHeight - 60 - 20 - 50 +function calcBlockSize() { // 36是消息滚动栏的高度 + const bodyHeight = document.body.clientHeight - 60 - 20 - 50 - 36 bigBlockHeight.value = bodyHeight blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300 blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3 diff --git a/src/views/workbench/components/messageScrolling.vue b/src/views/workbench/components/messageScrolling.vue index 7ed1ce6..b21770f 100644 --- a/src/views/workbench/components/messageScrolling.vue +++ b/src/views/workbench/components/messageScrolling.vue @@ -1,16 +1,49 @@