zdg #144

Merged
zhengdegang merged 24 commits from zdg into main 2024-08-16 13:42:41 +08:00
3 changed files with 9 additions and 8 deletions
Showing only changes of commit cc5c823071 - Show all commits

View File

@ -380,14 +380,13 @@ defineExpose({
savaDataStore savaDataStore
}) })
watchEffect(() => { watchEffect(() => {
console.log(toolState.isToolWin,'监听') console.log(toolState,'监听')
console.log(toolState,'监听111')
if(toolState.isToolWin){
ispointer.value=false
}else{
ispointer.value=true
}
if(toolState.isPdfWin){ if(toolState.isPdfWin){
// if(toolState.isToolWin){
// ispointer.value=false
// }else{
// ispointer.value=true
// }
watchToolState() // watchToolState() //
} }
}) })

View File

@ -105,7 +105,7 @@ const switchPageMode = () => {
} }
onMounted(async () => { onMounted(async () => {
toolState.isPdfWin=true toolState.isPdfWin=true
// pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) // pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线
pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) // pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //
textbookId.value = route.query.textbookId textbookId.value = route.query.textbookId
pdfObj.bookId=textbookId.value pdfObj.bookId=textbookId.value

View File

@ -100,6 +100,7 @@ const resetStatus = () => {
}, 500) }, 500)
}) })
toolStore.isToolWin = true // toolStore.isToolWin = true //
} }
// : // :
const sideMouse = e => { const sideMouse = e => {
@ -125,6 +126,7 @@ const sideChange = o => {
// === === // === ===
watchEffect(() => { watchEffect(() => {
console.log(toolStore)
// , : - // , : -
const show = !toolStore.isPdfWin && toolStore.showBoardAll const show = !toolStore.isPdfWin && toolStore.showBoardAll
if (show != isShow.value) isShow.value = show if (show != isShow.value) isShow.value = show