From 8f501745958ec547be1ce3d18c03e24da3064168 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 13 Aug 2024 16:46:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9ABUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/renderer/src/plugins/shareStore.js | 1 - src/renderer/src/views/prepare/index.vue | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index b10b50c..d4989df 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ VITE_APP_BASE_API = '/dev-api' VITE_APP_DOMAIN = 'file.ysaix.com' -VITE_APP_UPLOAD_API = 'http://192.168.2.52:7863' +VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api' VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/' diff --git a/src/renderer/src/plugins/shareStore.js b/src/renderer/src/plugins/shareStore.js index 3db1486..4857cc4 100644 --- a/src/renderer/src/plugins/shareStore.js +++ b/src/renderer/src/plugins/shareStore.js @@ -20,7 +20,6 @@ export function shareStorePlugin({store}) { function stateSync(store) { const storeName = store.$id const jsonStr = circularSafeStringify(store.$state) - console.log('state-change', jsonStr, storeName) // 通知主线程更新 ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr) } diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 489c993..13933d5 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -232,7 +232,7 @@ export default { this.isOpenHomework = false }) - + }, // activated() { // if (this.uploadData.textbookId !== null) { @@ -427,7 +427,7 @@ export default { await this.asyncAllFile() }, async initHomeWork() { - + if (this.uploadData.levelSecondId) { // 获取作业列表所需ID 可能存在没有 let { rows } = await this.getChapterId() @@ -552,7 +552,7 @@ export default { } } // 去重 - let ary = uniqBy([...this.currentFileList, ...list], 'id') + let ary = uniqBy([...list], 'id') // 深度克隆 this.currentWorkList = cloneDeep(ary) }) From 7fc04faad1533d57dfac0d0d13fb9d655362c988 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 13 Aug 2024 17:43:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9ABUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/utils/tool.js | 21 +++++++++++-------- .../src/views/classManage/reserv-item.vue | 8 +++---- src/renderer/src/views/prepare/index.vue | 1 - 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js index c9c91f1..28c7902 100644 --- a/src/renderer/src/utils/tool.js +++ b/src/renderer/src/utils/tool.js @@ -82,7 +82,9 @@ export function ipcHandle(fn,key, cb) { * @param {*} data 参数 * @returns */ +let wins_tool = null export const createWindow = async (type, data) => { + if (wins_tool) return console.error('createWindow: win is have') if (!type) return console.error('createWindow: type is null') switch(type) { case 'tool-sphere': { // 创建-悬浮球 @@ -97,16 +99,16 @@ export const createWindow = async (type, data) => { } data.isConsole = true // 是否开启控制台 data.option = {...defOption, ...option} - const win = await toolWindow(data) - win.type = type // 唯一标识 - win.show() - win.setFullScreen(true) // 设置窗口为全屏 - win.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口 - win.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口 - win.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 + wins_tool = await toolWindow(data) + wins_tool.type = type // 唯一标识 + wins_tool.show() + wins_tool.setFullScreen(true) // 设置窗口为全屏 + wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口 + wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口 + wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 // win.webContents.openDevTools() // 打开调试工具 - eventHandles(type, win) // 事件监听处理 - return win + eventHandles(type, wins_tool) // 事件监听处理 + return wins_tool } case 'open-PDF': { //课本展示-pdf const option = data.option||{} @@ -193,6 +195,7 @@ const eventHandles = (type, win) => { win.on('closed', () => { if(onClosed) onClosed() // 自定义关闭事件 win = null + wins_tool = null }) // 新窗口-创建事件(如:主进程加载远程服务) ipcRenderer.send('new-window', {id:win.id, type}) diff --git a/src/renderer/src/views/classManage/reserv-item.vue b/src/renderer/src/views/classManage/reserv-item.vue index 685d03a..76d2726 100644 --- a/src/renderer/src/views/classManage/reserv-item.vue +++ b/src/renderer/src/views/classManage/reserv-item.vue @@ -68,18 +68,18 @@ const startClassR = (item) => { } }) } -const toolStore = useToolState() +// const toolStore = useToolState() +let wins = null; // 上课-工具类悬浮 const openLesson = () => { - if (toolStore.isToolWin) return ElMessage.error('您当前已开始上课，请勿重复操作') startClass(props.item.id) listEntpcourse({ evalid: props.item.ex2, edituserid: useUserStore().user.userId, pageSize: 500 - }).then(res=>{ + }).then(async res=>{ if (res.rows[0].id) { - createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res.rows[0].id + "&reservId=" + props.item.id }) + wins = await createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res.rows[0].id + "&reservId=" + props.item.id }) } }) } diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 13933d5..b8a21f8 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -596,7 +596,6 @@ export default { // 上课-工具类悬浮 openLesson() { const toolStore = useToolState() - if (toolStore.isToolWin) return this.$message.error('您当前已开始上课，请勿重复操作') startClass(this.curClassReserv.id) createWindow('tool-sphere', { url: From 79055dc1c26c90d87936be683d880807e3dcbe59 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Wed, 14 Aug 2024 09:58:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9ABUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/tool/sphere.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue index 982b5e6..766f276 100644 --- a/src/renderer/src/views/tool/sphere.vue +++ b/src/renderer/src/views/tool/sphere.vue @@ -109,7 +109,7 @@ const sideMouse = e => { mouseChange(type == 'mouseleave') } // 侧边工具栏: 操作变化 -const sideChange = o => { +const sideChange = async o => { // console.log(o) switch(o.prop) { case 'resource': // 资源 @@ -120,7 +120,7 @@ const sideChange = o => { break case 'over': // 下课 toolStore.isToolWin = false - endClass(route.query.reservId) + await endClass(route.query.reservId) ipcMsgSend('tool-sphere:close') break }