zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge pull request '二期：BUG修复' (#79) from zhuhao_dev into main 

Reviewed-on: #79
This commit is contained in:
朱浩 2024-07-27 00:26:44 +08:00
parent 529197c9dc 2f4d48a8c0
commit f057320625
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/utils/tool.js
View File

@ -115,7 +115,7 @@ export function toolWindow({url, isFile, isConsole, option={}}) {
} }
// 创建-新窗口 // 创建-新窗口
let win = new Remote.BrowserWindow(config) let win = new Remote.BrowserWindow(config)
if (!!isFile) win.loadFile(urlAll,{hash: url}) // 加载文件 if (!isDev) win.loadFile(urlAll,{hash: url}) // 加载文件
else win.loadURL(urlAll) // 加载url else win.loadURL(urlAll) // 加载url
win.once('ready-to-show', () => {resolve(win)}) win.once('ready-to-show', () => {resolve(win)})
// 主窗口关闭事件 // 主窗口关闭事件

2
src/renderer/src/views/classBegins/index.vue
View File

@ -36,7 +36,7 @@ import { ref, onMounted, watch, reactive } from 'vue'
import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf' import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf'
pdfjsLib.GlobalWorkerOptions.workerSrc = '/lib/build/pdf.worker.mjs' pdfjsLib.GlobalWorkerOptions.workerSrc = '/lib/build/pdf.worker.mjs'
import pdfCanvas from '@/components/pdf/index.vue' import pdfCanvas from '@/components/pdf/index.vue'
const { ipcRenderer } = require('electron') const { ipcRenderer } = window.electron || {}
// 传过去的参数 // 传过去的参数
const pdfObj = reactive({ const pdfObj = reactive({
numberOfPdf: 2, //显示几页 numberOfPdf: 2, //显示几页