From bddcf2d4ff0ae8e6a3e6b2b2659d09979e5bd6ff Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Sat, 19 Oct 2024 17:01:05 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- src/main/index.js | 5 ++--- src/renderer/src/utils/tool.js | 4 ++-- .../views/prepare/container/kj-list-item.vue | 20 +++++++++++++++---- src/renderer/src/views/prepare/index.vue | 10 +++++----- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.env.development b/.env.development index 11bbc06..f3b45f2 100644 --- a/.env.development +++ b/.env.development @@ -16,4 +16,4 @@ VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktx VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/' -VITE_SHOW_DEV_TOOLS = true +VITE_SHOW_DEV_TOOLS = 'true' diff --git a/.env.production b/.env.production index 2a0bdc9..05e26a6 100644 --- a/.env.production +++ b/.env.production @@ -18,4 +18,4 @@ VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktx VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/' -VITE_SHOW_DEV_TOOLS = false +VITE_SHOW_DEV_TOOLS = 'true' diff --git a/src/main/index.js b/src/main/index.js index 91f5c08..f00b1b0 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -73,8 +73,7 @@ function createLoginWindow() { loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' }) updateInit(loginWindow) } - - if (import.meta.env.VITE_SHOW_DEV_TOOLS === true) loginWindow.webContents.openDevTools() + if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') loginWindow.webContents.openDevTools() loginWindow.once('ready-to-show', () => { loginWindow.show() }) @@ -128,7 +127,7 @@ function createMainWindow() { shell.openExternal(details.url) return { action: 'deny' } }) - if (import.meta.env.VITE_SHOW_DEV_TOOLS === true) mainWindow.webContents.openDevTools() + if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') mainWindow.webContents.openDevTools() if (is.dev && process.env['ELECTRON_RENDERER_URL']) { mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL']) diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js index ebce77f..445cf22 100644 --- a/src/renderer/src/utils/tool.js +++ b/src/renderer/src/utils/tool.js @@ -138,7 +138,7 @@ export const createWindow = async (type, data) => { wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口 wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口 wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 - if (import.meta.env.VITE_SHOW_DEV_TOOLS === true) wins_tool.webContents.openDevTools() // 打开调试工具 + if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') wins_tool.webContents.openDevTools() // 打开调试工具 eventHandles(type, wins_tool) // 事件监听处理 return wins_tool } @@ -165,7 +165,7 @@ export const createWindow = async (type, data) => { win.type = type // 唯一标识 win.show() win.setFullScreen(true) // 设置窗口为全屏 - if (import.meta.env.VITE_SHOW_DEV_TOOLS === true) win.webContents.openDevTools() // 打开调试工具 + if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具 eventHandles(type, win) // 事件监听处理 winPdf=win break diff --git a/src/renderer/src/views/prepare/container/kj-list-item.vue b/src/renderer/src/views/prepare/container/kj-list-item.vue index a4b0260..7a9a56a 100644 --- a/src/renderer/src/views/prepare/container/kj-list-item.vue +++ b/src/renderer/src/views/prepare/container/kj-list-item.vue @@ -98,7 +98,7 @@ import FileImage from '@/components/file-image/index.vue' import { asyncLocalFile } from '@/utils/talkFile' import { toTimeText } from '@/utils/date' import { ElMessage, ElMessageBox } from 'element-plus' -import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file' +import { deleteSmarttalk, updateSmarttalk, getPrepareById, getSmarttalkPage } from '@/api/file' import useUserStore from '@/store/modules/user' import outLink from '@/utils/linkConfig' import { sessionStore } from '@/utils/store' @@ -208,6 +208,7 @@ export default { } if (action === 'cancel'){ // 继续上课 + console.log(obj.bookImg) if (obj.bookImg) { //PPT listEntpcourse({ @@ -241,9 +242,20 @@ export default { } }) }else { - //APT - this.$emit('on-start-class', item, obj) - done() + console.log(obj) + getSmarttalkPage({fileId: obj.entpcoursefileid}).then(res2=>{ + console.log(res2) + //APT + if (res2&&res2.rows.length>0) { + this.$emit('on-start-class', res2.rows[0], obj) + }else { + ElMessage({ + message: '该文件未关联PPT，无法打开！', + type: 'warning' + }) + } + done() + }) } } if (action === 'close') { diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 8e74903..49f2615 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -106,7 +106,7 @@ :item="item" :index="index" @on-set="openSet" - @on-reSet="openReSet" + @on-reSet="openReSet" @on-delhomework="delhomework" > @@ -657,7 +657,7 @@ export default { this.$refs['reservDialog'].openDialog() }, - // 打开外部链接 + // 打开外部链接 // handleOutLink(key) { // if (key == 'homeWork') { // this.isOpenHomework = true @@ -689,11 +689,11 @@ export default { // 前往作业设计页面 goNewClassTask(){ // router.push({ path: '/newClassTask' }); - this.$router.push({ + this.$router.push({ path: '/newClassTask', query: { isBack: true, - } + } }); }, getWeekday1(date) { @@ -730,7 +730,7 @@ export default { } }); //--------------------- - // 暂时弃用 外链 新窗口打开标识 + // 暂时弃用 外链 新窗口打开标识 // this.isOpenHomework = true; // // key 对应的 linkConfig.js 外部链接配置 // let configObj = outLink()['homeWork']