|
@@ -245,14 +245,14 @@ const workUpdateInterval = 5000 // 5秒更新一次
|
|
|
|
|
|
|
|
// 启动作业更新定时器
|
|
// 启动作业更新定时器
|
|
|
const startWorkTimer = () => {
|
|
const startWorkTimer = () => {
|
|
|
- if (workTimer.value) {
|
|
|
|
|
- clearInterval(workTimer.value)
|
|
|
|
|
- }
|
|
|
|
|
- workTimer.value = setInterval(() => {
|
|
|
|
|
- console.log('定时器触发,检查作业更新')
|
|
|
|
|
- getWork(true) // 传入 true 表示是更新模式
|
|
|
|
|
- }, workUpdateInterval)
|
|
|
|
|
- console.log('作业更新定时器已启动,间隔:', workUpdateInterval, 'ms')
|
|
|
|
|
|
|
+ // if (workTimer.value) {
|
|
|
|
|
+ // clearInterval(workTimer.value)
|
|
|
|
|
+ // }
|
|
|
|
|
+ // workTimer.value = setInterval(() => {
|
|
|
|
|
+ // console.log('定时器触发,检查作业更新')
|
|
|
|
|
+ // getWork(true) // 传入 true 表示是更新模式
|
|
|
|
|
+ // }, workUpdateInterval)
|
|
|
|
|
+ // console.log('作业更新定时器已启动,间隔:', workUpdateInterval, 'ms')
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 停止作业更新定时器
|
|
// 停止作业更新定时器
|
|
@@ -325,14 +325,13 @@ const calculateSlideSize = () => {
|
|
|
slideWidth.value = winHeight / viewportRatio.value
|
|
slideWidth.value = winHeight / viewportRatio.value
|
|
|
slideHeight.value = winHeight
|
|
slideHeight.value = winHeight
|
|
|
}
|
|
}
|
|
|
|
|
+ console.log('calculateSlideSize', slideWidth.value, slideHeight.value, viewportRatio.value, canvasScale.value)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 使用编辑模式的缩放逻辑
|
|
// 使用编辑模式的缩放逻辑
|
|
|
const calculateScale = () => {
|
|
const calculateScale = () => {
|
|
|
console.log('calculateScale 开始执行')
|
|
console.log('calculateScale 开始执行')
|
|
|
|
|
|
|
|
- // 计算幻灯片尺寸
|
|
|
|
|
- calculateSlideSize()
|
|
|
|
|
|
|
|
|
|
// 获取容器尺寸
|
|
// 获取容器尺寸
|
|
|
const container = viewerCanvasRef.value || document.querySelector('.viewer-canvas')
|
|
const container = viewerCanvasRef.value || document.querySelector('.viewer-canvas')
|
|
@@ -371,6 +370,8 @@ const calculateScale = () => {
|
|
|
else {
|
|
else {
|
|
|
console.error('找不到容器元素')
|
|
console.error('找不到容器元素')
|
|
|
}
|
|
}
|
|
|
|
|
+ // 计算幻灯片尺寸
|
|
|
|
|
+ calculateSlideSize()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 简化:直接使用放映功能的缩放逻辑
|
|
// 简化:直接使用放映功能的缩放逻辑
|
|
@@ -476,7 +477,9 @@ const handleFullscreenChange = () => {
|
|
|
|
|
|
|
|
// 重新计算缩放比例
|
|
// 重新计算缩放比例
|
|
|
nextTick(() => {
|
|
nextTick(() => {
|
|
|
- calculateScale()
|
|
|
|
|
|
|
+ setTimeout(() => {
|
|
|
|
|
+ calculateScale()
|
|
|
|
|
+ }, 0)
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|