Compare commits

...

6 Commits

3 changed files with 15 additions and 6 deletions

View File

@ -120,6 +120,13 @@ const renderPage = async (canvasobj) => {
} }
// //
const savaDataStore = () => { 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) => { imgarr.value.forEach((a) => {
if (a.index == 0) { if (a.index == 0) {
a.JSONdata = canvasFabricVue.value.canvas.toJSON() a.JSONdata = canvasFabricVue.value.canvas.toJSON()
@ -170,7 +177,8 @@ const initPdf = async (type = 'default') => {
a.JSONdata = canvas1FabricVue.value.canvas.toJSON() 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])) const nameMap = new Map(canvsStore.pageArr.map((item) => [item.page, item.id]))
// //
let promises = [] let promises = []

View File

@ -50,7 +50,8 @@ const isOnLoadShow = ref(false) //加载完毕显示
// //
const pdfObj = reactive({ const pdfObj = reactive({
numberOfPdf: 2, // numberOfPdf: 2, //
pdfUrl: getStaticUrl('aaa.pdf', 'user', 'selfFile', true), // pdfUrl: getStaticUrl('aaa.pdf', 'user', 'selfFile', true),//
pdfUrl: null,
allPageData:[], allPageData:[],
bookId:null, bookId:null,
numPages: 1 // numPages: 1 //
@ -107,7 +108,7 @@ const switchPageMode = () => {
} }
onMounted(async () => { onMounted(async () => {
toolState.isPdfWin=true toolState.isPdfWin=true
console.log(toolState.showBoardAll,"c初始") pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true)
textbookId.value = route.query.textbookId textbookId.value = route.query.textbookId
pdfObj.bookId=textbookId.value pdfObj.bookId=textbookId.value
getBookMarkById(textbookId.value).then(res=>{ getBookMarkById(textbookId.value).then(res=>{

View File

@ -494,10 +494,10 @@ export default {
async navtoPdf() { async navtoPdf() {
const toolStore = useToolState() const toolStore = useToolState()
if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本,请勿重复操作') if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本,请勿重复操作')
// let path = await this.getBookPathFromServer() let path = await this.getBookPathFromServer()
// console.log(path) path=path.replace(/^.*[\\\/]/, '');
// console.log(this.uploadData.textbookId) // 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() { openLesson() {