diff --git a/src/renderer/src/components/pdf/index.vue b/src/renderer/src/components/pdf/index.vue index 5c7cf13..c686d14 100644 --- a/src/renderer/src/components/pdf/index.vue +++ b/src/renderer/src/components/pdf/index.vue @@ -120,6 +120,13 @@ const renderPage = async (canvasobj) => { } // 保存数据 const savaDataStore = () => { + if(!toolState.isToolWin){ + toolState.isPdfWin=false + toolState.showBoardAll=true //恢复默认值 + ipcRenderer.invoke('tool-sphere:reset') //重置tool状态 + ipcRenderer.send('open-PDF:minimize') + return + } imgarr.value.forEach((a) => { if (a.index == 0) { a.JSONdata = canvasFabricVue.value.canvas.toJSON() @@ -170,7 +177,8 @@ const initPdf = async (type = 'default') => { a.JSONdata = canvas1FabricVue.value.canvas.toJSON() } }) - if (type != 'default') { + // 判断是否翻页以及工具窗口是否打开 满足 翻页+打开工具才能保存数据 + if (type != 'default' && toolState.isToolWin) { const nameMap = new Map(canvsStore.pageArr.map((item) => [item.page, item.id])) // 创建一个用于存储所有异步操作的数组 let promises = [] diff --git a/src/renderer/src/views/classBegins/index.vue b/src/renderer/src/views/classBegins/index.vue index 188c790..5fc078a 100644 --- a/src/renderer/src/views/classBegins/index.vue +++ b/src/renderer/src/views/classBegins/index.vue @@ -50,7 +50,8 @@ const isOnLoadShow = ref(false) //加载完毕显示 // 传过去的参数 const pdfObj = reactive({ numberOfPdf: 2, //显示几页 - pdfUrl: getStaticUrl('aaa.pdf', 'user', 'selfFile', true), + // pdfUrl: getStaticUrl('aaa.pdf', 'user', 'selfFile', true),//本地 + pdfUrl: null, allPageData:[], bookId:null, numPages: 1 //当前页数 @@ -107,7 +108,7 @@ const switchPageMode = () => { } onMounted(async () => { toolState.isPdfWin=true - console.log(toolState.showBoardAll,"c初始") + pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) textbookId.value = route.query.textbookId pdfObj.bookId=textbookId.value getBookMarkById(textbookId.value).then(res=>{ diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 2a615f7..d9c06c3 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -494,10 +494,10 @@ export default { async navtoPdf() { const toolStore = useToolState() if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本,请勿重复操作') - // let path = await this.getBookPathFromServer() - // console.log(path) + let path = await this.getBookPathFromServer() + path=path.replace(/^.*[\\\/]/, ''); // console.log(this.uploadData.textbookId) - createWindow('open-PDF', { url: '/classBegins/index?textbookId='+this.uploadData.textbookId }) + createWindow('open-PDF', { url: '/classBegins/index?textbookId='+this.uploadData.textbookId+'&path='+ path }) }, // 上课-工具类悬浮 openLesson() {