diff --git a/src/renderer/src/components/pdf/index.vue b/src/renderer/src/components/pdf/index.vue index 0064a6a..3ac1cf6 100644 --- a/src/renderer/src/components/pdf/index.vue +++ b/src/renderer/src/components/pdf/index.vue @@ -187,11 +187,13 @@ onMounted(async () => { fabriccanvas.value = new fabric.Canvas('pdf-fabric') fabriccanvas.value.setWidth(595) fabriccanvas.value.isDrawingMode = true - fabriccanvas.value.freeDrawingBrush.color = 'red' + fabriccanvas.value.freeDrawingBrush.color = '#A33AFE' + fabriccanvas.value.freeDrawingCursor = 'default' fabriccanvas1.value = new fabric.Canvas('pdf-fabric1') fabriccanvas1.value.isDrawingMode = true - fabriccanvas1.value.freeDrawingBrush.color = 'red' + fabriccanvas1.value.freeDrawingBrush.color = '#A33AFE' + fabriccanvas1.value.freeDrawingCursor = 'default' fabriccanvas1.value.setWidth(595) emit('update:numPagesTotal', pdf.numPages) initPdf() diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js index 69a267a..2ca72e7 100644 --- a/src/renderer/src/utils/tool.js +++ b/src/renderer/src/utils/tool.js @@ -158,10 +158,19 @@ const eventHandles = (type, win) => { publicMethods(on) // 加载公共方法 break} case 'open-PDF': { - // 最小化窗口 - Remote.ipcMain.once('open-PDF:minimize', () => {win.minimize()}) + // 最小化窗口 minimize() + Remote.ipcMain.once('open-PDF:minimize', () => {win.destroy()}) break} default: break } } + +const taskHandles = () => { + // // 设置任务栏上下文菜单 + // const contextMenu = new Remote.Menu() + // contextMenu.append(new Remote.MenuItem({ + // label: '关闭', + // click: () => {Remote.app.quit()} + // })) +} diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 7119f9a..80ac306 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -12,7 +12,7 @@ 高考研读 教学大模型 - + 上课
@@ -260,10 +260,13 @@ export default { cookieData: {...(configObj.data)} }) }, + // 打开PDF-课件 navtoPdf() { - const params = { url: '/classBegins/index' } - createWindow('open-PDF', params) - + createWindow('open-PDF', { url: '/classBegins/index' }) + }, + // 上课-工具类悬浮 + openLesson() { + createWindow('tool-sphere', { url: '/tool/sphere' }) } } } diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index 03c4063..887ea2d 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -16,7 +16,7 @@
- 测试 +